diff options
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 3798249..563fb99 100755 --- a/git-debrebase +++ b/git-debrebase @@ -370,6 +370,7 @@ sub gbp_pq_export ($$$) { sub mwrecknote ($$$) { my ($wrecknotes, $reftail, $commitish) = @_; + confess unless defined $commitish; $wrecknotes->{$reftail} = $commitish; } @@ -454,7 +455,7 @@ sub merge_series ($$$;@) { printdebug "pec' $pec\n"; runcmd @git, qw(reset -q --hard), $pec; $q->{MR}{PEC} = $pec; - $mwrecknote->("$q->{LeftRight}-patchqueue"); + $mwrecknote->("$q->{LeftRight}-patchqueue", $pec); } # now, because of reverse, we are on $input_q->{MR}{OQC} runcmd @git, qw(checkout -q -b merge); @@ -1053,6 +1054,7 @@ sub walk ($;$$$) { for (;;) { $cl = classify $cur; + $cl->{MergeWreckNotes} //= {}; my $ty = $cl->{Type}; my $st = $cl->{SubType}; $prline->("$cl->{CommitId} $cl->{Type}"); |