git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Peyton Randolph <prandolph@apple.com>
Subject: [PATCH 0/3] Two fixes to "git apply"
Date: Wed,  6 Aug 2014 15:58:02 -0700	[thread overview]
Message-ID: <1407365885-1628-1-git-send-email-gitster@pobox.com> (raw)
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

  reply	other threads:[~2014-08-06 22:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-06 17:13 Bug v1.9.3: Spurious whitespace warnings when using git apply with the --exclude option Peyton Randolph
2014-08-06 20:12 ` Junio C Hamano
2014-08-06 22:58   ` Junio C Hamano [this message]
2014-08-06 22:58     ` [PATCH 1/3] apply: use the right attribute for paths in non-Git patches Junio C Hamano
2014-08-06 22:58     ` [PATCH 2/3] apply: hoist use_patch() helper for path exclusion up Junio C Hamano
2014-08-06 22:58     ` [PATCH 3/3] apply: omit ws check for excluded paths Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407365885-1628-1-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=prandolph@apple.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).