Skip to content

Commit 1294160

Browse files
committed
Merge branch 'dl/warn-tagging-a-tag'
Typofix. * dl/warn-tagging-a-tag: tag: fix typo in nested tagging hint
2 parents ab15ad1 + a54b2ab commit 1294160

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

builtin/tag.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ struct create_tag_options {
207207
};
208208

209209
static const char message_advice_nested_tag[] =
210-
N_("You have created a nested tag. The object referred to by your new is\n"
210+
N_("You have created a nested tag. The object referred to by your new tag is\n"
211211
"already a tag. If you meant to tag the object that it points to, use:\n"
212212
"\n"
213213
"\tgit tag -f %s %s^{}");

t/t7004-tag.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ test_expect_success '--points-at finds annotated tags of tags' '
17021702

17031703
test_expect_success 'recursive tagging should give advice' '
17041704
sed -e "s/|$//" <<-EOF >expect &&
1705-
hint: You have created a nested tag. The object referred to by your new is
1705+
hint: You have created a nested tag. The object referred to by your new tag is
17061706
hint: already a tag. If you meant to tag the object that it points to, use:
17071707
hint: |
17081708
hint: git tag -f nested annotated-v4.0^{}

0 commit comments

Comments
 (0)