Typo in catching blank lines.

[invirt/scripts/git-migration.git] / git-migrate

diff --git a/git-migrate b/git-migrate
index 796f937..65c7a12 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):

@@ -84,7 +84,7 @@ def mergeHistories():
     merges = []
     for line in open('merges'):
         line = line.strip()
     merges = []
     for line in open('merges'):
         line = line.strip()

-        if line[0] == '#' or line == '':
+        if line == '' or line[0] == '#':

             continue
         
         merges.append(line.split())
             continue
         
         merges.append(line.split())