diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-08-30 19:10:00 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-08-30 19:11:31 -0400 |
| commit | 56ed415a24d41e83169ac17f468a540260bd08ff (patch) | |
| tree | d21b204b4d8a96b31ce9315ef39014df207ed24a /src | |
| parent | 71ef639e5f48be8e8b459cc705be7f58016256f8 (diff) | |
| download | libgit2-56ed415a24d41e83169ac17f468a540260bd08ff.tar.gz | |
diff: drop `FILELIST_MATCH`
Now that non-pathspec matching diffs are implemented at the iterator
level, drop `FILELIST_MATCH`ing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 5ba263bb4..fc5088c82 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2405,7 +2405,7 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde * will be applied by the merge (including conflicts). Ensure that there * are no changes in the workdir to these paths. */ - opts.flags |= GIT_DIFF_ENABLE_FILELIST_MATCH; + opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; opts.pathspec.count = merged_paths->length; opts.pathspec.strings = (char **)merged_paths->contents; |