summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 18:09:11 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 20:11:09 +0100
commitd48a0cce536f1151c29f091d096f71aceb190b05 (patch)
treeff8da7204e912d44acc340d1a473682cd1931692 /tests
parent332806a67a034c88c2884b516ce2aaf8b317dd25 (diff)
git-debrebase: merge: test suite: Check wreckage saving
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/gdr-merge-conflicts12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 4517be4..467dc6a 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