diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:58:57 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:10:12 +0100 |
commit | 3411945b1ae36797de420b0e6e5bcf75e1e28c7f (patch) | |
tree | a596f537d30d1413e94be6fabc40384a0ac700e1 /git-debrebase | |
parent | a7e1b2feb9013251c5d1c763394170acc95eef65 (diff) |
git-debrebase: merge: Miscellaneous mwrecknote fixes
Add the missing commitish for the -patchqueue wrecknote.
Defend against undef (or too few) args to mwrecknote.
(The way we end up calling it means perl doesn't notice.)
In walk, ensure that we initialise $cl->{MergeWreckNotes}.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-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}"); |