commit 985ac6b9465652798009f63733f166c9d065443a
author Dan Willemsen <dwillemsen@google.com> Thu Feb 04 22:44:19 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 04 22:44:20 2016 +0000
tree c5bd344fab2e1b8bf84faf9b4e8a4978f6901d9a
parent ecf0a6c92b62437f2c0a2017a0e98c7f92b162dd
parent 1a799d14b71c3f694aa62edf99310bc3e1a482d5

Merge "Fix prune when bare git has detached head"

project.py

diff --git a/project.py b/project.py
index 5058088..d54e336 100644
--- a/project.py
+++ b/project.py
@@ -1583,8 +1583,6 @@
 
     if kill:
       old = self.bare_git.GetHead()
-      if old is None:
-        old = 'refs/heads/please_never_use_this_as_a_branch_name'
 
       try:
         self.bare_git.DetachHead(rev)
@@ -1596,7 +1594,10 @@
                        capture_stderr=True)
         b.Wait()
       finally:
-        self.bare_git.SetHead(old)
+        if ID_RE.match(old):
+          self.bare_git.DetachHead(old)
+        else:
+          self.bare_git.SetHead(old)
         left = self._allrefs
 
       for branch in kill: