diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:08 -0700 |
commit | b8b6365a8a214f2427f2cf9334fd43ace0be619c (patch) | |
tree | 983ce79cdb05e7d8612b3240699b9cbf20370a30 /builtin/remote.c | |
parent | 7e58b8166e6ac191739cf9001e73b2157f3aead5 (diff) | |
parent | 2721ce21e439ee0726dc69073acd7e0d2b2407b3 (diff) | |
download | git-b8b6365a8a214f2427f2cf9334fd43ace0be619c.tar.gz |
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/remote.c')
-rw-r--r-- | builtin/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index d33766be39..5ded3018af 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -247,7 +247,7 @@ struct branch_info { enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase; }; -static struct string_list branch_list; +static struct string_list branch_list = STRING_LIST_INIT_NODUP; static const char *abbrev_ref(const char *name, const char *prefix) { |