Merge branch 'dl/warn-tagging-a-tag'

Typofix.

* dl/warn-tagging-a-tag:
tag: fix typo in nested tagging hint

diff --git a/builtin/tag.c b/builtin/tag.c
index 1debd3a11c2ec0aa44fa75ebd908f78a46f371a1..ef37dccf864932a31c019775cdad6d33207941a1 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -207,7 +207,7 @@ struct create_tag_options {
 };
 
 static const char message_advice_nested_tag[] =
-       N_("You have created a nested tag. The object referred to by your new is\n"
+       N_("You have created a nested tag. The object referred to by your new tag is\n"
           "already a tag. If you meant to tag the object that it points to, use:\n"
           "\n"
           "\tgit tag -f %s %s^{}");

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index e285686662df781c87d59c910aa9d596eb974c34..6aeeb279a0a03614151a37f1bed8f22f4af0c4f5 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1702,7 +1702,7 @@ test_expect_success '--points-at finds annotated tags of tags' '
 
 test_expect_success 'recursive tagging should give advice' '
        sed -e "s/|$//" <<-EOF >expect &&
-       hint: You have created a nested tag. The object referred to by your new is
+       hint: You have created a nested tag. The object referred to by your new tag is
        hint: already a tag. If you meant to tag the object that it points to, use:
        hint: |
        hint:   git tag -f nested annotated-v4.0^{}