From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Sep 2014 19:53:58 +0000 (-0700)
Subject: Merge branch 'jc/apply-ws-prefix'
X-Git-Tag: v2.2.0-rc0~168
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ead51a75d5ca432daa7429b70d363dba0cdf6507?hp=ead51a75d5ca432daa7429b70d363dba0cdf6507

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
---