Fix a bug in "stg branch --rename"

We were using the wrong pathname when setting HEAD.

Signed-off-by: Chuck Lever <cel@netapp.com>

diff --git a/stgit/git.py b/stgit/git.py
index 241f375940b7f03ceeda07c65fcb6bd7b4e15714..de8d47f9f196a69f443648e556f76c53c3de6a77 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -318,16 +318,16 @@ def delete_branch(name):
 def rename_branch(from_name, to_name):
     """Rename a git branch
     """
 def rename_branch(from_name, to_name):
     """Rename a git branch
     """

-    from_head = os.path.join(base_dir, 'refs', 'heads', from_name)
+    from_head = os.path.join('refs', 'heads', from_name)

     if not branch_exists(from_head):
         raise GitException, 'Branch "%s" does not exist' % from_name
     if not branch_exists(from_head):
         raise GitException, 'Branch "%s" does not exist' % from_name

-    to_head = os.path.join(base_dir, 'refs', 'heads', to_name)
+    to_head = os.path.join('refs', 'heads', to_name)

     if branch_exists(to_head):
         raise GitException, 'Branch "%s" already exists' % to_name
 
     if get_head_file() == from_name:
     if branch_exists(to_head):
         raise GitException, 'Branch "%s" already exists' % to_name
 
     if get_head_file() == from_name:

-        set_head_file(os.path.join('refs', 'heads', to_name))
-    os.rename(from_head, to_head)
+        set_head_file(to_head)
+    os.rename(os.path.join(base_dir, from_head), os.path.join(base_dir, to_head))

 
 def add(names):
     """Add the files or recursively add the directory contents
 
 def add(names):
     """Add the files or recursively add the directory contents