summaryrefslogtreecommitdiff
path: root/src/pathspec.c
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-01-30 15:10:39 -0800
committerVicent Marti <vicent@github.com>2014-01-30 15:10:39 -0800
commit8646b0a0689c89d9cad949754885ec542b4d0ce1 (patch)
treee10f413a2616afbca266fee1ed0afea636803fdf /src/pathspec.c
parent32d7abfc2066a1782ab8fce29fea3541d6113327 (diff)
parent25babd02a4151f858a631314364fdca97180f2c5 (diff)
downloadlibgit2-8646b0a0689c89d9cad949754885ec542b4d0ce1.tar.gz
Merge pull request #2085 from libgit2/rb/index-tree-blob-collision
Index tree-bob collision
Diffstat (limited to 'src/pathspec.c')
-rw-r--r--src/pathspec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pathspec.c b/src/pathspec.c
index d6ce09c02..bee320576 100644
--- a/src/pathspec.c
+++ b/src/pathspec.c
@@ -445,7 +445,7 @@ static int pathspec_match_from_iterator(
/* check if path is ignored and untracked */
if (index != NULL &&
git_iterator_current_is_ignored(iter) &&
- git_index__find(NULL, index, entry->path, GIT_INDEX_STAGE_ANY) < 0)
+ git_index__find(NULL, index, entry->path, strlen(entry->path), GIT_INDEX_STAGE_ANY) < 0)
continue;
/* mark the matched pattern as used */