From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
To: git@vger.kernel.org
Cc: Denton Liu <liu.denton@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] grep: support the --pathspec-from-file option
Date: Thu, 5 Dec 2019 12:58:19 +0100 [thread overview]
Message-ID: <6af006eb-6d67-4eb5-c4f5-1677d6cbd120@syntevo.com> (raw)
In-Reply-To: <20191204203911.237056-1-emilyshaffer@google.com>
I'm excited to see someone else join my effort, thanks for continuing my
effort! Also, less work for me :)
On 04.12.2019 21:39, Emily Shaffer wrote:
> static int file_callback(const struct option *opt, const char *arg, int unset)
> {
> struct grep_opt *grep_opt = opt->value;
> - int from_stdin;
> FILE *patterns;
> int lno = 0;
> struct strbuf sb = STRBUF_INIT;
>
> BUG_ON_OPT_NEG(unset);
>
> - from_stdin = !strcmp(arg, "-");
> - patterns = from_stdin ? stdin : fopen(arg, "r");
> + patterns_from_stdin = !strcmp(arg, "-");
> +
> + if (patterns_from_stdin && pathspec_from_stdin)
To my understanding, this check will not work as expected.
`file_callback` will be called at the moment of parsing args.
`pathspec_from_stdin` is only initialized later.
Maybe it would be better to convert `file_callback` into a regular
function and call it after the options were parsed, similar to how
`pathspec_from_file` is parsed later?
This will also allow to move global variables into local scope and
resolve other small issues raised by other reviewers.
> +test_expect_success 'grep with two stdin inputs fails' '
> + test_must_fail git grep --pathspec-from-file - --patterns-from-file - <pathspecs
> +'
> +
It is usually a good idea to test for specific error, like this:
test_must_fail git grep --pathspec-from-file - --patterns-from-file -
<pathspecs 2>err &&
test_i18ngrep "cannot specify both patterns and pathspec via stdin"
err &&
next prev parent reply other threads:[~2019-12-05 11:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 1:16 [PATCH] grep: provide pathspecs/patterns via file or stdin Emily Shaffer
2019-11-22 2:14 ` Denton Liu
2019-11-22 2:34 ` Junio C Hamano
2019-11-22 3:56 ` Junio C Hamano
2019-11-22 18:52 ` Denton Liu
2019-11-22 22:02 ` Emily Shaffer
2019-11-22 22:06 ` Emily Shaffer
2019-11-23 0:28 ` Junio C Hamano
2019-11-22 2:24 ` Junio C Hamano
2019-12-04 20:39 ` [PATCH v2] grep: support the --pathspec-from-file option Emily Shaffer
2019-12-04 21:05 ` Denton Liu
2019-12-04 21:24 ` Junio C Hamano
2019-12-04 22:24 ` Junio C Hamano
2019-12-13 3:07 ` Emily Shaffer
2019-12-05 11:58 ` Alexandr Miloslavskiy [this message]
2019-12-13 4:00 ` Emily Shaffer
2019-12-06 11:22 ` Johannes Schindelin
2019-12-06 11:34 ` SZEDER Gábor
2019-12-13 4:12 ` [PATCH v3] " Emily Shaffer
2019-12-13 13:04 ` Alexandr Miloslavskiy
2019-12-13 18:26 ` Junio C Hamano
2019-12-13 20:13 ` Alexandr Miloslavskiy
2019-12-17 0:33 ` Emily Shaffer
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=6af006eb-6d67-4eb5-c4f5-1677d6cbd120@syntevo.com \
--to=alexandr.miloslavskiy@syntevo.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@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).