From: Michael Haggerty <mhagger@alum.mit.edu>
To: Ian Jackson <ijackson@chiark.greenend.org.uk>, git@vger.kernel.org
Subject: Re: [PATCH 5/5] check-ref-format: New --stdin option
Date: Mon, 19 Dec 2016 14:43:43 +0100 [thread overview]
Message-ID: <14d95a74-ad7e-a1dd-c3da-52afd53cede4@alum.mit.edu> (raw)
In-Reply-To: <20161104191358.28812-6-ijackson@chiark.greenend.org.uk>
On 11/04/2016 08:13 PM, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
> ---
> Documentation/git-check-ref-format.txt | 10 ++++++++--
> builtin/check-ref-format.c | 34 +++++++++++++++++++++++++++++++---
> 2 files changed, 39 insertions(+), 5 deletions(-)
>
> [...]
> diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
> index 559d5c2..87f52fa 100644
> --- a/builtin/check-ref-format.c
> +++ b/builtin/check-ref-format.c
> @@ -76,6 +76,7 @@ static int check_one_ref_format(const char *refname)
> int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
> {
> int i;
> + int use_stdin = 0;
>
> if (argc == 2 && !strcmp(argv[1], "-h"))
> usage(builtin_check_ref_format_usage);
> @@ -93,6 +94,8 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
> check_branch = 1;
> else if (!strcmp(argv[i], "--report-errors"))
> report_errors = 1;
> + else if (!strcmp(argv[i], "--stdin"))
> + use_stdin = 1;
> else
> usage(builtin_check_ref_format_usage);
> }
> @@ -100,8 +103,33 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
> if (check_branch && (flags || normalize))
> usage(builtin_check_ref_format_usage);
>
> - if (! (i == argc - 1))
> - usage(builtin_check_ref_format_usage);
> + if (!use_stdin) {
> + if (! (i == argc - 1))
> + usage(builtin_check_ref_format_usage);
> +
> + return check_one_ref_format(argv[i]);
> + } else {
> + char buffer[2048];
> + int worst = 0;
>
> - return check_one_ref_format(argv[i]);
> + if (! (i == argc))
> + usage(builtin_check_ref_format_usage);
> +
> + while (fgets(buffer, sizeof(buffer), stdin)) {
> + char *newline = strchr(buffer, '\n');
> + if (!newline) {
> + fprintf(stderr, "%s --stdin: missing final newline or line too long\n", *argv);
> + exit(127);
> + }
> + *newline = 0;
> + int got = check_one_ref_format(buffer);
Another minor point: project policy is not to mix declarations and code.
Please declare `got` at the top of the block.
> + if (got > worst)
> + worst = got;
> + }
> + if (!feof(stdin)) {
> + perror("reading from stdin");
> + exit(127);
> + }
> + return worst;
> + }
> }
>
Michael
next prev parent reply other threads:[~2016-12-19 13:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-04 19:13 [PATCH 0/5] git check-ref-format --stdin --report-errors Ian Jackson
2016-11-04 19:13 ` [PATCH 1/5] check-ref-format: Refactor out check_one_ref_format Ian Jackson
2016-12-19 8:27 ` Michael Haggerty
2016-12-19 13:19 ` Ian Jackson
2016-12-20 6:57 ` Michael Haggerty
2016-11-04 19:13 ` [PATCH 2/5] check-ref-format: Refactor to make --branch code more common Ian Jackson
2016-12-19 11:07 ` Michael Haggerty
2016-12-19 11:54 ` Ian Jackson
2016-11-04 19:13 ` [PATCH 3/5] check-ref-format: Abolish leak of collapsed refname Ian Jackson
2016-12-19 11:09 ` Michael Haggerty
2016-11-04 19:13 ` [PATCH 4/5] check-ref-format: New --report-errors option Ian Jackson
2016-11-04 19:13 ` [PATCH 5/5] check-ref-format: New --stdin option Ian Jackson
2016-12-19 11:22 ` Michael Haggerty
2016-12-19 13:43 ` Michael Haggerty [this message]
2016-12-19 11:29 ` [PATCH 0/5] git check-ref-format --stdin --report-errors Michael Haggerty
2016-12-19 16:22 ` Ian Jackson
2016-12-19 18:23 ` Junio C Hamano
2016-12-20 7:29 ` Michael Haggerty
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=14d95a74-ad7e-a1dd-c3da-52afd53cede4@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=ijackson@chiark.greenend.org.uk \
/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).