X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/e632345d7799e8c831ebd929fd0e64504669bc64..d5e615c26a3ac8476ca02831a55d4f870506eb9e:/git-migrate

diff --git a/git-migrate b/git-migrate
index f259f54..e61f380 100755
--- a/git-migrate
+++ b/git-migrate
@@ -32,7 +32,7 @@ def clonePackage(base, pkg):
                          stdout=subprocess.PIPE)
     p.wait()
     if len(p.stdout.read()) == 0:
-        subprocess.check_call(['git', 'reset', 'HEAD^'],
+        subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
                               cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):
@@ -81,16 +81,16 @@ def mergeHistory(old_pkg, new_pkg, n):
     print >>f, ' '.join(graft)
 
 def mergeHistories():
-    grafts = []
-    for line in open('grafts'):
+    merges = []
+    for line in open('merges'):
         line = line.strip()
         if line[0] == '#' or line == '':
             continue
         
-        grafts.append(line.split())
+        merges.append(line.split())
     
-    for graft in grafts:
-        mergeHistory(*graft)
+    for merge in merges:
+        mergeHistory(*merge)
     
     for line in open('package-list'):
         line = line.strip()
@@ -99,8 +99,8 @@ def mergeHistories():
                                '--all'],
                               cwd='%s.git' % line)
     
-    for graft in grafts:
-        shutil.rmtree('%s.git' % graft[0])
+    for merge in merges:
+        shutil.rmtree('%s.git' % merge[0])
 
 if __name__ == '__main__':
     try: