git-debrebase: merge: test suite: Drop check of no wreckage save

[dgit.git] / tests / tests / gdr-merge-conflicts

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 467dc6ad342d27f4dbd6e453e8e6f9bb987fce05..22cd32887e5f2a020e34a35414b2a7fd3517fb01 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -53,11 +53,6 @@ git commit -a --amend --no-edit
 junkref=refs/debrebase-wreckage/junk
 git update-ref $junkref v2.1
 
-t-expect-fail F:'divergent anchors' \
-t-git-debrebase
-
-git rev-parse $junkref
-
 t-expect-fail F:'divergent anchors' \
 t-git-debrebase --save-wreckage
 
@@ -75,6 +70,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