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

diff: drop FILELIST_MATCH

Browse Source 
Now that non-pathspec matching diffs are implemented at the iterator
level, drop `FILELIST_MATCH`ing.
This commit is contained in:
Edward Thomson 2015-08-30 19:10:00 -04:00
parent 71ef639e5f
commit 56ed415a24
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/git2/diff.h
View File

@ -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
*/

2
src/merge.c
View File

@ -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;