admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cw/strbuf-cleanup'

Browse Source 
Move functions that are not about pure string manipulation out of
strbuf.[ch]

* cw/strbuf-cleanup:
  strbuf: remove global variable
  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 dependency
  strbuf: clarify API boundary
This commit is contained in:
Junio C Hamano
2023-07-06 11:54:46 -07:00
parent da269af920 787cb8a48a
commit 67e7305e64
27 changed files with 231 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/branch.c
View File

@@ -665,7 +665,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"),
@@ -676,7 +676,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)