mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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

10
builtin/merge.c
View File

@ -880,13 +880,15 @@ static void prepare_to_commit(struct commit_list *remoteheads)
strbuf_addch(&msg, '\n');
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
wt_status_append_cut_line(&msg);
strbuf_commented_addf(&msg, "\n");
strbuf_commented_addf(&msg, comment_line_char, "\n");
}
strbuf_commented_addf(&msg, _(merge_editor_comment));
strbuf_commented_addf(&msg, comment_line_char,
_(merge_editor_comment));
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
strbuf_commented_addf(&msg, _(scissors_editor_comment));
strbuf_commented_addf(&msg, comment_line_char,
_(scissors_editor_comment));
else
strbuf_commented_addf(&msg,
strbuf_commented_addf(&msg, comment_line_char,
_(no_scissors_editor_comment), comment_line_char);
}
if (signoff)