From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 20:57:09 +0000 (+0100)
Subject: git-debrebase: merge: test conflict: Break out no-wreckage
X-Git-Tag: archive/debian/6.7~65
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=bab4f09f510a6af03210b40215bae6f1cf2c3179;p=dgit.git

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 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 -----