cache-tree.c 15.8 KB
Newer Older
J
Junio C Hamano 已提交
1 2
#include "cache.h"
#include "tree.h"
3
#include "tree-walk.h"
J
Junio C Hamano 已提交
4 5
#include "cache-tree.h"

6
#ifndef DEBUG
J
Junio C Hamano 已提交
7
#define DEBUG 0
8
#endif
J
Junio C Hamano 已提交
9 10 11 12 13 14 15 16

struct cache_tree *cache_tree(void)
{
	struct cache_tree *it = xcalloc(1, sizeof(struct cache_tree));
	it->entry_count = -1;
	return it;
}

17
void cache_tree_free(struct cache_tree **it_p)
J
Junio C Hamano 已提交
18 19
{
	int i;
20
	struct cache_tree *it = *it_p;
J
Junio C Hamano 已提交
21 22 23 24

	if (!it)
		return;
	for (i = 0; i < it->subtree_nr; i++)
25
		if (it->down[i]) {
26
			cache_tree_free(&it->down[i]->cache_tree);
27 28
			free(it->down[i]);
		}
J
Junio C Hamano 已提交
29 30
	free(it->down);
	free(it);
31
	*it_p = NULL;
J
Junio C Hamano 已提交
32 33
}

34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
static int subtree_name_cmp(const char *one, int onelen,
			    const char *two, int twolen)
{
	if (onelen < twolen)
		return -1;
	if (twolen < onelen)
		return 1;
	return memcmp(one, two, onelen);
}

static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
{
	struct cache_tree_sub **down = it->down;
	int lo, hi;
	lo = 0;
	hi = it->subtree_nr;
	while (lo < hi) {
		int mi = (lo + hi) / 2;
		struct cache_tree_sub *mdl = down[mi];
		int cmp = subtree_name_cmp(path, pathlen,
					   mdl->name, mdl->namelen);
		if (!cmp)
			return mi;
		if (cmp < 0)
			hi = mi;
		else
			lo = mi + 1;
	}
	return -lo-1;
}

J
Junio C Hamano 已提交
65 66 67 68 69 70
static struct cache_tree_sub *find_subtree(struct cache_tree *it,
					   const char *path,
					   int pathlen,
					   int create)
{
	struct cache_tree_sub *down;
71 72 73
	int pos = subtree_pos(it, path, pathlen);
	if (0 <= pos)
		return it->down[pos];
J
Junio C Hamano 已提交
74 75
	if (!create)
		return NULL;
76 77

	pos = -pos-1;
J
Junio C Hamano 已提交
78 79 80 81 82
	if (it->subtree_alloc <= it->subtree_nr) {
		it->subtree_alloc = alloc_nr(it->subtree_alloc);
		it->down = xrealloc(it->down, it->subtree_alloc *
				    sizeof(*it->down));
	}
83 84
	it->subtree_nr++;

J
Junio C Hamano 已提交
85
	down = xmalloc(sizeof(*down) + pathlen + 1);
86
	down->cache_tree = NULL;
J
Junio C Hamano 已提交
87 88
	down->namelen = pathlen;
	memcpy(down->name, path, pathlen);
89 90 91 92 93 94 95
	down->name[pathlen] = 0;

	if (pos < it->subtree_nr)
		memmove(it->down + pos + 1,
			it->down + pos,
			sizeof(down) * (it->subtree_nr - pos - 1));
	it->down[pos] = down;
J
Junio C Hamano 已提交
96 97 98
	return down;
}

99 100 101 102 103 104
struct cache_tree_sub *cache_tree_sub(struct cache_tree *it, const char *path)
{
	int pathlen = strlen(path);
	return find_subtree(it, path, pathlen, 1);
}

