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

[dgit.git] / tests / tests / gdr-merge-conflicts

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 48ed991eae18e697111edbc1d252ae80677132c4..e556db458d1afa18058ec3fa1fbf27ecee8acde6 100755 (executable)
--- 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 =====