From 56ed415a24d41e83169ac17f468a540260bd08ff Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sun, 30 Aug 2015 19:10:00 -0400 Subject: [PATCH] diff: drop `FILELIST_MATCH` Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing. --- include/git2/diff.h | 7 ------- src/merge.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/git2/diff.h b/include/git2/diff.h index d3adf9f01..491212182 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -165,13 +165,6 @@ typedef enum { /** Include unreadable files in the diff */ GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED = (1u << 17), - /** Use literal path matching in the iterators. This is more broad - * than the DISABLE_PATHSPEC_MATCH flag. The caller must provide an - * array of paths (no patterns or prefixes). Only values included in - * that list will be returned. - */ - GIT_DIFF_ENABLE_FILELIST_MATCH = (1u << 18), - /* * Options controlling how output will be generated */ 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;