diff options
author | Jeff King <peff@peff.net> | 2016-06-13 06:04:20 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-13 10:37:51 -0700 |
commit | 2721ce21e439ee0726dc69073acd7e0d2b2407b3 (patch) | |
tree | 204966369741352a8abc9651805ed0c88677598f /builtin/remote.c | |
parent | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init (diff) | |
download | tgif-2721ce21e439ee0726dc69073acd7e0d2b2407b3.tar.xz |
use string_list initializer consistently
There are two types of string_lists: those that own the
string memory, and those that don't. You can tell the
difference by the strdup_strings flag, and one should use
either STRING_LIST_INIT_DUP, or STRING_LIST_INIT_NODUP as an
initializer.
Historically, the normal all-zeros initialization has
corresponded to the NODUP case. Many sites use no
initializer at all, and that works as a shorthand for that
case. But for a reader of the code, it can be hard to
remember which is which. Let's be more explicit and actually
have each site declare which type it means to use.
This is a fairly mechanical conversion; I assumed each site
was correct as-is, and just switched them all to NODUP.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 fda5c2e53d..e1cc55e13c 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) { |