From 22e1d5872f69e3622bb84e6ea3b8e0b9df06d5d4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:19:56 +0100 Subject: [PATCH 1/1] git-debrebase: merge: test suite: Check wreckage tidying Signed-off-by: Ian Jackson --- tests/tests/gdr-merge-conflicts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 467dc6ad..6871fd8a 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -75,6 +75,8 @@ 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 + : ----- make the merge ----- git checkout master -- 2.30.2