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

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

Conflicts:
	builtin/merge.c

diff --git a/builtin/commit.c b/builtin/commit.c
index 3069041b8023224be0080f081d852dc001a81437..5891e95758a0d2530b325bd5fd346e15702e3017 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -104,7 +104,7 @@ 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 --git a/builtin/merge.c b/builtin/merge.c
index a896165790d0c6cf05858f229cfaf05e62f67a9c..4b0ca6550c130dc8efbf248c56503018b8bcb604 100644 (file)
--- 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;