undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-apply-no-binary' into maint

Browse Source 
* jk/maint-apply-no-binary:
  apply: don't segfault on binary files with missing data
This commit is contained in:
Junio C Hamano 2010-11-24 12:47:04 -08:00
commit 9bdef78fb0
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/apply.c
View File

@ -2645,6 +2645,12 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
unsigned long len;
void *dst;
if (!fragment)
return error("missing binary patch data for '%s'",
patch->new_name ?
patch->new_name :
patch->old_name);
/* Binary patch is irreversible without the optional second hunk */
if (apply_in_reverse) {
if (!fragment->next)

27
t/t4103-apply-binary.sh
View File

@ -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'