diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 26 |
1 files changed, 9 insertions, 17 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" |