Merge branch 'jk/maint-strbuf-missing-init' into maint

* jk/maint-strbuf-missing-init:
commit, merge: initialize static strbuf

diff --cc builtin/commit.c
index b02e2c4e89a55e04f7c5c3ee95617f947b9f5d99,564042de3928ccff7c8ecb739b78ae1fdc890268..d8d6dd5eaaa5691a0b5059b9a43dd69761dcf72f
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -99,11 -81,9 +99,11 @@@ static enum 
  } cleanup_mode;
  static char *cleanup_arg;
  
 -static int use_editor = 1, initial_commit, in_merge, include_status = 1;
 +static enum commit_whence whence;
 +static int use_editor = 1, include_status = 1;
 +static int show_ignored_in_status;
  static const char *only_include_assumed;
- static struct strbuf message;
+ static struct strbuf message = STRBUF_INIT;
  
  static int null_termination;
  static enum {

diff --cc builtin/merge.c
index 138737624807389ccb903a5cd03840d63b7cbf6f,c6e3e7fdaf92dc94925283ee5470588625c7df48..7d92e2064b97828ebd5209d97b1d49807149f212
--- 1/builtin/merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -44,12 -42,13 +44,12 @@@ static const char * const builtin_merge
        NULL
  };
  
 -static int show_diffstat = 1, option_log, squash;
 +static int show_diffstat = 1, shortlog_len, squash;
  static int option_commit = 1, allow_fast_forward = 1;
 -static int fast_forward_only;
 +static int fast_forward_only, option_edit;
  static int allow_trivial = 1, have_message;
- static struct strbuf merge_msg;
+ static struct strbuf merge_msg = STRBUF_INIT;
  static struct commit_list *remoteheads;
 -static unsigned char head[20], stash[20];
  static struct strategy **use_strategies;
  static size_t use_strategies_nr, use_strategies_alloc;
  static const char **xopts;