Historically we did not allow binary patch applied without an
explicit permission from the user, and this flag was the way to
do so.  This makes the flag a no-op by always allowing binary
patch application.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-09-06 22:45:21 -07:00
Родитель 7bbf88c52b
Коммит 2b6eef943f
3 изменённых файлов: 11 добавлений и 25 удалений

Просмотреть файл

@ -110,15 +110,10 @@ OPTIONS
deletion part but not addition part.
--allow-binary-replacement, --binary::
When applying a patch, which is a git-enhanced patch
that was prepared to record the pre- and post-image object
name in full, and the path being patched exactly matches
the object the patch applies to (i.e. "index" line's
pre-image object name is what is in the working tree),
and the post-image object is available in the object
database, use the post-image object as the patch
result. This allows binary files to be patched in a
very limited way.
Historically we did not allow binary patch applied
without an explicit permission from the user, and this
flag was the way to do so. Currently we always allow binary
patch application, so this is a no-op.
--exclude=<path-pattern>::
Don't apply changes to files matching the given path pattern. This can

Просмотреть файл

@ -28,7 +28,6 @@ static int prefix_length = -1;
static int newfd = -1;
static int p_value = 1;
static int allow_binary_replacement;
static int check_index;
static int write_index;
static int cached;
@ -1228,14 +1227,12 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
}
}
/* Empty patch cannot be applied if:
* - it is a binary patch and we do not do binary_replace, or
* - text patch without metadata change
/* Empty patch cannot be applied if it is a text patch
* without metadata change. A binary patch appears
* empty to us here.
*/
if ((apply || check) &&
(patch->is_binary
? !allow_binary_replacement
: !metadata_changes(patch)))
(!patch->is_binary && !metadata_changes(patch)))
die("patch with only garbage at line %d", linenr);
}
@ -1676,11 +1673,6 @@ static int apply_binary(struct buffer_desc *desc, struct patch *patch)
unsigned char hdr[50];
int hdrlen;
if (!allow_binary_replacement)
return error("cannot apply binary patch to '%s' "
"without --allow-binary-replacement",
name);
/* For safety, we require patch index line to contain
* full 40-byte textual SHA1 for old and new, at least for now.
*/
@ -2497,8 +2489,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "--allow-binary-replacement") ||
!strcmp(arg, "--binary")) {
allow_binary_replacement = 1;
continue;
continue; /* now no-op */
}
if (!strcmp(arg, "--numstat")) {
apply = 0;

Просмотреть файл

@ -94,11 +94,11 @@ test_expect_failure 'apply binary diff (copy) -- should fail.' \
'do_reset
git-apply --index C.diff'
test_expect_failure 'apply binary diff without replacement -- should fail.' \
test_expect_success 'apply binary diff without replacement.' \
'do_reset
git-apply BF.diff'
test_expect_failure 'apply binary diff without replacement (copy) -- should fail.' \
test_expect_success 'apply binary diff without replacement (copy).' \
'do_reset
git-apply CF.diff'