git-debrebase: fix Mixed handling

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 225f0c5bbb212473e5157a0fe028ca2183bfbe23..f73bf0c1d8489e7a1535231a3eb6eab5de93d4ed 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -475,7 +475,9 @@ sub walk ($;$$) {
        if ($nogenerate) {
            return (undef,undef);
        }
-       die "commit $cur: Cannot cope with this commit";
+       die "commit $cur: Cannot cope with this commit (d.".
+           (join ' ', map { sprintf "%#x", $_->{Differs} }
+            @{ $cl->{Parents} }). ")";
     };
 
     my $build;
@@ -513,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");