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 4517be4aa71575f94c692aa5ffa475b8ccc40a0d..22cd32887e5f2a020e34a35414b2a7fd3517fb01 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -50,8 +50,15 @@ dch -a 'Merge, only conflict was in debian/changelog'
 t-dch-r-rune dch
 git commit -a --amend --no-edit
 
 t-dch-r-rune dch
 git commit -a --amend --no-edit
 

+junkref=refs/debrebase-wreckage/junk
+git update-ref $junkref v2.1
+

 t-expect-fail F:'divergent anchors' \
 t-expect-fail F:'divergent anchors' \

-t-git-debrebase
+t-git-debrebase --save-wreckage
+
+test '' = "$(t-git-get-ref-exact $junkref)"
+
+git for-each-ref refs/debrebase-wreckage | egrep .

 
 : ===== late failure in apply =====
 
 
 : ===== late failure in apply =====
 


@@ -63,6 +70,8 @@ git commit -m 'other-upstream-conflict' docs/README
 
 t-git-debrebase quick
 
 
 t-git-debrebase quick
 

+if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
+

 : ----- make the merge -----
 
 git checkout master
 : ----- make the merge -----
 
 git checkout master