[prev in list] [next in list] [prev in thread] [next in thread]
List: git
Subject: [PATCH v4 0/2] diff --no-index: support symlinks and pipes
From: Dennis Kaarsemaker <dennis () kaarsemaker ! net>
Date: 2017-03-24 21:31:08
Message-ID: 20170324213110.4331-1-dennis () kaarsemaker ! net
[Download RAW message or body]
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/
v3: http://public-inbox.org/git/20170318210038.22638-1-dennis@kaarsemaker.net/
Changes since v3:
Using the --dereference option without being in explicit or implicit no-index
mode is no longer silently ignored, but an error. A test has been added for
this behaviour.
Dennis Kaarsemaker (2):
diff --no-index: optionally follow symlinks
diff --no-index: support reading from pipes
Documentation/diff-options.txt | 9 +++++++
builtin/diff.c | 2 ++
diff-no-index.c | 16 ++++++++++---
diff.c | 30 +++++++++++++++++++----
diff.h | 2 +-
t/t4011-diff-symlink.sh | 6 +++++
t/t4053-diff-no-index.sh | 54 ++++++++++++++++++++++++++++++++++++++++++
t/test-lib.sh | 4 ++++
8 files changed, 115 insertions(+), 8 deletions(-)
--
2.12.0-488-gd3584ba
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic