git-debrebase: merge: Call merge_failed in merge_series

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 0558e614828004d238ce1ad1e64963856514974f..464a14c4bb03bab5a0c7c8b7adc944e3387a555c 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -51,7 +51,7 @@ See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
 END
 
 our ($opt_force, $opt_noop_ok, @opt_anchors);
-our ($opt_defaultcmd_interactive, $opt_save_wreckage);
+our ($opt_defaultcmd_interactive);
 
 our $us = qw(git-debrebase);
 
@@ -170,6 +170,7 @@ sub run_deferred_updates ($) {
 
     confess 'dangerous internal error' unless all_snags_summarised();
 
+    merge_wreckage_cleaning \@deferred_updates;
     run_ref_updates_now $mrest, \@deferred_updates;
     print $_, "\n" foreach @deferred_update_messages;
 
@@ -383,25 +384,24 @@ sub merge_failed ($$) {
     my @m;
     push @m, "Merge resolution failed: $emsg";
 
-    $opt_save_wreckage //= do {
-       my $c = cfg 'git-debrebase.merge.save-wreckage', 1;
-       # ^ xxx documentation
-       $c && $c =~ m/^[1ty]/;
-    };
+    changedir $maindir;
 
-    if ($opt_save_wreckage) {
-       my @updates;
-       merge_wreckage_cleaning \@updates;
-       keys %$wrecknotes;
-       while (my ($k,$v) = each %$wrecknotes) {
-           push @updates, "create $wrecknoteprefix/$k $v";
-       }
-       run_ref_updates_now "merge failed", \@updates;
-       push @m, "Wreckage left in $wrecknoteprefix/* as requested.";
+    my @updates;
+    merge_wreckage_cleaning \@updates;
+    keys %$wrecknotes;
+    while (my ($k,$v) = each %$wrecknotes) {
+       push @updates, "create $wrecknoteprefix/$k $v";
     }
+    run_ref_updates_now "merge failed", \@updates;
+    push @m, "Wreckage left in $wrecknoteprefix/*.";
+
     push @m, "See git-debrebase(1) section FAILED MERGES for suggestions.";
-    # ^ xxx this section does not yet exist
-    fail join '', map { "$_\n" } @m;
+
+    # use finish rather than fail, in case we are within an eval
+    # (that can happen inside walk!)
+    print STDERR "\n";
+    print STDERR "$us: $_\n" foreach @m;
+    finish 15;
 }
 
 sub mwrecknote ($$$) {
@@ -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
@@ -2634,7 +2641,6 @@ getoptions_main
           'anchor=s' => \@opt_anchors,
           '--dgit=s' => \($dgit[0]),
           'force!',
-          '--save-wreckage', \$opt_save_wreckage,
           '-i:s' => sub {
               my ($opt,$val) = @_;
               badusage "git-debrebase: no cuddling to -i for git-rebase"