diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 19:01:20 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
commit | 60d8dcb7dc0e8e8463fe1a7728dd4114b3d3e52e (patch) | |
tree | 5cfc1ede352cfd6042800bc84dccc7b0eecaa8d8 /git-debrebase | |
parent | 11f20779c3a2d56ebdf9430737b7960bd628b16d (diff) |
git-debrebase: merge: Prettify subprocess failures
If we print STDERR in advance, there is a newline beforehand, which is
undesirable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index d3ed731..7f96749 100755 --- 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: @_"; } }; |