diff options
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 12 |
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 |