Merge branch 'jk/add-i-diff-compact-heuristics'

diff --git a/builtin/apply.c b/builtin/apply.c
index 7338ee6b68d48ec46436a621f6926be3e1252493..7fc5c3e30745d50a05accb3a83ccfa8871963df6 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -52,10 +52,7 @@ struct apply_state {
        const char *prefix;
        int prefix_length;
 
-       /*
-        * Since lockfile.c keeps a linked list of all created
-        * lock_file structures, it isn't safe to free(lock_file).
-        */
+       /* These are lock_file related */
        struct lock_file *lock_file;
        int newfd;
 
@@ -467,7 +464,7 @@ static int is_dev_null(const char *str)
 #define TERM_SPACE     1
 #define TERM_TAB       2
 
-static int name_terminate(const char *name, int namelen, int c, int terminate)
+static int name_terminate(int c, int terminate)
 {
        if (c == ' ' && !(terminate & TERM_SPACE))
                return 0;
@@ -703,7 +700,7 @@ static char *find_name_common(struct apply_state *state,
                if (!end && isspace(c)) {
                        if (c == '\n')
                                break;
-                       if (name_terminate(start, line-start, c, terminate))
+                       if (name_terminate(c, terminate))
                                break;
                }
                line++;
@@ -4670,6 +4667,9 @@ static void init_apply_state(struct apply_state *state,
        state->ws_error_action = warn_on_ws_error;
        state->ws_ignore_action = ignore_ws_none;
        state->linenr = 1;
+       string_list_init(&state->fn_table, 0);
+       string_list_init(&state->limit_by_name, 0);
+       string_list_init(&state->symlink_changes, 0);
        strbuf_init(&state->root, 0);
 
        git_apply_config();