From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:57:52 +0000 (+0100)
Subject: git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*
X-Git-Tag: archive/debian/6.7~81
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2e2f354d54d8af330c5a4a5ceab9d8c9604e5c0d

git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*

NFC

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 48ed991e..e556db45 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -10,6 +10,16 @@ t-setup-import gdr-convert-gbp-noarchive
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+wreckage-before () {
+	junkref=refs/debrebase-wreckage/junk
+	git update-ref $junkref v2.1
+}
+
+wreckage-after () {
+	test '' = "$(t-git-get-ref-exact $junkref)"
+	git for-each-ref refs/debrebase-wreckage | egrep .
+}
+
 : ----- prepare the baseline -----
 
 cd $p
@@ -50,15 +60,12 @@ dch -a 'Merge, only conflict was in debian/changelog'
 t-dch-r-rune dch
 git commit -a --amend --no-edit
 
-junkref=refs/debrebase-wreckage/junk
-git update-ref $junkref v2.1
+wreckage-before
 
 t-expect-fail F:'divergent anchors' \
 t-git-debrebase
 
-test '' = "$(t-git-get-ref-exact $junkref)"
-
-git for-each-ref refs/debrebase-wreckage | egrep .
+wreckage-after
 
 : ===== late failure in apply =====