summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:31 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:31 -0800
commit1aea303d7eafc5f178b253f4d069eb5f2acfb409 (patch)
treec4db1a26a5f63f8820e26e408163dac8dbe56763 /builtin/merge.c
parent339aff0846ccf21905d047c20e3c7d077d6f300b (diff)
parent03f94ae9f909952ed5a78917ab319a312889354b (diff)
downloadgit-1aea303d7eafc5f178b253f4d069eb5f2acfb409.tar.gz
Merge branch 'jk/maint-strbuf-missing-init'
* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf Conflicts: builtin/merge.c
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index a896165790..4b0ca6550c 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -50,7 +50,7 @@ static int option_commit = 1, allow_fast_forward = 1;
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 struct strategy **use_strategies;
static size_t use_strategies_nr, use_strategies_alloc;