From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2011 19:27:31 +0000 (-0800)
Subject: Merge branch 'jk/maint-strbuf-missing-init'
X-Git-Tag: v1.7.9-rc0~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1aea303d7eafc5f178b253f4d069eb5f2acfb409;p=git.git

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

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

Conflicts:
	builtin/merge.c
---

1aea303d7eafc5f178b253f4d069eb5f2acfb409
diff --cc builtin/commit.c
index 3069041b8,564042de3..5891e9575
--- a/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 a89616579,c6e3e7fda..4b0ca6550
--- a/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 int overwrite_ignore = 1;
- 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;