read-cache.c 33.9 KB
Newer Older
L
Linus Torvalds 已提交
1 2 3 4 5
/*
 * GIT - The information manager from hell
 *
 * Copyright (C) Linus Torvalds, 2005
 */
6
#define NO_THE_INDEX_COMPATIBILITY_MACROS
7
#include "cache.h"
8
#include "cache-tree.h"
9
#include "refs.h"
10
#include "dir.h"
11 12 13 14 15 16 17 18 19 20 21 22

/* Index extensions.
 *
 * The first letter should be 'A'..'Z' for extensions that are not
 * necessary for a correct operation (i.e. optimization data).
 * When new extensions are added that _needs_ to be understood in
 * order to correctly interpret the index file, pick character that
 * is outside the range, to cause the reader to abort.
 */

#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
#define CACHE_EXT_TREE 0x54524545	/* "TREE" */
23

24
struct index_state the_index;
25

26 27 28 29 30 31 32 33 34 35 36
static unsigned int hash_name(const char *name, int namelen)
{
	unsigned int hash = 0x123;

	do {
		unsigned char c = *name++;
		hash = hash*101 + c;
	} while (--namelen);
	return hash;
}

J
Junio C Hamano 已提交
37
static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
38 39
{
	void **pos;
L
Linus Torvalds 已提交
40
	unsigned int hash;
41

L
Linus Torvalds 已提交
42 43 44 45 46
	if (ce->ce_flags & CE_HASHED)
		return;
	ce->ce_flags |= CE_HASHED;
	ce->next = NULL;
	hash = hash_name(ce->name, ce_namelen(ce));
47 48 49 50 51 52 53
	pos = insert_hash(hash, ce, &istate->name_hash);
	if (pos) {
		ce->next = *pos;
		*pos = ce;
	}
}

J
Junio C Hamano 已提交
54 55 56 57 58 59 60 61 62 63 64 65 66
static void lazy_init_name_hash(struct index_state *istate)
{
	int nr;

	if (istate->name_hash_initialized)
		return;
	for (nr = 0; nr < istate->cache_nr; nr++)
		hash_index_entry(istate, istate->cache[nr]);
	istate->name_hash_initialized = 1;
}

static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
L
Linus Torvalds 已提交
67
	ce->ce_flags &= ~CE_UNHASHED;
J
Junio C Hamano 已提交
68 69 70 71 72
	istate->cache[nr] = ce;
	if (istate->name_hash_initialized)
		hash_index_entry(istate, ce);
}

73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
/*
 * We don't actually *remove* it, we can just mark it invalid so that
 * we won't find it in lookups.
 *
 * Not only would we have to search the lists (simple enough), but
 * we'd also have to rehash other hash buckets in case this makes the
 * hash bucket empty (common). So it's much better to just mark
 * it.
 */
static void remove_hash_entry(struct index_state *istate, struct cache_entry *ce)
{
	ce->ce_flags |= CE_UNHASHED;
}

static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
	struct cache_entry *old = istate->cache[nr];

L
Linus Torvalds 已提交
91 92
	remove_hash_entry(istate, old);
	set_index_entry(istate, nr, ce);
93 94 95 96 97 98
	istate->cache_changed = 1;
}

int index_name_exists(struct index_state *istate, const char *name, int namelen)
{
	unsigned int hash = hash_name(name, namelen);
J
Junio C Hamano 已提交
99 100 101 102
	struct cache_entry *ce;

	lazy_init_name_hash(istate);
	ce = lookup_hash(hash, &istate->name_hash);
103 104 105 106 107 108 109 110 111 112 113

	while (ce) {
		if (!(ce->ce_flags & CE_UNHASHED)) {
			if (!cache_name_compare(name, namelen, ce->name, ce->ce_flags))
				return 1;
		}
		ce = ce->next;
	}
	return 0;
}

114 115 116 117 118 119 120
/*
 * This only updates the "non-critical" parts of the directory
 * cache, ie the parts that aren't tracked by GIT, and only used
 * to validate the cache.
 */
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
{
121 122 123 124 125 126 127
	ce->ce_ctime = st->st_ctime;
	ce->ce_mtime = st->st_mtime;
	ce->ce_dev = st->st_dev;
	ce->ce_ino = st->st_ino;
	ce->ce_uid = st->st_uid;
	ce->ce_gid = st->st_gid;
	ce->ce_size = st->st_size;
J
Junio C Hamano 已提交
128 129

	if (assume_unchanged)
130
		ce->ce_flags |= CE_VALID;
131 132 133

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
134 135
}

J
Junio C Hamano 已提交
136 137 138 139 140 141 142
static int ce_compare_data(struct cache_entry *ce, struct stat *st)
{
	int match = -1;
	int fd = open(ce->name, O_RDONLY);

	if (fd >= 0) {
		unsigned char sha1[20];
143
		if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
144
			match = hashcmp(sha1, ce->sha1);
145
		/* index_fd() closed the file descriptor already */
J
Junio C Hamano 已提交
146 147 148 149
	}
	return match;
}

