From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> In some shells, such as bash and zsh, it's possible to use a command substitution to provide the output of a command as a file argument to another process, like so: diff -u <(printf "a\nb\n") <(printf "a\nc\n") However, this syntax does not produce useful results with git diff --no-index. On macOS, the arguments to the command are named pipes under /dev/fd, and git diff doesn't know how to handle a named pipe. On Linux, the arguments are symlinks to pipes, so git diff "helpfully" diffs these symlinks, comparing their targets like "pipe:[1234]" and "pipe:[5678]". There have been at least three previous attempts [1-3] to address this issue. They all seem to have received broad support for the aim of supporting process substitutions but have foundered on details of the implementation. In an effort to avoid the same fate this series is narrowly focussed on making command substitutions work with "diff --no-index" and does not attempt to add a general facility for de-referencing symbolic links or reading from pipes to the diff machinery. The only functional change is that if a path given on the commandline is a named pipe or a symbolic link that resolves to a named pipe then we read the data to diff from that pipe. The first two patches improve the error handling when reading from stdin and add a test. The third patch implements support for reading from pipes. This cover letter and the commit message for the third patch are largely copied from brian’s patch[2] - do we have a standard commit trailer for "I stole the commit message from someone else's patch"? I've cc’d the participants of the discussion of the last attempt[1] to fix this. Thanks to Junio for his comments, the changes since v1 are: * Patch 1: - This is new and changes the code to error out if the user tries to compare stdin to a directory. * Patch 4: - Changed the implementation of get_mode() to treat stdin and named pipes as special. (suggested by Junio) - Added separate functions to populate a diff_filespec from a stdin or a named pipe. (suggested by Junio) - It now dies if the user tries to compare a named pipe to a directory and added a test for this. (suggested by Junio) - The test for comparing named pipes now cleans up the background processes if it fails. [1] https://lore.kernel.org/git/20200918113256.8699-3-tguyot@xxxxxxxxx/ [2] https://lore.kernel.org/git/20181220002610.43832-1-sandals@xxxxxxxxxxxxxxxxxxxx/ [3] https://public-inbox.org/git/20170113102021.6054-1-dennis@xxxxxxxxxxxxxxx/ base-commit: 94486b6763c29144c60932829a65fec0597e17b3 Published-As: https://github.com/phillipwood/git/releases/tag/diff-no-index-pipes%2Fv2 View-Changes-At: https://github.com/phillipwood/git/compare/94486b676...4e05a0be5 Fetch-It-Via: git fetch https://github.com/phillipwood/git diff-no-index-pipes/v2 Phillip Wood (4): diff --no-index: refuse to compare stdin to a directory diff --no-index: die on error reading stdin t4054: test diff --no-index with stdin diff --no-index: support reading from named pipes diff-no-index.c | 126 ++++++++++++++++++++++++++++----------- t/t4053-diff-no-index.sh | 64 ++++++++++++++++++++ 2 files changed, 156 insertions(+), 34 deletions(-) Range-diff against v1: -: ---------- > 1: 5e65a15223 diff --no-index: refuse to compare stdin to a directory 1: 5dad728f3b = 2: be1d666769 diff --no-index: die on error reading stdin 2: b94d59034f ! 3: 1c7db4dbe2 t4054: test diff --no-index with stdin @@ t/t4053-diff-no-index.sh: test_expect_success POSIXPERM,SYMLINKS 'diff --no-inde + test_write_lines 1 | git diff --no-index -- a/1 - >actual && + test_must_be_empty actual +' - test_done ++ + test_expect_success 'diff --no-index refuses to diff stdin and a directory' ' + test_must_fail git diff --no-index -- - a </dev/null 2>err && + grep "fatal: cannot compare stdin to a directory" err 3: 990e71882b < -: ---------- diff --no-index: support reading from named pipes -: ---------- > 4: 4e05a0be54 diff --no-index: support reading from named pipes base-commit: 94486b6763c29144c60932829a65fec0597e17b3 -- 2.40.1.852.g0a1e0755a6
