status: rename long-format print routines

diff --git a/builtin/commit.c b/builtin/commit.c
index 18c890e5671e21955576f2e824088aa4300b06a5..b80273b5396e366bc3b6463c007e6ebd32bff46d 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -387,7 +387,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
         */
        if (all || (also && pathspec.nr)) {
                hold_locked_index(&index_lock, 1);
-               add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
+               add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0);
                refresh_cache_or_die(refresh_flags);
                update_main_cache_tree(WRITE_TREE_SILENT);
                if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
@@ -515,7 +515,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
                break;
        case STATUS_FORMAT_NONE:
        case STATUS_FORMAT_LONG:
-               wt_status_print(s);
+               wt_longstatus_print(s);
                break;
        }
 
@@ -715,7 +715,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                char *buffer;
                buffer = strstr(use_message_buffer, "\n\n");
                if (buffer)
-                       strbuf_addstr(&sb, buffer + 2);
+                       strbuf_addstr(&sb, skip_blank_lines(buffer + 2));
                hook_arg1 = "commit";
                hook_arg2 = use_message;
        } else if (fixup_message) {
@@ -1403,7 +1403,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
        case STATUS_FORMAT_LONG:
                s.verbose = verbose;
                s.ignore_submodule_arg = ignore_submodule_arg;
-               wt_status_print(&s);
+               wt_longstatus_print(&s);
                break;
        }
        return 0;