2005-11-17 13:32:44 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
test_description='git apply handling binary patches
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
2010-03-20 16:29:11 +08:00
|
|
|
test_expect_success 'setup' "
|
|
|
|
git update-index --add --remove file1 file2 file4 &&
|
|
|
|
git commit -m 'Initial Version' 2>/dev/null &&
|
|
|
|
|
|
|
|
git checkout -b binary &&
|
2012-06-13 00:49:59 +08:00
|
|
|
"$PERL_PATH" -pe 'y/x/\000/' <file1 >file3 &&
|
2010-03-20 16:29:11 +08:00
|
|
|
cat file3 >file4 &&
|
|
|
|
git add file2 &&
|
2012-06-13 00:49:59 +08:00
|
|
|
"$PERL_PATH" -pe 'y/\000/v/' <file3 >file1 &&
|
2010-03-20 16:29:11 +08:00
|
|
|
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 &&
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-19 02:39:17 +08:00
|
|
|
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
|
|
|
|
)
|
2010-03-20 16:29:11 +08:00
|
|
|
"
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'stat binary diff -- should not fail.' \
|
2010-10-31 09:46:54 +08:00
|
|
|
'git checkout master &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --stat --summary B.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'stat binary diff (copy) -- should not fail.' \
|
2010-10-31 09:46:54 +08:00
|
|
|
'git checkout master &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --stat --summary C.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success 'check binary diff -- should fail.' \
|
2008-09-03 16:59:29 +08:00
|
|
|
'git checkout master &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --check B.diff'
|
2008-02-01 17:50:53 +08:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff (copy) -- should fail.' \
|
2008-09-03 16:59:29 +08:00
|
|
|
'git checkout master &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --check C.diff'
|
2008-02-01 17:50:53 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'check incomplete binary diff with replacement -- should fail.' '
|
2008-09-03 16:59:29 +08:00
|
|
|
git checkout master &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --check --allow-binary-replacement B.diff
|
2008-02-01 17:50:53 +08:00
|
|
|
'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success \
|
|
|
|
'check incomplete binary diff with replacement (copy) -- should fail.' '
|
2008-09-03 16:59:29 +08:00
|
|
|
git checkout master &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --check --allow-binary-replacement C.diff
|
2008-02-01 17:50:53 +08:00
|
|
|
'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff with replacement.' \
|
2010-10-31 09:46:54 +08:00
|
|
|
'git checkout master &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --check --allow-binary-replacement BF.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff with replacement (copy).' \
|
2010-10-31 09:46:54 +08:00
|
|
|
'git checkout master &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --check --allow-binary-replacement CF.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
# Now we start applying them.
|
|
|
|
|
|
|
|
do_reset () {
|
2008-02-01 17:50:53 +08:00
|
|
|
rm -f file? &&
|
2008-09-03 16:59:29 +08:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout -f master
|
2005-11-17 13:32:44 +08:00
|
|
|
}
|
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply B.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --index B.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply C.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2008-02-01 17:50:53 +08:00
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 23:47:52 +08:00
|
|
|
test_must_fail git apply --index C.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-19 02:39:17 +08:00
|
|
|
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)
|
|
|
|
'
|
|
|
|
|
2006-09-07 13:45:21 +08:00
|
|
|
test_expect_success 'apply binary diff without replacement.' \
|
2008-02-01 17:50:53 +08:00
|
|
|
'do_reset &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply BF.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
2006-09-07 13:45:21 +08:00
|
|
|
test_expect_success 'apply binary diff without replacement (copy).' \
|
2008-02-01 17:50:53 +08:00
|
|
|
'do_reset &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply CF.diff'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'apply binary diff.' \
|
2008-02-01 17:50:53 +08:00
|
|
|
'do_reset &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --allow-binary-replacement --index BF.diff &&
|
|
|
|
test -z "$(git diff --name-status binary)"'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_expect_success 'apply binary diff (copy).' \
|
2008-02-01 17:50:53 +08:00
|
|
|
'do_reset &&
|
2007-07-03 13:52:14 +08:00
|
|
|
git apply --allow-binary-replacement --index CF.diff &&
|
|
|
|
test -z "$(git diff --name-status binary)"'
|
2005-11-17 13:32:44 +08:00
|
|
|
|
|
|
|
test_done
|