J
Junio C Hamano 已提交
105 106 107 108 109 110 111 112 113 114 115 116 117
void cache_tree_invalidate_path(struct cache_tree *it, const char *path)
{
	/* a/b/c
	 * ==> invalidate self
	 * ==> find "a", have it invalidate "b/c"
	 * a
	 * ==> invalidate self
	 * ==> if "a" exists as a subtree, remove it.
	 */
	const char *slash;
	int namelen;
	struct cache_tree_sub *down;

118 119 120 121
#if DEBUG
	fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif

J
Junio C Hamano 已提交
122 123 124 125 126
	if (!it)
		return;
	slash = strchr(path, '/');
	it->entry_count = -1;
	if (!slash) {
127
		int pos;
J
Junio C Hamano 已提交
128
		namelen = strlen(path);
129 130 131 132
		pos = subtree_pos(it, path, namelen);
		if (0 <= pos) {
			cache_tree_free(&it->down[pos]->cache_tree);
			free(it->down[pos]);
J
Junio C Hamano 已提交
133 134
			/* 0 1 2 3 4 5
			 *       ^     ^subtree_nr = 6
135
			 *       pos
J
Junio C Hamano 已提交
136
			 * move 4 and 5 up one place (2 entries)
137
			 * 2 = 6 - 3 - 1 = subtree_nr - pos - 1
J
Junio C Hamano 已提交
138
			 */
139
			memmove(it->down+pos, it->down+pos+1,
J
Junio C Hamano 已提交
140
				sizeof(struct cache_tree_sub *) *
141
				(it->subtree_nr - pos - 1));
J
Junio C Hamano 已提交
142 143 144 145 146 147 148 149 150 151 152
			it->subtree_nr--;
		}
		return;
	}
	namelen = slash - path;
	down = find_subtree(it, path, namelen, 0);
	if (down)
		cache_tree_invalidate_path(down->cache_tree, slash + 1);
}

static int verify_cache(struct cache_entry **cache,
153
			int entries, int flags)
J
Junio C Hamano 已提交
154 155
{
	int i, funny;
156
	int silent = flags & WRITE_TREE_SILENT;
J
Junio C Hamano 已提交
157 158 159 160 161

	/* Verify that the tree is merged */
	funny = 0;
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
162
		if (ce_stage(ce)) {
163 164
			if (silent)
				return -1;
J
Junio C Hamano 已提交
165 166 167 168
			if (10 < ++funny) {
				fprintf(stderr, "...\n");
				break;
			}
169 170
			fprintf(stderr, "%s: unmerged (%s)\n",
				ce->name, sha1_to_hex(ce->sha1));
J
Junio C Hamano 已提交
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
		}
	}
	if (funny)
		return -1;

	/* Also verify that the cache does not have path and path/file
	 * at the same time.  At this point we know the cache has only
	 * stage 0 entries.
	 */
	funny = 0;
	for (i = 0; i < entries - 1; i++) {
		/* path/file always comes after path because of the way
		 * the cache is sorted.  Also path can appear only once,
		 * which means conflicting one would immediately follow.
		 */
		const char *this_name = cache[i]->name;
		const char *next_name = cache[i+1]->name;
		int this_len = strlen(this_name);
		if (this_len < strlen(next_name) &&
		    strncmp(this_name, next_name, this_len) == 0 &&
		    next_name[this_len] == '/') {
			if (10 < ++funny) {
				fprintf(stderr, "...\n");
				break;
			}
			fprintf(stderr, "You have both %s and %s\n",
				this_name, next_name);
		}
	}
	if (funny)
		return -1;
	return 0;
}

static void discard_unused_subtrees(struct cache_tree *it)
{
	struct cache_tree_sub **down = it->down;
	int nr = it->subtree_nr;
	int dst, src;
	for (dst = src = 0; src < nr; src++) {
		struct cache_tree_sub *s = down[src];
		if (s->used)
			down[dst++] = s;
		else {
215
			cache_tree_free(&s->cache_tree);
J
Junio C Hamano 已提交
216 217 218 219 220 221
			free(s);
			it->subtree_nr--;
		}
	}
}

