Merge branch 'jgfouca/scripts/acme_util_fix_branch_get' into master

acme_util: get_current_branch return None on fail [BFB] * jgfouca/scripts/acme_util_fix_branch_get: acme_util: get_current_branch return None on fail
E3SM-Project · Oct 11, 2015 · 8f2c155 · 8f2c155
2 parents 7161c10 + 9af53d9
commit 8f2c155
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cime/scripts-acme/acme_util.py b/cime/scripts-acme/acme_util.py
@@ -282,8 +282,12 @@ def get_current_branch(repo=None):
             branch = branch.replace("origin/", "", 1)
         return branch
     else:
-        output = run_cmd("git symbolic-ref HEAD", from_dir=repo)
-        return output.replace("refs/heads/", "")
+        stat, output, errput = run_cmd("git symbolic-ref HEAD", from_dir=repo, ok_to_fail=True)
+        if (stat != 0):
+            warning("Couldn't get current git branch, error: '%s'" % errput)
+            return None
+        else:
+            return output.replace("refs/heads/", "")
 
 ###############################################################################
 def get_current_commit(short=False, repo=None):