undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
commit 1aea303d7e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -104,7 +104,7 @@ static enum commit_whence whence;
static int use_editor = 1, include_status = 1; static int use_editor = 1, include_status = 1;
static int show_ignored_in_status; static int show_ignored_in_status;
static const char *only_include_assumed; static const char *only_include_assumed;
static struct strbuf message; static struct strbuf message = STRBUF_INIT;
static int null_termination; static int null_termination;
static enum { static enum {

2
builtin/merge.c
View File

@ -50,7 +50,7 @@ static int option_commit = 1, allow_fast_forward = 1;
static int fast_forward_only, option_edit; static int fast_forward_only, option_edit;
static int allow_trivial = 1, have_message; static int allow_trivial = 1, have_message;
static int overwrite_ignore = 1; static int overwrite_ignore = 1;
static struct strbuf merge_msg; static struct strbuf merge_msg = STRBUF_INIT;
static struct commit_list *remoteheads; static struct commit_list *remoteheads;
static struct strategy **use_strategies; static struct strategy **use_strategies;
static size_t use_strategies_nr, use_strategies_alloc; static size_t use_strategies_nr, use_strategies_alloc;