222 223 224 225 226 227 228 229 230 231 232 233 234 235
int cache_tree_fully_valid(struct cache_tree *it)
{
	int i;
	if (!it)
		return 0;
	if (it->entry_count < 0 || !has_sha1_file(it->sha1))
		return 0;
	for (i = 0; i < it->subtree_nr; i++) {
		if (!cache_tree_fully_valid(it->down[i]->cache_tree))
			return 0;
	}
	return 1;
}

J
Junio C Hamano 已提交
236 237 238 239 240
static int update_one(struct cache_tree *it,
		      struct cache_entry **cache,
		      int entries,
		      const char *base,
		      int baselen,
241
		      int flags)
J
Junio C Hamano 已提交
242
{
P
Pierre Habouzit 已提交
243
	struct strbuf buffer;
244 245
	int missing_ok = flags & WRITE_TREE_MISSING_OK;
	int dryrun = flags & WRITE_TREE_DRY_RUN;
J
Junio C Hamano 已提交
246 247
	int i;

248
	if (0 <= it->entry_count && has_sha1_file(it->sha1))
J
Junio C Hamano 已提交
249 250 251 252 253 254 255 256 257 258 259 260 261
		return it->entry_count;

	/*
	 * We first scan for subtrees and update them; we start by
	 * marking existing subtrees -- the ones that are unmarked
	 * should not be in the result.
	 */
	for (i = 0; i < it->subtree_nr; i++)
		it->down[i]->used = 0;

	/*
	 * Find the subtrees and update them.
	 */
262 263
	i = 0;
	while (i < entries) {
J
Junio C Hamano 已提交
264 265 266 267 268 269 270 271 272 273 274
		struct cache_entry *ce = cache[i];
		struct cache_tree_sub *sub;
		const char *path, *slash;
		int pathlen, sublen, subcnt;

		path = ce->name;
		pathlen = ce_namelen(ce);
		if (pathlen <= baselen || memcmp(base, path, baselen))
			break; /* at the end of this level */

		slash = strchr(path + baselen, '/');
275 276
		if (!slash) {
			i++;
J
Junio C Hamano 已提交
277
			continue;
278
		}
J
Junio C Hamano 已提交
279 280 281 282 283 284 285 286 287 288 289 290 291
		/*
		 * a/bbb/c (base = a/, slash = /c)
		 * ==>
		 * path+baselen = bbb/c, sublen = 3
		 */
		sublen = slash - (path + baselen);
		sub = find_subtree(it, path + baselen, sublen, 1);
		if (!sub->cache_tree)
			sub->cache_tree = cache_tree();
		subcnt = update_one(sub->cache_tree,
				    cache + i, entries - i,
				    path,
				    baselen + sublen + 1,
292
				    flags);
293 294
		if (subcnt < 0)
			return subcnt;
295
		i += subcnt;
J
Junio C Hamano 已提交
296 297 298 299 300 301 302 303
		sub->used = 1;
	}

	discard_unused_subtrees(it);

	/*
	 * Then write out the tree object for this level.
	 */
304
	strbuf_init(&buffer, 8192);
J
Junio C Hamano 已提交
305

306 307
	i = 0;
	while (i < entries) {
J
Junio C Hamano 已提交
308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326
		struct cache_entry *ce = cache[i];
		struct cache_tree_sub *sub;
		const char *path, *slash;
		int pathlen, entlen;
		const unsigned char *sha1;
		unsigned mode;

		path = ce->name;
		pathlen = ce_namelen(ce);
		if (pathlen <= baselen || memcmp(base, path, baselen))
			break; /* at the end of this level */

		slash = strchr(path + baselen, '/');
		if (slash) {
			entlen = slash - (path + baselen);
			sub = find_subtree(it, path + baselen, entlen, 0);
			if (!sub)
				die("cache-tree.c: '%.*s' in '%s' not found",
				    entlen, path + baselen, path);
327
			i += sub->cache_tree->entry_count;
J
Junio C Hamano 已提交
328 329 330 331 332
			sha1 = sub->cache_tree->sha1;
			mode = S_IFDIR;
		}
		else {
			sha1 = ce->sha1;
333
			mode = ce->ce_mode;
J
Junio C Hamano 已提交
334
			entlen = pathlen - baselen;
335
			i++;
J
Junio C Hamano 已提交
336
		}
337 338
		if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1)) {
			strbuf_release(&buffer);
339 340
			return error("invalid object %06o %s for '%.*s'",
				mode, sha1_to_hex(sha1), entlen+baselen, path);
341
		}
