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

allow (ignore) bare slash in gitignore

Browse Source
This commit is contained in:
Edward Thomson 2013-05-29 16:03:30 -05:00
parent 17776314c8
commit 2d160ef782
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/attr_file.c
View File

@ -397,7 +397,8 @@ int git_attr_fnmatch__parse(
*base = scan;
spec->length = scan - pattern;
if ((spec->length = scan - pattern) == 0)
return GIT_ENOTFOUND;
if (pattern[spec->length - 1] == '/') {
spec->length--;

5
src/pool.c
View File

@ -194,6 +194,11 @@ char *git_pool_strndup(git_pool *pool, const char *str, size_t n)
assert(pool && str && pool->item_size == sizeof(char));
if (n + 1 == 0) {
giterr_set_oom();
return NULL;
}
if ((ptr = git_pool_malloc(pool, (uint32_t)(n + 1))) != NULL) {
memcpy(ptr, str, n);
*(((char *)ptr) + n) = '\0';

21
tests-clar/attr/ignore.c
View File

@ -34,6 +34,27 @@ void test_attr_ignore__honor_temporary_rules(void)
assert_is_ignored(true, "NewFolder/NewFolder/File.txt");
}
void test_attr_ignore__allow_root(void)
{
cl_git_rewritefile("attr/.gitignore", "/");
assert_is_ignored(false, "File.txt");
assert_is_ignored(false, "NewFolder");
assert_is_ignored(false, "NewFolder/NewFolder");
assert_is_ignored(false, "NewFolder/NewFolder/File.txt");
}
void test_attr_ignore__ignore_root(void)
{
cl_git_rewritefile("attr/.gitignore", "/\n\n/NewFolder\n/NewFolder/NewFolder");
assert_is_ignored(false, "File.txt");
assert_is_ignored(true, "NewFolder");
assert_is_ignored(true, "NewFolder/NewFolder");
assert_is_ignored(true, "NewFolder/NewFolder/File.txt");
}
void test_attr_ignore__skip_gitignore_directory(void)
{
cl_git_rewritefile("attr/.git/info/exclude", "/NewFolder\n/NewFolder/NewFolder");

10
tests-clar/core/pool.c
View File

@ -133,3 +133,13 @@ void test_core_pool__free_list(void)
git_pool_clear(&p);
}
void test_core_pool__strndup_limit(void)
{
git_pool p;
cl_git_pass(git_pool_init(&p, 1, 100));
cl_assert(git_pool_strndup(&p, "foo", -1) == NULL);
git_pool_clear(&p);
}