chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea212c7
)
git-debrebase: merge: Do not sometimes drop the first patch!
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:32:10 +0000
(11:32 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:38:39 +0000
(11:38 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 429e17d345a24a9ca1d09bdd55ea5dc8dcc7b755..72c6f3ad1cf472f809b38c0fca1eb89ec7bbc201 100755
(executable)
--- 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;
}