Merge branch 'jk/maint-strbuf-missing-init'
[gitweb.git] / builtin / merge.c
index a896165790d0c6cf05858f229cfaf05e62f67a9c..4b0ca6550c130dc8efbf248c56503018b8bcb604 100644 (file)
@@ -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;