git-debrebase: merge: Always save wreckage

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 2a28e720b43d3712fb2910902375fb5113e6370b..bd93fbd07eef19090da2380dcc866e6d55a3a953 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);
 
@@ -384,22 +384,15 @@ 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]/;
-    };
-
-    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;
@@ -2635,7 +2628,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"