admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* jk/maint-strbuf-missing-init:
  commit, merge: initialize static strbuf
This commit is contained in:
Junio C Hamano
2011-12-28 11:42:46 -08:00
parent 4a242d6cb7 03f94ae9f9
commit b42e81afe2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@@ -48,7 +48,7 @@ static int show_diffstat = 1, shortlog_len, squash;
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;