From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:18:58 +0000 (+0100)
Subject: git-debrebase: merge: Wreckage: tidy it up on successful commands
X-Git-Tag: archive/debian/6.7~89
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=bc8a67b8d44d166e125c946960cdfe567e2325dc;ds=sidebyside

git-debrebase: merge: Wreckage: tidy it up on successful commands

Whenever we do a final ref update, discard any wreckage.  The wreckage
can be autoregenerated, so it is not very important.

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

diff --git a/git-debrebase b/git-debrebase
index 0558e614..2a28e720 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -170,6 +170,7 @@ sub run_deferred_updates ($) {
 
     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;