path: root/builtin/shortlog.c
diff options
authorJeff King <>2016-06-13 05:39:28 (GMT)
committerJunio C Hamano <>2016-06-13 17:33:33 (GMT)
commit64093fc06a871f71316211a2aea6bb46c49b20ab (patch)
tree909e8391c6a00852340a2288dc21e09efd5a60b7 /builtin/shortlog.c
parent7c4b169585ebe650783051c4b7a7b17de62836ad (diff)
blame,shortlog: don't make local option variables static
There's no need for these option variables to be static, except that they are referenced by the options array itself, which is static. But having all of this static is simply unnecessary and confusing (and inconsistent with most other commands, which either use a static global option list or a true function-local one). Note that in some cases we may need to actually initialize the variables (since we cannot rely on BSS to do so). This is a net improvement to readability, though, as we can use the more verbose initializers for our string_lists. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/shortlog.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 007cc66..cb3e89c 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -221,11 +221,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,