From bab4f09f510a6af03210b40215bae6f1cf2c3179 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 21:57:09 +0100 Subject: [PATCH] git-debrebase: merge: test conflict: Break out no-wreckage Signed-off-by: Ian Jackson --- tests/tests/gdr-merge-conflicts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 ----- -- 2.30.2