diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-10 18:14:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-10 18:14:28 -0700 |
| commit | 380a7426794dcad369dd48519cd01d6e0246cde5 (patch) | |
| tree | a6671d54dfa9c41094f541ef5377ae53d04e842c /builtin-read-tree.c | |
| parent | 1f8115b113def8ee03701aa87b26c5e8b7c94434 (diff) | |
| parent | 1102952b45dde09d73445aa2284bcb592362fa23 (diff) | |
| download | git-380a7426794dcad369dd48519cd01d6e0246cde5.tar.gz | |
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 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index e9cfd2bbc5..7ac30883bc 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -40,7 +40,7 @@ static int read_cache_unmerged(void) for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; if (ce_stage(ce)) { - remove_index_entry(ce); + remove_name_hash(ce); if (last && !strcmp(ce->name, last->name)) continue; cache_tree_invalidate_path(active_cache_tree, ce->name); |