From: Evan Broder <broder@mit.edu>
Date: Thu, 25 Dec 2008 04:33:24 +0000 (-0500)
Subject: Newer versions of git are more clever.
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/commitdiff_plain/d5e615c26a3ac8476ca02831a55d4f870506eb9e?ds=sidebyside

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
--- 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):