summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVsevolod Parfenov <vsevolodp@gmail.com>2015-08-24 18:47:48 +0300
committerVsevolod Parfenov <vsevolodp@gmail.com>2015-08-24 18:47:48 +0300
commit6d0defe31c67a61f2f38894a2e4db7818a952d60 (patch)
treeb3e6b4f9d59c42aad13ee5035e2e5b0d135aebc2
parent6b36945d7e8a780a3063f09c65b3d9fed6525552 (diff)
downloadlibgit2-6d0defe31c67a61f2f38894a2e4db7818a952d60.tar.gz
Fix 'If we're dealing with a directory' check
-rw-r--r--src/ignore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ignore.c b/src/ignore.c
index 0031e4696..1f33687bc 100644
--- a/src/ignore.c
+++ b/src/ignore.c
@@ -97,7 +97,7 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
if (rule->containing_dir) {
git_buf_puts(&buf, rule->containing_dir);
}
- if (!strchr(rule->pattern, '*'))
+ if (rule->flags & GIT_ATTR_FNMATCH_LEADINGDIR && !(rule->flags & GIT_ATTR_FNMATCH_NEGATIVE))
error = git_buf_printf(&buf, "%s/*", rule->pattern);
else
error = git_buf_puts(&buf, rule->pattern);