undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-apply.c: optimize match_beginning/end processing a bit.

Browse Source 
Wnen the caller knows the hunk needs to match at the beginning
or at the end, there is no point starting from the line number
that is found in the patch and trying match with increasing
offset.  The logic to find matching lines was made more line
oriented with the previous patch and this optimization is now
trivial.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-01-28 03:04:30 -08:00
parent b94f2eda99
commit ecf4c2ec6b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-apply.c
View File

@ -1579,6 +1579,16 @@ static int find_pos(struct image *img,
if (preimage->nr > img->nr) if (preimage->nr > img->nr)
return -1; return -1;
/*
* If match_begining or match_end is specified, there is no
* point starting from a wrong line that will never match and
* wander around and wait for a match at the specified end.
*/
if (match_beginning)
line = 0;
else if (match_end)
line = img->nr - preimage->nr;
try = 0; try = 0;
for (i = 0; i < line; i++) for (i = 0; i < line; i++)
try += img->line[i].len; try += img->line[i].len;