summaryrefslogtreecommitdiff
path: root/builtin/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:22:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:22:25 (GMT)
commit43eb7cb260cb17e28dda12e8dc1eb5554e650841 (patch)
tree9ba0da5adaa0b3004bc13e76ad336dc4088f2cfa /builtin/tag.c
parentd83c9c75e1edebd4ece3ad5223103f46fc38a4d3 (diff)
parentd78f340ed6250dfe8de6e039acc56a013bcf3637 (diff)
downloadgit-43eb7cb260cb17e28dda12e8dc1eb5554e650841.zip
git-43eb7cb260cb17e28dda12e8dc1eb5554e650841.tar.gz
git-43eb7cb260cb17e28dda12e8dc1eb5554e650841.tar.bz2
Merge branch 'tg/tag-state-tag-name-in-editor-hints'
* tg/tag-state-tag-name-in-editor-hints: builtin/tag.c: show tag name to hint in the message editor
Diffstat (limited to 'builtin/tag.c')
-rw-r--r--builtin/tag.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index f344002..c6e8a71 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -338,11 +338,11 @@ static int do_sign(struct strbuf *buffer)
}
static const char tag_template[] =
- N_("\nWrite a tag message\n"
+ N_("\nWrite a message for tag:\n %s\n"
"Lines starting with '%c' will be ignored.\n");
static const char tag_template_nocleanup[] =
- N_("\nWrite a tag message\n"
+ N_("\nWrite a message for tag:\n %s\n"
"Lines starting with '%c' will be kept; you may remove them"
" yourself if you want to.\n");
@@ -438,9 +438,9 @@ static void create_tag(const unsigned char *object, const char *tag,
struct strbuf buf = STRBUF_INIT;
strbuf_addch(&buf, '\n');
if (opt->cleanup_mode == CLEANUP_ALL)
- strbuf_commented_addf(&buf, _(tag_template), comment_line_char);
+ strbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);
else
- strbuf_commented_addf(&buf, _(tag_template_nocleanup), comment_line_char);
+ strbuf_commented_addf(&buf, _(tag_template_nocleanup), tag, comment_line_char);
write_or_die(fd, buf.buf, buf.len);
strbuf_release(&buf);
}