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 1debd3a..ef37dcc 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -207,7 +207,7 @@
};
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 e285686..6aeeb27 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1702,7 +1702,7 @@
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^{}
