From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:09:11 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Check wreckage saving
X-Git-Tag: archive/debian/6.7~91
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d48a0cce536f1151c29f091d096f71aceb190b05

git-debrebase: merge: test suite: Check wreckage saving

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 4517be4a..467dc6ad 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -50,9 +50,21 @@ 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
 
+git rev-parse $junkref
+
+t-expect-fail F:'divergent anchors' \
+t-git-debrebase --save-wreckage
+
+test '' = "$(t-git-get-ref-exact $junkref)"
+
+git for-each-ref refs/debrebase-wreckage | egrep .
+
 : ===== late failure in apply =====
 
 git checkout other