From ed6ced18970c0ecec79ab9697e45e07a6f7c2956 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:56:18 +0100 Subject: [PATCH] git-debrebase: merge: Call merge_failed in merge_series Introduce $attempt_cmd for this purpose. Signed-off-by: Ian Jackson --- git-debrebase | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/git-debrebase b/git-debrebase index c3bd7ff2..464a14c4 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 -- 2.30.2