proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 16:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore submodules when checking for merge conflicts in the workdir.

Browse Source
This commit is contained in:
Jason Haslam 2016-05-12 13:18:07 -06:00 committed by Edward Thomson
parent afab1fff01
commit c864b4ab99
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/merge.c
View File

@ -2827,6 +2827,7 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde
opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH;
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;
opts.ignore_submodules = GIT_SUBMODULE_IGNORE_ALL;
if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, NULL, &opts)) < 0) if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, NULL, &opts)) < 0)
goto done; goto done;