From 26da7fadd1341cd8aa244153c1f96221fd9e9b3b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 20:28:54 +0100
Subject: [PATCH] git-debrebase: when dieing due to bad commit, print differs

---
 git-debrebase | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
-- 
2.30.2