Newer versions of git are more clever.

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

diff --git a/git-migrate b/git-migrate
index 796f937..e61f380 100755 (executable)
--- 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:
                          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):
                               cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):