From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: git@vger.kernel.org
Cc: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Subject: [PATCH v3 0/2] diff --no-index: support symlinks and pipes
Date: Sat, 18 Mar 2017 22:00:36 +0100 [thread overview]
Message-ID: <20170318210038.22638-1-dennis@kaarsemaker.net> (raw)
git diff <(command1) <(command2) is less useful than it could be, all it outputs is:
diff --git a/dev/fd/63 b/dev/fd/62
index 9e6542b297..9f7b2c291b 120000
--- a/dev/fd/63
+++ b/dev/fd/62
@@ -1 +1 @@
-pipe:[464811685]
\ No newline at end of file
+pipe:[464811687]
\ No newline at end of file
Normal diff provides arguably better output: the diff of the output of the
commands. This series makes it possible for git diff --no-index to follow
symlinks and read from pipes, mimicking the behaviour of normal diff.
v1: http://public-inbox.org/git/20161111201958.2175-1-dennis@kaarsemaker.net/
v2: http://public-inbox.org/git/20170113102021.6054-1-dennis@kaarsemaker.net/
Changes since v2, prompted by feedback from Junio:
- A --derefence option was added and the default is no longer to dereference
symlinks.
- Instead of looking at what canon_mode returns, use the original mode of
files to override behaviour for pipes.
- Turn the !S_ISREG(...) check into a should_mmap_file_contents helper.
Dennis Kaarsemaker (2):
diff --no-index: optionally follow symlinks
diff --no-index: support reading from pipes
Documentation/diff-options.txt | 9 +++++++
diff-no-index.c | 16 ++++++++++---
diff.c | 30 +++++++++++++++++++----
diff.h | 2 +-
t/t4053-diff-no-index.sh | 54 ++++++++++++++++++++++++++++++++++++++++++
t/test-lib.sh | 4 ++++
6 files changed, 107 insertions(+), 8 deletions(-)
--
2.12.0-437-g0cc2799
next reply other threads:[~2017-03-18 21:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-18 21:00 Dennis Kaarsemaker [this message]
2017-03-18 21:00 ` [PATCH v3 1/2] diff --no-index: optionally follow symlinks Dennis Kaarsemaker
2017-03-19 22:14 ` Junio C Hamano
2017-03-20 10:50 ` Dennis Kaarsemaker
2017-03-18 21:00 ` [PATCH v3 2/2] diff --no-index: support reading from pipes Dennis Kaarsemaker
2017-03-19 22:08 ` [PATCH v3 0/2] diff --no-index: support symlinks and pipes Junio C Hamano
2017-03-20 10:40 ` Dennis Kaarsemaker
2017-03-20 16:02 ` 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
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=20170318210038.22638-1-dennis@kaarsemaker.net \
--to=dennis@kaarsemaker.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.
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).