diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
commit | 63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66 (patch) | |
tree | a2f3400ce412aef23e0c53f2e2f415f94d55e2f1 /t | |
parent | 21247455f328fcf26fc4f78134bcc6f8a676fa8a (diff) | |
parent | b9e31f59478eeae3e4230308f6fc06713c6fc547 (diff) | |
download | git-63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66.tar.gz git-63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66.tar.xz |
Merge branch 'js/rerere-forget-protect-against-NUL' into maint
* js/rerere-forget-protect-against-NUL:
rerere forget: do not segfault if not all stages are present
rerere forget: grok files containing NUL
Diffstat (limited to 't')
-rwxr-xr-x | t/t2030-unresolve-info.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh index f2620650c..309199bca 100755 --- a/t/t2030-unresolve-info.sh +++ b/t/t2030-unresolve-info.sh @@ -44,14 +44,21 @@ prime_resolve_undo () { test_expect_success setup ' mkdir fi && + printf "a\0a" >binary && + git add binary && test_commit initial fi/le first && git branch side && git branch another && + printf "a\0b" >binary && + git add binary && test_commit second fi/le second && git checkout side && test_commit third fi/le third && + git branch add-add && git checkout another && test_commit fourth fi/le fourth && + git checkout add-add && + test_commit fifth add-differently && git checkout master ' @@ -167,4 +174,22 @@ test_expect_success 'rerere and rerere forget (subdirectory)' ' test_cmp expect actual ' +test_expect_success 'rerere forget (binary)' ' + git checkout -f side && + printf "a\0c" >binary && + git commit -a -m binary && + test_must_fail git merge second && + git rerere forget binary +' + +test_expect_success 'rerere forget (add-add conflict)' ' + git checkout -f master && + echo master >add-differently && + git add add-differently && + git commit -m "add differently" && + test_must_fail git merge fifth && + git rerere forget add-differently 2>actual && + test_i18ngrep "no remembered" actual +' + test_done |