From: Michael J Gruber <git@drmicha.warpmail.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] diff/xdiff: refactor EOF-EOL detection
Date: Fri, 04 Jun 2010 09:38:29 +0200 [thread overview]
Message-ID: <4C08AD75.6040307@drmicha.warpmail.net> (raw)
In-Reply-To: <7vsk537p8k.fsf@alter.siamese.dyndns.org>
Junio C Hamano venit, vidit, dixit 03.06.2010 23:58:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>> This puts the "No newline at end of file" warning for both code paths
>
> This is not a warning.
>
> It is an integral part of the diff output specification that allows patch
> recipients to correctly reproduce incomplete lines. Removing this from
> the output is simply out of question.
>
I'm sorry, but that makes 3 out of 3 respondents who didn't seem to read
what I wrote.
This series is about the display of that line for human-consumable
output such as log -p etc.
Patch 1/4 doesn't remove anything. It just makes it simpler to follow
the different diff code paths that we have.
In 3/4, that "No NL at EOF" is suppressed for symlinks *when textconv is
in effect only*, i.e. when we don't (necessarily) produce a diff fit to
be applied anyways.
As Jeff pointed out in his 2nd response, it may make sense to have this
dependent on TERM just like color output is currently (which messes ab
diff|apply also!).
I would even go so far to say that --no-textconv should be the default
for diff,log etc. unless the output goes to the terminal, just like our
color handling.
Michael
next prev parent reply other threads:[~2010-06-04 7:39 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 [this message]
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
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=4C08AD75.6040307@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.