150
static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
J
Junio C Hamano 已提交
151 152 153 154 155
{
	int match = -1;
	char *target;
	void *buffer;
	unsigned long size;
156
	enum object_type type;
J
Junio C Hamano 已提交
157 158 159 160 161 162 163 164
	int len;

	target = xmalloc(expected_size);
	len = readlink(ce->name, target, expected_size);
	if (len != expected_size) {
		free(target);
		return -1;
	}
165
	buffer = read_sha1_file(ce->sha1, &type, &size);
J
Junio C Hamano 已提交
166 167 168 169 170 171 172 173 174 175 176
	if (!buffer) {
		free(target);
		return -1;
	}
	if (size == expected_size)
		match = memcmp(buffer, target, size);
	free(buffer);
	free(target);
	return match;
}

177 178 179 180 181 182
static int ce_compare_gitlink(struct cache_entry *ce)
{
	unsigned char sha1[20];

	/*
	 * We don't actually require that the .git directory
M
Martin Waitz 已提交
183
	 * under GITLINK directory be a valid git directory. It
184 185 186 187 188 189 190 191 192 193
	 * might even be missing (in case nobody populated that
	 * sub-project).
	 *
	 * If so, we consider it always to match.
	 */
	if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
		return 0;
	return hashcmp(sha1, ce->sha1);
}

J
Junio C Hamano 已提交
194 195 196 197 198 199 200 201
static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
{
	switch (st->st_mode & S_IFMT) {
	case S_IFREG:
		if (ce_compare_data(ce, st))
			return DATA_CHANGED;
		break;
	case S_IFLNK:
202
		if (ce_compare_link(ce, xsize_t(st->st_size)))
J
Junio C Hamano 已提交
203 204
			return DATA_CHANGED;
		break;
205
	case S_IFDIR:
206
		if (S_ISGITLINK(ce->ce_mode))
207
			return 0;
J
Junio C Hamano 已提交
208 209 210 211 212 213
	default:
		return TYPE_CHANGED;
	}
	return 0;
}

J
Junio C Hamano 已提交
214
static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
215 216 217
{
	unsigned int changed = 0;

218 219 220 221
	if (ce->ce_flags & CE_REMOVE)
		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;

	switch (ce->ce_mode & S_IFMT) {
222 223
	case S_IFREG:
		changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
J
Junio C Hamano 已提交
224 225 226 227
		/* We consider only the owner x bit to be relevant for
		 * "mode changes"
		 */
		if (trust_executable_bit &&
228
		    (0100 & (ce->ce_mode ^ st->st_mode)))
229
			changed |= MODE_CHANGED;
230 231
		break;
	case S_IFLNK:
232 233 234
		if (!S_ISLNK(st->st_mode) &&
		    (has_symlinks || !S_ISREG(st->st_mode)))
			changed |= TYPE_CHANGED;
235
		break;
M
Martin Waitz 已提交
236
	case S_IFGITLINK:
237 238 239 240
		if (!S_ISDIR(st->st_mode))
			changed |= TYPE_CHANGED;
		else if (ce_compare_gitlink(ce))
			changed |= DATA_CHANGED;
241
		return changed;
242
	default:
243
		die("internal error: ce_mode is %o", ce->ce_mode);
244
	}
245
	if (ce->ce_mtime != (unsigned int) st->st_mtime)
246
		changed |= MTIME_CHANGED;
247
	if (ce->ce_ctime != (unsigned int) st->st_ctime)
248
		changed |= CTIME_CHANGED;
249

250 251
	if (ce->ce_uid != (unsigned int) st->st_uid ||
	    ce->ce_gid != (unsigned int) st->st_gid)
252
		changed |= OWNER_CHANGED;
253
	if (ce->ce_ino != (unsigned int) st->st_ino)
254
		changed |= INODE_CHANGED;
255 256 257 258 259 260 261

#ifdef USE_STDEV
	/*
	 * st_dev breaks on network filesystems where different
	 * clients will have different views of what "device"
	 * the filesystem is on
	 */
262
	if (ce->ce_dev != (unsigned int) st->st_dev)
263 264 265
		changed |= INODE_CHANGED;
#endif

266
	if (ce->ce_size != (unsigned int) st->st_size)
267
		changed |= DATA_CHANGED;
268

J
Junio C Hamano 已提交
269 270 271
	return changed;
}

272 273 274 275 276 277
static int is_racy_timestamp(struct index_state *istate, struct cache_entry *ce)
{
	return (istate->timestamp &&
		((unsigned int)istate->timestamp) <= ce->ce_mtime);
}

278
int ie_match_stat(struct index_state *istate,
279 280
		  struct cache_entry *ce, struct stat *st,
		  unsigned int options)
