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);
our @deferred_updates;
our @deferred_update_messages;
+sub merge_wreckage_cleaning ($) {
+ my ($updates) = @_;
+ git_for_each_ref("$wrecknoteprefix/*", sub {
+ my ($objid,$objtype,$fullrefname,$reftail) = @_;
+ push @$updates, "delete $fullrefname";
+ });
+}
+
sub all_snags_summarised () {
$snags_forced + $snags_tripped == $snags_summarised;
}
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;
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;
- git_for_each_ref("$wrecknoteprefix/*", sub {
- my ($objid,$objtype,$fullrefname,$reftail) = @_;
- push @updates, "delete $fullrefname";
- });
- 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;
'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"