git-debrebase: merge: test conflict: Break out no-wreckage

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 59dec9720b18e0fb5fcbe6813f1a11da4c028386..f0abea79572c7ce9fec02b7a2537081814aeeac4 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -20,6 +20,12 @@ wreckage-after () {
        git for-each-ref refs/debrebase/wreckage | egrep .
 }
 
+no-wreckage () {
+       if git for-each-ref refs/debrebase/wreckage | egrep .; then
+               fail wreckage
+       fi
+}
+
 : ----- prepare the baseline -----
 
 cd $p
@@ -77,7 +83,7 @@ git commit -m 'other-upstream-conflict' docs/README
 
 t-git-debrebase quick
 
-if git for-each-ref refs/debrebase/wreckage | egrep .; then fail wreck; fi
+no-wreckage
 
 : ----- make the merge -----