J
Junio C Hamano 已提交
281
{
J
Junio C Hamano 已提交
282
	unsigned int changed;
283 284
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
	int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
J
Junio C Hamano 已提交
285 286 287 288 289

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
	 */
290
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
291 292 293
		return 0;

	changed = ce_match_stat_basic(ce, st);
J
Junio C Hamano 已提交
294

J
Junio C Hamano 已提交
295 296 297 298 299 300 301 302 303 304 305 306 307 308
	/*
	 * Within 1 second of this sequence:
	 * 	echo xyzzy >file && git-update-index --add file
	 * running this command:
	 * 	echo frotz >file
	 * would give a falsely clean cache entry.  The mtime and
	 * length match the cache, and other stat fields do not change.
	 *
	 * We could detect this at update-index time (the cache entry
	 * being registered/updated records the same time as "now")
	 * and delay the return from git-update-index, but that would
	 * effectively mean we can make at most one commit per second,
	 * which is not acceptable.  Instead, we check cache entries
	 * whose mtime are the same as the index file timestamp more
J
Junio C Hamano 已提交
309
	 * carefully than others.
J
Junio C Hamano 已提交
310
	 */
311
	if (!changed && is_racy_timestamp(istate, ce)) {
312 313 314 315 316
		if (assume_racy_is_modified)
			changed |= DATA_CHANGED;
		else
			changed |= ce_modified_check_fs(ce, st);
	}
317

J
Junio C Hamano 已提交
318
	return changed;
319 320
}

321
int ie_modified(struct index_state *istate,
322
		struct cache_entry *ce, struct stat *st, unsigned int options)
323
{
J
Junio C Hamano 已提交
324
	int changed, changed_fs;
325 326

	changed = ie_match_stat(istate, ce, st, options);
327 328 329 330 331 332 333 334 335 336 337 338 339
	if (!changed)
		return 0;
	/*
	 * If the mode or type has changed, there's no point in trying
	 * to refresh the entry - it's not going to match
	 */
	if (changed & (MODE_CHANGED | TYPE_CHANGED))
		return changed;

	/* Immediately after read-tree or update-index --cacheinfo,
	 * the length field is zero.  For other cases the ce_size
	 * should match the SHA1 recorded in the index entry.
	 */
340
	if ((changed & DATA_CHANGED) && ce->ce_size != 0)
341 342
		return changed;

J
Junio C Hamano 已提交
343 344 345
	changed_fs = ce_modified_check_fs(ce, st);
	if (changed_fs)
		return changed | changed_fs;
346 347 348
	return 0;
}

349 350 351 352 353 354 355 356 357 358 359 360
int base_name_compare(const char *name1, int len1, int mode1,
		      const char *name2, int len2, int mode2)
{
	unsigned char c1, c2;
	int len = len1 < len2 ? len1 : len2;
	int cmp;

	cmp = memcmp(name1, name2, len);
	if (cmp)
		return cmp;
	c1 = name1[len];
	c2 = name2[len];
361
	if (!c1 && S_ISDIR(mode1))
362
		c1 = '/';
363
	if (!c2 && S_ISDIR(mode2))
364 365 366 367
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

368
int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
369
{
370 371
	int len1 = flags1 & CE_NAMEMASK;
	int len2 = flags2 & CE_NAMEMASK;
372 373 374 375 376 377 378 379 380 381
	int len = len1 < len2 ? len1 : len2;
	int cmp;

	cmp = memcmp(name1, name2, len);
	if (cmp)
		return cmp;
	if (len1 < len2)
		return -1;
	if (len1 > len2)
		return 1;
J
Junio C Hamano 已提交
382

383 384 385
	/* Compare stages  */
	flags1 &= CE_STAGEMASK;
	flags2 &= CE_STAGEMASK;
J
Junio C Hamano 已提交
386

387 388 389 390
	if (flags1 < flags2)
		return -1;
	if (flags1 > flags2)
		return 1;
391 392 393
	return 0;
}

394
int index_name_pos(struct index_state *istate, const char *name, int namelen)
395 396 397 398
{
	int first, last;

	first = 0;
399
	last = istate->cache_nr;
400 401
	while (last > first) {
		int next = (last + first) >> 1;
402
		struct cache_entry *ce = istate->cache[next];
403
		int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
404
		if (!cmp)
405
			return next;
406 407 408 409 410 411
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
412
	return -first-1;
413 414
}

415
/* Remove entry, return true if there are more entries to go.. */
416
int remove_index_entry_at(struct index_state *istate, int pos)
417
{
418 419 420
	struct cache_entry *ce = istate->cache[pos];

	remove_hash_entry(istate, ce);
421 422 423
	istate->cache_changed = 1;
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
424
		return 0;
425 426 427
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
428 429 430
	return 1;
}

431
int remove_file_from_index(struct index_state *istate, const char *path)
432
{
433
	int pos = index_name_pos(istate, path, strlen(path));
434 435
	if (pos < 0)
		pos = -pos-1;
J
Junio C Hamano 已提交
436
	cache_tree_invalidate_path(istate->cache_tree, path);
437 438
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
439 440 441
	return 0;
}

442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469
static int compare_name(struct cache_entry *ce, const char *path, int namelen)
{
	return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
}

static int index_name_pos_also_unmerged(struct index_state *istate,
	const char *path, int namelen)
{
	int pos = index_name_pos(istate, path, namelen);
	struct cache_entry *ce;

	if (pos >= 0)
		return pos;

	/* maybe unmerged? */
	pos = -1 - pos;
	if (pos >= istate->cache_nr ||
			compare_name((ce = istate->cache[pos]), path, namelen))
		return -1;

	/* order of preference: stage 2, 1, 3 */
	if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
			ce_stage((ce = istate->cache[pos + 1])) == 2 &&
			!compare_name(ce, path, namelen))
		pos++;
	return pos;
}

470
int add_file_to_index(struct index_state *istate, const char *path, int verbose)
J
Johannes Schindelin 已提交
471
{
472
	int size, namelen, pos;
J
Johannes Schindelin 已提交
473 474
	struct stat st;
	struct cache_entry *ce;
475
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
J
Johannes Schindelin 已提交
476 477 478 479

	if (lstat(path, &st))
		die("%s: unable to stat (%s)", path, strerror(errno));

480 481
	if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode) && !S_ISDIR(st.st_mode))
		die("%s: can only add regular files, symbolic links or git-directories", path);
