diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-11 16:46:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 16:46:20 -0800 |
commit | e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d (patch) | |
tree | 8ce3be12cc0fba866845b18e977c264fbcf54792 /tree.c | |
parent | 3960a951795819e6cd09422e15092b45cdd46f73 (diff) | |
parent | 9cb76b8cdc8ac62a77080595f6443613fd64bab3 (diff) | |
download | git-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.gz git-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.xz |
Merge branch 'lt/in-core-index'
* lt/in-core-index:
lazy index hashing
Create pathname-based hash-table lookup into index
read-cache.c: introduce is_racy_timestamp() helper
read-cache.c: fix a couple more CE_REMOVE conversion
Also use unpack_trees() in do_diff_cache()
Make run_diff_index() use unpack_trees(), not read_tree()
Avoid running lstat(2) on the same cache entry.
index: be careful when handling long names
Make on-disk index representation separate from in-core one
Diffstat (limited to 'tree.c')
-rw-r--r-- | tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -142,8 +142,8 @@ static int cmp_cache_name_compare(const void *a_, const void *b_) ce1 = *((const struct cache_entry **)a_); ce2 = *((const struct cache_entry **)b_); - return cache_name_compare(ce1->name, ntohs(ce1->ce_flags), - ce2->name, ntohs(ce2->ce_flags)); + return cache_name_compare(ce1->name, ce1->ce_flags, + ce2->name, ce2->ce_flags); } int read_tree(struct tree *tree, int stage, const char **match) |