From: Jeff King <peff@peff.net>
To: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [RFC/PATCH 0/2] git diff <(command1) <(command2)
Date: Sat, 12 Nov 2016 02:06:19 -0500 [thread overview]
Message-ID: <20161112070619.hto3lehbyh6oamql@sigill.intra.peff.net> (raw)
In-Reply-To: <1478931094.12153.3.camel@kaarsemaker.net>
On Sat, Nov 12, 2016 at 07:11:34AM +0100, Dennis Kaarsemaker wrote:
> > * If normal "diff" that follows symlinks by default has an option
> > to disable it, then it is OK to also add --no-follow-symlinks
> > that is only valid in the --no-index mode, so that we can mimick
> > it better (I do not think this is the case, though).
>
> It does not, so no new option.
There is "--no-dereference", but it is not that helpful:
$ echo one >1
$ echo two >2
$ ln -s 1 sl1
$ ln -s 2 sl2
$ diff --no-dereference sl1 sl2
Symbolic links sl1 and sl2 differ
$ diff --no-dereference sl1 2
File sl1 is a symbolic link while file 2 is a regular file
So it does do the thing we are talking about here, but diff's handling
of non-file content is not nearly as useful as git's.
That said, I have no problem with proceeding without it and waiting
until somebody actually shows up who really _wants_ --no-dereference. I
won't be surprised if that never happens.
-Peff
next prev parent reply other threads:[~2016-11-12 7:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 20:19 [RFC/PATCH 0/2] git diff <(command1) <(command2) Dennis Kaarsemaker
2016-11-11 20:19 ` [PATCH 1/2] diff --no-index: add option to follow symlinks Dennis Kaarsemaker
2016-11-11 20:19 ` [PATCH 2/2] diff --no-index: support reading from pipes Dennis Kaarsemaker
2016-11-11 21:27 ` [RFC/PATCH 0/2] git diff <(command1) <(command2) Junio C Hamano
2016-11-11 23:14 ` Jacob Keller
2016-11-12 10:08 ` Johannes Schindelin
2016-11-14 3:14 ` Junio C Hamano
2016-11-14 15:31 ` Michael J Gruber
2016-11-14 16:40 ` Johannes Schindelin
2016-11-14 18:01 ` Junio C Hamano
2016-11-14 20:23 ` Michael J Gruber
2016-11-14 21:10 ` Junio C Hamano
2016-11-16 9:50 ` Johannes Schindelin
2016-11-16 18:29 ` Junio C Hamano
2016-11-16 18:37 ` Junio C Hamano
2016-11-12 6:11 ` Dennis Kaarsemaker
2016-11-12 7:06 ` Jeff King [this message]
2016-11-11 23:15 ` Jacob Keller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161112070619.hto3lehbyh6oamql@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dennis@kaarsemaker.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).