J
Johannes Schindelin 已提交
482 483

	namelen = strlen(path);
484 485 486 487
	if (S_ISDIR(st.st_mode)) {
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
488 489 490
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
491
	ce->ce_flags = namelen;
J
Johannes Schindelin 已提交
492 493
	fill_stat_cache_info(ce, &st);

494
	if (trust_executable_bit && has_symlinks)
495 496
		ce->ce_mode = create_ce_mode(st.st_mode);
	else {
497 498
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
499
		 */
500
		struct cache_entry *ent;
501
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
502

503
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
504
		ce->ce_mode = ce_mode_from_stat(ent, st.st_mode);
J
Johannes Schindelin 已提交
505 506
	}

507 508 509
	pos = index_name_pos(istate, ce->name, namelen);
	if (0 <= pos &&
	    !ce_stage(istate->cache[pos]) &&
510
	    !ie_match_stat(istate, istate->cache[pos], &st, ce_option)) {
511 512
		/* Nothing changed, really */
		free(ce);
513
		ce_mark_uptodate(istate->cache[pos]);
514 515 516
		return 0;
	}

J
Johannes Schindelin 已提交
517 518
	if (index_path(ce->sha1, path, &st, 1))
		die("unable to index file %s", path);
519
	if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
J
Johannes Schindelin 已提交
520 521 522 523 524 525
		die("unable to add %s to index",path);
	if (verbose)
		printf("add '%s'\n", path);
	return 0;
}

526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
		int refresh)
{
	int size, len;
	struct cache_entry *ce;

	if (!verify_path(path))
		return NULL;

	len = strlen(path);
	size = cache_entry_size(len);
	ce = xcalloc(1, size);

	hashcpy(ce->sha1, sha1);
	memcpy(ce->name, path, len);
	ce->ce_flags = create_ce_flags(len, stage);
	ce->ce_mode = create_ce_mode(mode);

	if (refresh)
		return refresh_cache_entry(ce, 0);

	return ce;
}

551
int ce_same_name(struct cache_entry *a, struct cache_entry *b)
552 553 554 555 556
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576
int ce_path_match(const struct cache_entry *ce, const char **pathspec)
{
	const char *match, *name;
	int len;

	if (!pathspec)
		return 1;

	len = ce_namelen(ce);
	name = ce->name;
	while ((match = *pathspec++) != NULL) {
		int matchlen = strlen(match);
		if (matchlen > len)
			continue;
		if (memcmp(name, match, matchlen))
			continue;
		if (matchlen && name[matchlen-1] == '/')
			return 1;
		if (name[matchlen] == '/' || !name[matchlen])
			return 1;
577 578
		if (!matchlen)
			return 1;
579 580 581 582
	}
	return 0;
}

583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 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 640 641 642 643 644 645 646
/*
 * We fundamentally don't like some paths: we don't want
 * dot or dot-dot anywhere, and for obvious reasons don't
 * want to recurse into ".git" either.
 *
 * Also, we don't want double slashes or slashes at the
 * end that can make pathnames ambiguous.
 */
static int verify_dotfile(const char *rest)
{
	/*
	 * The first character was '.', but that
	 * has already been discarded, we now test
	 * the rest.
	 */
	switch (*rest) {
	/* "." is not allowed */
	case '\0': case '/':
		return 0;

	/*
	 * ".git" followed by  NUL or slash is bad. This
	 * shares the path end test with the ".." case.
	 */
	case 'g':
		if (rest[1] != 'i')
			break;
		if (rest[2] != 't')
			break;
		rest += 2;
	/* fallthrough */
	case '.':
		if (rest[1] == '\0' || rest[1] == '/')
			return 0;
	}
	return 1;
}

int verify_path(const char *path)
{
	char c;

	goto inside;
	for (;;) {
		if (!c)
			return 1;
		if (c == '/') {
inside:
			c = *path++;
			switch (c) {
			default:
				continue;
			case '/': case '\0':
				break;
			case '.':
				if (verify_dotfile(path))
					continue;
			}
			return 0;
		}
		c = *path++;
	}
}

647 648 649
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
650
 */
651 652
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
653
{
654 655
	int retval = 0;
	int len = ce_namelen(ce);
656
	int stage = ce_stage(ce);
657
	const char *name = ce->name;
658

659 660
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
661

662
		if (len >= ce_namelen(p))
663
			break;
664 665
		if (memcmp(name, p->name, len))
			break;
666 667
		if (ce_stage(p) != stage)
			continue;
668 669
		if (p->name[len] != '/')
			continue;
670
		if (p->ce_flags & CE_REMOVE)
671
			continue;
672 673 674
		retval = -1;
		if (!ok_to_replace)
			break;
675
		remove_index_entry_at(istate, --pos);
676
	}
