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=467dc6ad342d27f4dbd6e453e8e6f9bb987fce05;hp=4517be4aa71575f94c692aa5ffa475b8ccc40a0d;hb=d48a0cce536f1151c29f091d096f71aceb190b05;hpb=0c08383390e6759b14a8a825c736abd5ec555e0a 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