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

diff --git a/git-debrebase b/git-debrebase
index c3bd7ff2..d3ed731b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -439,6 +439,15 @@ sub merge_series ($$$;@) {
 
     my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
 
+    my $attempt_cmd = sub {
+	debugcmd '+', @_;
+	$!=0; $?=-1;
+	if (system @_) {
+	    failedcmd_report_cmd undef, @_;
+	    merge_failed $wrecknotes, failedcmd_waitstatus();
+	}
+    };
+
     local $workarea = fresh_playground "$playprefix/merge";
     my $seriesfile = "debian/patches/series";
     in_workarea sub {
@@ -498,11 +507,8 @@ sub merge_series ($$$;@) {
 	runcmd @git, qw(checkout -q -b merge);
 	printdebug "merge_series merging...\n";
 	my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
-	debugcmd '+', @mergecmd;
-	$!=0; $?=-1;
-	if (system @mergecmd) {
-	    failedcmd @mergecmd;
-	}
+
+	$attempt_cmd->(@mergecmd);
 
 	printdebug "merge_series merge ok, series...\n";
 	# We need to construct a new series file
@@ -578,7 +584,8 @@ sub merge_series ($$$;@) {
 	$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
 
 	printdebug "merge_series series gbp pq import\n";
-	runcmd qw(gbp pq import);
+
+	$attempt_cmd->(qw(gbp pq import));
 
 	# OK now we are on patch-queue/merge, and we need to rebase
 	# onto the intended parent and drop the patches from each one
@@ -1337,8 +1344,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);