677 678
	return retval;
}
679

680 681 682 683
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
684 685
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
686 687
{
	int retval = 0;
688
	int stage = ce_stage(ce);
689 690
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
691

692 693
	for (;;) {
		int len;
694

695 696 697 698 699 700 701
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
702

703
		pos = index_name_pos(istate, name, create_ce_flags(len, stage));
704
		if (pos >= 0) {
705 706 707 708 709 710 711 712
			/*
			 * Found one, but not so fast.  This could
			 * be a marker that says "I was here, but
			 * I am being removed".  Such an entry is
			 * not a part of the resulting tree, and
			 * it is Ok to have a directory at the same
			 * path.
			 */
713
			if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
714 715 716
				retval = -1;
				if (!ok_to_replace)
					break;
717
				remove_index_entry_at(istate, pos);
718 719
				continue;
			}
720
		}
721 722
		else
			pos = -pos-1;
723 724 725 726

		/*
		 * Trivial optimization: if we find an entry that
		 * already matches the sub-directory, then we know
727
		 * we're ok, and we can exit.
728
		 */
729 730
		while (pos < istate->cache_nr) {
			struct cache_entry *p = istate->cache[pos];
731 732 733 734
			if ((ce_namelen(p) <= len) ||
			    (p->name[len] != '/') ||
			    memcmp(p->name, name, len))
				break; /* not our subdirectory */
735 736 737
			if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
				/*
				 * p is at the same stage as our entry, and
738 739 740 741 742 743
				 * is a subdirectory of what we are looking
				 * at, so we cannot have conflicts at our
				 * level or anything shorter.
				 */
				return retval;
			pos++;
744
		}
745
	}
746 747 748 749 750 751 752
	return retval;
}

/* We may be in a situation where we already have path/file and path
 * is being added, or we already have path and path/file is being
 * added.  Either one would result in a nonsense tree that has path
 * twice when git-write-tree tries to write it out.  Prevent it.
J
Junio C Hamano 已提交
753
 *
754 755 756 757
 * If ok-to-replace is specified, we remove the conflicting entries
 * from the cache so the caller should recompute the insert position.
 * When this happens, we return non-zero.
 */
758 759 760
static int check_file_directory_conflict(struct index_state *istate,
					 const struct cache_entry *ce,
					 int pos, int ok_to_replace)
761
{
762 763 764 765 766
	int retval;

	/*
	 * When ce is an "I am going away" entry, we allow it to be added
	 */
767
	if (ce->ce_flags & CE_REMOVE)
768 769
		return 0;

770 771 772
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
773
	 * in the array.
774
	 */
775
	retval = has_file_name(istate, ce, pos, ok_to_replace);
776

777 778 779 780
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
781
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
782 783
}

784
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
785 786
{
	int pos;
787 788
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
789
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
790

J
Junio C Hamano 已提交
791
	cache_tree_invalidate_path(istate->cache_tree, ce->name);
792
	pos = index_name_pos(istate, ce->name, ce->ce_flags);
793

J
Junio C Hamano 已提交
794
	/* existing match? Just replace it. */
795
	if (pos >= 0) {
796
		replace_index_entry(istate, pos, ce);
797 798
		return 0;
	}
799
	pos = -pos-1;
800

801 802 803 804
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
805 806
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
807
			ok_to_add = 1;
808
			if (!remove_index_entry_at(istate, pos))
809 810 811 812
				break;
		}
	}

813 814
	if (!ok_to_add)
		return -1;
815 816
	if (!verify_path(ce->name))
		return -1;
817

J
Junio C Hamano 已提交
818
	if (!skip_df_check &&
819
	    check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
820
		if (!ok_to_replace)
821 822
			return error("'%s' appears as both a file and as a directory",
				     ce->name);
823
		pos = index_name_pos(istate, ce->name, ce->ce_flags);
824 825
		pos = -pos-1;
	}
826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841
	return pos + 1;
}

int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
{
	int pos;

	if (option & ADD_CACHE_JUST_APPEND)
		pos = istate->cache_nr;
	else {
		int ret;
		ret = add_index_entry_with_check(istate, ce, option);
		if (ret <= 0)
			return ret;
		pos = ret - 1;
	}
842

843
	/* Make sure the array is big enough .. */
844 845 846 847
	if (istate->cache_nr == istate->cache_alloc) {
		istate->cache_alloc = alloc_nr(istate->cache_alloc);
		istate->cache = xrealloc(istate->cache,
					istate->cache_alloc * sizeof(struct cache_entry *));
848 849 850
	}

	/* Add it in.. */
851
	istate->cache_nr++;
852
	if (istate->cache_nr > pos + 1)
853 854 855
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
856
	set_index_entry(istate, pos, ce);
857
	istate->cache_changed = 1;
858 859 860
	return 0;
}

