summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-06 20:09:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-07 19:23:55 (GMT)
commit477a08af04c227064860ce99197c501037f7f39c (patch)
treec3cfb7d999f2a1f8f52ade251ec8852f1511b1bb /builtin/apply.c
parent3ee2ad14c6a6823d16eeda2aa48496d4b6e16f70 (diff)
downloadgit-477a08af04c227064860ce99197c501037f7f39c.zip
git-477a08af04c227064860ce99197c501037f7f39c.tar.gz
git-477a08af04c227064860ce99197c501037f7f39c.tar.bz2
apply: omit ws check for excluded paths
Whitespace breakages are checked while the patch is being parsed. Disable them at the beginning of parse_chunk(), where each individual patch is parsed, immediately after we learn the name of the file the patch applies to and before we start parsing the diff contained in the patch. One may naively think that we should be able to not just skip the whitespace checks but simply fast-forward to the next patch without doing anything once use_patch() tells us that this patch is not going to be used. But in reality we cannot really skip much of the parsing in order to do such a "fast-forward", primarily because parsing "@@ -k,l +m,n @@" lines and counting the input lines is how we determine the boundaries of individual patches. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index bf075cc..13319e8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1997,9 +1997,12 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
prefix_patch(patch);
- patch->ws_rule = whitespace_rule(patch->new_name
- ? patch->new_name
- : patch->old_name);
+ if (!use_patch(patch))
+ patch->ws_rule = 0;
+ else
+ patch->ws_rule = whitespace_rule(patch->new_name
+ ? patch->new_name
+ : patch->old_name);
patchsize = parse_single_patch(buffer + offset + hdrsize,
size - offset - hdrsize, patch);