Do at least a little cleanup.

svn path=/trunk/scripts/git-migration/; revision=1894

diff --git a/git-migrate b/git-migrate
index f03884f..ccd9934 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -118,6 +118,12 @@ def mergeHistory(old_pkg, new_pkg, n):
                      '--',
                      '--all'],
                     cwd='%s.git' % new_pkg)
+    
+    subprocess.call(['git', 'branch',
+                     '-D',
+                     old_pkg],
+                    cwd='%s.git' % new_pkg)
+    shutil.rmtree('%s.git/refs/original' % new_pkg, True)
 
 def mergeHistories():
     merges = []
@@ -130,6 +136,9 @@ def mergeHistories():
     
     for merge in merges:
         mergeHistory(*merge)
+    
+    for merge in merges:
+        shutil.rmtree('%s.git' % merge[0])
 
 if __name__ == '__main__':
     try: