kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin-apply --reverse: two bugfixes. 

Parsing of a binary hunk did not consume the terminating blank
line.  When applying in reverse, it did not use the second,
reverse binary hunk.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-08-16 16:07:20 -07:00
parent 409d1d2053
commit 03eb8f8aeb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-apply.c
View File

@ -1063,8 +1063,12 @@ static struct fragment *parse_binary_hunk(char **buf_p,
llen = linelen(buffer, size); llen = linelen(buffer, size);
used += llen; used += llen;
linenr++; linenr++;
if (llen == 1) if (llen == 1) {
/* consume the blank line */
buffer++;
size--;
break; break;
}
/* Minimum line is "A00000\n" which is 7-byte long, /* Minimum line is "A00000\n" which is 7-byte long,
* and the line length must be multiple of 5 plus 2. * and the line length must be multiple of 5 plus 2.
*/ */
@ -1618,7 +1622,7 @@ static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
"without the reverse hunk to '%s'", "without the reverse hunk to '%s'",
patch->new_name patch->new_name
? patch->new_name : patch->old_name); ? patch->new_name : patch->old_name);
fragment = fragment; fragment = fragment->next;
} }
data = (void*) fragment->patch; data = (void*) fragment->patch;
switch (fragment->binary_patch_method) { switch (fragment->binary_patch_method) {
@ -1717,7 +1721,7 @@ static int apply_binary(struct buffer_desc *desc, struct patch *patch)
write_sha1_file_prepare(desc->buffer, desc->size, blob_type, write_sha1_file_prepare(desc->buffer, desc->size, blob_type,
sha1, hdr, &hdrlen); sha1, hdr, &hdrlen);
if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix)) if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
return error("binary patch to '%s' creates incorrect result", name); return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
} }


return 0; return 0;