git-apply -R: binary patches are irreversible for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e5a94313c0
commit
ab9f30fd75
@ -1535,6 +1535,12 @@ static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
|
|||||||
void *data;
|
void *data;
|
||||||
void *result;
|
void *result;
|
||||||
|
|
||||||
|
/* Binary patch is irreversible */
|
||||||
|
if (patch->is_reverse)
|
||||||
|
return error("cannot reverse-apply a binary patch to '%s'",
|
||||||
|
patch->new_name
|
||||||
|
? patch->new_name : patch->old_name);
|
||||||
|
|
||||||
data = inflate_it(fragment->patch, fragment->size,
|
data = inflate_it(fragment->patch, fragment->size,
|
||||||
patch->deflate_origlen);
|
patch->deflate_origlen);
|
||||||
if (!data)
|
if (!data)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user