diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-20 10:44:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-20 10:44:57 -0700 |
| commit | 7435d51bfd183d2f6fd9fc9fc20a11d413d152ac (patch) | |
| tree | 98785528cc68ed2331c53be4a59c157c5b72cbf1 /diff-no-index.c | |
| parent | d4a83d07b8cc66d4afac2f33a8af729f2ba93bba (diff) | |
| parent | 48944f214c7cd7402e70e661cf9efb8dd118fe0c (diff) | |
| download | git-7435d51bfd183d2f6fd9fc9fc20a11d413d152ac.tar.gz | |
Merge branch 'pw/diff-no-index-from-named-pipes'
"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
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 1 |
1 files changed, 1 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); |