diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-12-09 10:25:36 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-12-09 11:40:44 -0500 |
| commit | 5588f0736089ab00e12cb7ea7c8143ec666738e6 (patch) | |
| tree | 1f877c23d223d4dedabafb4bc6c793efe82f9fdc /src/merge.c | |
| parent | 07c5dc84fd486b380d618319b4852591d355bd81 (diff) | |
| download | libgit2-5588f0736089ab00e12cb7ea7c8143ec666738e6.tar.gz | |
Clean up warnings
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index ef138c284..45387d4ad 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2306,8 +2306,8 @@ done: int git_merge__indexes(git_repository *repo, git_index *index_new) { - git_index *index_repo; - unsigned int index_repo_caps; + git_index *index_repo = NULL; + unsigned int index_repo_caps = 0; git_vector paths = GIT_VECTOR_INIT; size_t index_conflicts = 0, wd_conflicts = 0, conflicts, i; char *path; |