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

update-ref --stdin: simplify error messages for missing oldvalues

Browse Source 
Instead of, for example,

    fatal: update refs/heads/master missing [<oldvalue>] NUL

emit

    fatal: update refs/heads/master missing <oldvalue>

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:03 +02:00 committed by Junio C Hamano
parent 9255f059ff
commit ac1177553d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/update-ref.c
View File

@ -176,7 +176,7 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
if (*next != line_termination) if (*next != line_termination)
die("update %s has extra input: %s", update->ref_name, next); die("update %s has extra input: %s", update->ref_name, next);
} else if (!line_termination) } else if (!line_termination)
die("update %s missing [<oldvalue>] NUL", update->ref_name); die("update %s missing <oldvalue>", update->ref_name);
return next; return next;
} }
@ -222,7 +222,7 @@ static const char *parse_cmd_delete(struct strbuf *input, const char *next)
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 <oldvalue>", 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>", update->ref_name);
if (*next != line_termination) if (*next != line_termination)
die("delete %s has extra input: %s", update->ref_name, next); die("delete %s has extra input: %s", update->ref_name, next);
@ -245,7 +245,7 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
update_store_old_sha1("verify", update, value.buf); update_store_old_sha1("verify", update, value.buf);
hashcpy(update->new_sha1, update->old_sha1); hashcpy(update->new_sha1, update->old_sha1);
} else if (!line_termination) } else if (!line_termination)
die("verify %s missing [<oldvalue>] NUL", update->ref_name); die("verify %s missing <oldvalue>", update->ref_name);
if (*next != line_termination) if (*next != line_termination)
die("verify %s has extra input: %s", update->ref_name, next); die("verify %s has extra input: %s", update->ref_name, next);

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

@ -739,7 +739,7 @@ test_expect_success 'stdin -z fails update with no new value' '
test_expect_success 'stdin -z fails update with no old value' ' test_expect_success 'stdin -z fails update with no old value' '
printf $F "update $a" "$m" >stdin && printf $F "update $a" "$m" >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 $a missing \\[<oldvalue>\\] NUL" err grep "fatal: update $a missing <oldvalue>" err
' '
test_expect_success 'stdin -z fails update with too many arguments' ' test_expect_success 'stdin -z fails update with too many arguments' '
@ -763,7 +763,7 @@ test_expect_success 'stdin -z fails delete with bad ref name' '
test_expect_success 'stdin -z fails delete with no old value' ' test_expect_success 'stdin -z fails delete with no old value' '
printf $F "delete $a" >stdin && printf $F "delete $a" >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 missing \\[<oldvalue>\\] NUL" err grep "fatal: delete $a missing <oldvalue>" err
' '
test_expect_success 'stdin -z fails delete with too many arguments' ' test_expect_success 'stdin -z fails delete with too many arguments' '
@ -781,7 +781,7 @@ test_expect_success 'stdin -z fails verify with too many arguments' '
test_expect_success 'stdin -z fails verify with no old value' ' test_expect_success 'stdin -z fails verify with no old value' '
printf $F "verify $a" >stdin && printf $F "verify $a" >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: verify $a missing \\[<oldvalue>\\] NUL" err grep "fatal: verify $a missing <oldvalue>" err
' '
test_expect_success 'stdin -z fails option with unknown name' ' test_expect_success 'stdin -z fails option with unknown name' '