From: Jeff King <peff@peff.net>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/4] diff: Do not warn about missing EOL at EOF for symlinks
Date: Thu, 3 Jun 2010 13:02:44 -0400 [thread overview]
Message-ID: <20100603170244.GA22779@coredump.intra.peff.net> (raw)
In-Reply-To: <c1e0646449aae50fb962108d16b5428fb7d73bae.1275575236.git.git@drmicha.warpmail.net>
On Thu, Jun 03, 2010 at 04:35:22PM +0200, Michael J Gruber wrote:
> diff --git a/diff.c b/diff.c
> index 7950df6..cad7339 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -1788,6 +1788,8 @@ static void builtin_diff(const char *name_a,
> ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
> ecbdata.found_changesp = &o->found_changes;
> ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
> + if (DIFF_OPT_TST(o, ALLOW_TEXTCONV) && (S_ISLNK(one->mode) || S_ISLNK(two->mode)))
> + ecbdata.ws_rule &= ~WS_NO_EOL_AT_EOF;
I see why you would use ALLOW_TEXTCONV to control this behavior, since
textconv by definition creates patches you can't apply. But it feels a
little hack-ish to me, as textconv is really something different. You
seem to want a "--allow-diff-which-cant-be-applied".
-Peff
next prev parent reply other threads:[~2010-06-03 17:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 14:35 [PATCH 0/4] Don't warn about missing EOL for symlinks Michael J Gruber
2010-06-03 14:35 ` [PATCH 1/4] diff/xdiff: refactor EOF-EOL detection Michael J Gruber
2010-06-03 21:58 ` Junio C Hamano
2010-06-04 7:38 ` Michael J Gruber
2010-06-05 6:38 ` Junio C Hamano
2010-06-05 18:58 ` Michael J Gruber
2010-06-06 22:03 ` Jeff King
2010-06-06 4:00 ` Junio C Hamano
2010-06-06 9:01 ` Johannes Sixt
2010-06-06 22:08 ` Jeff King
2010-06-07 8:10 ` Michael J Gruber
2010-06-03 14:35 ` [PATCH 2/4] diff: make treatment of missing EOL at EOF configurable Michael J Gruber
2010-06-03 14:35 ` [PATCH 3/4] diff: Do not warn about missing EOL at EOF for symlinks Michael J Gruber
2010-06-03 17:02 ` Jeff King [this message]
2010-06-03 14:35 ` [PATCH 4/4] RFC: add whitespace rule for no-eol-at-eof Michael J Gruber
2010-06-03 14:47 ` [PATCH 0/4] Don't warn about missing EOL for symlinks Matthieu Moy
2010-06-03 14:57 ` Michael J Gruber
2010-06-03 17:07 ` Jeff King
2010-06-03 19:55 ` Michael J Gruber
2010-06-03 20:17 ` Jeff King
2010-06-04 14:15 ` Johannes Sixt
2010-06-04 15:25 ` Jeff King
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=20100603170244.GA22779@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/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).