summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 07:55:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 07:55:47 +0100
commit4f753d1e7e9916352bf2f8670f56c1fa20791915 (patch)
tree87be53d9dd9c1e950415a12545a1556e859205e4
parentaef653db307bc8e38f248e8dbec43ae3d2430413 (diff)
git-debrebase: walk: unprocessable: use fail, not die, and clean up
Make this message like the one printed by $x->($fatal, ...) in keycommits. That is more consistent and also nicer. There is no need for the line number etc. either. This is mentioned in #905003. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 07e5f47..0c351a4 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -679,10 +679,11 @@ sub walk ($;$$) {
if ($nogenerate) {
return (undef,undef);
}
- die "commit $cur: Cannot cope with this commit (d.".
+ fail "found unprocessable commit, cannot cope:".
+ (defined $cl->{Why} ? "; $cl->{Why}": '').
+ " (commit $cur) (d.".
(join ' ', map { sprintf "%#x", $_->{Differs} }
@{ $cl->{Parents} }).
- (defined $cl->{Why} ? "; $cl->{Why}": '').
")";
};