| commit | 020a5198095153a7a7107cc33830992e7736914e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Aug 2014 18:51:37 +0000 (21 11:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Aug 2014 18:51:37 +0000 (21 11:51 -0700) | ||
| tree | 8c57f940fc629aeceed500ae06769bb9a50e0833 | treesnapshot (tar.gz zip) |
| parent | 9b6131025efc20969deb1e7a8e0e1fff328c4a29 | commitdiff |
| parent | 477a08af04c227064860ce99197c501037f7f39c | commitdiff |
Merge branch 'jc/apply-ws-prefix' into jch
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
# Conflicts:
# builtin/apply.c
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
# Conflicts:
# builtin/apply.c
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4119-apply-config.sh | diff1 | diff2 | blobhistory |