J
Junio C Hamano 已提交
342

343 344
		if (ce->ce_flags & (CE_REMOVE | CE_INTENT_TO_ADD))
			continue; /* entry being removed or placeholder */
J
Junio C Hamano 已提交
345

P
Pierre Habouzit 已提交
346 347 348
		strbuf_grow(&buffer, entlen + 100);
		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
		strbuf_add(&buffer, sha1, 20);
J
Junio C Hamano 已提交
349 350

#if DEBUG
351
		fprintf(stderr, "cache-tree update-one %o %.*s\n",
J
Junio C Hamano 已提交
352 353 354 355
			mode, entlen, path + baselen);
#endif
	}

R
Rene Scharfe 已提交
356
	if (dryrun)
P
Pierre Habouzit 已提交
357
		hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
358 359 360 361 362
	else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1)) {
		strbuf_release(&buffer);
		return -1;
	}

P
Pierre Habouzit 已提交
363
	strbuf_release(&buffer);
J
Junio C Hamano 已提交
364 365
	it->entry_count = i;
#if DEBUG
366
	fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
J
Junio C Hamano 已提交
367 368 369 370 371 372 373 374 375
		it->entry_count, it->subtree_nr,
		sha1_to_hex(it->sha1));
#endif
	return i;
}

int cache_tree_update(struct cache_tree *it,
		      struct cache_entry **cache,
		      int entries,
376
		      int flags)
J
Junio C Hamano 已提交
377 378
{
	int i;
379
	i = verify_cache(cache, entries, flags);
J
Junio C Hamano 已提交
380 381
	if (i)
		return i;
382
	i = update_one(it, cache, entries, "", 0, flags);
J
Junio C Hamano 已提交
383 384 385 386 387
	if (i < 0)
		return i;
	return 0;
}

388 389
static void write_one(struct strbuf *buffer, struct cache_tree *it,
                      const char *path, int pathlen)
J
Junio C Hamano 已提交
390 391 392 393 394 395 396 397 398
{
	int i;

	/* One "cache-tree" entry consists of the following:
	 * path (NUL terminated)
	 * entry_count, subtree_nr ("%d %d\n")
	 * tree-sha1 (missing if invalid)
	 * subtree_nr "cache-tree" entries for subtrees.
	 */
P
Pierre Habouzit 已提交
399 400 401
	strbuf_grow(buffer, pathlen + 100);
	strbuf_add(buffer, path, pathlen);
	strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
J
Junio C Hamano 已提交
402 403 404 405 406 407 408 409 410 411 412 413

#if DEBUG
	if (0 <= it->entry_count)
		fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
			pathlen, path, it->entry_count, it->subtree_nr,
			sha1_to_hex(it->sha1));
	else
		fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
			pathlen, path, it->subtree_nr);
#endif

	if (0 <= it->entry_count) {
P
Pierre Habouzit 已提交
414
		strbuf_add(buffer, it->sha1, 20);
J
Junio C Hamano 已提交
415 416 417
	}
	for (i = 0; i < it->subtree_nr; i++) {
		struct cache_tree_sub *down = it->down[i];
418 419 420 421 422 423
		if (i) {
			struct cache_tree_sub *prev = it->down[i-1];
			if (subtree_name_cmp(down->name, down->namelen,
					     prev->name, prev->namelen) <= 0)
				die("fatal - unsorted cache subtree");
		}
424
		write_one(buffer, down->cache_tree, down->name, down->namelen);
J
Junio C Hamano 已提交
425 426 427
	}
}

