Start the 2.46 cycle

[thirdparty/git.git] / rebase-interactive.c

diff --git a/rebase-interactive.c b/rebase-interactive.c
index d9718409b3d7862fee0eaa7e2255e83f50379656..c343e16fcddddec8601a2278ae3b5e39dbab770c 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -71,14 +71,14 @@ void append_todo_help(int command_count,
 
        if (!edit_todo) {
                strbuf_addch(buf, '\n');
-               strbuf_commented_addf(buf, comment_line_char,
+               strbuf_commented_addf(buf, comment_line_str,
                                      Q_("Rebase %s onto %s (%d command)",
                                         "Rebase %s onto %s (%d commands)",
                                         command_count),
                                      shortrevisions, shortonto, command_count);
        }
 
-       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_char);
+       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_str);
 
        if (get_missing_commit_check_level() == MISSING_COMMIT_CHECK_ERROR)
                msg = _("\nDo not remove any line. Use 'drop' "
@@ -87,7 +87,7 @@ void append_todo_help(int command_count,
                msg = _("\nIf you remove a line here "
                         "THAT COMMIT WILL BE LOST.\n");
 
-       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_char);
+       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_str);
 
        if (edit_todo)
                msg = _("\nYou are editing the todo file "
@@ -98,7 +98,7 @@ void append_todo_help(int command_count,
                msg = _("\nHowever, if you remove everything, "
                        "the rebase will be aborted.\n\n");
 
-       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_char);
+       strbuf_add_commented_lines(buf, msg, strlen(msg), comment_line_str);
 }
 
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
@@ -130,7 +130,7 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
        if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
                return -2;
 
-       strbuf_stripspace(&new_todo->buf, comment_line_char);
+       strbuf_stripspace(&new_todo->buf, comment_line_str);
        if (initial && new_todo->buf.len == 0)
                return -3;