From c864b4ab996159a2cb0905aafbccb3347560e4ac Mon Sep 17 00:00:00 2001 From: Jason Haslam Date: Thu, 12 May 2016 13:18:07 -0600 Subject: [PATCH] Ignore submodules when checking for merge conflicts in the workdir. --- src/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/merge.c b/src/merge.c index a0f2405ff..b93851b7e 100644 --- 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;