From: Duy Nguyen <pclouds@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
myon@debian.org
Subject: Re: [PATCH] grep: provide a noop --recursive option
Date: Sat, 29 Sep 2018 17:47:06 +0200 [thread overview]
Message-ID: <CACsJy8C7hxpxaXvvgv5CRh4gCKLF2ZvOn6FZ5-yMyVLcFi26rg@mail.gmail.com> (raw)
In-Reply-To: <87d0swiavd.fsf@evledraar.gmail.com>
On Sat, Sep 29, 2018 at 5:25 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
>
> On Sat, Sep 29 2018, Duy Nguyen wrote:
>
> > On Sat, Sep 29, 2018 at 4:58 PM Ævar Arnfjörð Bjarmason
> > <avarab@gmail.com> wrote:
> >>
> >> This --recursive (-r) option does nothing, and is purely here to
> >> appease people who have "grep -r ..." burned into their muscle memory.
> >
> > GNU grep -r recurses infinitely but Git grep also has --max-depth. How
> > do these interact? My knee-jerk reaction is -r equals --max-depth=-1
> > (i.e. overriding previous --mex-depth options on command line, or from
> > alias)
>
> I didn't know about --max-depth, we could squash the following in to
> deal with that, but that still leaves --max-depth=123 --no-recursive as
> using depth 123, and we'd need different options parsing than OPT_BOOL
> to deal with that.
I think if you initialize recursive variable below to -1, then you can
detect both --recursive (1) and --no-recursive (0).
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 02d4384225..2e048d9b49 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -785,7 +785,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> int use_index = 1;
> int pattern_type_arg = GREP_PATTERN_TYPE_UNSPECIFIED;
> int allow_revs;
> - int unused_recursive; /* this is never used */
> + int recursive = 0;
>
> struct option options[] = {
> OPT_BOOL(0, "cached", &cached,
> @@ -803,7 +803,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> N_("show non-matching lines")),
> OPT_BOOL('i', "ignore-case", &opt.ignore_case,
> N_("case insensitive matching")),
> - OPT_BOOL('r', "recursive", &unused_recursive,
> + OPT_BOOL('r', "recursive", &recursive,
> N_("does nothing, git-grep is always recursive, for grep(1) muscle memory compatibility")),
> OPT_BOOL('w', "word-regexp", &opt.word_regexp,
> N_("match patterns only at word boundaries")),
> @@ -926,6 +926,8 @@ 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 (opt.max_depth != -1 && recursive)
> + die(_("The --max-depth and --recursive options are incompatible"));
> if (use_index && !startup_info->have_repository) {
> int fallback = 0;
> git_config_get_bool("grep.fallbacktonoindex", &fallback);
> diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
> index c48d1fa34b..ad25cd50f5 100755
> --- a/t/t7810-grep.sh
> +++ b/t/t7810-grep.sh
> @@ -1697,4 +1697,8 @@ test_expect_success 'grep does not report i-t-a and assume unchanged with -L' '
> test_cmp expected actual
> '
>
> +test_expect_success 'grep --recursive is incompatible with --max-depth' '
> + test_must_fail git grep --recursive --max-depth=1
> +'
> +
> test_done
--
Duy
next prev parent reply other threads:[~2018-09-29 15:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-29 14:01 wishlist: git grep -r Christoph Berg
2018-09-29 14:55 ` [PATCH] grep: provide a noop --recursive option Ævar Arnfjörð Bjarmason
2018-09-29 15:08 ` Duy Nguyen
2018-09-29 15:25 ` Ævar Arnfjörð Bjarmason
2018-09-29 15:47 ` Duy Nguyen [this message]
2018-09-29 17:11 ` Junio C Hamano
2018-09-29 19:38 ` Christoph Berg
2018-10-01 19:15 ` René Scharfe
2018-10-05 8:17 ` Junio C Hamano
2018-10-05 12:49 ` Ævar Arnfjörð Bjarmason
2018-10-01 19:23 ` Stefan Beller
2018-10-05 8:15 ` Christoph Berg
2018-10-05 8:19 ` Junio C Hamano
2018-10-05 13:05 ` Mischa POSLAWSKY
2018-10-05 19:17 ` Stefan Beller
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=CACsJy8C7hxpxaXvvgv5CRh4gCKLF2ZvOn6FZ5-yMyVLcFi26rg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=myon@debian.org \
/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).