diff options
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 4a210fba63..089b65f97e 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -426,7 +426,7 @@ file_exclude = %s''' % (name, file_filter or '<empty>', repo.get('file_exclude', | |||
426 | merge.append(name) | 426 | merge.append(name) |
427 | # Root all commits which have no parent in the common | 427 | # Root all commits which have no parent in the common |
428 | # ancestor in the new repository. | 428 | # ancestor in the new repository. |
429 | for start in runcmd('git log --pretty=format:%%H --max-parents=0 %s' % name).split('\n'): | 429 | for start in runcmd('git log --pretty=format:%%H --max-parents=0 %s --' % name).split('\n'): |
430 | runcmd('git replace --graft %s %s' % (start, startrev)) | 430 | runcmd('git replace --graft %s %s' % (start, startrev)) |
431 | try: | 431 | try: |
432 | runcmd(merge) | 432 | runcmd(merge) |