diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-04-07 15:48:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 12:09:14 -0700 |
| commit | f11b09fb60556954c6a222f4809631470c81cae6 (patch) | |
| tree | 74be9e134ca000761be9f3abb11619b93eceec28 /builtin/update-ref.c | |
| parent | 726f69166ff0ac3fef0a9a0241f09a7d9f0fa48f (diff) | |
| download | git-f11b09fb60556954c6a222f4809631470c81cae6.tar.gz git-f11b09fb60556954c6a222f4809631470c81cae6.tar.xz | |
update-ref --stdin: harmonize error messages
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-ref.c')
| -rw-r--r-- | builtin/update-ref.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 0d5f1d076..423c5c30c 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; } |