t4216: avoid unnecessary subshell in test_bloom_filters_not_used

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

diff --git a/rebase-interactive.c b/rebase-interactive.c
index ac001dea5887a119f839ab4577797f9a9a179174..762853bc7e074cba1ae904790cbc1eb07520f613 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -35,7 +35,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
        return MISSING_COMMIT_CHECK_IGNORE;
 }
 
-void append_todo_help(unsigned keep_empty, int command_count,
+void append_todo_help(int command_count,
                      const char *shortrevisions, const char *shortonto,
                      struct strbuf *buf)
 {
@@ -87,11 +87,6 @@ void append_todo_help(unsigned keep_empty, int command_count,
                        "the rebase will be aborted.\n\n");
 
        strbuf_add_commented_lines(buf, msg, strlen(msg));
-
-       if (!keep_empty) {
-               msg = _("Note that empty commits are commented out");
-               strbuf_add_commented_lines(buf, msg, strlen(msg));
-       }
 }
 
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
@@ -134,14 +129,14 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 
        if (incorrect) {
                if (todo_list_check_against_backup(r, new_todo)) {
-                       write_file(rebase_path_dropped(), "");
+                       write_file(rebase_path_dropped(), "%s", "");
                        return -4;
                }
 
                if (incorrect > 0)
                        unlink(rebase_path_dropped());
        } else if (todo_list_check(todo_list, new_todo)) {
-               write_file(rebase_path_dropped(), "");
+               write_file(rebase_path_dropped(), "%s", "");
                return -4;
        }