summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Germishuys <jacquesg@striata.com>2014-09-12 22:37:15 +0200
committerJacques Germishuys <jacquesg@striata.com>2014-09-12 22:54:05 +0200
commitdc68ee8d158e4a773f3eaef4cdcb038e042e0e4e (patch)
treea31ec864a4b305fd3e6642901b9e5d11f4c46b07
parenta565f364aba55c730908f80e63c90d9432667075 (diff)
downloadlibgit2-dc68ee8d158e4a773f3eaef4cdcb038e042e0e4e.tar.gz
Remove local unused index_repo variable
-rw-r--r--src/merge.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c
index 341f9a645..ddeea8752 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2338,7 +2338,6 @@ done:
static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_index *index_new, git_vector *merged_paths)
{
- git_index *index_repo = NULL;
git_diff *wd_diff_list = NULL;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
int error = 0;
@@ -2366,13 +2365,12 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde
opts.pathspec.count = merged_paths->length;
opts.pathspec.strings = (char **)merged_paths->contents;
- if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, index_repo, &opts)) < 0)
+ if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, NULL, &opts)) < 0)
goto done;
*conflicts = wd_diff_list->deltas.length;
done:
- git_index_free(index_repo);
git_diff_free(wd_diff_list);
return error;