Skip to content

diff --no-index: support symlinks and pipes

Dennis Kaarsemaker git 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest2 patches 3 repliesIn review
  2. v32 patches 5 repliesSuperseded
  3. v22 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v12 patches15 repliesSuperseded

Changes in v4 from the cover letter

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.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2diff --no-index: optionally follow symlinksDocumentation/diff-options.txt builtin/diff.c diff-no-index.c +4 more+76 -63 replies
2/2diff --no-index: support reading from pipesdiff-no-index.c diff.c t/t4053-diff-no-index.sh +1 more+39 -20 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

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

git diff <(command1) <(command2) is less useful than it could be, all it outputs is:

dev/fd/62 renamed from dev/fd/63 +1 -1
index 9e6542b297..9f7b2c291b 120000
@@ -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/[email protected]/
v2: http://public-inbox.org/git/[email protected]/
v3: http://public-inbox.org/git/[email protected]/

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(-)
Signature · 1 line
2.12.0-488-gd3584ba