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/  |  17 ++++++
 t/ |  11 ++++
 3 files changed, 96 insertions(+), 63 deletions(-)


To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to