From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:19:56 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Check wreckage tidying
X-Git-Tag: archive/debian/6.7~88
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=22e1d5872f69e3622bb84e6ea3b8e0b9df06d5d4

git-debrebase: merge: test suite: Check wreckage tidying

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