428
void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
J
Junio C Hamano 已提交
429
{
430
	write_one(sb, root, "", 0);
J
Junio C Hamano 已提交
431 432 433 434 435 436
}

static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
{
	const char *buf = *buffer;
	unsigned long size = *size_p;
437 438
	const char *cp;
	char *ep;
J
Junio C Hamano 已提交
439 440 441 442 443 444 445 446 447 448 449 450 451
	struct cache_tree *it;
	int i, subtree_nr;

	it = NULL;
	/* skip name, but make sure name exists */
	while (size && *buf) {
		size--;
		buf++;
	}
	if (!size)
		goto free_return;
	buf++; size--;
	it = cache_tree();
452 453 454 455 456 457 458 459

	cp = buf;
	it->entry_count = strtol(cp, &ep, 10);
	if (cp == ep)
		goto free_return;
	cp = ep;
	subtree_nr = strtol(cp, &ep, 10);
	if (cp == ep)
J
Junio C Hamano 已提交
460 461 462 463 464 465 466 467 468 469 470
		goto free_return;
	while (size && *buf && *buf != '\n') {
		size--;
		buf++;
	}
	if (!size)
		goto free_return;
	buf++; size--;
	if (0 <= it->entry_count) {
		if (size < 20)
			goto free_return;
J
Junio C Hamano 已提交
471
		hashcpy(it->sha1, (const unsigned char*)buf);
J
Junio C Hamano 已提交
472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495
		buf += 20;
		size -= 20;
	}

#if DEBUG
	if (0 <= it->entry_count)
		fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
			*buffer, it->entry_count, subtree_nr,
			sha1_to_hex(it->sha1));
	else
		fprintf(stderr, "cache-tree <%s> (%d subtrees) invalid\n",
			*buffer, subtree_nr);
#endif

	/*
	 * Just a heuristic -- we do not add directories that often but
	 * we do not want to have to extend it immediately when we do,
	 * hence +2.
	 */
	it->subtree_alloc = subtree_nr + 2;
	it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
	for (i = 0; i < subtree_nr; i++) {
		/* read each subtree */
		struct cache_tree *sub;
496
		struct cache_tree_sub *subtree;
J
Junio C Hamano 已提交
497
		const char *name = buf;
498

J
Junio C Hamano 已提交
499 500 501
		sub = read_one(&buf, &size);
		if (!sub)
			goto free_return;
502
		subtree = cache_tree_sub(it, name);
503
		subtree->cache_tree = sub;
J
Junio C Hamano 已提交
504 505 506 507 508 509 510 511
	}
	if (subtree_nr != it->subtree_nr)
		die("cache-tree: internal error");
	*buffer = buf;
	*size_p = size;
	return it;

 free_return:
512
	cache_tree_free(&it);
J
Junio C Hamano 已提交
513 514 515
	return NULL;
}

516
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
J
Junio C Hamano 已提交
517
{
518
	if (buffer[0])
J
Junio C Hamano 已提交
519 520 521
		return NULL; /* not the whole tree */
	return read_one(&buffer, &size);
}
J
Junio C Hamano 已提交
522

523
static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
J
Junio C Hamano 已提交
524
{
525 526
	if (!it)
		return NULL;
J
Junio C Hamano 已提交
527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
	while (*path) {
		const char *slash;
		struct cache_tree_sub *sub;

		slash = strchr(path, '/');
		if (!slash)
			slash = path + strlen(path);
		/* between path and slash is the name of the
		 * subtree to look for.
		 */
		sub = find_subtree(it, path, slash - path, 0);
		if (!sub)
			return NULL;
		it = sub->cache_tree;
		if (slash)
			while (*slash && *slash == '/')
				slash++;
		if (!slash || !*slash)
			return it; /* prefix ended with slashes */
		path = slash;
	}
	return it;
}
550

