summaryrefslogtreecommitdiff
path: root/builtin/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-25 20:57:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-25 20:57:41 (GMT)
commitc4a09cc9ccb63090b78a4d9529462151df62d73d (patch)
tree1ffed9c273282fbc4c977dabc1a1692b03d67329 /builtin/tag.c
parent274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925 (diff)
parentf665d63a912748bc1397940a0dc1de80c6f693e3 (diff)
downloadgit-c4a09cc9ccb63090b78a4d9529462151df62d73d.zip
git-c4a09cc9ccb63090b78a4d9529462151df62d73d.tar.gz
git-c4a09cc9ccb63090b78a4d9529462151df62d73d.tar.bz2
Merge branch 'hw/advise-ng'
Revamping of the advise API to allow more systematic enumeration of advice knobs in the future. * hw/advise-ng: tag: use new advice API to check visibility advice: revamp advise API advice: change "setupStreamFailure" to "setUpstreamFailure" advice: extract vadvise() from advise()
Diffstat (limited to 'builtin/tag.c')
-rw-r--r--builtin/tag.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index e0a4c25..cc30d34 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -231,8 +231,9 @@ static void create_tag(const struct object_id *object, const char *object_ref,
if (type <= OBJ_NONE)
die(_("bad object type."));
- if (type == OBJ_TAG && advice_nested_tag)
- advise(_(message_advice_nested_tag), tag, object_ref);
+ if (type == OBJ_TAG)
+ advise_if_enabled(ADVICE_NESTED_TAG, _(message_advice_nested_tag),
+ tag, object_ref);
strbuf_addf(&header,
"object %s\n"