L
Linus Torvalds 已提交
861 862 863 864 865 866 867 868 869 870 871
/*
 * "refresh" does not calculate a new sha1 file or bring the
 * cache up-to-date for mode/content changes. But what it
 * _does_ do is to "re-match" the stat information of a file
 * with the cache, so that you can refresh the cache for a
 * file that hasn't been changed but where the stat entry is
 * out of date.
 *
 * For example, you'd want to do this after doing a "git-read-tree",
 * to link up the stat cache details with the proper files.
 */
872
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
873 874
					     struct cache_entry *ce,
					     unsigned int options, int *err)
L
Linus Torvalds 已提交
875 876 877 878
{
	struct stat st;
	struct cache_entry *updated;
	int changed, size;
879
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
L
Linus Torvalds 已提交
880

881 882 883
	if (ce_uptodate(ce))
		return ce;

884
	if (lstat(ce->name, &st) < 0) {
885 886
		if (err)
			*err = errno;
887 888
		return NULL;
	}
L
Linus Torvalds 已提交
889

890
	changed = ie_match_stat(istate, ce, &st, options);
L
Linus Torvalds 已提交
891
	if (!changed) {
892 893 894 895 896 897 898 899
		/*
		 * The path is unchanged.  If we were told to ignore
		 * valid bit, then we did the actual stat check and
		 * found that the entry is unmodified.  If the entry
		 * is not marked VALID, this is the place to mark it
		 * valid again, under "assume unchanged" mode.
		 */
		if (ignore_valid && assume_unchanged &&
900
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
901
			; /* mark this one VALID again */
902 903 904 905 906 907 908
		else {
			/*
			 * We do not mark the index itself "modified"
			 * because CE_UPTODATE flag is in-core only;
			 * we are not going to write this change out.
			 */
			ce_mark_uptodate(ce);
909
			return ce;
910
		}
L
Linus Torvalds 已提交
911 912
	}

913
	if (ie_modified(istate, ce, &st, options)) {
914 915
		if (err)
			*err = EINVAL;
916 917
		return NULL;
	}
L
Linus Torvalds 已提交
918 919 920 921 922

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
923 924 925 926 927
	/*
	 * If ignore_valid is not set, we should leave CE_VALID bit
	 * alone.  Otherwise, paths marked with --no-assume-unchanged
	 * (i.e. things to be edited) will reacquire CE_VALID bit
	 * automatically, which is not really what we want.
L
Linus Torvalds 已提交
928
	 */
929
	if (!ignore_valid && assume_unchanged &&
930 931
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
932 933 934 935

	return updated;
}

936
int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen)
L
Linus Torvalds 已提交
937 938 939 940 941 942 943
{
	int i;
	int has_errors = 0;
	int really = (flags & REFRESH_REALLY) != 0;
	int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
	int quiet = (flags & REFRESH_QUIET) != 0;
	int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
944
	unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
L
Linus Torvalds 已提交
945

946
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
947
		struct cache_entry *ce, *new;
948 949
		int cache_errno = 0;

950
		ce = istate->cache[i];
L
Linus Torvalds 已提交
951
		if (ce_stage(ce)) {
952 953
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
954 955 956 957 958 959 960 961 962
				i++;
			i--;
			if (allow_unmerged)
				continue;
			printf("%s: needs merge\n", ce->name);
			has_errors = 1;
			continue;
		}

963 964 965
		if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
			continue;

966
		new = refresh_cache_ent(istate, ce, options, &cache_errno);
967
		if (new == ce)
L
Linus Torvalds 已提交
968
			continue;
969 970
		if (!new) {
			if (not_new && cache_errno == ENOENT)
L
Linus Torvalds 已提交
971
				continue;
972
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
973 974 975
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
976
				ce->ce_flags &= ~CE_VALID;
977
				istate->cache_changed = 1;
L
Linus Torvalds 已提交
978 979 980 981 982 983 984
			}
			if (quiet)
				continue;
			printf("%s: needs update\n", ce->name);
			has_errors = 1;
			continue;
		}
985 986

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
987 988 989 990
	}
	return has_errors;
}

991 992
struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
{
993
	return refresh_cache_ent(&the_index, ce, really, NULL);
994 995
}

996
static int verify_hdr(struct cache_header *hdr, unsigned long size)
997 998
{
	SHA_CTX c;
999
	unsigned char sha1[20];
1000

1001
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1002
		return error("bad signature");
1003 1004
	if (hdr->hdr_version != htonl(2))
		return error("bad index version");
1005
	SHA1_Init(&c);
1006
	SHA1_Update(&c, hdr, size - 20);
1007
	SHA1_Final(sha1, &c);
1008
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1009
		return error("bad index file sha1 signature");
1010 1011 1012
	return 0;
}

1013 1014
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1015 1016 1017
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1018
		istate->cache_tree = cache_tree_read(data, sz);
1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029
		break;
	default:
		if (*ext < 'A' || 'Z' < *ext)
			return error("index uses %.4s extension, which we do not understand",
				     ext);
		fprintf(stderr, "ignoring %.4s extension\n", ext);
		break;
	}
	return 0;
}

1030
int read_index(struct index_state *istate)
1031
{
1032
	return read_index_from(istate, get_index_file());
1033 1034
}