J
Junio C Hamano 已提交
551
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
552 553
{
	int entries, was_valid, newfd;
J
Junio C Hamano 已提交
554
	struct lock_file *lock_file;
555 556 557 558 559

	/*
	 * We can't free this memory, it becomes part of a linked list
	 * parsed atexit()
	 */
J
Junio C Hamano 已提交
560
	lock_file = xcalloc(1, sizeof(struct lock_file));
561 562 563 564 565 566

	newfd = hold_locked_index(lock_file, 1);

	entries = read_cache();
	if (entries < 0)
		return WRITE_TREE_UNREADABLE_INDEX;
J
Junio C Hamano 已提交
567 568
	if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
		cache_tree_free(&(active_cache_tree));
569 570 571 572 573 574 575 576

	if (!active_cache_tree)
		active_cache_tree = cache_tree();

	was_valid = cache_tree_fully_valid(active_cache_tree);
	if (!was_valid) {
		if (cache_tree_update(active_cache_tree,
				      active_cache, active_nr,
577
				      flags) < 0)
578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606
			return WRITE_TREE_UNMERGED_INDEX;
		if (0 <= newfd) {
			if (!write_cache(newfd, active_cache, active_nr) &&
			    !commit_lock_file(lock_file))
				newfd = -1;
		}
		/* Not being able to write is fine -- we are only interested
		 * in updating the cache-tree part, and if the next caller
		 * ends up using the old index with unupdated cache-tree part
		 * it misses the work we did here, but that is just a
		 * performance penalty and not a big deal.
		 */
	}

	if (prefix) {
		struct cache_tree *subtree =
			cache_tree_find(active_cache_tree, prefix);
		if (!subtree)
			return WRITE_TREE_PREFIX_ERROR;
		hashcpy(sha1, subtree->sha1);
	}
	else
		hashcpy(sha1, active_cache_tree->sha1);

	if (0 <= newfd)
		rollback_lock_file(lock_file);

	return 0;
}
607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639

static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{
	struct tree_desc desc;
	struct name_entry entry;
	int cnt;

	hashcpy(it->sha1, tree->object.sha1);
	init_tree_desc(&desc, tree->buffer, tree->size);
	cnt = 0;
	while (tree_entry(&desc, &entry)) {
		if (!S_ISDIR(entry.mode))
			cnt++;
		else {
			struct cache_tree_sub *sub;
			struct tree *subtree = lookup_tree(entry.sha1);
			if (!subtree->object.parsed)
				parse_tree(subtree);
			sub = cache_tree_sub(it, entry.path);
			sub->cache_tree = cache_tree();
			prime_cache_tree_rec(sub->cache_tree, subtree);
			cnt += sub->cache_tree->entry_count;
		}
	}
	it->entry_count = cnt;
}

void prime_cache_tree(struct cache_tree **it, struct tree *tree)
{
	cache_tree_free(it);
	*it = cache_tree();
	prime_cache_tree_rec(*it, tree);
}
640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671

/*
 * find the cache_tree that corresponds to the current level without
 * exploding the full path into textual form.  The root of the
 * cache tree is given as "root", and our current level is "info".
 * (1) When at root level, info->prev is NULL, so it is "root" itself.
 * (2) Otherwise, find the cache_tree that corresponds to one level
 *     above us, and find ourselves in there.
 */
static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root,
							 struct traverse_info *info)
{
	struct cache_tree *our_parent;

	if (!info->prev)
		return root;
	our_parent = find_cache_tree_from_traversal(root, info->prev);
	return cache_tree_find(our_parent, info->name.path);
}

int cache_tree_matches_traversal(struct cache_tree *root,
				 struct name_entry *ent,
				 struct traverse_info *info)
{
	struct cache_tree *it;

	it = find_cache_tree_from_traversal(root, info);
	it = cache_tree_find(it, ent->path);
	if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1))
		return it->entry_count;
	return 0;
}
672

673
int update_main_cache_tree(int flags)
674 675 676 677
{
	if (!the_index.cache_tree)
		the_index.cache_tree = cache_tree();
	return cache_tree_update(the_index.cache_tree,
678
				 the_index.cache, the_index.cache_nr, flags);
679
}