X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=c3bd7ff2cd287dd3054cf3e277017e8666cbfc2e;hp=213728023f249305eb873722d305f3168a1cb0c4;hb=343532497ca085d0ed5a56982953cb4edcd151bc;hpb=eec3f8c097bdb3f03499c9228f42d5cd2ce65786

diff --git a/git-debrebase b/git-debrebase
index 21372802..c3bd7ff2 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -396,8 +396,12 @@ sub merge_failed ($$) {
     push @m, "Wreckage left in $wrecknoteprefix/*.";
 
     push @m, "See git-debrebase(1) section FAILED MERGES for suggestions.";
-    # ^ xxx this section does not yet exist
-    fail join '', map { "$_\n" } @m;
+
+    # use finish rather than fail, in case we are within an eval
+    # (that can happen inside walk!)
+    print STDERR "\n";
+    print STDERR "$us: $_\n" foreach @m;
+    finish 15;
 }
 
 sub mwrecknote ($$$) {