diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index d9b95a2..18bc21f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -597,6 +597,7 @@ sub merge_series ($$$;@) { $mwrecknote->('merged-patchqueue', $merged_pq); printdebug "merge_series series gbp pq import\n"; + runcmd @git, qw(checkout -q -b mergec), $merged_pq; merge_attempt_cmd($wrecknotes, qw(gbp pq import)); @@ -605,7 +606,7 @@ sub merge_series ($$$;@) { printdebug "merge_series series ok, building...\n"; my $build = $newbase; - my @lcmd = (@git, qw(rev-list --reverse merge..patch-queue/merge)); + my @lcmd = (@git, qw(rev-list --reverse mergec..patch-queue/mergec)); foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) { my $commit = git_cat_file $c, 'commit'; printdebug "merge_series series ok, building $c\n"; |