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

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

Conflicts:
	builtin/merge.c
This commit is contained in:
Junio C Hamano
2011-12-22 11:27:31 -08:00
2 changed files with 2 additions and 2 deletions

View File

@ -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 {