From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 10:32:10 +0000 (+0100)
Subject: git-debrebase: merge: Do not sometimes drop the first patch!
X-Git-Tag: archive/debian/6.7~139
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=770df553c36474e58926dfe833d97b375cd9c272

git-debrebase: merge: Do not sometimes drop the first patch!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 429e17d3..72c6f3ad 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -228,7 +228,7 @@ sub get_differs ($$) {
 	    unless $differs & (D_PAT_ADD|D_PAT_OTH);
     }
 
-    printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
+    printdebug sprintf "get_differs %s %s = %#x\n", $x, $y, $differs;
 
     return $differs;
 }
@@ -395,6 +395,7 @@ sub merge_series ($$;@) {
 		my @earlier;
 		while (my $patch = <S>) {
 		    chomp $patch or die $!;
+		    $prereq{$patch} //= {};
 		    foreach my $earlier (@earlier) {
 			$prereq{$patch}{$earlier}{$s}++ and die;
 		    }