summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-10-22 20:28:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit26da7fadd1341cd8aa244153c1f96221fd9e9b3b (patch)
tree8f255326dda0bac25d0af3c88fa3837af4c640ab /git-debrebase
parentca10b89a6d58b656251ecf0f564cd40f720d9239 (diff)
git-debrebase: when dieing due to bad commit, print differs
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 225f0c5..dd1ddb0 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;