From cd91db80343bdae936479474deed7b70c1028a8e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 18:09:34 +0100
Subject: git-debrebase: merge: Break out merge_wreckage_cleaning (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index 589fa90..0558e61 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -154,6 +154,14 @@ our $snags_summarised = 0;
 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;
 }
@@ -383,10 +391,7 @@ sub merge_failed ($$) {
 
     if ($opt_save_wreckage) {
 	my @updates;
-	git_for_each_ref("$wrecknoteprefix/*", sub {
-            my ($objid,$objtype,$fullrefname,$reftail) = @_;
-            push @updates, "delete $fullrefname";
-        });
+	merge_wreckage_cleaning \@updates;
 	keys %$wrecknotes;
 	while (my ($k,$v) = each %$wrecknotes) {
 	    push @updates, "create $wrecknoteprefix/$k $v";
-- 
cgit v1.2.3