mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: split load_preimage() helper function out

Browse Source 
Given a patch for a single path, the function apply_data() reads the
preimage in core, and applies the change represented in the patch.

Separate out the first part that reads the preimage into a separate
helper function load_preimage().

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-05-08 13:35:21 -07:00
parent f4c66eeddd
commit 37b9c903eb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/apply.c
View File

@ -3046,10 +3046,10 @@ static int checkout_target(struct cache_entry *ce, struct stat *st)
return 0; return 0;
} }
static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce) static int load_preimage(struct image *image,
struct patch *patch, struct stat *st, struct cache_entry *ce)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct image image;
size_t len; size_t len;
char *img; char *img;
struct patch *tpatch; struct patch *tpatch;
@ -3086,7 +3086,16 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
} }
img = strbuf_detach(&buf, &len); img = strbuf_detach(&buf, &len);
prepare_image(&image, img, len, !patch->is_binary); prepare_image(image, img, len, !patch->is_binary);
return 0;
}
static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
{
struct image image;
if (load_preimage(&image, patch, st, ce) < 0)
return -1;
if (apply_fragments(&image, patch) < 0) if (apply_fragments(&image, patch) < 0)
return -1; /* note with --reject this succeeds. */ return -1; /* note with --reject this succeeds. */