From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 16:58:57 +0000 (+0100)
Subject: git-debrebase: merge: Miscellaneous mwrecknote fixes
X-Git-Tag: archive/debian/6.7~95
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3411945b1ae36797de420b0e6e5bcf75e1e28c7f;ds=sidebyside

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>
---

diff --git a/git-debrebase b/git-debrebase
index 37982499..563fb997 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}");