From: Thomas Gummerer <t.gummerer@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, "Jens Lehmann" <Jens.Lehmann@web.de>,
"Junio C Hamano" <gitster@pobox.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c
Date: Sat, 14 Dec 2013 11:42:18 +0100 [thread overview]
Message-ID: <87zjo3lnn9.fsf@gmail.com> (raw)
In-Reply-To: <20131214004347.GZ2311@google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
> Hi,
>
> Thomas Gummerer wrote:
>
>> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>
> Thanks, and sorry for the slow follow-up.
>
> [...]
>> --- a/builtin/diff.c
>> +++ b/builtin/diff.c
>> @@ -16,6 +16,9 @@
> [...]
>> @@ -283,14 +286,57 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
>> * Other cases are errors.
>> */
>>
>> + /* Were we asked to do --no-index explicitly? */
>> + for (i = 1; i < argc; i++) {
>> + if (!strcmp(argv[i], "--")) {
>> + i++;
>> + break;
>> + }
>> + if (!strcmp(argv[i], "--no-index"))
>> + no_index = DIFF_NO_INDEX_EXPLICIT;
>
> Neat.
>
> [...]
>> + /*
>> + * Treat git diff with at least one path outside of the
>> + * repo the same as if the command would have been executed
>> + * outside of a git repository. In this case it behaves
>> + * the same way as "git diff --no-index <a> <b>", which acts
>> + * as a colourful "diff" replacement.
>> + */
>> + if (nongit || ((argc == i + 2) &&
>> + (!path_inside_repo(prefix, argv[i]) ||
>> + !path_inside_repo(prefix, argv[i + 1]))))
>> + no_index = DIFF_NO_INDEX_IMPLICIT;
>
> What happens if I run 'git diff --no-index /tmp git.c git.c' from
> within a git repository? With this, I fear I will get
Thanks, I've missed that one. It only happens when run outside a git
repository, but the same comments still apply. Will fix and send a
re-roll.
> Not a git repository
> To compare two paths outside a working tree:
> usage: git diff [--no-index] <path> <path>
>
> instead of the expected
>
> usage: git diff --no-index <path> <path>
>
> Something like
>
> if (no_index)
> ;
> else if (nongit)
> no_index = DIFF_NO_INDEX_IMPLICIT;
> else if (argc != i + 2)
> ;
> else if (!path_inside_repo(prefix, argv[i]) ||
> !path_inside_repo(prefix, argv[i + 1]))
> no_index = DIFF_NO_INDEX_IMPLICIT;
>
> should work. Or:
>
> if (!no_index) {
> /*
> * Treat git diff with ...
> */
> if (nongit || ...)
> no_index = DIFF_NO_INDEX_IMPLICIT;
> }
>
> Or the '!no_index &&' condition inserted some other way.
>
>> - /* If this is a no-index diff, just run it and exit there. */
>> - diff_no_index(&rev, argc, argv, nongit, prefix);
>> + if (no_index) {
>> + if (argc != i + 2) {
> [...]
>> + /* Give the usage message for non-repository usage and exit. */
>> + usagef("git diff %s <path> <path>",
>> + no_index == DIFF_NO_INDEX_EXPLICIT ?
>> + "--no-index" : "[--no-index]");
>> +
>> + }
>> + /* If this is a no-index diff, just run it and exit there. */
>> + diff_no_index(&rev, argc, argv, prefix);
>> + }
>
> Perhaps, to avoid some nesting:
>
> /* A no-index diff takes exactly two path arguments. */
> if (no_index && argc != i + 2) {
> ...
> usagef(...);
> }
>
> if (no_index)
> /* Just run the diff and exit. */
> diff_no_index(...);
>
> Jonathan
Thanks, will change in the re-roll.
--
Thomas
next prev parent reply other threads:[~2013-12-14 10:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 12:05 [PATCH] diff: don't read index when --no-index is given Thomas Gummerer
2013-12-09 15:16 ` Jonathan Nieder
2013-12-09 17:27 ` Jens Lehmann
2013-12-09 19:06 ` Jonathan Nieder
2013-12-09 19:14 ` Thomas Gummerer
2013-12-09 19:20 ` Jonathan Nieder
2013-12-09 20:40 ` [PATCH v2] " Thomas Gummerer
2013-12-09 20:55 ` Torsten Bögershausen
2013-12-09 20:57 ` Eric Sunshine
2013-12-09 21:17 ` Thomas Gummerer
2013-12-09 20:30 ` [PATCH] " Junio C Hamano
2013-12-09 21:13 ` Thomas Gummerer
2013-12-10 17:52 ` [PATCH v3 1/2] diff: move no-index detection to builtin/diff.c Thomas Gummerer
2013-12-10 17:52 ` [PATCH v3 2/2] diff: don't read index when --no-index is given Thomas Gummerer
2013-12-10 18:18 ` Jonathan Nieder
2013-12-10 18:55 ` Thomas Gummerer
2013-12-10 18:16 ` [PATCH v3 1/2] diff: move no-index detection to builtin/diff.c Jonathan Nieder
2013-12-10 18:46 ` Thomas Gummerer
2013-12-11 9:58 ` [PATCH v4 " Thomas Gummerer
2013-12-11 9:58 ` [PATCH v4 2/2] diff: don't read index when --no-index is given Thomas Gummerer
2013-12-12 20:25 ` Junio C Hamano
2013-12-14 0:44 ` Jonathan Nieder
2013-12-14 0:43 ` [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c Jonathan Nieder
2013-12-14 10:42 ` Thomas Gummerer [this message]
2013-12-16 17:48 ` Junio C Hamano
2013-12-16 19:23 ` [PATCH 1/2] diff: add test for --no-index executed outside repo Thomas Gummerer
2013-12-16 19:23 ` [PATCH 2/2] diff: avoid some nesting Thomas Gummerer
2013-12-16 19:42 ` [PATCH 1/2] diff: add test for --no-index executed outside repo Junio C Hamano
2013-12-14 13:07 ` [PATCH v5 1/2] diff: move no-index detection to builtin/diff.c Thomas Gummerer
2013-12-14 13:07 ` [PATCH v5 2/2] diff: don't read index when --no-index is given Thomas Gummerer
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=87zjo3lnn9.fsf@gmail.com \
--to=t.gummerer@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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).