diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:18 +0900 |
| commit | bfb8376d68180494aba70448e1b3ddcb0b42f4a4 (patch) | |
| tree | b44bb7016b2e8300242d00cb8416559771330b39 | |
| parent | d12df942ba017c1301a51083b82431e9b3699a11 (diff) | |
| parent | 48944f214c7cd7402e70e661cf9efb8dd118fe0c (diff) | |
| download | git-bfb8376d68180494aba70448e1b3ddcb0b42f4a4.tar.gz | |
Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42
"git diff --no-index -R <(one) <(two)" did not work correctly,
which has been corrected.
* pw/diff-no-index-from-named-pipes:
diff --no-index: fix -R with stdin
| -rw-r--r-- | diff-no-index.c | 1 | ||||
| -rwxr-xr-x | t/t4053-diff-no-index.sh | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 8aead3e332..e7041b89e3 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -232,6 +232,7 @@ static int queue_diff(struct diff_options *o, if (o->flags.reverse_diff) { SWAP(mode1, mode2); SWAP(name1, name2); + SWAP(special1, special2); } d1 = noindex_filespec(name1, mode1, special1); diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh index 6781cc9078..5f059f65fc 100755 --- a/t/t4053-diff-no-index.sh +++ b/t/t4053-diff-no-index.sh @@ -224,6 +224,25 @@ test_expect_success "diff --no-index treats '-' as stdin" ' test_must_be_empty actual ' +test_expect_success "diff --no-index -R treats '-' as stdin" ' + cat >expect <<-EOF && + diff --git b/a/1 a/- + index $(git hash-object --stdin <a/1)..$ZERO_OID 100644 + --- b/a/1 + +++ a/- + @@ -1 +1 @@ + -1 + +x + EOF + + test_write_lines x | test_expect_code 1 \ + git -c core.abbrev=no diff --no-index -R -- - a/1 >actual && + test_cmp expect actual && + + test_write_lines 1 | git diff --no-index -R -- a/1 - >actual && + test_must_be_empty actual +' + 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 |