git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 0/2] diff --no-index: support symlinks and pipes

From
Dennis Kaarsemaker <dennis@kaarsemaker.net>
Date
Mar 24, 2017, 21:31 UTC
Message-ID
<20170324213110.4331-1-dennis@kaarsemaker.net>
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
Next: Dennis Kaarsemaker
Message 1 of 6 in “diff --no-index: support symlinks and pipes”
  1. 0/2 diff --no-index: support symlinks and pipesDennis Kaarsemaker, Mar 24, 2017
  2. 1/2 diff --no-index: optionally follow symlinksDennis Kaarsemaker, Mar 24, 2017
  3. Junio C HamanoMar 24, 2017
  4. Dennis KaarsemakerMar 25, 2017
  5. Junio C HamanoMar 26, 2017
  6. 2/2 diff --no-index: support reading from pipesDennis Kaarsemaker, Mar 24, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.