X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=22cd32887e5f2a020e34a35414b2a7fd3517fb01;hp=4517be4aa71575f94c692aa5ffa475b8ccc40a0d;hb=952a781025083b34762fe6bb2093ef64524c23cd;hpb=0c08383390e6759b14a8a825c736abd5ec555e0a;ds=sidebyside

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 4517be4a..22cd3288 100755
--- 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
 
+junkref=refs/debrebase-wreckage/junk
+git update-ref $junkref v2.1
+
 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 =====
 
@@ -63,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