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

Merge branch 'jc/maint-apply-no-double-patch' into maint

Browse Source 
* jc/maint-apply-no-double-patch:
  apply: do not patch lines that were already patched
This commit is contained in:
Junio C Hamano 2011-04-01 16:20:11 -07:00
commit b46c9fafcf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/apply.c
View File

@ -204,6 +204,7 @@ struct line {
unsigned hash : 24; unsigned hash : 24;
unsigned flag : 8; unsigned flag : 8;
#define LINE_COMMON 1 #define LINE_COMMON 1
#define LINE_PATCHED 2
}; };
/* /*
@ -2085,7 +2086,8 @@ static int match_fragment(struct image *img,
/* Quick hash check */ /* Quick hash check */
for (i = 0; i < preimage_limit; i++) for (i = 0; i < preimage_limit; i++)
if (preimage->line[i].hash != img->line[try_lno + i].hash) if ((img->line[try_lno + i].flag & LINE_PATCHED) ||
(preimage->line[i].hash != img->line[try_lno + i].hash))
return 0; return 0;
if (preimage_limit == preimage->nr) { if (preimage_limit == preimage->nr) {
@ -2428,6 +2430,9 @@ static void update_image(struct image *img,
memcpy(img->line + applied_pos, memcpy(img->line + applied_pos,
postimage->line, postimage->line,
postimage->nr * sizeof(*img->line)); postimage->nr * sizeof(*img->line));
for (i = 0; i < postimage->nr; i++)
img->line[applied_pos + i].flag |= LINE_PATCHED;
img->nr = nr; img->nr = nr;
} }