From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Dec 2011 08:27:59 +0000 (-0800)
Subject: Update jk/maint-strbuf-missing-init to builtin/ rename
X-Git-Tag: v1.7.8.2~5^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03f94ae9f909952ed5a78917ab319a312889354b;p=git.git

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

03f94ae9f909952ed5a78917ab319a312889354b
diff --cc builtin/commit.c
index 5b418a53f,55676fd87..564042de3
--- a/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 49e9115ec,3aaec7bed..c6e3e7fda
--- a/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;