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

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

Conflicts:
	builtin/merge.c

diff --cc builtin/commit.c
index 3069041b8023224be0080f081d852dc001a81437,564042de3928ccff7c8ecb739b78ae1fdc890268..5891e95758a0d2530b325bd5fd346e15702e3017
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -100,11 -81,9 +100,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 a896165790d0c6cf05858f229cfaf05e62f67a9c,c6e3e7fdaf92dc94925283ee5470588625c7df48..4b0ca6550c130dc8efbf248c56503018b8bcb604
--- 1/builtin/merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -45,13 -42,13 +45,13 @@@ static const char * const builtin_merge
        NULL
  };
  
 -static int show_diffstat = 1, option_log, squash;
 +static int show_diffstat = 1, shortlog_len = -1, 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 int overwrite_ignore = 1;
+ 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;