Fix the branch renaming to also rename the reflogs

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index cdf15fd55e246a58a66a5724f7fdf15d66cf58bb..4c5685ae33589420dd585816d1c7d8449354cfbc 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -397,6 +397,11 @@ def rename_branch(from_name, to_name):
     rename(os.path.join(basedir.get(), 'refs', 'heads'),
            from_name, to_name)
 
+    reflog_dir = os.path.join(basedir.get(), 'logs', 'refs', 'heads')
+    if os.path.exists(reflog_dir) \
+           and os.path.exists(os.path.join(reflog_dir, from_name)):
+        rename(reflog_dir, from_name, to_name)
+
 def add(names):
     """Add the files or recursively add the directory contents
     """