summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 18:28:59 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 20:11:09 +0100
commitca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28 (patch)
treed1563c1e4b7c586ebc2a6987cfff8d8ff09f8de3
parent952a781025083b34762fe6bb2093ef64524c23cd (diff)
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>
-rwxr-xr-xgit-debrebase26
-rwxr-xr-xtests/tests/gdr-merge-conflicts2
2 files changed, 10 insertions, 18 deletions
diff --git a/git-debrebase b/git-debrebase
index 2a28e72..bd93fbd 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 22cd328..48ed991 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)"