summaryrefslogtreecommitdiff
path: root/builtin/update-ref.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-04-07 13:48:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-07 19:09:12 (GMT)
commit9255f059ff0bfce7605748f62f58d6ba9055a1f3 (patch)
tree9d51b3ed58d5ae61e2b9c45cbd875e46e5663f4a /builtin/update-ref.c
parent1746ef4e9d869fb0f54194bb225604eb61a77501 (diff)
downloadgit-9255f059ff0bfce7605748f62f58d6ba9055a1f3.zip
git-9255f059ff0bfce7605748f62f58d6ba9055a1f3.tar.gz
git-9255f059ff0bfce7605748f62f58d6ba9055a1f3.tar.bz2
update-ref --stdin: make error messages more consistent
The old error messages emitted for invalid input sometimes said "<oldvalue>"/"<newvalue>" and sometimes said "old value"/"new value". Convert them all to the former. Update the tests accordingly. 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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 13a884a..e4c0854 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -40,7 +40,7 @@ static void update_store_new_sha1(const char *command,
const char *newvalue)
{
if (*newvalue && get_sha1(newvalue, update->new_sha1))
- die("%s %s: invalid new value: %s",
+ die("%s %s: invalid <newvalue>: %s",
command, update->ref_name, newvalue);
}
@@ -49,7 +49,7 @@ static void update_store_old_sha1(const char *command,
const char *oldvalue)
{
if (*oldvalue && get_sha1(oldvalue, update->old_sha1))
- die("%s %s: invalid old value: %s",
+ die("%s %s: invalid <oldvalue>: %s",
command, update->ref_name, oldvalue);
/* We have an old value if non-empty, or if empty without -z */
@@ -198,7 +198,7 @@ static const char *parse_cmd_create(struct strbuf *input, const char *next)
die("create %s missing <newvalue>", update->ref_name);
if (is_null_sha1(update->new_sha1))
- die("create %s given zero new value", update->ref_name);
+ die("create %s given zero <newvalue>", update->ref_name);
if (*next != line_termination)
die("create %s has extra input: %s", update->ref_name, next);
@@ -220,7 +220,7 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
if (!parse_next_arg(input, &next, &oldvalue)) {
update_store_old_sha1("delete", update, oldvalue.buf);
if (update->have_old && is_null_sha1(update->old_sha1))
- die("delete %s given zero old value", update->ref_name);
+ die("delete %s given zero <oldvalue>", update->ref_name);
} else if (!line_termination)
die("delete %s missing [<oldvalue>] NUL", update->ref_name);