From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:22:17 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Drop check of no wreckage save
X-Git-Tag: archive/debian/6.7~87
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=952a781025083b34762fe6bb2093ef64524c23cd

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

We are going to make this nonconfigurable.

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 6871fd8a..22cd3288 100755
--- 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