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 07e5f478cac58281570da99ef27e57953c0a6a53..0c351a474459471abd8ec66b9a5a3c3ffac48bba 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -679,10 +679,11 @@ sub walk ($;$$) {
        if ($nogenerate) {
            return (undef,undef);
        }
        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} }).
            (join ' ', map { sprintf "%#x", $_->{Differs} }
             @{ $cl->{Parents} }).

-           (defined $cl->{Why} ? "; $cl->{Why}": '').

                 ")";
     };
 
                 ")";
     };