diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:18 -0800 |
| commit | ee438efbc1a05382fa6f2ab59e7d07240a5013be (patch) | |
| tree | 2a0a571446019e49e3e573c3214d9fa4d04d3f40 /t | |
| parent | Merge branch 'jk/push-progress' (diff) | |
| parent | apply: don't segfault on binary files with missing data (diff) | |
| download | tgif-ee438efbc1a05382fa6f2ab59e7d07240a5013be.tar.xz | |
Merge branch 'jk/maint-apply-no-binary'
* jk/maint-apply-no-binary:
apply: don't segfault on binary files with missing data
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4103-apply-binary.sh | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh index 9692f16f35..08ad6d8b9e 100755 --- a/t/t4103-apply-binary.sh +++ b/t/t4103-apply-binary.sh @@ -37,7 +37,16 @@ test_expect_success 'setup' " git diff-tree -p -C master binary >C.diff && git diff-tree -p --binary master binary >BF.diff && - git diff-tree -p --binary -C master binary >CF.diff + git diff-tree -p --binary -C master binary >CF.diff && + + git diff-tree -p --full-index master binary >B-index.diff && + git diff-tree -p -C --full-index master binary >C-index.diff && + + git init other-repo && + (cd other-repo && + git fetch .. master && + git reset --hard FETCH_HEAD + ) " test_expect_success 'stat binary diff -- should not fail.' \ @@ -100,6 +109,22 @@ test_expect_success 'apply binary diff (copy) -- should fail.' \ 'do_reset && test_must_fail git apply --index C.diff' +test_expect_success 'apply binary diff with full-index' ' + do_reset && + git apply B-index.diff +' + +test_expect_success 'apply binary diff with full-index (copy)' ' + do_reset && + git apply C-index.diff +' + +test_expect_success 'apply full-index binary diff in new repo' ' + (cd other-repo && + do_reset && + test_must_fail git apply ../B-index.diff) +' + test_expect_success 'apply binary diff without replacement.' \ 'do_reset && git apply BF.diff' |