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 {
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
$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