chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f39de91
)
git-debrebase: when dieing due to bad commit, print differs
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:28:54 +0000
(20:28 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:06 +0000
(19:19 +0000)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 225f0c5bbb212473e5157a0fe028ca2183bfbe23..dd1ddb0a9cc7d350323d33e7a3ff9350c1f4686e 100755
(executable)
--- 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;