summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-debrebase3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 429e17d..72c6f3a 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;
}