From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Taylor Blau <me@ttaylorr.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Thomas Guyot-Sionnest <tguyot@gmail.com>
Subject: Re: [PATCH v2 1/4] diff --no-index: refuse to compare stdin to a directory
Date: Wed, 05 Jul 2023 14:17:12 -0700 [thread overview]
Message-ID: <xmqqmt0axdlz.fsf@gitster.g> (raw)
In-Reply-To: <5e65a15223bc42293516308eb31ade5395609c55.1688586536.git.phillip.wood@dunelm.org.uk> (Phillip Wood's message of "Wed, 5 Jul 2023 20:49:27 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> When the user runs
>
> git diff --no-index file directory
>
> we follow the behavior of POSIX diff and rewrite the arguments as
>
> git diff --no-index file directory/file
>
> Doing that when "file" is "-" (which means "read from stdin") does not
> make sense so we should error out if the user asks us to compare "-" to
> a directory. This matches the behavior of GNU diff and diff on *BSD.
"git diff --no-index directory file" would also be the same way.
Makes sense.
> - if (path[0] == file_from_standard_input ||
> - path[1] == file_from_standard_input)
> - return;
> - isdir0 = is_directory(path[0]);
> - isdir1 = is_directory(path[1]);
We used to silently did nonsense, I guess.
> + isdir0 = path[0] != file_from_standard_input && is_directory(path[0]);
> + isdir1 = path[1] != file_from_standard_input && is_directory(path[1]);
> +
> + if ((path[0] == file_from_standard_input && isdir1) ||
> + (isdir0 && path[1] == file_from_standard_input))
> + die(_("cannot compare stdin to a directory"));
OK. It is much better than turning "diff - D" into "diff - D/-".
If D were a missing or a misspelt directory name, the rest of the
function will just leave the original intact and let comparison
between the standard input and D that does not exist, and will fail
correctly anyway. Good.
> if (isdir0 == isdir1)
> return;
> if (isdir0) {
> diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
> index 4e9fa0403d..5bfb282e98 100755
> --- a/t/t4053-diff-no-index.sh
> +++ b/t/t4053-diff-no-index.sh
> @@ -205,4 +205,9 @@ test_expect_success POSIXPERM,SYMLINKS 'diff --no-index normalizes: mode not lik
> test_cmp expected 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
> +'
> +
> test_done
next prev parent reply other threads:[~2023-07-05 21:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 14:10 [PATCH 0/3] diff --no-index: support reading from named pipes Phillip Wood
2023-06-27 14:10 ` [PATCH 1/3] diff --no-index: die on error reading stdin Phillip Wood
2023-06-27 14:10 ` [PATCH 2/3] t4054: test diff --no-index with stdin Phillip Wood
2023-06-27 14:10 ` [PATCH 3/3] diff --no-index: support reading from named pipes Phillip Wood
2023-06-27 19:44 ` Junio C Hamano
2023-06-28 10:05 ` Phillip Wood
2023-07-05 19:49 ` [PATCH v2 0/4] " Phillip Wood
2023-07-05 19:49 ` [PATCH v2 1/4] diff --no-index: refuse to compare stdin to a directory Phillip Wood
2023-07-05 21:17 ` Junio C Hamano [this message]
2023-07-05 19:49 ` [PATCH v2 2/4] diff --no-index: die on error reading stdin Phillip Wood
2023-07-05 21:18 ` Junio C Hamano
2023-07-05 19:49 ` [PATCH v2 3/4] t4054: test diff --no-index with stdin Phillip Wood
2023-07-05 21:22 ` Junio C Hamano
2023-07-05 19:49 ` [PATCH v2 4/4] diff --no-index: support reading from named pipes Phillip Wood
2023-07-05 22:19 ` Junio C Hamano
2023-08-09 17:17 ` Jeff King
2023-08-10 12:56 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmt0axdlz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=tguyot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).