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

1 files changed, 3 insertions, 0 deletions

diff --git a/builtin/apply.c b/builtin/apply.c
index ecb7f1b258..7fc5c3e307 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();