diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/index.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c index 1338ef3b1..a0ae4cb5b 100644 --- a/src/config.c +++ b/src/config.c @@ -120,7 +120,7 @@ int git_config_add_file(git_config *cfg, git_config_file *file, int priority) assert(cfg && file); if ((error = file->open(file)) < GIT_SUCCESS) - return git__rethrow(error, "Failed to open config file"); + return git__throw(error, "Failed to open config file"); internal = git__malloc(sizeof(file_internal)); if (internal == NULL) diff --git a/src/index.c b/src/index.c index 9f9a08f0d..9e88012bb 100644 --- a/src/index.c +++ b/src/index.c @@ -510,6 +510,7 @@ int git_index_append2(git_index *index, const git_index_entry *source_entry) int git_index_remove(git_index *index, int position) { + int error; git_index_entry *entry; git_vector_sort(&index->entries); @@ -517,7 +518,12 @@ int git_index_remove(git_index *index, int position) if (entry != NULL) git_tree_cache_invalidate_path(index->tree, entry->path); - return git_vector_remove(&index->entries, (unsigned int)position); + error = git_vector_remove(&index->entries, (unsigned int)position); + + if (error == GIT_SUCCESS) + index_entry_free(entry); + + return error; } int git_index_find(git_index *index, const char *path) |