chiark / gitweb /
git-debrebase: merge: test suite: Check wreckage tidying
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:19:56 +0000 (18:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000 (20:11 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge-conflicts

index 467dc6a..6871fd8 100755 (executable)
@@ -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