git-debrebase: merge: Prettify subprocess failures

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 464a14c4bb03bab5a0c7c8b7adc944e3387a555c..7f96749626f94cd7e0848eb9b75aa8613a3c3b9c 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -379,10 +379,11 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
-sub merge_failed ($$) {
-    my ($wrecknotes, $emsg) = @_;
+sub merge_failed ($$;@) {
+    my ($wrecknotes, $emsg, @xmsgs) = @_;
     my @m;
     push @m, "Merge resolution failed: $emsg";
+    push @m, @xmsgs;
 
     changedir $maindir;
 
@@ -443,8 +444,9 @@ sub merge_series ($$$;@) {
        debugcmd '+', @_;
        $!=0; $?=-1;
        if (system @_) {
-           failedcmd_report_cmd undef, @_;
-           merge_failed $wrecknotes, failedcmd_waitstatus();
+           merge_failed $wrecknotes,
+               failedcmd_waitstatus(),
+               "failed command: @_";
        }
     };
 
@@ -1344,8 +1346,9 @@ sub walk ($;$$$) {
            my ($btip, $bbw, $banchor) = eval {
                walk $ib, 0, $report, $report_lprefix.'  ';
            };
-           $nomerge->("walking interchange branch merge base ($ibleaf): ".
-                      $@) if length $@;
+           $nomerge->("walking interchange branch merge base ($ibleaf):\n".
+                      $@)
+               if length $@;
 
            $mwrecknote->("mergebase-laundered", $btip);
            $mwrecknote->("mergebase-breakwater", $bbw);