From: Jeff King <peff@peff.net>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org, pclouds@gmail.com, sunshine@sunshineco.com,
gitster@pobox.com
Subject: Re: [PATCH v4 2/2] builtin/grep: add grep.fallbackToNoIndex config
Date: Tue, 12 Jan 2016 07:11:07 -0500 [thread overview]
Message-ID: <20160112121106.GA18512@sigill.intra.peff.net> (raw)
In-Reply-To: <1452595226-14616-3-git-send-email-t.gummerer@gmail.com>
On Tue, Jan 12, 2016 at 11:40:26AM +0100, Thomas Gummerer wrote:
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 4229cae..6b7add6 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -755,9 +755,15 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> PARSE_OPT_STOP_AT_NON_OPTION);
> grep_commit_pattern_type(pattern_type_arg, &opt);
>
> - if (use_index && !startup_info->have_repository)
> - /* die the same way as if we did it at the beginning */
> - setup_git_directory();
> + if (use_index && !startup_info->have_repository) {
> + int fallback = 0;
> + git_config_get_bool("grep.fallbacktonoindex", &fallback);
> + if (fallback)
> + use_index = 0;
> + else
> + /* die the same way as if we did it at the beginning */
> + setup_git_directory();
> + }
>
> /*
> * skip a -- separator; we know it cannot be
Nice. This turned out delightfully simple.
-Peff
next prev parent reply other threads:[~2016-01-12 12:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-10 14:19 [PATCH 0/3] Implicitly use --no-index if git grep is used outside of repo Thomas Gummerer
2016-01-10 14:19 ` [PATCH 1/3] t7810: correct --no-index test Thomas Gummerer
2016-01-10 14:19 ` [PATCH 2/3] builtin/grep: rename use_index to no_index Thomas Gummerer
2016-01-11 17:33 ` Junio C Hamano
2016-01-10 14:19 ` [PATCH 3/3] builtin/grep: allow implicit --no-index Thomas Gummerer
2016-01-11 0:50 ` Duy Nguyen
2016-01-11 11:10 ` Thomas Gummerer
2016-01-11 17:26 ` Junio C Hamano
2016-01-11 17:48 ` Thomas Gummerer
2016-01-11 17:59 ` Jeff King
2016-01-11 18:37 ` Junio C Hamano
2016-01-11 1:54 ` Eric Sunshine
2016-01-11 11:29 ` Thomas Gummerer
2016-01-11 17:30 ` Junio C Hamano
2016-01-11 19:28 ` Thomas Gummerer
2016-01-11 19:35 ` Junio C Hamano
2016-01-11 19:44 ` Junio C Hamano
2016-01-11 21:01 ` Thomas Gummerer
2016-01-11 17:00 ` [PATCH v2 0/3] Introduce a --use-index command line argument in git grep Thomas Gummerer
2016-01-11 17:00 ` [PATCH v2 1/3] t7810: correct --no-index test Thomas Gummerer
2016-01-11 17:00 ` [PATCH v2 2/3] builtin/grep: rename use_index to no_index Thomas Gummerer
2016-01-11 17:00 ` [PATCH v2 3/3] builtin/grep: introduce --use-index argument Thomas Gummerer
2016-01-11 21:26 ` [PATCH v3 0/2] grep: add fallbackToNoIndex config option Thomas Gummerer
2016-01-11 21:26 ` [PATCH v3 1/2] t7810: correct --no-index test Thomas Gummerer
2016-01-11 21:26 ` [PATCH v3 2/2] builtin/grep: add grep.fallbackToNoIndex config Thomas Gummerer
2016-01-11 21:48 ` Jeff King
2016-01-11 22:35 ` Thomas Gummerer
2016-01-12 10:40 ` [PATCH v4 0/2] grep: add fallbackToNoIndex config option Thomas Gummerer
2016-01-12 10:40 ` [PATCH v4 1/2] t7810: correct --no-index test Thomas Gummerer
2016-01-12 10:40 ` [PATCH v4 2/2] builtin/grep: add grep.fallbackToNoIndex config Thomas Gummerer
2016-01-12 12:11 ` Jeff King [this message]
2016-01-12 15:50 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160112121106.GA18512@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=t.gummerer@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.
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 NNTP newsgroup(s).