From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 19:28:54 +0000 (+0100)
Subject: git-debrebase: when dieing due to bad commit, print differs
X-Git-Tag: archive/debian/5.0~315
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=26da7fadd1341cd8aa244153c1f96221fd9e9b3b

git-debrebase: when dieing due to bad commit, print differs
---

diff --git a/git-debrebase b/git-debrebase
index 225f0c5b..dd1ddb0a 100755
--- 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;