From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Brad King <brad.king@kitware.com>,
Johan Herland <johan@herland.net>, Jeff King <peff@peff.net>,
Vicent Marti <tanoku@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 18/27] update-ref --stdin: Harmonize error messages
Date: Mon, 31 Mar 2014 14:51:48 -0700 [thread overview]
Message-ID: <xmqqy4zq2g0b.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1395683820-17304-19-git-send-email-mhagger@alum.mit.edu> (Michael Haggerty's message of "Mon, 24 Mar 2014 18:56:51 +0100")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> Make (most of) the error messages for invalid input have the same
> format [1]:
>
> $COMMAND [SP $REFNAME]: $MESSAGE
>
> Update the tests accordingly.
>
> [1] A few error messages are left with their old form, because
> $COMMAND and $REFNAME aren't passed all the way down the call
> stack. Maybe those sites should be changed some day, too.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
Up to this point, modulo nits that have been pointed out separately,
the series looked reasonably well done.
Thanks.
> builtin/update-ref.c | 24 ++++++++++++------------
> t/t1400-update-ref.sh | 32 ++++++++++++++++----------------
> 2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
> index b49a5b0..bbc04b2 100644
> --- a/builtin/update-ref.c
> +++ b/builtin/update-ref.c
> @@ -202,19 +202,19 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
>
> update->ref_name = parse_refname(input, &next);
> if (!update->ref_name)
> - die("update line missing <ref>");
> + die("update: missing <ref>");
>
> if (parse_next_sha1(input, &next, update->new_sha1,
> "update", update->ref_name,
> PARSE_SHA1_ALLOW_EMPTY))
> - die("update %s missing <newvalue>", update->ref_name);
> + die("update %s: missing <newvalue>", update->ref_name);
>
> update->have_old = !parse_next_sha1(input, &next, update->old_sha1,
> "update", update->ref_name,
> PARSE_SHA1_OLD);
>
> if (*next != line_termination)
> - die("update %s has extra input: %s", update->ref_name, next);
> + die("update %s: extra input: %s", update->ref_name, next);
>
> return next;
> }
> @@ -227,17 +227,17 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
>
> update->ref_name = parse_refname(input, &next);
> if (!update->ref_name)
> - die("create line missing <ref>");
> + die("create: missing <ref>");
>
> if (parse_next_sha1(input, &next, update->new_sha1,
> "create", update->ref_name, 0))
> - die("create %s missing <newvalue>", update->ref_name);
> + die("create %s: missing <newvalue>", update->ref_name);
>
> if (is_null_sha1(update->new_sha1))
> - die("create %s given zero <newvalue>", update->ref_name);
> + die("create %s: zero <newvalue>", update->ref_name);
>
> if (*next != line_termination)
> - die("create %s has extra input: %s", update->ref_name, next);
> + die("create %s: extra input: %s", update->ref_name, next);
>
> return next;
> }
> @@ -250,19 +250,19 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
>
> update->ref_name = parse_refname(input, &next);
> if (!update->ref_name)
> - die("delete line missing <ref>");
> + die("delete: missing <ref>");
>
> if (parse_next_sha1(input, &next, update->old_sha1,
> "delete", update->ref_name, PARSE_SHA1_OLD)) {
> update->have_old = 0;
> } else {
> if (is_null_sha1(update->old_sha1))
> - die("delete %s given zero <oldvalue>", update->ref_name);
> + die("delete %s: zero <oldvalue>", update->ref_name);
> update->have_old = 1;
> }
>
> if (*next != line_termination)
> - die("delete %s has extra input: %s", update->ref_name, next);
> + die("delete %s: extra input: %s", update->ref_name, next);
>
> return next;
> }
> @@ -275,7 +275,7 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
>
> update->ref_name = parse_refname(input, &next);
> if (!update->ref_name)
> - die("verify line missing <ref>");
> + die("verify: missing <ref>");
>
> if (parse_next_sha1(input, &next, update->old_sha1,
> "verify", update->ref_name, PARSE_SHA1_OLD)) {
> @@ -286,7 +286,7 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
> }
>
> if (*next != line_termination)
> - die("verify %s has extra input: %s", update->ref_name, next);
> + die("verify %s: extra input: %s", update->ref_name, next);
>
> return next;
> }
> diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
> index 1db0689..48ccc4d 100755
> --- a/t/t1400-update-ref.sh
> +++ b/t/t1400-update-ref.sh
> @@ -371,7 +371,7 @@ test_expect_success 'stdin fails on junk after quoted argument' '
> test_expect_success 'stdin fails create with no ref' '
> echo "create " >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: create line missing <ref>" err
> + grep "fatal: create: missing <ref>" err
> '
>
> test_expect_success 'stdin fails create with bad ref name' '
> @@ -383,19 +383,19 @@ test_expect_success 'stdin fails create with bad ref name' '
> test_expect_success 'stdin fails create with no new value' '
> echo "create $a" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: create $a missing <newvalue>" err
> + grep "fatal: create $a: missing <newvalue>" err
> '
>
> test_expect_success 'stdin fails create with too many arguments' '
> echo "create $a $m $m" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: create $a has extra input: $m" err
> + grep "fatal: create $a: extra input: $m" err
> '
>
> test_expect_success 'stdin fails update with no ref' '
> echo "update " >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: update line missing <ref>" err
> + grep "fatal: update: missing <ref>" err
> '
>
> test_expect_success 'stdin fails update with bad ref name' '
> @@ -407,19 +407,19 @@ test_expect_success 'stdin fails update with bad ref name' '
> test_expect_success 'stdin fails update with no new value' '
> echo "update $a" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: update $a missing <newvalue>" err
> + grep "fatal: update $a: missing <newvalue>" err
> '
>
> test_expect_success 'stdin fails update with too many arguments' '
> echo "update $a $m $m $m" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: update $a has extra input: $m" err
> + grep "fatal: update $a: extra input: $m" err
> '
>
> test_expect_success 'stdin fails delete with no ref' '
> echo "delete " >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: delete line missing <ref>" err
> + grep "fatal: delete: missing <ref>" err
> '
>
> test_expect_success 'stdin fails delete with bad ref name' '
> @@ -431,13 +431,13 @@ test_expect_success 'stdin fails delete with bad ref name' '
> test_expect_success 'stdin fails delete with too many arguments' '
> echo "delete $a $m $m" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: delete $a has extra input: $m" err
> + grep "fatal: delete $a: extra input: $m" err
> '
>
> test_expect_success 'stdin fails verify with too many arguments' '
> echo "verify $a $m $m" >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: verify $a has extra input: $m" err
> + grep "fatal: verify $a: extra input: $m" err
> '
>
> test_expect_success 'stdin fails option with unknown name' '
> @@ -532,7 +532,7 @@ test_expect_success 'stdin create ref fails with bad new value' '
> test_expect_success 'stdin create ref fails with zero new value' '
> echo "create $c " >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: create $c given zero <newvalue>" err &&
> + grep "fatal: create $c: zero <newvalue>" err &&
> test_must_fail git rev-parse --verify -q $c
> '
>
> @@ -556,7 +556,7 @@ test_expect_success 'stdin delete ref fails with wrong old value' '
> test_expect_success 'stdin delete ref fails with zero old value' '
> echo "delete $a " >stdin &&
> test_must_fail git update-ref --stdin <stdin 2>err &&
> - grep "fatal: delete $a given zero <oldvalue>" err &&
> + grep "fatal: delete $a: zero <oldvalue>" err &&
> git rev-parse $m >expect &&
> git rev-parse $a >actual &&
> test_cmp expect actual
> @@ -697,7 +697,7 @@ test_expect_success 'stdin -z fails on unknown command' '
> test_expect_success 'stdin -z fails create with no ref' '
> printf $F "create " >stdin &&
> test_must_fail git update-ref -z --stdin <stdin 2>err &&
> - grep "fatal: create line missing <ref>" err
> + grep "fatal: create: missing <ref>" err
> '
>
> test_expect_success 'stdin -z fails create with bad ref name' '
> @@ -721,7 +721,7 @@ test_expect_success 'stdin -z fails create with too many arguments' '
> test_expect_success 'stdin -z fails update with no ref' '
> printf $F "update " >stdin &&
> test_must_fail git update-ref -z --stdin <stdin 2>err &&
> - grep "fatal: update line missing <ref>" err
> + grep "fatal: update: missing <ref>" err
> '
>
> test_expect_success 'stdin -z fails update with too few args' '
> @@ -765,7 +765,7 @@ test_expect_success 'stdin -z fails update with too many arguments' '
> test_expect_success 'stdin -z fails delete with no ref' '
> printf $F "delete " >stdin &&
> test_must_fail git update-ref -z --stdin <stdin 2>err &&
> - grep "fatal: delete line missing <ref>" err
> + grep "fatal: delete: missing <ref>" err
> '
>
> test_expect_success 'stdin -z fails delete with bad ref name' '
> @@ -868,7 +868,7 @@ test_expect_success 'stdin -z create ref fails with bad new value' '
> test_expect_success 'stdin -z create ref fails with empty new value' '
> printf $F "create $c" "" >stdin &&
> test_must_fail git update-ref -z --stdin <stdin 2>err &&
> - grep "fatal: create $c missing <newvalue>" err &&
> + grep "fatal: create $c: missing <newvalue>" err &&
> test_must_fail git rev-parse --verify -q $c
> '
>
> @@ -892,7 +892,7 @@ test_expect_success 'stdin -z delete ref fails with wrong old value' '
> test_expect_success 'stdin -z delete ref fails with zero old value' '
> printf $F "delete $a" "$Z" >stdin &&
> test_must_fail git update-ref -z --stdin <stdin 2>err &&
> - grep "fatal: delete $a given zero <oldvalue>" err &&
> + grep "fatal: delete $a: zero <oldvalue>" err &&
> git rev-parse $m >expect &&
> git rev-parse $a >actual &&
> test_cmp expect actual
next prev parent reply other threads:[~2014-03-31 21:51 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-24 17:56 [PATCH v2 00/27] Clean up update-refs --stdin and implement ref_transaction Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 01/27] t1400: Fix name and expected result of one test Michael Haggerty
2014-03-31 21:30 ` Junio C Hamano
2014-03-31 21:49 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 02/27] t1400: Provide more usual input to the command Michael Haggerty
2014-03-31 21:28 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 03/27] parse_arg(): Really test that argument is properly terminated Michael Haggerty
2014-03-31 21:36 ` Junio C Hamano
2014-03-31 22:11 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 04/27] t1400: Add some more tests involving quoted arguments Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 05/27] refs.h: Rename the action_on_err constants Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 06/27] update_refs(): Fix constness Michael Haggerty
2014-03-31 21:40 ` Junio C Hamano
2014-03-31 22:16 ` Michael Haggerty
2014-03-31 22:38 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 07/27] update-ref --stdin: Read the whole input at once Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 08/27] parse_cmd_verify(): Copy old_sha1 instead of evaluating <oldvalue> twice Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 09/27] update-ref.c: Extract a new function, parse_refname() Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 10/27] update-ref --stdin: Improve error messages for invalid values Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 11/27] update-ref --stdin: Make error messages more consistent Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 12/27] update-ref --stdin: Simplify error messages for missing oldvalues Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 13/27] t1400: Test that stdin -z update treats empty <newvalue> as zeros Michael Haggerty
2014-03-31 21:48 ` Junio C Hamano
2014-03-31 22:20 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 14/27] update-ref.c: Extract a new function, parse_next_sha1() Michael Haggerty
2014-03-26 18:39 ` Brad King
2014-03-24 17:56 ` [PATCH v2 15/27] update-ref --stdin -z: Deprecate interpreting the empty string as zeros Michael Haggerty
2014-03-31 21:49 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 16/27] t1400: Test one mistake at a time Michael Haggerty
2014-03-26 18:39 ` Brad King
2014-03-31 21:50 ` Junio C Hamano
2014-03-31 22:32 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 17/27] update-ref --stdin: Improve the error message for unexpected EOF Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 18/27] update-ref --stdin: Harmonize error messages Michael Haggerty
2014-03-31 21:51 ` Junio C Hamano [this message]
2014-03-31 22:37 ` Michael Haggerty
2014-04-01 9:29 ` Michael Haggerty
2014-04-02 16:38 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 19/27] refs: Add a concept of a reference transaction Michael Haggerty
2014-03-26 18:39 ` Brad King
2014-03-26 21:42 ` Michael Haggerty
2014-04-01 19:39 ` Junio C Hamano
2014-04-02 4:57 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 20/27] update-ref --stdin: Reimplement using reference transactions Michael Haggerty
2014-04-01 19:46 ` Junio C Hamano
2014-04-02 5:03 ` Michael Haggerty
2014-04-03 15:57 ` Junio C Hamano
2014-04-04 5:02 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 21/27] refs: Remove API function update_refs() Michael Haggerty
2014-04-01 19:46 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 22/27] struct ref_update: Rename field "ref_name" to "refname" Michael Haggerty
2014-04-01 19:53 ` Junio C Hamano
2014-04-02 5:11 ` Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 23/27] struct ref_update: Store refname as a FLEX_ARRAY Michael Haggerty
2014-04-01 19:54 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 24/27] ref_transaction_commit(): Introduce temporary variables Michael Haggerty
2014-04-01 19:26 ` Junio C Hamano
2014-03-24 17:56 ` [PATCH v2 25/27] struct ref_update: Add a lock member Michael Haggerty
2014-03-24 17:56 ` [PATCH v2 26/27] struct ref_update: Add type field Michael Haggerty
2014-04-01 20:03 ` Junio C Hamano
2014-04-02 10:13 ` Michael Haggerty
2014-04-02 17:44 ` Junio C Hamano
2014-03-24 17:57 ` [PATCH v2 27/27] ref_transaction_commit(): Work with transaction->updates in place Michael Haggerty
2014-03-26 18:39 ` [PATCH v2 00/27] Clean up update-refs --stdin and implement ref_transaction Brad King
2014-03-26 21:47 ` 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=xmqqy4zq2g0b.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=tanoku@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).