From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 19:29:04 +0000 (+0100)
Subject: git-debrebase: fix Mixed handling
X-Git-Tag: archive/debian/5.0~314
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f3af4f8354f80fcb10e2329010eac9686dc070a8

git-debrebase: fix Mixed handling
---

diff --git a/git-debrebase b/git-debrebase
index dd1ddb0a..f73bf0c1 100755
--- 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");