X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=f0abea79572c7ce9fec02b7a2537081814aeeac4;hp=59dec9720b18e0fb5fcbe6813f1a11da4c028386;hb=bab4f09f510a6af03210b40215bae6f1cf2c3179;hpb=d83b380941520c668a712b0b936513373bd44278

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 59dec972..f0abea79 100755
--- 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 -----