diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-04-07 15:48:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 12:09:12 -0700 |
| commit | ac1177553d8c632e93c507f8efc80b80e6c7d3d8 (patch) | |
| tree | 9dd2989d399612a06f5a1d7eb0ced12d23cb0ea2 | |
| parent | 9255f059ff0bfce7605748f62f58d6ba9055a1f3 (diff) | |
| download | git-ac1177553d8c632e93c507f8efc80b80e6c7d3d8.tar.gz | |
update-ref --stdin: simplify error messages for missing oldvalues
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>
| -rw-r--r-- | builtin/update-ref.c | 6 | ||||
| -rwxr-xr-x | t/t1400-update-ref.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index e4c0854e9f..a9eb5fe24d 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -176,7 +176,7 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next) if (*next != line_termination) die("update %s has extra input: %s", update->ref_name, next); } else if (!line_termination) - die("update %s missing [<oldvalue>] NUL", update->ref_name); + die("update %s missing <oldvalue>", update->ref_name); 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)) die("delete %s given zero <oldvalue>", update->ref_name); } 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) 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); hashcpy(update->new_sha1, update->old_sha1); } 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) die("verify %s has extra input: %s", update->ref_name, next); diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index ef61fe324b..a2015d0977 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -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' ' printf $F "update $a" "$m" >stdin && 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' ' @@ -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' ' printf $F "delete $a" >stdin && 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' ' @@ -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' ' printf $F "verify $a" >stdin && 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' ' |