git-debrebase: merge: Do wreckage cleaning separately

git-update-ref hates us if we delete a ref and reintroduce it, in the
same transaction.  In this case we don't mind doing it in two goes.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/git-debrebase b/git-debrebase
index 3ac087c..25ebbe6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -391,6 +391,9 @@ sub merge_failed ($$;@) {
 
     my @updates;
     merge_wreckage_cleaning \@updates;
+    run_ref_updates_now "merge failed", \@updates;
+
+    @updates = ();
     keys %$wrecknotes;
     while (my ($k,$v) = each %$wrecknotes) {
 	push @updates, "create $wrecknoteprefix/$k $v";