diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:26 +0900 |
| commit | 1294160b27d1c673e4ae8b47eba359a8266a623d (patch) | |
| tree | 59864648315d5be6f6bded1f962a4aebe7b1c7cb | |
| parent | Git 2.22-rc0 (diff) | |
| parent | tag: fix typo in nested tagging hint (diff) | |
| download | tgif-1294160b27d1c673e4ae8b47eba359a8266a623d.tar.xz | |
Merge branch 'dl/warn-tagging-a-tag'
Typofix.
* dl/warn-tagging-a-tag:
tag: fix typo in nested tagging hint
| -rw-r--r-- | builtin/tag.c | 2 | ||||
| -rwxr-xr-x | t/t7004-tag.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 1debd3a11c..ef37dccf86 100644 --- 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 e285686662..6aeeb279a0 100755 --- 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^{} |