git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 6, 2014, 22:58 UTC
Message-ID
<1407365885-1628-1-git-send-email-gitster@pobox.com>
In-Reply-To
<xmqq8un1ml7e.fsf@gitster.dls.corp.google.com>

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
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 6 in “Bug v1.9.3: Spurious whitespace warnings when using git apply with the --exclude option”
  1. Peyton RandolphAug 6, 2014
  2. Junio C HamanoAug 6, 2014
  3. 0/3 Two fixes to "git apply"Junio C Hamano, Aug 6, 2014
  4. 1/3 apply: use the right attribute for paths in non-Git patchesJunio C Hamano, Aug 6, 2014
  5. 2/3 apply: hoist use_patch() helper for path exclusion upJunio C Hamano, Aug 6, 2014
  6. 3/3 apply: omit ws check for excluded pathsJunio C Hamano, Aug 6, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.