diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:46 +0300 |
| commit | 67e7305e64fea8d15879e9dc3831fc8e31cfe619 (patch) | |
| tree | d8ed9ee0a2b54f3df4619af5757d938bb5247986 /builtin/merge.c | |
| parent | da269af9207e38e820daad8aa993caa7d2fad76c (diff) | |
| parent | 787cb8a48ae24ff07fa7c763909bb204bfdc84a7 (diff) | |
Merge branch 'cw/strbuf-cleanup'
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
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 420e81008e..41fe0d8e5e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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) |