chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: merge: Prettify subprocess failures
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index d3ed731ba97e299fe2a8c9368799abc7d5691480..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
# 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";
my @m;
push @m, "Merge resolution failed: $emsg";
+ push @m, @xmsgs;
changedir $maindir;
changedir $maindir;
@@
-443,8
+444,9
@@
sub merge_series ($$$;@) {
debugcmd '+', @_;
$!=0; $?=-1;
if (system @_) {
debugcmd '+', @_;
$!=0; $?=-1;
if (system @_) {
- failedcmd_report_cmd undef, @_;
- merge_failed $wrecknotes, failedcmd_waitstatus();
+ merge_failed $wrecknotes,
+ failedcmd_waitstatus(),
+ "failed command: @_";
}
};
}
};