chiark / gitweb /
git-debrebase: print more why on Unprocessable commits
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 22:38:02 +0000 (22:38 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:58 +0000 (16:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index b69450baaa4f952463e6bbcb925ad0be6a0788e1..3d837272ac1b4f2e4a3aab9cdaa0a19fc0de765a 100755 (executable)
@@ -598,13 +598,16 @@ sub walk ($;$$) {
 
     my $bomb = sub { # usage: return $bomb->();
        print $report " Unprocessable" if $report;
+       print $report " ($cl->{Why})" if $report && defined $cl->{Why};
        $prprdelim->();
        if ($nogenerate) {
            return (undef,undef);
        }
        die "commit $cur: Cannot cope with this commit (d.".
            (join ' ', map { sprintf "%#x", $_->{Differs} }
-            @{ $cl->{Parents} }). ")";
+            @{ $cl->{Parents} }).
+           (defined $cl->{Why} ? "; $cl->{Why}": '').
+                ")";
     };
 
     my $build;