mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 05:26:20 +02:00
Code

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

Typofix.

* dl/warn-tagging-a-tag:
  tag: fix typo in nested tagging hint
This commit is contained in:
Junio C Hamano 2019-05-19 16:45:26 +09:00
parent ab15ad1a3b a54b2ab345
commit 1294160b27
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/tag.c
View File

@ -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^{}");

2
t/t7004-tag.sh
View File

@ -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^{}