From ca48e6426685db01f1b008e9e8a55b80ad04a324 Mon Sep 17 00:00:00 2001
From: ChJR <chjr8815@gmail.com>
Date: Sun, 22 Sep 2019 17:43:37 +0900
Subject: [PATCH] Use git_identifier instead of version_number

---
 vm/src/sysmodule.rs |  2 +-
 vm/src/version.rs   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/vm/src/sysmodule.rs b/vm/src/sysmodule.rs
index 2788dd7eb..312388f19 100644
--- a/vm/src/sysmodule.rs
+++ b/vm/src/sysmodule.rs
@@ -166,7 +166,7 @@ fn sys_exc_info(vm: &VirtualMachine) -> PyResult {
 fn sys_git_info(vm: &VirtualMachine) -> PyObjectRef {
     vm.ctx.new_tuple(vec![
         vm.ctx.new_str("RustPython".to_string()),
-        vm.ctx.new_str(version::get_version_number()),
+        vm.ctx.new_str(version::get_git_identifier()),
         vm.ctx.new_str(version::get_git_revision()),
     ])
 }
diff --git a/vm/src/version.rs b/vm/src/version.rs
index da3a147d9..eda1b3f7d 100644
--- a/vm/src/version.rs
+++ b/vm/src/version.rs
@@ -47,3 +47,14 @@ pub fn get_git_branch() -> String {
         .unwrap_or("")
         .to_string()
 }
+
+pub fn get_git_identifier() -> String {
+    let git_tag = get_git_tag();
+    let git_branch = get_git_branch();
+
+    if git_tag.is_empty() || git_tag == "undefined" {
+        git_branch
+    } else {
+        git_tag
+    }
+}