Thread (5 messages) flat view 5 messages, 1 author, 2016-06-15
DORMANTno replies

[PATCH 0/3] Two fixes to "git apply"

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:09

This started as an attempt to fix a long-time bug, in which a
partial "git apply" with --exclude/--include still complained about
whitespace breakage in a part that was excluded from patch
application.  The final patch fixes it.

Restructuring of the code necessary to fix it revealing another
long-standing bug that is not related X-<, which turned out to be a
larger fix (patch 1).

Junio C Hamano (3):
  apply: use the right attribute for paths in non-Git patches
  apply: hoist use_patch() helper for path exclusion up
  apply: omit ws check for excluded paths

 builtin/apply.c          | 131 ++++++++++++++++++++++++-----------------------
 t/t4119-apply-config.sh  |  17 ++++++
 t/t4124-apply-ws-rule.sh |  11 ++++
 3 files changed, 96 insertions(+), 63 deletions(-)

-- 
2.1.0-rc1-209-g4e1b551
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help