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:
26da7fa
)
git-debrebase: fix Mixed handling
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:29:04 +0000
(20:29 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index dd1ddb0a9cc7d350323d33e7a3ff9350c1f4686e..f73bf0c1d8489e7a1535231a3eb6eab5de93d4ed 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-515,7
+515,7
@@
sub walk ($;$$) {
} elsif ($ty eq 'Mixed') {
my $queue = sub {
my ($q, $wh) = @_;
- my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
+ my $cls = {
%
$cl, $xmsg->("split mixed commit: $wh part") };
push @$q, $cls;
};
$queue->(\@brw_cl, "debian");