diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 11:32:10 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 11:38:39 +0100 |
commit | 770df553c36474e58926dfe833d97b375cd9c272 (patch) | |
tree | 8b7b8446883d22be8952e428c8c22310a9b2411d /git-debrebase | |
parent | ea212c7ae3fabab519aefe16cbc24a8911be134f (diff) |
git-debrebase: merge: Do not sometimes drop the first patch!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 3 |
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; } |