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/shortlog.c | |
| parent | Merge branch 'jk/send-pack-stdio' (diff) | |
| parent | use string_list initializer consistently (diff) | |
| download | tgif-b8b6365a8a214f2427f2cf9334fd43ace0be619c.tar.xz | |
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/shortlog.c')
| -rw-r--r-- | builtin/shortlog.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, |