From: Thomas Gummerer <t.gummerer@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Alexey Borzenkov" <snaury@gmail.com>,
"René Scharfe" <l.s.r@web.de>,
"Michael Haggerty" <mhagger@alum.mit.edu>,
"Tim Henigan" <tim.henigan@gmail.com>,
"Bobby Powers" <bobbypowers@gmail.com>,
"Jens Lehmann" <Jens.Lehmann@web.de>, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH] diff: don't read index when --no-index is given
Date: Mon, 09 Dec 2013 22:13:06 +0100 [thread overview]
Message-ID: <87ppp5n2xp.fsf@gmail.com> (raw)
In-Reply-To: <xmqqwqjdydga.fsf@gitster.dls.corp.google.com>
[Sorry for not seeing this before sending out v2.]
Junio C Hamano <gitster@pobox.com> writes:
> Thomas Gummerer <t.gummerer@gmail.com> writes:
>
>> git diff --no-index ... currently reads the index, during setup, when
>> calling gitmodules_config(). In the usual case this gives us some
>> performance drawbacks, but it's especially annoying if there is a broken
>> index file.
>>
>> Avoid calling the unnecessary gitmodules_config() when the --no-index
>> option is given. Also add a test to guard against similar breakages in the future.
>>
>> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>> ---
>> builtin/diff.c | 13 +++++++++++--
>> t/t4053-diff-no-index.sh | 6 ++++++
>> 2 files changed, 17 insertions(+), 2 deletions(-)
>>
>> diff --git a/builtin/diff.c b/builtin/diff.c
>> index adb93a9..47c0833 100644
>> --- a/builtin/diff.c
>> +++ b/builtin/diff.c
>> @@ -257,7 +257,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
>> int blobs = 0, paths = 0;
>> const char *path = NULL;
>> struct blobinfo blob[2];
>> - int nongit;
>> + int nongit, no_index = 0;
>> int result = 0;
>>
>> /*
>> @@ -282,9 +282,18 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
>> *
>> * Other cases are errors.
>> */
>> + for (i = 1; i < argc; i++) {
>> + if (!strcmp(argv[i], "--"))
>> + break;
>> + if (!strcmp(argv[i], "--no-index")) {
>> + no_index = 1;
>> + break;
>> + }
>> + }
>
> This seems to duplicate only half the logic at the beginning of
> diff_no_index(), right? E.g., running "git diff /var/tmp/[12]"
> inside a working tree that is controlled by a Git repository when
> /var/tmp/ is outside, we do want to behave as if the command line
> were "git diff --no-index /var/tmp/[12]", but this half duplication
> makes these two behave differently, no?
Yes you're right, I missed that. "git diff /var/tmp/[12]" inside a
working tree with a broken index has the same problems, which should be
fixed too. I'll try to fix that and send a new patch afterwards.
> I think the issue you are trying to address is worth tackling, but I
> wonder if a bit of preparatory refactoring is necessary to avoid the
> partial duplication.
>
>> prefix = setup_git_directory_gently(&nongit);
>> - gitmodules_config();
>> + if (!no_index)
>> + gitmodules_config();
>> git_config(git_diff_ui_config, NULL);
>>
>> init_revisions(&rev, prefix);
>> diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
>> index 979e983..a24ae4d 100755
>> --- a/t/t4053-diff-no-index.sh
>> +++ b/t/t4053-diff-no-index.sh
>> @@ -29,4 +29,10 @@ test_expect_success 'git diff --no-index relative path outside repo' '
>> )
>> '
>>
>> +test_expect_success 'git diff --no-index with broken index' '
>> + cd repo &&
>> + echo broken >.git/index &&
>> + test_expect_code 0 git diff --no-index a ../non/git/a
>> +'
>> +
>> test_done
--
Thomas
next prev parent reply other threads:[~2013-12-09 21:13 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 [this message]
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
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=87ppp5n2xp.fsf@gmail.com \
--to=t.gummerer@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=bobbypowers@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=snaury@gmail.com \
--cc=tim.henigan@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).