Merge changes from github.

Change: 138143557

1 files changed, 5 insertions, 3 deletions

diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
index 267bcad816..adc6bdbd17 100755
--- a/tensorflow/tools/git/gen_git_source.py
+++ b/tensorflow/tools/git/gen_git_source.py
@@ -147,8 +147,10 @@ def get_git_version(git_base_path):
   """
   unknown_label = b"unknown"
   try:
-    val = subprocess.check_output(["git", str("--git-dir="+git_base_path+"/.git"), str("--work-tree="+git_base_path), "describe",
-                                   "--long", "--dirty", "--tags"]).strip()
+    val = bytes(subprocess.check_output([
+        "git", str("--git-dir=%s/.git" % git_base_path),
+        str("--work-tree=" + git_base_path), "describe", "--long", "--dirty", "--tags"
+    ]).strip())
     return val if val else unknown_label
   except subprocess.CalledProcessError:
     return unknown_label
@@ -199,7 +201,7 @@ def generate(arglist):
   data = json.load(open(spec))
   git_version = None
   if not data["git"]:
-    git_version = "unknown"
+    git_version = b"unknown"
   else:
     old_branch = data["branch"]
     new_branch = parse_branch_ref(head_symlink)