From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 22:38:02 +0000 (+0000)
Subject: git-debrebase: print more why on Unprocessable commits
X-Git-Tag: archive/debian/5.0~163
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=9ba4f33ee531a379f7d55b6b32b3d9221d7ec04f;p=dgit.git

git-debrebase: print more why on Unprocessable commits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index b69450ba..3d837272 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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;