proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 18:11:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove local unused index_repo variable

Browse Source
This commit is contained in:
Jacques Germishuys 2014-09-12 22:37:15 +02:00
parent a565f364ab
commit dc68ee8d15
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/merge.c
View File

@ -2338,7 +2338,6 @@ done:
static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_index *index_new, git_vector *merged_paths) 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 *wd_diff_list = NULL;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
int error = 0; 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.count = merged_paths->length;
opts.pathspec.strings = (char **)merged_paths->contents; 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; goto done;
*conflicts = wd_diff_list->deltas.length; *conflicts = wd_diff_list->deltas.length;
done: done:
git_index_free(index_repo);
git_diff_free(wd_diff_list); git_diff_free(wd_diff_list);
return error; return error;