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-rerere.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 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index a9e3ebc13..b0c17bde8 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -149,8 +149,8 @@ static int find_conflict(struct path_list *conflict) if (ce_stage(e2) == 2 && ce_stage(e3) == 3 && ce_same_name(e2, e3) && - S_ISREG(ntohl(e2->ce_mode)) && - S_ISREG(ntohl(e3->ce_mode))) { + S_ISREG(e2->ce_mode) && + S_ISREG(e3->ce_mode)) { path_list_insert((const char *)e2->name, conflict); i++; /* skip over both #2 and #3 */ } |