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):
merges = []
for line in open('merges'):
line = line.strip()
- if line[0] == '#' or line == '':
+ if line == '' or line[0] == '#':
continue
merges.append(line.split())