From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 06:55:47 +0000 (+0100)
Subject: git-debrebase: walk: unprocessable: use fail, not die, and clean up
X-Git-Tag: archive/debian/6.3~15
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4f753d1e7e9916352bf2f8670f56c1fa20791915

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

diff --git a/git-debrebase b/git-debrebase
index 07e5f478..0c351a47 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}": '').
 		 ")";
     };