author | Junio C Hamano <gitster@pobox.com> | |
Wed, 28 Dec 2011 19:42:46 +0000 (11:42 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 28 Dec 2011 19:42:46 +0000 (11:42 -0800) |
* jk/maint-strbuf-missing-init:
commit, merge: initialize static strbuf
commit, merge: initialize static strbuf
builtin/commit.c | patch | blob | history | |
builtin/merge.c | patch | blob | history |
diff --git a/builtin/commit.c b/builtin/commit.c
index b02e2c4e89a55e04f7c5c3ee95617f947b9f5d99..d8d6dd5eaaa5691a0b5059b9a43dd69761dcf72f 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
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 --git a/builtin/merge.c b/builtin/merge.c
index 138737624807389ccb903a5cd03840d63b7cbf6f..7d92e2064b97828ebd5209d97b1d49807149f212 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
static int option_commit = 1, allow_fast_forward = 1;
static int fast_forward_only, option_edit;
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 struct strategy **use_strategies;
static size_t use_strategies_nr, use_strategies_alloc;