From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
To: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Cc: "Denton Liu" <liu.denton@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v3] grep: support the --pathspec-from-file option
Date: Fri, 13 Dec 2019 14:04:22 +0100 [thread overview]
Message-ID: <e4e81dba-d861-0e7c-c06c-4041e903f8ea@syntevo.com> (raw)
In-Reply-To: <20191213041254.13202-1-emilyshaffer@google.com>
Thanks, the patch looks solid to me, just a few code style rants :)
On 13.12.2019 5:12, Emily Shaffer wrote:
> + if (patterns_from_file && pathspec_from_file &&
> + !strcmp(pathspec_from_file, "-") &&
> + !strcmp(patterns_from_file, "-"))
> + die(_("cannot specify both patterns and pathspec via stdin"));
> +
> + if (patterns_from_file)
> + read_pattern_file(&opt, patterns_from_file);
> +
> +
That looks a lot more solid now, thanks!
> @@ -549,6 +549,10 @@ test_expect_success 'grep -f, non-existent file' '
> test_must_fail git grep -f patterns
> '
Could also benefit from testing for specific error here.
> +test_expect_success 'setup pathspecs-file tests' '
> +cat >excluded-file <<EOF &&
> +bar
> +EOF
> +cat >pathspec-file <<EOF &&
> +foo
> +bar
> +baz
> +EOF
> +cat >unrelated-file <<EOF &&
> +xyz
> +EOF
> +git add excluded-file pathspec-file unrelated-file
> +'
Please use <<-EOF and tabulate the code properly. I suggest that you
have a look at `t/t7107-reset-pathspec-file.sh`, last test.
> +
> +cat >pathspecs <<EOF
> +pathspec-file
> +unrelated-file
> +EOF
> +
> +cat >expected <<EOF
> +pathspec-file:bar
> +EOF
The general approach nowadays is to write `expect` file in every test.
Note that the standard name is `expect`, so please remove `ed` from your
name. I think that this is also reasonable for `pathspecs` file, it's
only used in two places. Again, please refer to
`t/t7107-reset-pathspec-file.sh`.
next prev parent reply other threads:[~2019-12-13 13:24 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
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 [this message]
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=e4e81dba-d861-0e7c-c06c-4041e903f8ea@syntevo.com \
--to=alexandr.miloslavskiy@syntevo.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=szeder.dev@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).