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

update-ref --stdin: harmonize error messages

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

24
builtin/update-ref.c
View File

@ -202,19 +202,19 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
update->ref_name = parse_refname(input, &next); update->ref_name = parse_refname(input, &next);
if (!update->ref_name) if (!update->ref_name)
die("update line missing <ref>"); die("update: missing <ref>");
if (parse_next_sha1(input, &next, update->new_sha1, if (parse_next_sha1(input, &next, update->new_sha1,
"update", update->ref_name, "update", update->ref_name,
PARSE_SHA1_ALLOW_EMPTY)) 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->have_old = !parse_next_sha1(input, &next, update->old_sha1,
"update", update->ref_name, "update", update->ref_name,
PARSE_SHA1_OLD); PARSE_SHA1_OLD);
if (*next != line_termination) 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; 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); update->ref_name = parse_refname(input, &next);
if (!update->ref_name) if (!update->ref_name)
die("create line missing <ref>"); die("create: missing <ref>");
if (parse_next_sha1(input, &next, update->new_sha1, if (parse_next_sha1(input, &next, update->new_sha1,
"create", update->ref_name, 0)) "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)) 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) 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; 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); update->ref_name = parse_refname(input, &next);
if (!update->ref_name) if (!update->ref_name)
die("delete line missing <ref>"); die("delete: missing <ref>");
if (parse_next_sha1(input, &next, update->old_sha1, if (parse_next_sha1(input, &next, update->old_sha1,
"delete", update->ref_name, PARSE_SHA1_OLD)) { "delete", update->ref_name, PARSE_SHA1_OLD)) {
update->have_old = 0; update->have_old = 0;
} else { } else {
if (is_null_sha1(update->old_sha1)) 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; update->have_old = 1;
} }
if (*next != line_termination) 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; 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); update->ref_name = parse_refname(input, &next);
if (!update->ref_name) if (!update->ref_name)
die("verify line missing <ref>"); die("verify: missing <ref>");
if (parse_next_sha1(input, &next, update->old_sha1, if (parse_next_sha1(input, &next, update->old_sha1,
"verify", update->ref_name, PARSE_SHA1_OLD)) { "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) 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; return next;
} }

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

@ -371,7 +371,7 @@ test_expect_success 'stdin fails on junk after quoted argument' '
test_expect_success 'stdin fails create with no ref' ' test_expect_success 'stdin fails create with no ref' '
echo "create " >stdin && echo "create " >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' 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' ' test_expect_success 'stdin fails create with no new value' '
echo "create $a" >stdin && echo "create $a" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' test_expect_success 'stdin fails create with too many arguments' '
echo "create $a $m $m" >stdin && echo "create $a $m $m" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' test_expect_success 'stdin fails update with no ref' '
echo "update " >stdin && echo "update " >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' 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' ' test_expect_success 'stdin fails update with no new value' '
echo "update $a" >stdin && echo "update $a" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' test_expect_success 'stdin fails update with too many arguments' '
echo "update $a $m $m $m" >stdin && echo "update $a $m $m $m" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' test_expect_success 'stdin fails delete with no ref' '
echo "delete " >stdin && echo "delete " >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' 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' ' test_expect_success 'stdin fails delete with too many arguments' '
echo "delete $a $m $m" >stdin && echo "delete $a $m $m" >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 has extra input: $m" err grep "fatal: delete $a: extra input: $m" err
' '
test_expect_success 'stdin fails verify with too many arguments' ' test_expect_success 'stdin fails verify with too many arguments' '
echo "verify $a $m $m" >stdin && echo "verify $a $m $m" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && 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' ' 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' ' 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 <newvalue>" err && grep "fatal: create $c: 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 <oldvalue>" err && grep "fatal: delete $a: 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
@ -697,7 +697,7 @@ test_expect_success 'stdin -z fails on unknown command' '
test_expect_success 'stdin -z fails create with no ref' ' test_expect_success 'stdin -z fails create with no ref' '
printf $F "create " >stdin && printf $F "create " >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 line missing <ref>" err grep "fatal: create: missing <ref>" err
' '
test_expect_success 'stdin -z fails create with bad ref name' ' 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' ' test_expect_success 'stdin -z fails update with no ref' '
printf $F "update " >stdin && printf $F "update " >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 line missing <ref>" err grep "fatal: update: missing <ref>" err
' '
test_expect_success 'stdin -z fails update with too few args' ' 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' ' test_expect_success 'stdin -z fails delete with no ref' '
printf $F "delete " >stdin && printf $F "delete " >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 line missing <ref>" err grep "fatal: delete: missing <ref>" err
' '
test_expect_success 'stdin -z fails delete with bad ref name' ' 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' ' test_expect_success 'stdin -z create ref fails with empty new value' '
printf $F "create $c" "" >stdin && printf $F "create $c" "" >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 missing <newvalue>" err && grep "fatal: create $c: missing <newvalue>" err &&
test_must_fail git rev-parse --verify -q $c 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' ' 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 <oldvalue>" err && grep "fatal: delete $a: 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