diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:31 -0800 |
| commit | 1aea303d7eafc5f178b253f4d069eb5f2acfb409 (patch) | |
| tree | c4db1a26a5f63f8820e26e408163dac8dbe56763 /builtin/merge.c | |
| parent | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' (diff) | |
| parent | Update jk/maint-strbuf-missing-init to builtin/ rename (diff) | |
| download | tgif-1aea303d7eafc5f178b253f4d069eb5f2acfb409.tar.xz | |
Merge branch 'jk/maint-strbuf-missing-init'
* jk/maint-strbuf-missing-init:
commit, merge: initialize static strbuf
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a896165790..4b0ca6550c 100644 --- 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; |