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 /builtin-grep.c | |
| parent | 3960a951795819e6cd09422e15092b45cdd46f73 (diff) | |
| parent | 9cb76b8cdc8ac62a77080595f6443613fd64bab3 (diff) | |
| download | git-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.gz | |
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 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 0d6cc7361f..9180b39e3f 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -331,7 +331,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) struct cache_entry *ce = active_cache[i]; char *name; int kept; - if (!S_ISREG(ntohl(ce->ce_mode))) + if (!S_ISREG(ce->ce_mode)) continue; if (!pathspec_matches(paths, ce->name)) continue; @@ -387,7 +387,7 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached) for (nr = 0; nr < active_nr; nr++) { struct cache_entry *ce = active_cache[nr]; - if (!S_ISREG(ntohl(ce->ce_mode))) + if (!S_ISREG(ce->ce_mode)) continue; if (!pathspec_matches(paths, ce->name)) continue; |