mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
94221d2203
As of the last commit, we can use "perl" instead of "$PERL_PATH" when running tests, as the former is now a function which uses the latter. As the shorter "perl" is easier on the eyes, let's switch to using it everywhere. This is not quite a mechanical s/$PERL_PATH/perl/ replacement, though. There are some places where we invoke perl from a script we generate on the fly, and those scripts do not have access to our internal shell functions. The result can be double-checked by running: ln -s /bin/false bin-wrappers/perl make test which continues to pass even after this patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
158 lines
4.1 KiB
Bash
Executable file
158 lines
4.1 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git apply handling binary patches
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
cat >file1 <<-\EOF &&
|
|
A quick brown fox jumps over the lazy dog.
|
|
A tiny little penguin runs around in circles.
|
|
There is a flag with Linux written on it.
|
|
A slow black-and-white panda just sits there,
|
|
munching on his bamboo.
|
|
EOF
|
|
cat file1 >file2 &&
|
|
cat file1 >file4 &&
|
|
|
|
git update-index --add --remove file1 file2 file4 &&
|
|
git commit -m "Initial Version" 2>/dev/null &&
|
|
|
|
git checkout -b binary &&
|
|
perl -pe "y/x/\000/" <file1 >file3 &&
|
|
cat file3 >file4 &&
|
|
git add file2 &&
|
|
perl -pe "y/\000/v/" <file3 >file1 &&
|
|
rm -f file2 &&
|
|
git update-index --add --remove file1 file2 file3 file4 &&
|
|
git commit -m "Second Version" &&
|
|
|
|
git diff-tree -p master binary >B.diff &&
|
|
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 --full-index master binary >B-index.diff &&
|
|
git diff-tree -p -C --full-index master binary >C-index.diff &&
|
|
|
|
git diff-tree -p --binary --no-prefix master binary -- file3 >B0.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.' \
|
|
'git checkout master &&
|
|
git apply --stat --summary B.diff'
|
|
|
|
test_expect_success 'stat binary -p0 diff -- should not fail.' '
|
|
git checkout master &&
|
|
git apply --stat -p0 B0.diff
|
|
'
|
|
|
|
test_expect_success 'stat binary diff (copy) -- should not fail.' \
|
|
'git checkout master &&
|
|
git apply --stat --summary C.diff'
|
|
|
|
test_expect_success 'check binary diff -- should fail.' \
|
|
'git checkout master &&
|
|
test_must_fail git apply --check B.diff'
|
|
|
|
test_expect_success 'check binary diff (copy) -- should fail.' \
|
|
'git checkout master &&
|
|
test_must_fail git apply --check C.diff'
|
|
|
|
test_expect_success \
|
|
'check incomplete binary diff with replacement -- should fail.' '
|
|
git checkout master &&
|
|
test_must_fail git apply --check --allow-binary-replacement B.diff
|
|
'
|
|
|
|
test_expect_success \
|
|
'check incomplete binary diff with replacement (copy) -- should fail.' '
|
|
git checkout master &&
|
|
test_must_fail git apply --check --allow-binary-replacement C.diff
|
|
'
|
|
|
|
test_expect_success 'check binary diff with replacement.' \
|
|
'git checkout master &&
|
|
git apply --check --allow-binary-replacement BF.diff'
|
|
|
|
test_expect_success 'check binary diff with replacement (copy).' \
|
|
'git checkout master &&
|
|
git apply --check --allow-binary-replacement CF.diff'
|
|
|
|
# Now we start applying them.
|
|
|
|
do_reset () {
|
|
rm -f file? &&
|
|
git reset --hard &&
|
|
git checkout -f master
|
|
}
|
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
'do_reset &&
|
|
test_must_fail git apply B.diff'
|
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
'do_reset &&
|
|
test_must_fail git apply --index B.diff'
|
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
'do_reset &&
|
|
test_must_fail git apply C.diff'
|
|
|
|
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'
|
|
|
|
test_expect_success 'apply binary diff without replacement (copy).' \
|
|
'do_reset &&
|
|
git apply CF.diff'
|
|
|
|
test_expect_success 'apply binary diff.' \
|
|
'do_reset &&
|
|
git apply --allow-binary-replacement --index BF.diff &&
|
|
test -z "$(git diff --name-status binary)"'
|
|
|
|
test_expect_success 'apply binary diff (copy).' \
|
|
'do_reset &&
|
|
git apply --allow-binary-replacement --index CF.diff &&
|
|
test -z "$(git diff --name-status binary)"'
|
|
|
|
test_expect_success 'apply binary -p0 diff' '
|
|
do_reset &&
|
|
git apply -p0 --index B0.diff &&
|
|
test -z "$(git diff --name-status binary -- file3)"
|
|
'
|
|
|
|
test_done
|