From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:09:34 +0000 (+0100)
Subject: git-debrebase: merge: Break out merge_wreckage_cleaning (nfc)
X-Git-Tag: archive/debian/6.7~90
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=cd91db80343bdae936479474deed7b70c1028a8e

git-debrebase: merge: Break out merge_wreckage_cleaning (nfc)

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

diff --git a/git-debrebase b/git-debrebase
index 589fa901..0558e614 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";