Skip to content

Commit 1196807

Browse files
author
Edward Thomson
authored
Merge pull request libgit2#4087 from tiennou/warnings
Fix a few recent warnings
2 parents 185fe9c + e2b3dc1 commit 1196807

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

include/git2/tree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ GIT_EXTERN(int) git_treebuilder_write(
381381
*
382382
* @see git_treebuilder_write
383383
*
384-
* @param id Pointer to store the OID of the newly written tree
384+
* @param oid Pointer to store the OID of the newly written tree
385385
* @param bld Tree builder to write
386386
* @param tree Shared buffer for writing the tree. Will be grown as necessary.
387387
* @return 0 or an error code

src/submodule.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,10 @@ static int submodule_get_or_create(git_submodule **out, git_repository *repo, gi
349349
static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cfg)
350350
{
351351
int error;
352-
git_iterator *i;
352+
git_iterator *i = NULL;
353353
const git_index_entry *entry;
354354
git_strmap *names = 0;
355+
355356
git_strmap_alloc(&names);
356357
if ((error = load_submodule_names(names, cfg)))
357358
goto done;

0 commit comments

Comments
 (0)