Merge branch 'jk/core-comment-string'

[thirdparty/git.git] / builtin / branch.c

diff --git a/builtin/branch.c b/builtin/branch.c
index 8c2305ad2c85586c960c986582f1d9e874a26a24..dd3e3a7dc09541892d4fb86f66f78f5d8038daa0 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -677,18 +677,18 @@ static int edit_branch_description(const char *branch_name)
        exists = !read_branch_desc(&buf, branch_name);
        if (!buf.len || buf.buf[buf.len-1] != '\n')
                strbuf_addch(&buf, '\n');
-       strbuf_commented_addf(&buf, comment_line_char,
+       strbuf_commented_addf(&buf, comment_line_str,
                    _("Please edit the description for the branch\n"
                      "  %s\n"
-                     "Lines starting with '%c' will be stripped.\n"),
-                   branch_name, comment_line_char);
+                     "Lines starting with '%s' will be stripped.\n"),
+                   branch_name, comment_line_str);
        write_file_buf(edit_description(), buf.buf, buf.len);
        strbuf_reset(&buf);
        if (launch_editor(edit_description(), &buf, NULL)) {
                strbuf_release(&buf);
                return -1;
        }
-       strbuf_stripspace(&buf, comment_line_char);
+       strbuf_stripspace(&buf, comment_line_str);
 
        strbuf_addf(&name, "branch.%s.description", branch_name);
        if (buf.len || exists)