git-debrebase: merge: Do wreckage cleaning separately

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 3ac087c980034a3a4812b97ec6d8a5b21c4b1e07..25ebbe6f0ad84448ca44a1b78167f0c0c0ac535a 100755 (executable)
--- 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";