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>

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index e4c0854e9fc58b6fa6b96e3216d417de3245c02e..a9eb5fe24d3efdb8ac2b70b55ad3de19b4182582 100644 (file)
--- 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)
                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;
 }
 
        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)
                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);
 
        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)
                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);
 
        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 ef61fe324bdd14294c5203358ae91b85956f970e..a2015d09773e8d63d7763106b50307eeb28a764a 100755 (executable)
--- 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 &&
 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' '
 '
 
 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 &&
 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' '
 '
 
 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 &&
 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' '
 '
 
 test_expect_success 'stdin -z fails option with unknown name' '