chiark / gitweb /
git-debrebase: when dieing due to bad commit, print differs
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:28:54 +0000 (20:28 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index 225f0c5..dd1ddb0 100755 (executable)
@@ -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;