mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-apply: fail if a patch cannot be applied.

Browse Source 
Recently we fixed 'git-apply --stat' not to barf on a binary
differences.  But it accidentally broke the error detection when
we actually attempt to apply them.

This commit fixes the problem and adds test cases.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-11-16 14:12:56 -08:00
parent 5b4525eb8b
commit 92927ed0aa
2 changed files with 85 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apply.c
View File

@ -891,7 +891,7 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
if (!patchsize && !metadata_changes(patch)) {
if (!patchsize) {
static const char binhdr[] = "Binary files ";
if (sizeof(binhdr) - 1 < size - offset - hdrsize &&
@ -899,9 +899,12 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
sizeof(binhdr)-1))
patch->is_binary = 1;
if (patch->is_binary && !apply && !check)
;
else
/* Empty patch cannot be applied if:
* - it is a binary patch or
* - metadata does not change and is not a binary patch.
*/
if ((apply || check) &&
(patch->is_binary || !metadata_changes(patch)))
die("patch with only garbage at line %d", linenr);
}

78
t/t4103-apply-binary.sh Normal file
View File

@ -0,0 +1,78 @@
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='git-apply handling binary patches
'
. ./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
git-update-index --add --remove file1 file2 file4
git-commit -m 'Initial Version' 2>/dev/null
git-checkout -b binary
tr 'x' '\0' <file1 >file3
cat file3 >file4
git-add file2
tr '\0' '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
test_expect_success 'stat binary diff -- should not fail.' \
'git-checkout master
git-apply --stat --summary B.diff'
test_expect_success 'stat binary diff (copy) -- should not fail.' \
'git-checkout master
git-apply --stat --summary C.diff'
test_expect_failure 'check binary diff -- should fail.' \
'git-checkout master
git-apply --check B.diff'
test_expect_failure 'check binary diff (copy) -- should fail.' \
'git-checkout master
git-apply --check C.diff'
# Now we start applying them.
test_expect_failure 'apply binary diff -- should fail.' \
'git-checkout master
git-apply B.diff'
git-reset --hard
test_expect_failure 'apply binary diff -- should fail.' \
'git-checkout master
git-apply --index B.diff'
git-reset --hard
test_expect_failure 'apply binary diff (copy) -- should fail.' \
'git-checkout master
git-apply C.diff'
git-reset --hard
test_expect_failure 'apply binary diff (copy) -- should fail.' \
'git-checkout master
git-apply --index C.diff'
test_done