diff options
author | Patrick Steinhardt <ps@pks.im> | 2019-04-05 10:22:46 +0200 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2019-04-05 10:22:46 +0200 |
commit | 9d117e20119ffa1814253d822598d33721d04ece (patch) | |
tree | 0a71134bad7eafcfd24c677b38bbcc8e3198ac6d /src/ignore.c | |
parent | aeea1c463941806a0176859c06c0e2e9716efcb0 (diff) | |
download | libgit2-9d117e20119ffa1814253d822598d33721d04ece.tar.gz |
ignore: treat paths with trailing "/" as directories
The function `git_ignore_path_is_ignored` is there to test the
ignore status of paths that need not necessarily exist inside of
a repository. This has the implication that for a given path, we
cannot always decide whether it references a directory or a file,
and we need to distinguish those cases because ignore rules may
treat those differently. E.g. given the following gitignore file:
*
!/**/
we'd only want to unignore directories, while keeping files
ignored. But still, calling `git_ignore_path_is_ignored("dir/")`
will say that this directory is ignored because it treats "dir/"
as a file path.
As said, the `is_ignored` function cannot always decide whether
the given path is a file or directory, and thus it may produce
wrong results in some cases. While this is unfixable in the
general case, we can do better when we are being passed a path
name with a trailing path separator (e.g. "dir/") and always
treat them as directories.
Diffstat (limited to 'src/ignore.c')
-rw-r--r-- | src/ignore.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ignore.c b/src/ignore.c index c6e4da705..5427efa29 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -534,7 +534,9 @@ int git_ignore_path_is_ignored( memset(&path, 0, sizeof(path)); memset(&ignores, 0, sizeof(ignores)); - if (git_repository_is_bare(repo)) + if (!git__suffixcmp(pathname, "/")) + dir_flag = GIT_DIR_FLAG_TRUE; + else if (git_repository_is_bare(repo)) dir_flag = GIT_DIR_FLAG_FALSE; if ((error = git_attr_path__init(&path, pathname, workdir, dir_flag)) < 0 || |