5 #include "cache-tree.h"
6 #include "bulk-checkin.h"
7 #include "object-store.h"
8 #include "replace-object.h"
9 #include "promisor-remote.h"
10 #include "sparse-index.h"
12 #ifndef DEBUG_CACHE_TREE
13 #define DEBUG_CACHE_TREE 0
16 struct cache_tree
*cache_tree(void)
18 struct cache_tree
*it
= xcalloc(1, sizeof(struct cache_tree
));
23 void cache_tree_free(struct cache_tree
**it_p
)
26 struct cache_tree
*it
= *it_p
;
30 for (i
= 0; i
< it
->subtree_nr
; i
++)
32 cache_tree_free(&it
->down
[i
]->cache_tree
);
40 static int subtree_name_cmp(const char *one
, int onelen
,
41 const char *two
, int twolen
)
47 return memcmp(one
, two
, onelen
);
50 int cache_tree_subtree_pos(struct cache_tree
*it
, const char *path
, int pathlen
)
52 struct cache_tree_sub
**down
= it
->down
;
57 int mi
= lo
+ (hi
- lo
) / 2;
58 struct cache_tree_sub
*mdl
= down
[mi
];
59 int cmp
= subtree_name_cmp(path
, pathlen
,
60 mdl
->name
, mdl
->namelen
);
71 static struct cache_tree_sub
*find_subtree(struct cache_tree
*it
,
76 struct cache_tree_sub
*down
;
77 int pos
= cache_tree_subtree_pos(it
, path
, pathlen
);
84 ALLOC_GROW(it
->down
, it
->subtree_nr
+ 1, it
->subtree_alloc
);
87 FLEX_ALLOC_MEM(down
, name
, path
, pathlen
);
88 down
->cache_tree
= NULL
;
89 down
->namelen
= pathlen
;
91 if (pos
< it
->subtree_nr
)
92 MOVE_ARRAY(it
->down
+ pos
+ 1, it
->down
+ pos
,
93 it
->subtree_nr
- pos
- 1);
98 struct cache_tree_sub
*cache_tree_sub(struct cache_tree
*it
, const char *path
)
100 int pathlen
= strlen(path
);
101 return find_subtree(it
, path
, pathlen
, 1);
104 static int do_invalidate_path(struct cache_tree
*it
, const char *path
)
107 * ==> invalidate self
108 * ==> find "a", have it invalidate "b/c"
110 * ==> invalidate self
111 * ==> if "a" exists as a subtree, remove it.
115 struct cache_tree_sub
*down
;
118 fprintf(stderr
, "cache-tree invalidate <%s>\n", path
);
123 slash
= strchrnul(path
, '/');
124 namelen
= slash
- path
;
125 it
->entry_count
= -1;
128 pos
= cache_tree_subtree_pos(it
, path
, namelen
);
130 cache_tree_free(&it
->down
[pos
]->cache_tree
);
135 * move 4 and 5 up one place (2 entries)
136 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
138 MOVE_ARRAY(it
->down
+ pos
, it
->down
+ pos
+ 1,
139 it
->subtree_nr
- pos
- 1);
144 down
= find_subtree(it
, path
, namelen
, 0);
146 do_invalidate_path(down
->cache_tree
, slash
+ 1);
150 void cache_tree_invalidate_path(struct index_state
*istate
, const char *path
)
152 if (do_invalidate_path(istate
->cache_tree
, path
))
153 istate
->cache_changed
|= CACHE_TREE_CHANGED
;
156 static int verify_cache(struct index_state
*istate
, int flags
)
159 int silent
= flags
& WRITE_TREE_SILENT
;
161 /* Verify that the tree is merged */
163 for (i
= 0; i
< istate
->cache_nr
; i
++) {
164 const struct cache_entry
*ce
= istate
->cache
[i
];
169 fprintf(stderr
, "...\n");
172 fprintf(stderr
, "%s: unmerged (%s)\n",
173 ce
->name
, oid_to_hex(&ce
->oid
));
179 /* Also verify that the cache does not have path and path/file
180 * at the same time. At this point we know the cache has only
184 for (i
= 0; i
+ 1 < istate
->cache_nr
; i
++) {
185 /* path/file always comes after path because of the way
186 * the cache is sorted. Also path can appear only once,
187 * which means conflicting one would immediately follow.
189 const struct cache_entry
*this_ce
= istate
->cache
[i
];
190 const struct cache_entry
*next_ce
= istate
->cache
[i
+ 1];
191 const char *this_name
= this_ce
->name
;
192 const char *next_name
= next_ce
->name
;
193 int this_len
= ce_namelen(this_ce
);
194 if (this_len
< ce_namelen(next_ce
) &&
195 next_name
[this_len
] == '/' &&
196 strncmp(this_name
, next_name
, this_len
) == 0) {
198 fprintf(stderr
, "...\n");
201 fprintf(stderr
, "You have both %s and %s\n",
202 this_name
, next_name
);
210 static void discard_unused_subtrees(struct cache_tree
*it
)
212 struct cache_tree_sub
**down
= it
->down
;
213 int nr
= it
->subtree_nr
;
215 for (dst
= src
= 0; src
< nr
; src
++) {
216 struct cache_tree_sub
*s
= down
[src
];
220 cache_tree_free(&s
->cache_tree
);
227 int cache_tree_fully_valid(struct cache_tree
*it
)
232 if (it
->entry_count
< 0 || !has_object_file(&it
->oid
))
234 for (i
= 0; i
< it
->subtree_nr
; i
++) {
235 if (!cache_tree_fully_valid(it
->down
[i
]->cache_tree
))
241 static int must_check_existence(const struct cache_entry
*ce
)
243 return !(has_promisor_remote() && ce_skip_worktree(ce
));
246 static int update_one(struct cache_tree
*it
,
247 struct cache_entry
**cache
,
254 struct strbuf buffer
;
255 int missing_ok
= flags
& WRITE_TREE_MISSING_OK
;
256 int dryrun
= flags
& WRITE_TREE_DRY_RUN
;
257 int repair
= flags
& WRITE_TREE_REPAIR
;
258 int to_invalidate
= 0;
261 assert(!(dryrun
&& repair
));
266 * If the first entry of this region is a sparse directory
267 * entry corresponding exactly to 'base', then this cache_tree
268 * struct is a "leaf" in the data structure, pointing to the
269 * tree OID specified in the entry.
272 const struct cache_entry
*ce
= cache
[0];
274 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
275 ce
->ce_namelen
== baselen
&&
276 !strncmp(ce
->name
, base
, baselen
)) {
278 oidcpy(&it
->oid
, &ce
->oid
);
283 if (0 <= it
->entry_count
&& has_object_file(&it
->oid
))
284 return it
->entry_count
;
287 * We first scan for subtrees and update them; we start by
288 * marking existing subtrees -- the ones that are unmarked
289 * should not be in the result.
291 for (i
= 0; i
< it
->subtree_nr
; i
++)
292 it
->down
[i
]->used
= 0;
295 * Find the subtrees and update them.
298 while (i
< entries
) {
299 const struct cache_entry
*ce
= cache
[i
];
300 struct cache_tree_sub
*sub
;
301 const char *path
, *slash
;
302 int pathlen
, sublen
, subcnt
, subskip
;
305 pathlen
= ce_namelen(ce
);
306 if (pathlen
<= baselen
|| memcmp(base
, path
, baselen
))
307 break; /* at the end of this level */
309 slash
= strchr(path
+ baselen
, '/');
315 * a/bbb/c (base = a/, slash = /c)
317 * path+baselen = bbb/c, sublen = 3
319 sublen
= slash
- (path
+ baselen
);
320 sub
= find_subtree(it
, path
+ baselen
, sublen
, 1);
321 if (!sub
->cache_tree
)
322 sub
->cache_tree
= cache_tree();
323 subcnt
= update_one(sub
->cache_tree
,
324 cache
+ i
, entries
- i
,
326 baselen
+ sublen
+ 1,
332 die("index cache-tree records empty sub-tree");
334 sub
->count
= subcnt
; /* to be used in the next loop */
335 *skip_count
+= subskip
;
339 discard_unused_subtrees(it
);
342 * Then write out the tree object for this level.
344 strbuf_init(&buffer
, 8192);
347 while (i
< entries
) {
348 const struct cache_entry
*ce
= cache
[i
];
349 struct cache_tree_sub
*sub
= NULL
;
350 const char *path
, *slash
;
352 const struct object_id
*oid
;
354 int expected_missing
= 0;
355 int contains_ita
= 0;
359 pathlen
= ce_namelen(ce
);
360 if (pathlen
<= baselen
|| memcmp(base
, path
, baselen
))
361 break; /* at the end of this level */
363 slash
= strchr(path
+ baselen
, '/');
365 entlen
= slash
- (path
+ baselen
);
366 sub
= find_subtree(it
, path
+ baselen
, entlen
, 0);
368 die("cache-tree.c: '%.*s' in '%s' not found",
369 entlen
, path
+ baselen
, path
);
371 oid
= &sub
->cache_tree
->oid
;
373 contains_ita
= sub
->cache_tree
->entry_count
< 0;
376 expected_missing
= 1;
382 entlen
= pathlen
- baselen
;
386 ce_missing_ok
= mode
== S_IFGITLINK
|| missing_ok
||
387 !must_check_existence(ce
);
388 if (is_null_oid(oid
) ||
389 (!ce_missing_ok
&& !has_object_file(oid
))) {
390 strbuf_release(&buffer
);
391 if (expected_missing
)
393 return error("invalid object %06o %s for '%.*s'",
394 mode
, oid_to_hex(oid
), entlen
+baselen
, path
);
398 * CE_REMOVE entries are removed before the index is
399 * written to disk. Skip them to remain consistent
400 * with the future on-disk index.
402 if (ce
->ce_flags
& CE_REMOVE
) {
403 *skip_count
= *skip_count
+ 1;
408 * CE_INTENT_TO_ADD entries exist in on-disk index but
409 * they are not part of generated trees. Invalidate up
410 * to root to force cache-tree users to read elsewhere.
412 if (!sub
&& ce_intent_to_add(ce
)) {
418 * "sub" can be an empty tree if all subentries are i-t-a.
420 if (contains_ita
&& is_empty_tree_oid(oid
))
423 strbuf_grow(&buffer
, entlen
+ 100);
424 strbuf_addf(&buffer
, "%o %.*s%c", mode
, entlen
, path
+ baselen
, '\0');
425 strbuf_add(&buffer
, oid
->hash
, the_hash_algo
->rawsz
);
428 fprintf(stderr
, "cache-tree update-one %o %.*s\n",
429 mode
, entlen
, path
+ baselen
);
434 struct object_id oid
;
435 hash_object_file(the_hash_algo
, buffer
.buf
, buffer
.len
,
437 if (has_object_file_with_flags(&oid
, OBJECT_INFO_SKIP_FETCH_OBJECT
))
438 oidcpy(&it
->oid
, &oid
);
442 hash_object_file(the_hash_algo
, buffer
.buf
, buffer
.len
,
444 } else if (write_object_file_flags(buffer
.buf
, buffer
.len
, OBJ_TREE
,
445 &it
->oid
, flags
& WRITE_TREE_SILENT
446 ? HASH_SILENT
: 0)) {
447 strbuf_release(&buffer
);
451 strbuf_release(&buffer
);
452 it
->entry_count
= to_invalidate
? -1 : i
- *skip_count
;
454 fprintf(stderr
, "cache-tree update-one (%d ent, %d subtree) %s\n",
455 it
->entry_count
, it
->subtree_nr
,
456 oid_to_hex(&it
->oid
));
461 int cache_tree_update(struct index_state
*istate
, int flags
)
465 i
= verify_cache(istate
, flags
);
470 if (!istate
->cache_tree
)
471 istate
->cache_tree
= cache_tree();
473 if (!(flags
& WRITE_TREE_MISSING_OK
) && has_promisor_remote())
474 prefetch_cache_entries(istate
, must_check_existence
);
476 trace_performance_enter();
477 trace2_region_enter("cache_tree", "update", the_repository
);
478 begin_odb_transaction();
479 i
= update_one(istate
->cache_tree
, istate
->cache
, istate
->cache_nr
,
480 "", 0, &skip
, flags
);
481 end_odb_transaction();
482 trace2_region_leave("cache_tree", "update", the_repository
);
483 trace_performance_leave("cache_tree_update");
486 istate
->cache_changed
|= CACHE_TREE_CHANGED
;
490 static void write_one(struct strbuf
*buffer
, struct cache_tree
*it
,
491 const char *path
, int pathlen
)
495 /* One "cache-tree" entry consists of the following:
496 * path (NUL terminated)
497 * entry_count, subtree_nr ("%d %d\n")
498 * tree-sha1 (missing if invalid)
499 * subtree_nr "cache-tree" entries for subtrees.
501 strbuf_grow(buffer
, pathlen
+ 100);
502 strbuf_add(buffer
, path
, pathlen
);
503 strbuf_addf(buffer
, "%c%d %d\n", 0, it
->entry_count
, it
->subtree_nr
);
506 if (0 <= it
->entry_count
)
507 fprintf(stderr
, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
508 pathlen
, path
, it
->entry_count
, it
->subtree_nr
,
509 oid_to_hex(&it
->oid
));
511 fprintf(stderr
, "cache-tree <%.*s> (%d subtree) invalid\n",
512 pathlen
, path
, it
->subtree_nr
);
515 if (0 <= it
->entry_count
) {
516 strbuf_add(buffer
, it
->oid
.hash
, the_hash_algo
->rawsz
);
518 for (i
= 0; i
< it
->subtree_nr
; i
++) {
519 struct cache_tree_sub
*down
= it
->down
[i
];
521 struct cache_tree_sub
*prev
= it
->down
[i
-1];
522 if (subtree_name_cmp(down
->name
, down
->namelen
,
523 prev
->name
, prev
->namelen
) <= 0)
524 die("fatal - unsorted cache subtree");
526 write_one(buffer
, down
->cache_tree
, down
->name
, down
->namelen
);
530 void cache_tree_write(struct strbuf
*sb
, struct cache_tree
*root
)
532 trace2_region_enter("cache_tree", "write", the_repository
);
533 write_one(sb
, root
, "", 0);
534 trace2_region_leave("cache_tree", "write", the_repository
);
537 static struct cache_tree
*read_one(const char **buffer
, unsigned long *size_p
)
539 const char *buf
= *buffer
;
540 unsigned long size
= *size_p
;
543 struct cache_tree
*it
;
545 const unsigned rawsz
= the_hash_algo
->rawsz
;
548 /* skip name, but make sure name exists */
549 while (size
&& *buf
) {
559 it
->entry_count
= strtol(cp
, &ep
, 10);
563 subtree_nr
= strtol(cp
, &ep
, 10);
566 while (size
&& *buf
&& *buf
!= '\n') {
573 if (0 <= it
->entry_count
) {
576 oidread(&it
->oid
, (const unsigned char *)buf
);
582 if (0 <= it
->entry_count
)
583 fprintf(stderr
, "cache-tree <%s> (%d ent, %d subtree) %s\n",
584 *buffer
, it
->entry_count
, subtree_nr
,
585 oid_to_hex(&it
->oid
));
587 fprintf(stderr
, "cache-tree <%s> (%d subtrees) invalid\n",
588 *buffer
, subtree_nr
);
592 * Just a heuristic -- we do not add directories that often but
593 * we do not want to have to extend it immediately when we do,
596 it
->subtree_alloc
= subtree_nr
+ 2;
597 CALLOC_ARRAY(it
->down
, it
->subtree_alloc
);
598 for (i
= 0; i
< subtree_nr
; i
++) {
599 /* read each subtree */
600 struct cache_tree
*sub
;
601 struct cache_tree_sub
*subtree
;
602 const char *name
= buf
;
604 sub
= read_one(&buf
, &size
);
607 subtree
= cache_tree_sub(it
, name
);
608 subtree
->cache_tree
= sub
;
610 if (subtree_nr
!= it
->subtree_nr
)
611 die("cache-tree: internal error");
617 cache_tree_free(&it
);
621 struct cache_tree
*cache_tree_read(const char *buffer
, unsigned long size
)
623 struct cache_tree
*result
;
626 return NULL
; /* not the whole tree */
628 trace2_region_enter("cache_tree", "read", the_repository
);
629 result
= read_one(&buffer
, &size
);
630 trace2_region_leave("cache_tree", "read", the_repository
);
635 static struct cache_tree
*cache_tree_find(struct cache_tree
*it
, const char *path
)
641 struct cache_tree_sub
*sub
;
643 slash
= strchrnul(path
, '/');
645 * Between path and slash is the name of the subtree
648 sub
= find_subtree(it
, path
, slash
- path
, 0);
651 it
= sub
->cache_tree
;
660 static int write_index_as_tree_internal(struct object_id
*oid
,
661 struct index_state
*index_state
,
662 int cache_tree_valid
,
666 if (flags
& WRITE_TREE_IGNORE_CACHE_TREE
) {
667 cache_tree_free(&index_state
->cache_tree
);
668 cache_tree_valid
= 0;
671 if (!cache_tree_valid
&& cache_tree_update(index_state
, flags
) < 0)
672 return WRITE_TREE_UNMERGED_INDEX
;
675 struct cache_tree
*subtree
;
676 subtree
= cache_tree_find(index_state
->cache_tree
, prefix
);
678 return WRITE_TREE_PREFIX_ERROR
;
679 oidcpy(oid
, &subtree
->oid
);
682 oidcpy(oid
, &index_state
->cache_tree
->oid
);
687 struct tree
* write_in_core_index_as_tree(struct repository
*repo
) {
691 struct index_state
*index_state
= repo
->index
;
692 was_valid
= index_state
->cache_tree
&&
693 cache_tree_fully_valid(index_state
->cache_tree
);
695 ret
= write_index_as_tree_internal(&o
, index_state
, was_valid
, 0, NULL
);
696 if (ret
== WRITE_TREE_UNMERGED_INDEX
) {
698 bug("there are unmerged index entries:");
699 for (i
= 0; i
< index_state
->cache_nr
; i
++) {
700 const struct cache_entry
*ce
= index_state
->cache
[i
];
702 bug("%d %.*s", ce_stage(ce
),
703 (int)ce_namelen(ce
), ce
->name
);
705 BUG("unmerged index entries when writing in-core index");
708 return lookup_tree(repo
, &index_state
->cache_tree
->oid
);
712 int write_index_as_tree(struct object_id
*oid
, struct index_state
*index_state
, const char *index_path
, int flags
, const char *prefix
)
714 int entries
, was_valid
;
715 struct lock_file lock_file
= LOCK_INIT
;
718 hold_lock_file_for_update(&lock_file
, index_path
, LOCK_DIE_ON_ERROR
);
720 entries
= read_index_from(index_state
, index_path
, get_git_dir());
722 ret
= WRITE_TREE_UNREADABLE_INDEX
;
726 was_valid
= !(flags
& WRITE_TREE_IGNORE_CACHE_TREE
) &&
727 index_state
->cache_tree
&&
728 cache_tree_fully_valid(index_state
->cache_tree
);
730 ret
= write_index_as_tree_internal(oid
, index_state
, was_valid
, flags
,
732 if (!ret
&& !was_valid
) {
733 write_locked_index(index_state
, &lock_file
, COMMIT_LOCK
);
734 /* Not being able to write is fine -- we are only interested
735 * in updating the cache-tree part, and if the next caller
736 * ends up using the old index with unupdated cache-tree part
737 * it misses the work we did here, but that is just a
738 * performance penalty and not a big deal.
743 rollback_lock_file(&lock_file
);
747 static void prime_cache_tree_sparse_dir(struct cache_tree
*it
,
751 oidcpy(&it
->oid
, &tree
->object
.oid
);
755 static void prime_cache_tree_rec(struct repository
*r
,
756 struct cache_tree
*it
,
758 struct strbuf
*tree_path
)
760 struct tree_desc desc
;
761 struct name_entry entry
;
763 size_t base_path_len
= tree_path
->len
;
765 oidcpy(&it
->oid
, &tree
->object
.oid
);
767 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
769 while (tree_entry(&desc
, &entry
)) {
770 if (!S_ISDIR(entry
.mode
))
773 struct cache_tree_sub
*sub
;
774 struct tree
*subtree
= lookup_tree(r
, &entry
.oid
);
776 if (!subtree
->object
.parsed
)
778 sub
= cache_tree_sub(it
, entry
.path
);
779 sub
->cache_tree
= cache_tree();
782 * Recursively-constructed subtree path is only needed when working
783 * in a sparse index (where it's used to determine whether the
784 * subtree is a sparse directory in the index).
786 if (r
->index
->sparse_index
) {
787 strbuf_setlen(tree_path
, base_path_len
);
788 strbuf_add(tree_path
, entry
.path
, entry
.pathlen
);
789 strbuf_addch(tree_path
, '/');
793 * If a sparse index is in use, the directory being processed may be
794 * sparse. To confirm that, we can check whether an entry with that
795 * exact name exists in the index. If it does, the created subtree
796 * should be sparse. Otherwise, cache tree expansion should continue
799 if (r
->index
->sparse_index
&&
800 index_entry_exists(r
->index
, tree_path
->buf
, tree_path
->len
))
801 prime_cache_tree_sparse_dir(sub
->cache_tree
, subtree
);
803 prime_cache_tree_rec(r
, sub
->cache_tree
, subtree
, tree_path
);
804 cnt
+= sub
->cache_tree
->entry_count
;
808 it
->entry_count
= cnt
;
811 void prime_cache_tree(struct repository
*r
,
812 struct index_state
*istate
,
815 struct strbuf tree_path
= STRBUF_INIT
;
817 trace2_region_enter("cache-tree", "prime_cache_tree", the_repository
);
818 cache_tree_free(&istate
->cache_tree
);
819 istate
->cache_tree
= cache_tree();
821 prime_cache_tree_rec(r
, istate
->cache_tree
, tree
, &tree_path
);
822 strbuf_release(&tree_path
);
823 istate
->cache_changed
|= CACHE_TREE_CHANGED
;
824 trace2_region_leave("cache-tree", "prime_cache_tree", the_repository
);
828 * find the cache_tree that corresponds to the current level without
829 * exploding the full path into textual form. The root of the
830 * cache tree is given as "root", and our current level is "info".
831 * (1) When at root level, info->prev is NULL, so it is "root" itself.
832 * (2) Otherwise, find the cache_tree that corresponds to one level
833 * above us, and find ourselves in there.
835 static struct cache_tree
*find_cache_tree_from_traversal(struct cache_tree
*root
,
836 struct traverse_info
*info
)
838 struct cache_tree
*our_parent
;
842 our_parent
= find_cache_tree_from_traversal(root
, info
->prev
);
843 return cache_tree_find(our_parent
, info
->name
);
846 int cache_tree_matches_traversal(struct cache_tree
*root
,
847 struct name_entry
*ent
,
848 struct traverse_info
*info
)
850 struct cache_tree
*it
;
852 it
= find_cache_tree_from_traversal(root
, info
);
853 it
= cache_tree_find(it
, ent
->path
);
854 if (it
&& it
->entry_count
> 0 && oideq(&ent
->oid
, &it
->oid
))
855 return it
->entry_count
;
859 static void verify_one_sparse(struct index_state
*istate
,
863 struct cache_entry
*ce
= istate
->cache
[pos
];
865 if (!S_ISSPARSEDIR(ce
->ce_mode
))
866 BUG("directory '%s' is present in index, but not sparse",
872 * 0 - Verification completed.
873 * 1 - Restart verification - a call to ensure_full_index() freed the cache
874 * tree that is being verified and verification needs to be restarted from
875 * the new toplevel cache tree.
877 static int verify_one(struct repository
*r
,
878 struct index_state
*istate
,
879 struct cache_tree
*it
,
882 int i
, pos
, len
= path
->len
;
883 struct strbuf tree_buf
= STRBUF_INIT
;
884 struct object_id new_oid
;
886 for (i
= 0; i
< it
->subtree_nr
; i
++) {
887 strbuf_addf(path
, "%s/", it
->down
[i
]->name
);
888 if (verify_one(r
, istate
, it
->down
[i
]->cache_tree
, path
))
890 strbuf_setlen(path
, len
);
893 if (it
->entry_count
< 0 ||
894 /* no verification on tests (t7003) that replace trees */
895 lookup_replace_object(r
, &it
->oid
) != &it
->oid
)
900 * If the index is sparse and the cache tree is not
901 * index_name_pos() may trigger ensure_full_index() which will
902 * free the tree that is being verified.
904 int is_sparse
= istate
->sparse_index
;
905 pos
= index_name_pos(istate
, path
->buf
, path
->len
);
906 if (is_sparse
&& !istate
->sparse_index
)
910 verify_one_sparse(istate
, path
, pos
);
920 while (i
< it
->entry_count
) {
921 struct cache_entry
*ce
= istate
->cache
[pos
+ i
];
923 struct cache_tree_sub
*sub
= NULL
;
924 const struct object_id
*oid
;
929 if (ce
->ce_flags
& (CE_STAGEMASK
| CE_INTENT_TO_ADD
| CE_REMOVE
))
930 BUG("%s with flags 0x%x should not be in cache-tree",
931 ce
->name
, ce
->ce_flags
);
932 name
= ce
->name
+ path
->len
;
933 slash
= strchr(name
, '/');
935 entlen
= slash
- name
;
936 sub
= find_subtree(it
, ce
->name
+ path
->len
, entlen
, 0);
937 if (!sub
|| sub
->cache_tree
->entry_count
< 0)
938 BUG("bad subtree '%.*s'", entlen
, name
);
939 oid
= &sub
->cache_tree
->oid
;
941 i
+= sub
->cache_tree
->entry_count
;
945 entlen
= ce_namelen(ce
) - path
->len
;
948 strbuf_addf(&tree_buf
, "%o %.*s%c", mode
, entlen
, name
, '\0');
949 strbuf_add(&tree_buf
, oid
->hash
, r
->hash_algo
->rawsz
);
951 hash_object_file(r
->hash_algo
, tree_buf
.buf
, tree_buf
.len
, OBJ_TREE
,
953 if (!oideq(&new_oid
, &it
->oid
))
954 BUG("cache-tree for path %.*s does not match. "
955 "Expected %s got %s", len
, path
->buf
,
956 oid_to_hex(&new_oid
), oid_to_hex(&it
->oid
));
957 strbuf_setlen(path
, len
);
958 strbuf_release(&tree_buf
);
962 void cache_tree_verify(struct repository
*r
, struct index_state
*istate
)
964 struct strbuf path
= STRBUF_INIT
;
966 if (!istate
->cache_tree
)
968 if (verify_one(r
, istate
, istate
->cache_tree
, &path
)) {
970 if (verify_one(r
, istate
, istate
->cache_tree
, &path
))
971 BUG("ensure_full_index() called twice while verifying cache tree");
973 strbuf_release(&path
);