summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-11 01:14:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-11 01:14:28 (GMT)
commit380a7426794dcad369dd48519cd01d6e0246cde5 (patch)
treea6671d54dfa9c41094f541ef5377ae53d04e842c /dir.c
parent1f8115b113def8ee03701aa87b26c5e8b7c94434 (diff)
parent1102952b45dde09d73445aa2284bcb592362fa23 (diff)
downloadgit-380a7426794dcad369dd48519cd01d6e0246cde5.zip
git-380a7426794dcad369dd48519cd01d6e0246cde5.tar.gz
git-380a7426794dcad369dd48519cd01d6e0246cde5.tar.bz2
Merge branch 'lt/case-insensitive'
* lt/case-insensitive: Make git-add behave more sensibly in a case-insensitive environment When adding files to the index, add support for case-independent matches Make unpack-tree update removed files before any updated files Make branch merging aware of underlying case-insensitive filsystems Add 'core.ignorecase' option Make hash_name_lookup able to do case-independent lookups Make "index_name_exists()" return the cache_entry it found Move name hashing functions into a file of its own Make unpack_trees_options bit flags actual bitfields
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 9501476..29d1d5b 100644
--- a/dir.c
+++ b/dir.c
@@ -389,7 +389,7 @@ static struct dir_entry *dir_entry_new(const char *pathname, int len)
struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
{
- if (cache_name_exists(pathname, len))
+ if (cache_name_exists(pathname, len, ignore_case))
return NULL;
ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);