undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-ref --stdin: make error messages more consistent

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2014-04-07 15:48:02 +02:00 committed by Junio C Hamano
parent 1746ef4e9d
commit 9255f059ff
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/update-ref.c
View File

@ -40,7 +40,7 @@ static void update_store_new_sha1(const char *command,
const char *newvalue) const char *newvalue)
{ {
if (*newvalue && get_sha1(newvalue, update->new_sha1)) 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); command, update->ref_name, newvalue);
} }
@ -49,7 +49,7 @@ static void update_store_old_sha1(const char *command,
const char *oldvalue) const char *oldvalue)
{ {
if (*oldvalue && get_sha1(oldvalue, update->old_sha1)) 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); command, update->ref_name, oldvalue);
/* We have an old value if non-empty, or if empty without -z */ /* 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); die("create %s missing <newvalue>", update->ref_name);
if (is_null_sha1(update->new_sha1)) 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) if (*next != line_termination)
die("create %s has extra input: %s", update->ref_name, next); 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)) { if (!parse_next_arg(input, &next, &oldvalue)) {
update_store_old_sha1("delete", update, oldvalue.buf); update_store_old_sha1("delete", update, oldvalue.buf);
if (update->have_old && is_null_sha1(update->old_sha1)) 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) } else if (!line_termination)
die("delete %s missing [<oldvalue>] NUL", update->ref_name); die("delete %s missing [<oldvalue>] NUL", update->ref_name);

14
t/t1400-update-ref.sh
View File

@ -518,21 +518,21 @@ test_expect_success 'stdin update ref fails with wrong old value' '
test_expect_success 'stdin update ref fails with bad old value' ' test_expect_success 'stdin update ref fails with bad old value' '
echo "update $c $m does-not-exist" >stdin && echo "update $c $m does-not-exist" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: update $c: invalid old value: does-not-exist" err && grep "fatal: update $c: invalid <oldvalue>: does-not-exist" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
test_expect_success 'stdin create ref fails with bad new value' ' test_expect_success 'stdin create ref fails with bad new value' '
echo "create $c does-not-exist" >stdin && echo "create $c does-not-exist" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: create $c: invalid new value: does-not-exist" err && grep "fatal: create $c: invalid <newvalue>: does-not-exist" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
test_expect_success 'stdin create ref fails with zero new value' ' test_expect_success 'stdin create ref fails with zero new value' '
echo "create $c " >stdin && echo "create $c " >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: create $c given zero new value" err && grep "fatal: create $c given zero <newvalue>" err &&
test_must_fail git rev-parse --verify -q $c 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' ' test_expect_success 'stdin delete ref fails with zero old value' '
echo "delete $a " >stdin && echo "delete $a " >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: delete $a given zero old value" err && grep "fatal: delete $a given zero <oldvalue>" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual test_cmp expect actual
@ -840,14 +840,14 @@ test_expect_success 'stdin -z update ref fails with wrong old value' '
test_expect_success 'stdin -z update ref fails with bad old value' ' test_expect_success 'stdin -z update ref fails with bad old value' '
printf $F "update $c" "$m" "does-not-exist" >stdin && printf $F "update $c" "$m" "does-not-exist" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: update $c: invalid old value: does-not-exist" err && grep "fatal: update $c: invalid <oldvalue>: does-not-exist" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
test_expect_success 'stdin -z create ref fails with bad new value' ' test_expect_success 'stdin -z create ref fails with bad new value' '
printf $F "create $c" "does-not-exist" >stdin && printf $F "create $c" "does-not-exist" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: create $c: invalid new value: does-not-exist" err && grep "fatal: create $c: invalid <newvalue>: does-not-exist" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
@ -878,7 +878,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' ' test_expect_success 'stdin -z delete ref fails with zero old value' '
printf $F "delete $a" "$Z" >stdin && printf $F "delete $a" "$Z" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: delete $a given zero old value" err && grep "fatal: delete $a given zero <oldvalue>" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual test_cmp expect actual