Update jk/maint-strbuf-missing-init to builtin/ rename

diff --cc builtin/commit.c
index 5b418a53f8af4bc5241f7ffcbad8592bd3e8e3af,55676fd874466c70445e81c69cf397cd01380aaf..564042de3928ccff7c8ecb739b78ae1fdc890268
--- 1/builtin-commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -67,10 -81,17 +81,17 @@@ static enum 
  } cleanup_mode;
  static char *cleanup_arg;
  
- static int use_editor = 1, initial_commit, in_merge;
+ static int use_editor = 1, initial_commit, in_merge, include_status = 1;
  static const char *only_include_assumed;
 -static struct strbuf message;
 +static struct strbuf message = STRBUF_INIT;
  
+ static int null_termination;
+ static enum {
+       STATUS_FORMAT_LONG,
+       STATUS_FORMAT_SHORT,
+       STATUS_FORMAT_PORCELAIN,
+ } status_format = STATUS_FORMAT_LONG;
+ 
  static int opt_parse_m(const struct option *opt, const char *arg, int unset)
  {
        struct strbuf *buf = opt->value;

diff --cc builtin/merge.c
index 49e9115ec449eb4b8b38d9391496b5640c403118,3aaec7bed76af9efdfe5647be0da64373db2011e..c6e3e7fdaf92dc94925283ee5470588625c7df48
--- 1/builtin-merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -41,8 -44,9 +44,9 @@@ static const char * const builtin_merge
  
  static int show_diffstat = 1, option_log, squash;
  static int option_commit = 1, allow_fast_forward = 1;
+ static int fast_forward_only;
  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;