| commit | ead51a75d5ca432daa7429b70d363dba0cdf6507 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Sep 2014 19:53:58 +0000 (9 12:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Sep 2014 19:53:58 +0000 (9 12:53 -0700) | ||
| tree | 852b67645fe3e0b97daa72634dc9ab18533fb631 | treesnapshot (tar.gz zip) |
| parent | 93424a0fd882a3ed1c1f7a8b6fe71fdaa21cce99 | commitdiff |
| parent | 477a08af04c227064860ce99197c501037f7f39c | commitdiff |
Merge branch 'jc/apply-ws-prefix'
Applying a patch not generated by Git in a subdirectory used to
check the whitespace breakage using the attributes for incorrect
paths. Also whitespace checks were performed even for paths
excluded via "git apply --exclude=<path>" mechanism.
* jc/apply-ws-prefix:
apply: omit ws check for excluded paths
apply: hoist use_patch() helper for path exclusion up
apply: use the right attribute for paths in non-Git patches
Applying a patch not generated by Git in a subdirectory used to
check the whitespace breakage using the attributes for incorrect
paths. Also whitespace checks were performed even for paths
excluded via "git apply --exclude=<path>" mechanism.
* jc/apply-ws-prefix:
apply: omit ws check for excluded paths
apply: hoist use_patch() helper for path exclusion up
apply: use the right attribute for paths in non-Git patches
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4119-apply-config.sh | diff1 | diff2 | blobhistory |