1035 1036
static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
{
1037 1038
	size_t len;

1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
	ce->ce_ctime = ntohl(ondisk->ctime.sec);
	ce->ce_mtime = ntohl(ondisk->mtime.sec);
	ce->ce_dev   = ntohl(ondisk->dev);
	ce->ce_ino   = ntohl(ondisk->ino);
	ce->ce_mode  = ntohl(ondisk->mode);
	ce->ce_uid   = ntohl(ondisk->uid);
	ce->ce_gid   = ntohl(ondisk->gid);
	ce->ce_size  = ntohl(ondisk->size);
	/* On-disk flags are just 16 bits */
	ce->ce_flags = ntohs(ondisk->flags);
	hashcpy(ce->sha1, ondisk->sha1);
1050 1051 1052 1053 1054 1055 1056 1057 1058

	len = ce->ce_flags & CE_NAMEMASK;
	if (len == CE_NAMEMASK)
		len = strlen(ondisk->name);
	/*
	 * NEEDSWORK: If the original index is crafted, this copy could
	 * go unchecked.
	 */
	memcpy(ce->name, ondisk->name, len + 1);
1059 1060
}

1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074
static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
{
	long per_entry;

	per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);

	/*
	 * Alignment can cause differences. This should be "alignof", but
	 * since that's a gcc'ism, just use the size of a pointer.
	 */
	per_entry += sizeof(void *);
	return ondisk_size + entries*per_entry;
}

1075
/* remember to discard_cache() before reading a different cache! */
1076
int read_index_from(struct index_state *istate, const char *path)
1077 1078 1079
{
	int fd, i;
	struct stat st;
1080
	unsigned long src_offset, dst_offset;
1081
	struct cache_header *hdr;
1082 1083
	void *mmap;
	size_t mmap_size;
1084 1085

	errno = EBUSY;
1086
	if (istate->alloc)
1087
		return istate->cache_nr;
1088

1089
	errno = ENOENT;
1090
	istate->timestamp = 0;
1091
	fd = open(path, O_RDONLY);
1092 1093 1094 1095 1096
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
		die("index file open failed (%s)", strerror(errno));
	}
1097

1098
	if (fstat(fd, &st))
1099
		die("cannot stat the open index (%s)", strerror(errno));
1100 1101

	errno = EINVAL;
1102 1103
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1104 1105
		die("index file smaller than expected");

1106
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1107
	close(fd);
1108 1109
	if (mmap == MAP_FAILED)
		die("unable to map index file");
1110

1111 1112
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1113 1114
		goto unmap;

1115 1116 1117
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
	istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
1118

1119 1120 1121 1122 1123 1124
	/*
	 * The disk format is actually larger than the in-memory format,
	 * due to space for nsec etc, so even though the in-memory one
	 * has room for a few  more flags, we can allocate using the same
	 * index size
	 */
1125
	istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
1126 1127 1128

	src_offset = sizeof(*hdr);
	dst_offset = 0;
1129
	for (i = 0; i < istate->cache_nr; i++) {
1130
		struct ondisk_cache_entry *disk_ce;
1131 1132
		struct cache_entry *ce;

1133 1134 1135
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
		ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
		convert_from_disk(disk_ce, ce);
1136
		set_index_entry(istate, i, ce);
1137 1138 1139

		src_offset += ondisk_ce_size(ce);
		dst_offset += ce_size(ce);
1140
	}
1141
	istate->timestamp = st.st_mtime;
1142
	while (src_offset <= mmap_size - 20 - 8) {
1143 1144 1145 1146 1147 1148 1149
		/* After an array of active_nr index entries,
		 * there can be arbitrary number of extended
		 * sections, each of which is prefixed with
		 * extension name (4-byte) and section length
		 * in 4-byte network byte order.
		 */
		unsigned long extsize;
1150
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1151
		extsize = ntohl(extsize);
1152
		if (read_index_extension(istate,
1153 1154
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1155
					 extsize) < 0)
1156
			goto unmap;
1157 1158
		src_offset += 8;
		src_offset += extsize;
1159
	}
1160
	munmap(mmap, mmap_size);
1161
	return istate->cache_nr;
1162 1163

unmap:
1164
	munmap(mmap, mmap_size);
1165
	errno = EINVAL;
1166
	die("index file corrupt");
1167 1168
}

1169
int discard_index(struct index_state *istate)
1170
{
1171 1172 1173
	istate->cache_nr = 0;
	istate->cache_changed = 0;
	istate->timestamp = 0;
1174
	free_hash(&istate->name_hash);
1175
	cache_tree_free(&(istate->cache_tree));
1176 1177
	free(istate->alloc);
	istate->alloc = NULL;
1178 1179

	/* no need to throw away allocated active_cache */
1180
	return 0;
1181 1182
}

1183
#define WRITE_BUFFER_SIZE 8192
1184
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1185 1186
static unsigned long write_buffer_len;

1187 1188 1189 1190 1191
static int ce_write_flush(SHA_CTX *context, int fd)
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
		SHA1_Update(context, write_buffer, buffered);
