From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:28:59 +0000 (+0100)
Subject: git-debrebase: merge: Always save wreckage
X-Git-Tag: archive/debian/6.7~86
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28;ds=sidebyside

git-debrebase: merge: Always save wreckage

There is no point configuring this.  We tidy it up again soon enough.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 2a28e720..bd93fbd0 100755
--- 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"
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 22cd3288..48ed991e 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -54,7 +54,7 @@ junkref=refs/debrebase-wreckage/junk
 git update-ref $junkref v2.1
 
 t-expect-fail F:'divergent anchors' \
-t-git-debrebase --save-wreckage
+t-git-debrebase
 
 test '' = "$(t-git-get-ref-exact $junkref)"