diff options
| author | Jeff King <peff@peff.net> | 2024-03-12 05:17:34 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-12 13:28:10 -0700 |
| commit | f99e1d94f5ed72fd7c5115a814b1087fde919fe5 (patch) | |
| tree | 4993814ec63e24425c428658406c9bc76ab4d240 /builtin/tag.c | |
| parent | strbuf: accept a comment string for strbuf_add_commented_lines() (diff) | |
| download | git-f99e1d94f5ed72fd7c5115a814b1087fde919fe5.tar.gz git-f99e1d94f5ed72fd7c5115a814b1087fde919fe5.zip | |
prefer comment_line_str to comment_line_char for printing
As part of our transition to multi-byte comment characters, we should
use the string variable rather than the historical character variable.
All of the sites adjusted here are just swapping out "%c" for "%s" in
format strings, or strbuf_addch() for strbuf_addstr(). The type system
and printf-attribute give the compiler enough information to make sure
our formats and variable changes all match (especially important for
cases where the format string is defined far away from its use, like
prepare_to_commit() in commit.c).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/tag.c')
| -rw-r--r-- | builtin/tag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 1c708785bf..721d07a589 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -158,11 +158,11 @@ static int do_sign(struct strbuf *buffer) static const char tag_template[] = N_("\nWrite a message for tag:\n %s\n" - "Lines starting with '%c' will be ignored.\n"); + "Lines starting with '%s' will be ignored.\n"); static const char tag_template_nocleanup[] = N_("\nWrite a message for tag:\n %s\n" - "Lines starting with '%c' will be kept; you may remove them" + "Lines starting with '%s' will be kept; you may remove them" " yourself if you want to.\n"); static int git_tag_config(const char *var, const char *value, @@ -292,10 +292,10 @@ static void create_tag(const struct object_id *object, const char *object_ref, strbuf_addch(&buf, '\n'); if (opt->cleanup_mode == CLEANUP_ALL) strbuf_commented_addf(&buf, comment_line_str, - _(tag_template), tag, comment_line_char); + _(tag_template), tag, comment_line_str); else strbuf_commented_addf(&buf, comment_line_str, - _(tag_template_nocleanup), tag, comment_line_char); + _(tag_template_nocleanup), tag, comment_line_str); write_or_die(fd, buf.buf, buf.len); strbuf_release(&buf); } |