diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-17 14:22:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-17 14:22:06 -0700 |
| commit | 50ce8e131750487835554327ff0964f265bf37ed (patch) | |
| tree | 96f36e9aa08fa465ab3b4503236a06cd7630a940 /builtin/branch.c | |
| parent | c0f7402a526723afe716a4b93d958ce138be43f0 (diff) | |
| parent | 6897be8f14fb97e7ee4f9d5543af4320bb8039ee (diff) | |
| download | git-50ce8e131750487835554327ff0964f265bf37ed.tar.gz | |
Merge branch 'cw/strbuf-cleanup' into jch
Move functions that are not about pure string manipulation out of
strbuf.[ch]
* cw/strbuf-cleanup:
strbuf: remove global variable
strbuf: clarify dependency
path: move related function to path
object-name: move related functions to object-name
credential-store: move related functions to credential-store file
abspath: move related functions to abspath
strbuf: clarify API boundary
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index e6c2655af6..40a79e60f5 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -674,7 +674,7 @@ 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, + strbuf_commented_addf(&buf, comment_line_char, _("Please edit the description for the branch\n" " %s\n" "Lines starting with '%c' will be stripped.\n"), @@ -685,7 +685,7 @@ static int edit_branch_description(const char *branch_name) strbuf_release(&buf); return -1; } - strbuf_stripspace(&buf, 1); + strbuf_stripspace(&buf, comment_line_char); strbuf_addf(&name, "branch.%s.description", branch_name); if (buf.len || exists) |