summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:08 (GMT)
commitb8b6365a8a214f2427f2cf9334fd43ace0be619c (patch)
tree983ce79cdb05e7d8612b3240699b9cbf20370a30 /builtin/apply.c
parent7e58b8166e6ac191739cf9001e73b2157f3aead5 (diff)
parent2721ce21e439ee0726dc69073acd7e0d2b2407b3 (diff)
downloadgit-b8b6365a8a214f2427f2cf9334fd43ace0be619c.zip
git-b8b6365a8a214f2427f2cf9334fd43ace0be619c.tar.gz
git-b8b6365a8a214f2427f2cf9334fd43ace0be619c.tar.bz2
Merge branch 'jk/string-list-static-init'
Instead of taking advantage of a struct string_list that is allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind, initialize them explicitly as such, to document their behaviour better. * jk/string-list-static-init: use string_list initializer consistently blame,shortlog: don't make local option variables static interpret-trailers: don't duplicate option strings parse_opt_string_list: stop allocating new strings
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index ecb7f1b..7fc5c3e 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4667,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();