mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 19:03:52 +01:00
Code

Merge branch 'tg/tag-state-tag-name-in-editor-hints'

Browse Source 
* tg/tag-state-tag-name-in-editor-hints:
  builtin/tag.c: show tag name to hint in the message editor
This commit is contained in:
Junio C Hamano 2014-06-06 11:22:24 -07:00
commit 43eb7cb260
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/tag.c
View File

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