Ignore submodules when checking for merge conflicts in the workdir.

diff --git a/src/merge.c b/src/merge.c
index a0f2405ff89fcf1e6a58fd8e78c2632119bd5458..b93851b7e8fa330d64406dac907e56dfca22c9ca 100644 (file)
--- a/src/merge.c
+++ b/src/merge.c
@@ -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.pathspec.count = merged_paths->length;
        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)
                goto done;