1192
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1193 1194 1195 1196 1197 1198
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1199
static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
1200 1201 1202 1203 1204 1205 1206 1207 1208
{
	while (len) {
		unsigned int buffered = write_buffer_len;
		unsigned int partial = WRITE_BUFFER_SIZE - buffered;
		if (partial > len)
			partial = len;
		memcpy(write_buffer + buffered, data, partial);
		buffered += partial;
		if (buffered == WRITE_BUFFER_SIZE) {
1209 1210
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1211 1212 1213 1214 1215
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1216
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1217 1218
	}
	return 0;
1219 1220
}

1221
static int write_index_ext_header(SHA_CTX *context, int fd,
1222
				  unsigned int ext, unsigned int sz)
1223 1224 1225
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1226 1227
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1228 1229 1230
}

static int ce_flush(SHA_CTX *context, int fd)
1231 1232
{
	unsigned int left = write_buffer_len;
1233

1234 1235
	if (left) {
		write_buffer_len = 0;
1236
		SHA1_Update(context, write_buffer, left);
1237
	}
1238

1239 1240
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1241
		if (write_in_full(fd, write_buffer, left) != left)
1242 1243 1244 1245
			return -1;
		left = 0;
	}

1246
	/* Append the SHA1 signature at the end */
1247
	SHA1_Final(write_buffer + left, context);
1248
	left += 20;
1249
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1250 1251
}

J
Junio C Hamano 已提交
1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266
static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
{
	/*
	 * The only thing we care about in this function is to smudge the
	 * falsely clean entry due to touch-update-touch race, so we leave
	 * everything else as they are.  We are called for entries whose
	 * ce_mtime match the index file mtime.
	 */
	struct stat st;

	if (lstat(ce->name, &st) < 0)
		return;
	if (ce_match_stat_basic(ce, &st))
		return;
	if (ce_modified_check_fs(ce, &st)) {
1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277
		/* This is "racily clean"; smudge it.  Note that this
		 * is a tricky code.  At first glance, it may appear
		 * that it can break with this sequence:
		 *
		 * $ echo xyzzy >frotz
		 * $ git-update-index --add frotz
		 * $ : >frotz
		 * $ sleep 3
		 * $ echo filfre >nitfol
		 * $ git-update-index --add nitfol
		 *
1278
		 * but it does not.  When the second update-index runs,
1279 1280 1281 1282 1283
		 * it notices that the entry "frotz" has the same timestamp
		 * as index, and if we were to smudge it by resetting its
		 * size to zero here, then the object name recorded
		 * in index is the 6-byte file but the cached stat information
		 * becomes zero --- which would then match what we would
J
Junio C Hamano 已提交
1284
		 * obtain from the filesystem next time we stat("frotz").
1285 1286 1287 1288 1289 1290 1291
		 *
		 * However, the second update-index, before calling
		 * this function, notices that the cached size is 6
		 * bytes and what is on the filesystem is an empty
		 * file, and never calls us, so the cached size information
		 * for "frotz" stays 6 which does not match the filesystem.
		 */
1292
		ce->ce_size = 0;
J
Junio C Hamano 已提交
1293 1294 1295
	}
}

1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317
static int ce_write_entry(SHA_CTX *c, int fd, struct cache_entry *ce)
{
	int size = ondisk_ce_size(ce);
	struct ondisk_cache_entry *ondisk = xcalloc(1, size);

	ondisk->ctime.sec = htonl(ce->ce_ctime);
	ondisk->ctime.nsec = 0;
	ondisk->mtime.sec = htonl(ce->ce_mtime);
	ondisk->mtime.nsec = 0;
	ondisk->dev  = htonl(ce->ce_dev);
	ondisk->ino  = htonl(ce->ce_ino);
	ondisk->mode = htonl(ce->ce_mode);
	ondisk->uid  = htonl(ce->ce_uid);
	ondisk->gid  = htonl(ce->ce_gid);
	ondisk->size = htonl(ce->ce_size);
	hashcpy(ondisk->sha1, ce->sha1);
	ondisk->flags = htons(ce->ce_flags);
	memcpy(ondisk->name, ce->name, ce_namelen(ce));

	return ce_write(c, fd, ondisk, size);
}

1318
int write_index(struct index_state *istate, int newfd)
1319 1320 1321
{
	SHA_CTX c;
	struct cache_header hdr;
1322
	int i, err, removed;
1323 1324
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1325 1326

	for (i = removed = 0; i < entries; i++)
1327
		if (cache[i]->ce_flags & CE_REMOVE)
1328
			removed++;
1329

1330
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1331
	hdr.hdr_version = htonl(2);
1332
	hdr.hdr_entries = htonl(entries - removed);
1333 1334

	SHA1_Init(&c);
1335
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1336 1337 1338 1339
		return -1;

	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1340
		if (ce->ce_flags & CE_REMOVE)
1341
			continue;
1342
		if (is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1343
			ce_smudge_racily_clean_entry(ce);
1344
		if (ce_write_entry(&c, newfd, ce) < 0)
1345 1346
			return -1;
	}
1347

1348
	/* Write extension data here */
1349
	if (istate->cache_tree) {
1350 1351 1352 1353 1354 1355 1356 1357
		struct strbuf sb;

		strbuf_init(&sb, 0);
		cache_tree_write(&sb, istate->cache_tree);
		err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
		strbuf_release(&sb);
		if (err)
1358 1359 1360
			return -1;
	}
	return ce_flush(&c, newfd);
1361
}