mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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:
commit
1294160b27
|
@ -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^{}");
|
||||
|
|
|
@ -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^{}
|
||||
|
|
Loading…
Reference in a new issue