From c47501f994ed3b2e0906ccee5590903756fe566d Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 6 Oct 2005 21:59:55 +0100 Subject: [PATCH] Fix a bug in "stg branch --rename" We were using the wrong pathname when setting HEAD. Signed-off-by: Chuck Lever --- stgit/git.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stgit/git.py b/stgit/git.py index 241f375..de8d47f 100644 --- 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 """ - 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 - 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: - 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 -- 2.11.0