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: https://git.tokkee.org/?a=commitdiff_plain;h=03f94ae9f909952ed5a78917ab319a312889354b;hp=81b50f3ce40bfdd66e5d967bf82be001039a9a98;p=git.git

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

diff --git a/builtin/commit.c b/builtin/commit.c
index 55676fd87..564042de3 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -83,7 +83,7 @@ static char *cleanup_arg;
 
 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 {
diff --git a/builtin/merge.c b/builtin/merge.c
index 3aaec7bed..c6e3e7fda 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -46,7 +46,7 @@ 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;