From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 19:13:41 +0000 (+0100)
Subject: git-debrebase: merge: Do wreckage cleaning separately
X-Git-Tag: archive/debian/6.7~77
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=186b386b3adc95b515109a430cad3d82b4d637dd

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>
---

diff --git a/git-debrebase b/git-debrebase
index 3ac087c9..25ebbe6f 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";