Fixed a bug with branch names omitting path components.

empty · empty · commit b65df78a10c3 · 2008-12-16T09:55:00.000-05:00
Git allows branches to be named and organized using path components, e.g using
a branch called "refactoring/feature1", which gets stored under
refs/heads/refactoring/feature1. The previous code omitted everything but the
last path component giving the name "feature1" instead of
"refactoring/feature1" for the branch. This changeset fixes that.
(cherry picked from commit dc4738bc53e580754e47037e26c7eec3047aeb69)
diff --git a/lib/git/head.py b/lib/git/head.py
@@ -104,7 +104,12 @@ def from_string(cls, repo, line):
             git.Head
         """
         full_name, ids = line.split("\x00")
-        name = full_name.split("/")[-1]
+
+        if full_name.startswith('refs/heads/'):
+            name = full_name[len('refs/heads/'):]
+        else:
+            name = full_name
+
         c = commit.Commit(repo, id=ids)
         return Head(name, c)
 
diff --git a/test/fixtures/for_each_ref_with_path_component b/test/fixtures/for_each_ref_with_path_component
diff --git a/test/git/test_head.py b/test/git/test_head.py
@@ -21,3 +21,12 @@ def test_repr(self, git):
         
         assert_true(git.called)
         assert_equal(git.call_args, (('for_each_ref', 'refs/heads'), {'sort': 'committerdate', 'format': '%(refname)%00%(objectname)'}))
+
+    @patch_object(Git, '_call_process')
+    def test_ref_with_path_component(self, git):
+        git.return_value = fixture('for_each_ref_with_path_component')
+        head = self.repo.heads[0]
+
+        assert_equal('refactoring/feature1', head.name)
+        assert_true(git.called)
+        assert_equal(git.call_args, (('for_each_ref', 'refs/heads'), {'sort': 'committerdate', 'format': '%(refname)%00%(objectname)'}))
