development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-apply: fix apply of a new file

Browse source 
(And fix name handling for when we have an implied
create or delete event from a traditional diff).
This commit is contained in:
Linus Torvalds 2005-06-05 12:43:56 -07:00
parent 6e7c92a91d
commit 30996652e7
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apply.c
View file

@ -606,7 +606,7 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
{ {
int added, deleted; int added, deleted;
int len = linelen(line, size), offset; int len = linelen(line, size), offset;
unsigned long pos[4], oldlines, newlines; unsigned long oldlines, newlines;
offset = parse_fragment_header(line, len, fragment); offset = parse_fragment_header(line, len, fragment);
if (offset < 0) if (offset < 0)
@ -614,10 +614,21 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
oldlines = fragment->oldlines; oldlines = fragment->oldlines;
newlines = fragment->newlines; newlines = fragment->newlines;
if (patch->is_new < 0 && (pos[0] || oldlines)) if (patch->is_new < 0) {
patch->is_new = 0; patch->is_new = !oldlines;
if (patch->is_delete < 0 && (pos[1] || newlines)) if (!oldlines)
patch->is_delete = 0; patch->old_name = NULL;
}
if (patch->is_delete < 0) {
patch->is_delete = !newlines;
if (!newlines)
patch->new_name = NULL;
}
if (patch->is_new != !oldlines)
return error("new file depends on old contents");
if (patch->is_delete != !newlines)
return error("deleted file still has contents");
/* Parse the thing.. */ /* Parse the thing.. */
line += len; line += len;
@ -928,6 +939,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
return error("patch failed: %s:%d", patch->old_name, frag->oldpos); return error("patch failed: %s:%d", patch->old_name, frag->oldpos);
frag = frag->next; frag = frag->next;
} }
return 0;
} }
static int apply_data(struct patch *patch, struct stat *st) static int apply_data(struct patch *patch, struct stat *st)
@ -936,13 +948,16 @@ static int apply_data(struct patch *patch, struct stat *st)
unsigned long size, alloc; unsigned long size, alloc;
struct buffer_desc desc; struct buffer_desc desc;
if (!patch->old_name || !patch->fragments) size = 0;
return 0; alloc = 0;
size = st->st_size; buf = NULL;
alloc = size + 8192; if (patch->old_name) {
buf = xmalloc(alloc); size = st->st_size;
if (read_old_data(st, patch->old_name, buf, alloc) != size) alloc = size + 8192;
return error("read of %s failed", patch->old_name); buf = xmalloc(alloc);
if (read_old_data(st, patch->old_name, buf, alloc) != size)
return error("read of %s failed", patch->old_name);
}
desc.size = size; desc.size = size;
desc.alloc = alloc; desc.alloc = alloc;