diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-13 10:37:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-13 10:37:48 -0700 |
| commit | 7013220d2b3181d4ae55e21e0f18b9abfd6e011d (patch) | |
| tree | 4ceb8a1c5dd10047c7d9b59a30e9687cc7fc8372 | |
| parent | e059388fb200fb2b5281ce211242ef3525a9c2c7 (diff) | |
| parent | 64093fc06a871f71316211a2aea6bb46c49b20ab (diff) | |
| download | git-7013220d2b3181d4ae55e21e0f18b9abfd6e011d.tar.gz | |
Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
* jk/parseopt-string-list:
blame,shortlog: don't make local option variables static
interpret-trailers: don't duplicate option strings
parse_opt_string_list: stop allocating new strings
| -rw-r--r-- | builtin/blame.c | 12 | ||||
| -rw-r--r-- | builtin/interpret-trailers.c | 2 | ||||
| -rw-r--r-- | builtin/shortlog.c | 6 | ||||
| -rw-r--r-- | parse-options-cb.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 21f42b0b62..80d24315b3 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2522,12 +2522,12 @@ int cmd_blame(int argc, const char **argv, const char *prefix) enum object_type type; struct commit *final_commit = NULL; - static struct string_list range_list; - static int output_option = 0, opt = 0; - static int show_stats = 0; - static const char *revs_file = NULL; - static const char *contents_from = NULL; - static const struct option options[] = { + struct string_list range_list = STRING_LIST_INIT_NODUP; + int output_option = 0, opt = 0; + int show_stats = 0; + const char *revs_file = NULL; + const char *contents_from = NULL; + const struct option options[] = { OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")), OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")), OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")), diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index b99ae4be88..175f14797b 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -20,7 +20,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) { int in_place = 0; int trim_empty = 0; - struct string_list trailers = STRING_LIST_INIT_DUP; + struct string_list trailers = STRING_LIST_INIT_NODUP; struct option options[] = { OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")), diff --git a/builtin/shortlog.c b/builtin/shortlog.c index bfc082e584..f83984e8a1 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -233,11 +233,11 @@ void shortlog_init(struct shortlog *log) int cmd_shortlog(int argc, const char **argv, const char *prefix) { - static struct shortlog log; - static struct rev_info rev; + struct shortlog log = { STRING_LIST_INIT_NODUP }; + struct rev_info rev; int nongit = !startup_info->have_repository; - static const struct option options[] = { + const struct option options[] = { OPT_BOOL('n', "numbered", &log.sort_by_number, N_("sort output according to the number of commits per author")), OPT_BOOL('s', "summary", &log.summary, diff --git a/parse-options-cb.c b/parse-options-cb.c index 239898d946..ba5acf3111 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -144,7 +144,7 @@ int parse_opt_string_list(const struct option *opt, const char *arg, int unset) if (!arg) return -1; - string_list_append(v, xstrdup(arg)); + string_list_append(v, arg); return 0; } |