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

builtin-apply.c: pass ws_rule down to match_fragment()

Browse Source 
This is necessary to allow match_fragment() to attempt a match
with a preimage that is based on a version before whitespace
errors were fixed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-01-30 15:13:37 -08:00
parent ee810b7159
commit c607aaa2f0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-apply.c
View File

@ -1614,6 +1614,7 @@ static int match_fragment(struct image *img,
struct image *postimage, struct image *postimage,
unsigned long try, unsigned long try,
int try_lno, int try_lno,
unsigned ws_rule,
int match_beginning, int match_end) int match_beginning, int match_end)
{ {
int i; int i;
@ -1656,6 +1657,7 @@ static int find_pos(struct image *img,
struct image *preimage, struct image *preimage,
struct image *postimage, struct image *postimage,
int line, int line,
unsigned ws_rule,
int match_beginning, int match_end) int match_beginning, int match_end)
{ {
int i; int i;
@ -1691,7 +1693,7 @@ static int find_pos(struct image *img,
for (i = 0; ; i++) { for (i = 0; ; i++) {
if (match_fragment(img, preimage, postimage, if (match_fragment(img, preimage, postimage,
try, try_lno, try, try_lno, ws_rule,
match_beginning, match_end)) match_beginning, match_end))
return try_lno; return try_lno;
@ -1930,8 +1932,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
for (;;) { for (;;) {
applied_pos = find_pos(img, &preimage, &postimage, applied_pos = find_pos(img, &preimage, &postimage, pos,
pos, match_beginning, match_end); ws_rule, match_beginning, match_end);
if (applied_pos >= 0) if (applied_pos >= 0)
break; break;