read-cache.c 60.7 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
#include "tree.h"
#include "commit.h"
J
Junio C Hamano 已提交
13
#include "blob.h"
14
#include "resolve-undo.h"
15 16
#include "strbuf.h"
#include "varint.h"
17
#include "split-index.h"
18
#include "sigchain.h"
19

20 21
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options);
22

23 24 25 26
/* Mask for the name length in ce_flags in the on-disk index */

#define CE_NAMEMASK  (0x0fff)

27 28 29 30 31 32 33 34 35 36 37
/* 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" */
38
#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
39 40 41
#define CACHE_EXT_LINK 0x6c696e6b	  /* "link" */

/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
42
#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
43 44
		 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
		 SPLIT_INDEX_ORDERED)
45

46
struct index_state the_index;
47
static const char *alternate_index_output;
48

J
Junio C Hamano 已提交
49 50 51
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
	istate->cache[nr] = ce;
52
	add_name_hash(istate, ce);
J
Junio C Hamano 已提交
53 54
}

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

59
	replace_index_entry_in_base(istate, old, ce);
60
	remove_name_hash(istate, old);
61
	free(old);
L
Linus Torvalds 已提交
62
	set_index_entry(istate, nr, ce);
63
	ce->ce_flags |= CE_UPDATE_IN_BASE;
64
	istate->cache_changed |= CE_ENTRY_CHANGED;
65 66
}

67 68 69 70 71 72 73
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
	struct cache_entry *old = istate->cache[nr], *new;
	int namelen = strlen(new_name);

	new = xmalloc(cache_entry_size(namelen));
	copy_cache_entry(new, old);
74
	new->ce_flags &= ~CE_HASHED;
75
	new->ce_namelen = namelen;
76
	new->index = 0;
77 78
	memcpy(new->name, new_name, namelen + 1);

79
	cache_tree_invalidate_path(istate, old->name);
80 81 82 83
	remove_index_entry_at(istate, nr);
	add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}

84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
void fill_stat_data(struct stat_data *sd, struct stat *st)
{
	sd->sd_ctime.sec = (unsigned int)st->st_ctime;
	sd->sd_mtime.sec = (unsigned int)st->st_mtime;
	sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
	sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
	sd->sd_dev = st->st_dev;
	sd->sd_ino = st->st_ino;
	sd->sd_uid = st->st_uid;
	sd->sd_gid = st->st_gid;
	sd->sd_size = st->st_size;
}

int match_stat_data(const struct stat_data *sd, struct stat *st)
{
	int changed = 0;

	if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
		changed |= MTIME_CHANGED;
	if (trust_ctime && check_stat &&
	    sd->sd_ctime.sec != (unsigned int)st->st_ctime)
		changed |= CTIME_CHANGED;

#ifdef USE_NSEC
	if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
		changed |= MTIME_CHANGED;
	if (trust_ctime && check_stat &&
	    sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
		changed |= CTIME_CHANGED;
#endif

	if (check_stat) {
		if (sd->sd_uid != (unsigned int) st->st_uid ||
			sd->sd_gid != (unsigned int) st->st_gid)
			changed |= OWNER_CHANGED;
		if (sd->sd_ino != (unsigned int) st->st_ino)
			changed |= INODE_CHANGED;
	}

#ifdef USE_STDEV
	/*
	 * st_dev breaks on network filesystems where different
	 * clients will have different views of what "device"
	 * the filesystem is on
	 */
	if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
			changed |= INODE_CHANGED;
#endif

	if (sd->sd_size != (unsigned int) st->st_size)
		changed |= DATA_CHANGED;

	return changed;
}

139 140 141 142 143 144 145
/*
 * 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)
{
146
	fill_stat_data(&ce->ce_stat_data, st);
J
Junio C Hamano 已提交
147 148

	if (assume_unchanged)
149
		ce->ce_flags |= CE_VALID;
150 151 152

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
153 154
}

155
static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
J
Junio C Hamano 已提交
156 157 158 159 160 161
{
	int match = -1;
	int fd = open(ce->name, O_RDONLY);

	if (fd >= 0) {
		unsigned char sha1[20];
162
		if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
163
			match = hashcmp(sha1, ce->sha1);
164
		/* index_fd() closed the file descriptor already */
J
Junio C Hamano 已提交
165 166 167 168
	}
	return match;
}

169
static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
J
Junio C Hamano 已提交
170 171 172 173
{
	int match = -1;
	void *buffer;
	unsigned long size;
174
	enum object_type type;
175
	struct strbuf sb = STRBUF_INIT;
J
Junio C Hamano 已提交
176

177
	if (strbuf_readlink(&sb, ce->name, expected_size))
J
Junio C Hamano 已提交
178
		return -1;
179

180
	buffer = read_sha1_file(ce->sha1, &type, &size);
181 182 183 184
	if (buffer) {
		if (size == sb.len)
			match = memcmp(buffer, sb.buf, size);
		free(buffer);
J
Junio C Hamano 已提交
185
	}
186
	strbuf_release(&sb);
J
Junio C Hamano 已提交
187 188 189
	return match;
}

190
static int ce_compare_gitlink(const struct cache_entry *ce)
191 192 193 194 195
{
	unsigned char sha1[20];

	/*
	 * We don't actually require that the .git directory
M
Martin Waitz 已提交
196
	 * under GITLINK directory be a valid git directory. It
197 198 199 200 201 202 203 204 205 206
	 * 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);
}

207
static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
J
Junio C Hamano 已提交
208 209 210 211 212 213 214
{
	switch (st->st_mode & S_IFMT) {
	case S_IFREG:
		if (ce_compare_data(ce, st))
			return DATA_CHANGED;
		break;
	case S_IFLNK:
215
		if (ce_compare_link(ce, xsize_t(st->st_size)))
J
Junio C Hamano 已提交
216 217
			return DATA_CHANGED;
		break;
218
	case S_IFDIR:
219
		if (S_ISGITLINK(ce->ce_mode))
220
			return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
J
Junio C Hamano 已提交
221 222 223 224 225 226
	default:
		return TYPE_CHANGED;
	}
	return 0;
}

227
static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
228 229 230
{
	unsigned int changed = 0;

231 232 233 234
	if (ce->ce_flags & CE_REMOVE)
		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;

	switch (ce->ce_mode & S_IFMT) {
235 236
	case S_IFREG:
		changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
J
Junio C Hamano 已提交
237 238 239 240
		/* We consider only the owner x bit to be relevant for
		 * "mode changes"
		 */
		if (trust_executable_bit &&
241
		    (0100 & (ce->ce_mode ^ st->st_mode)))
242
			changed |= MODE_CHANGED;
243 244
		break;
	case S_IFLNK:
245 246 247
		if (!S_ISLNK(st->st_mode) &&
		    (has_symlinks || !S_ISREG(st->st_mode)))
			changed |= TYPE_CHANGED;
248
		break;
M
Martin Waitz 已提交
249
	case S_IFGITLINK:
250
		/* We ignore most of the st_xxx fields for gitlinks */
251 252 253 254
		if (!S_ISDIR(st->st_mode))
			changed |= TYPE_CHANGED;
		else if (ce_compare_gitlink(ce))
			changed |= DATA_CHANGED;
255
		return changed;
256
	default:
257
		die("internal error: ce_mode is %o", ce->ce_mode);
258
	}
259

260
	changed |= match_stat_data(&ce->ce_stat_data, st);
261

262
	/* Racily smudged entry? */
263
	if (!ce->ce_stat_data.sd_size) {
264 265 266 267
		if (!is_empty_blob_sha1(ce->sha1))
			changed |= DATA_CHANGED;
	}

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

271 272
static int is_racy_timestamp(const struct index_state *istate,
			     const struct cache_entry *ce)
273
{
274
	return (!S_ISGITLINK(ce->ce_mode) &&
K
Kjetil Barvik 已提交
275 276 277
		istate->timestamp.sec &&
#ifdef USE_NSEC
		 /* nanosecond timestamped files can also be racy! */
278 279 280
		(istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
		 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
		  istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
K
Kjetil Barvik 已提交
281
#else
282
		istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
K
Kjetil Barvik 已提交
283 284
#endif
		 );
285 286
}

287
int ie_match_stat(const struct index_state *istate,
288
		  const struct cache_entry *ce, struct stat *st,
289
		  unsigned int options)
J
Junio C Hamano 已提交
290
{
J
Junio C Hamano 已提交
291
	unsigned int changed;
292
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
293
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
294
	int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
J
Junio C Hamano 已提交
295 296 297 298

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
299 300
	 *
	 * skip-worktree has the same effect with higher precedence
J
Junio C Hamano 已提交
301
	 */
302 303
	if (!ignore_skip_worktree && ce_skip_worktree(ce))
		return 0;
304
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
305 306
		return 0;

307 308 309 310 311 312 313 314
	/*
	 * Intent-to-add entries have not been added, so the index entry
	 * by definition never matches what is in the work tree until it
	 * actually gets added.
	 */
	if (ce->ce_flags & CE_INTENT_TO_ADD)
		return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;

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

J
Junio C Hamano 已提交
317 318 319 320 321 322 323 324 325 326 327 328 329 330
	/*
	 * 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 已提交
331
	 * carefully than others.
J
Junio C Hamano 已提交
332
	 */
333
	if (!changed && is_racy_timestamp(istate, ce)) {
334 335 336 337 338
		if (assume_racy_is_modified)
			changed |= DATA_CHANGED;
		else
			changed |= ce_modified_check_fs(ce, st);
	}
339

J
Junio C Hamano 已提交
340
	return changed;
341 342
}

343
int ie_modified(const struct index_state *istate,
344 345
		const struct cache_entry *ce,
		struct stat *st, unsigned int options)
346
{
J
Junio C Hamano 已提交
347
	int changed, changed_fs;
348 349

	changed = ie_match_stat(istate, ce, st, options);
350 351 352 353 354 355 356 357 358
	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;

359 360 361 362 363 364 365 366 367 368 369 370 371
	/*
	 * Immediately after read-tree or update-index --cacheinfo,
	 * the length field is zero, as we have never even read the
	 * lstat(2) information once, and we cannot trust DATA_CHANGED
	 * returned by ie_match_stat() which in turn was returned by
	 * ce_match_stat_basic() to signal that the filesize of the
	 * blob changed.  We have to actually go to the filesystem to
	 * see if the contents match, and if so, should answer "unchanged".
	 *
	 * The logic does not apply to gitlinks, as ce_match_stat_basic()
	 * already has checked the actual HEAD from the filesystem in the
	 * subproject.  If ie_match_stat() already said it is different,
	 * then we know it is.
372
	 */
373
	if ((changed & DATA_CHANGED) &&
374
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
375 376
		return changed;

J
Junio C Hamano 已提交
377 378 379
	changed_fs = ce_modified_check_fs(ce, st);
	if (changed_fs)
		return changed | changed_fs;
380 381 382
	return 0;
}

383 384 385 386 387 388 389 390 391 392 393 394
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];
395
	if (!c1 && S_ISDIR(mode1))
396
		c1 = '/';
397
	if (!c2 && S_ISDIR(mode2))
398 399 400 401
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436
/*
 * df_name_compare() is identical to base_name_compare(), except it
 * compares conflicting directory/file entries as equal. Note that
 * while a directory name compares as equal to a regular file, they
 * then individually compare _differently_ to a filename that has
 * a dot after the basename (because '\0' < '.' < '/').
 *
 * This is used by routines that want to traverse the git namespace
 * but then handle conflicting entries together when possible.
 */
int df_name_compare(const char *name1, int len1, int mode1,
		    const char *name2, int len2, int mode2)
{
	int len = len1 < len2 ? len1 : len2, cmp;
	unsigned char c1, c2;

	cmp = memcmp(name1, name2, len);
	if (cmp)
		return cmp;
	/* Directories and files compare equal (same length, same name) */
	if (len1 == len2)
		return 0;
	c1 = name1[len];
	if (!c1 && S_ISDIR(mode1))
		c1 = '/';
	c2 = name2[len];
	if (!c2 && S_ISDIR(mode2))
		c2 = '/';
	if (c1 == '/' && !c2)
		return 0;
	if (c2 == '/' && !c1)
		return 0;
	return c1 - c2;
}

437
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
438
{
439 440
	size_t min_len = (len1 < len2) ? len1 : len2;
	int cmp = memcmp(name1, name2, min_len);
441 442 443 444 445 446
	if (cmp)
		return cmp;
	if (len1 < len2)
		return -1;
	if (len1 > len2)
		return 1;
447 448 449 450 451 452 453 454 455 456
	return 0;
}

int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
{
	int cmp;

	cmp = name_compare(name1, len1, name2, len2);
	if (cmp)
		return cmp;
J
Junio C Hamano 已提交
457

458
	if (stage1 < stage2)
459
		return -1;
460
	if (stage1 > stage2)
461
		return 1;
462 463 464
	return 0;
}

465
static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
466 467 468 469
{
	int first, last;

	first = 0;
470
	last = istate->cache_nr;
471 472
	while (last > first) {
		int next = (last + first) >> 1;
473
		struct cache_entry *ce = istate->cache[next];
474
		int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
475
		if (!cmp)
476
			return next;
477 478 479 480 481 482
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
483
	return -first-1;
484 485
}

486 487 488 489 490
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
{
	return index_name_stage_pos(istate, name, namelen, 0);
}

491
/* Remove entry, return true if there are more entries to go.. */
492
int remove_index_entry_at(struct index_state *istate, int pos)
493
{
494 495
	struct cache_entry *ce = istate->cache[pos];

496
	record_resolve_undo(istate, ce);
497
	remove_name_hash(istate, ce);
498
	save_or_free_index_entry(istate, ce);
499
	istate->cache_changed |= CE_ENTRY_REMOVED;
500 501
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
502
		return 0;
503 504 505
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
506 507 508
	return 1;
}

509
/*
O
Ondřej Bílka 已提交
510
 * Remove all cache entries marked for removal, that is where
511 512 513 514 515 516 517 518 519
 * CE_REMOVE is set in ce_flags.  This is much more effective than
 * calling remove_index_entry_at() for each entry to be removed.
 */
void remove_marked_cache_entries(struct index_state *istate)
{
	struct cache_entry **ce_array = istate->cache;
	unsigned int i, j;

	for (i = j = 0; i < istate->cache_nr; i++) {
520
		if (ce_array[i]->ce_flags & CE_REMOVE) {
521
			remove_name_hash(istate, ce_array[i]);
522
			save_or_free_index_entry(istate, ce_array[i]);
523
		}
524 525 526
		else
			ce_array[j++] = ce_array[i];
	}
527 528
	if (j == istate->cache_nr)
		return;
529
	istate->cache_changed |= CE_ENTRY_REMOVED;
530 531 532
	istate->cache_nr = j;
}

533
int remove_file_from_index(struct index_state *istate, const char *path)
534
{
535
	int pos = index_name_pos(istate, path, strlen(path));
536 537
	if (pos < 0)
		pos = -pos-1;
538
	cache_tree_invalidate_path(istate, path);
539 540
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
541 542 543
	return 0;
}

544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571
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;
}

572 573 574 575 576 577 578 579 580 581 582 583 584 585 586
static int different_name(struct cache_entry *ce, struct cache_entry *alias)
{
	int len = ce_namelen(ce);
	return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
}

/*
 * If we add a filename that aliases in the cache, we will use the
 * name that we already have - but we don't want to update the same
 * alias twice, because that implies that there were actually two
 * different files with aliasing names!
 *
 * So we use the CE_ADDED flag to verify that the alias was an old
 * one before we accept it as
 */
587 588 589
static struct cache_entry *create_alias_ce(struct index_state *istate,
					   struct cache_entry *ce,
					   struct cache_entry *alias)
590 591 592 593 594 595 596 597 598 599 600 601
{
	int len;
	struct cache_entry *new;

	if (alias->ce_flags & CE_ADDED)
		die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);

	/* Ok, create the new entry using the name of the existing alias */
	len = ce_namelen(alias);
	new = xcalloc(1, cache_entry_size(len));
	memcpy(new->name, alias->name, len);
	copy_cache_entry(new, ce);
602
	save_or_free_index_entry(istate, ce);
603 604 605
	return new;
}

606
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
J
Junio C Hamano 已提交
607 608 609 610 611 612 613
{
	unsigned char sha1[20];
	if (write_sha1_file("", 0, blob_type, sha1))
		die("cannot create an empty blob in the object database");
	hashcpy(ce->sha1, sha1);
}

614
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
615
{
616
	int size, namelen, was_same;
617
	mode_t st_mode = st->st_mode;
618
	struct cache_entry *ce, *alias;
619
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
620 621
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
622 623 624
	int intent_only = flags & ADD_CACHE_INTENT;
	int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
			  (intent_only ? ADD_CACHE_NEW_ONLY : 0));
J
Johannes Schindelin 已提交
625

626
	if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
627
		return error("%s: can only add regular files, symbolic links or git-directories", path);
J
Johannes Schindelin 已提交
628 629

	namelen = strlen(path);
630
	if (S_ISDIR(st_mode)) {
631 632 633
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
634 635 636
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
637
	ce->ce_namelen = namelen;
J
Junio C Hamano 已提交
638 639
	if (!intent_only)
		fill_stat_cache_info(ce, st);
640 641
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
642

643
	if (trust_executable_bit && has_symlinks)
644
		ce->ce_mode = create_ce_mode(st_mode);
645
	else {
646 647
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
648
		 */
649
		struct cache_entry *ent;
650
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
651

652
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
653
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
654 655
	}

656 657 658 659 660 661 662 663 664 665 666 667 668 669
	/* When core.ignorecase=true, determine if a directory of the same name but differing
	 * case already exists within the Git repository.  If it does, ensure the directory
	 * case of the file being added to the repository matches (is folded into) the existing
	 * entry's directory case.
	 */
	if (ignore_case) {
		const char *startPtr = ce->name;
		const char *ptr = startPtr;
		while (*ptr) {
			while (*ptr && *ptr != '/')
				++ptr;
			if (*ptr == '/') {
				struct cache_entry *foundce;
				++ptr;
670
				foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
671 672 673 674 675 676 677 678
				if (foundce) {
					memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
					startPtr = ptr;
				}
			}
		}
	}

679
	alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
680
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
681 682
		/* Nothing changed, really */
		free(ce);
683 684
		if (!S_ISGITLINK(alias->ce_mode))
			ce_mark_uptodate(alias);
685
		alias->ce_flags |= CE_ADDED;
686 687
		return 0;
	}
J
Junio C Hamano 已提交
688
	if (!intent_only) {
689
		if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
J
Junio C Hamano 已提交
690 691
			return error("unable to index file %s", path);
	} else
692
		set_object_name_for_intent_to_add_entry(ce);
J
Junio C Hamano 已提交
693

694
	if (ignore_case && alias && different_name(ce, alias))
695
		ce = create_alias_ce(istate, ce, alias);
696
	ce->ce_flags |= CE_ADDED;
697

J
Junio C Hamano 已提交
698
	/* It was suspected to be racily clean, but it turns out to be Ok */
699 700 701 702 703 704 705
	was_same = (alias &&
		    !ce_stage(alias) &&
		    !hashcmp(alias->sha1, ce->sha1) &&
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
		;
J
Junio C Hamano 已提交
706
	else if (add_index_entry(istate, ce, add_option))
707
		return error("unable to add %s to index",path);
708
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
709 710 711 712
		printf("add '%s'\n", path);
	return 0;
}

713
int add_file_to_index(struct index_state *istate, const char *path, int flags)
714 715 716
{
	struct stat st;
	if (lstat(path, &st))
717
		die_errno("unable to stat '%s'", path);
718
	return add_to_index(istate, path, &st, flags);
719 720
}

721 722
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
723
		unsigned int refresh_options)
724 725 726 727
{
	int size, len;
	struct cache_entry *ce;

728 729
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
730
		return NULL;
731
	}
732 733 734 735 736 737 738

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

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

743
	return refresh_cache_entry(ce, refresh_options);
744 745
}

746
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
747 748 749 750 751
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

752 753 754 755 756 757 758 759 760 761 762 763 764 765 766
/*
 * 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.
	 */
767

768
	/* "." is not allowed */
769
	if (*rest == '\0' || is_dir_sep(*rest))
770 771
		return 0;

772
	switch (*rest) {
773 774 775 776 777 778 779 780 781 782 783 784
	/*
	 * ".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 '.':
785
		if (rest[1] == '\0' || is_dir_sep(rest[1]))
786 787 788 789 790 791 792 793 794
			return 0;
	}
	return 1;
}

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

795 796 797
	if (has_dos_drive_prefix(path))
		return 0;

798 799 800 801
	goto inside;
	for (;;) {
		if (!c)
			return 1;
802
		if (is_dir_sep(c)) {
803 804
inside:
			c = *path++;
805 806 807
			if ((c == '.' && !verify_dotfile(path)) ||
			    is_dir_sep(c) || c == '\0')
				return 0;
808 809 810 811 812
		}
		c = *path++;
	}
}

813 814 815
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
816
 */
817 818
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
819
{
820 821
	int retval = 0;
	int len = ce_namelen(ce);
822
	int stage = ce_stage(ce);
823
	const char *name = ce->name;
824

825 826
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
827

828
		if (len >= ce_namelen(p))
829
			break;
830 831
		if (memcmp(name, p->name, len))
			break;
832 833
		if (ce_stage(p) != stage)
			continue;
834 835
		if (p->name[len] != '/')
			continue;
836
		if (p->ce_flags & CE_REMOVE)
837
			continue;
838 839 840
		retval = -1;
		if (!ok_to_replace)
			break;
841
		remove_index_entry_at(istate, --pos);
842
	}
843 844
	return retval;
}
845

846 847 848 849
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
850 851
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
852 853
{
	int retval = 0;
854
	int stage = ce_stage(ce);
855 856
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
857

858 859
	for (;;) {
		int len;
860

861 862 863 864 865 866 867
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
868

869
		pos = index_name_stage_pos(istate, name, len, stage);
870
		if (pos >= 0) {
871 872 873 874 875 876 877 878
			/*
			 * 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.
			 */
879
			if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
880 881 882
				retval = -1;
				if (!ok_to_replace)
					break;
883
				remove_index_entry_at(istate, pos);
884 885
				continue;
			}
886
		}
887 888
		else
			pos = -pos-1;
889 890 891 892

		/*
		 * Trivial optimization: if we find an entry that
		 * already matches the sub-directory, then we know
893
		 * we're ok, and we can exit.
894
		 */
895 896
		while (pos < istate->cache_nr) {
			struct cache_entry *p = istate->cache[pos];
897 898 899 900
			if ((ce_namelen(p) <= len) ||
			    (p->name[len] != '/') ||
			    memcmp(p->name, name, len))
				break; /* not our subdirectory */
901 902 903
			if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
				/*
				 * p is at the same stage as our entry, and
904 905 906 907 908 909
				 * is a subdirectory of what we are looking
				 * at, so we cannot have conflicts at our
				 * level or anything shorter.
				 */
				return retval;
			pos++;
910
		}
911
	}
912 913 914 915 916 917 918
	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 已提交
919
 *
920 921 922 923
 * 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.
 */
924 925 926
static int check_file_directory_conflict(struct index_state *istate,
					 const struct cache_entry *ce,
					 int pos, int ok_to_replace)
927
{
928 929 930 931 932
	int retval;

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

936 937 938
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
939
	 * in the array.
940
	 */
941
	retval = has_file_name(istate, ce, pos, ok_to_replace);
942

943 944 945 946
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
947
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
948 949
}

950
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
951 952
{
	int pos;
953 954
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
955
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
956
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
957

958 959
	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
		cache_tree_invalidate_path(istate, ce->name);
960
	pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
961

J
Junio C Hamano 已提交
962
	/* existing match? Just replace it. */
963
	if (pos >= 0) {
J
Junio C Hamano 已提交
964 965
		if (!new_only)
			replace_index_entry(istate, pos, ce);
966 967
		return 0;
	}
968
	pos = -pos-1;
969

970 971 972 973
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
974 975
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
976
			ok_to_add = 1;
977
			if (!remove_index_entry_at(istate, pos))
978 979 980 981
				break;
		}
	}

982 983
	if (!ok_to_add)
		return -1;
984
	if (!verify_path(ce->name))
985
		return error("Invalid path '%s'", ce->name);
986

J
Junio C Hamano 已提交
987
	if (!skip_df_check &&
988
	    check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
989
		if (!ok_to_replace)
990 991
			return error("'%s' appears as both a file and as a directory",
				     ce->name);
992
		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
993 994
		pos = -pos-1;
	}
995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010
	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;
	}
1011

1012
	/* Make sure the array is big enough .. */
1013
	ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1014 1015

	/* Add it in.. */
1016
	istate->cache_nr++;
1017
	if (istate->cache_nr > pos + 1)
1018 1019 1020
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
1021
	set_index_entry(istate, pos, ce);
1022
	istate->cache_changed |= CE_ENTRY_ADDED;
1023 1024 1025
	return 0;
}

L
Linus Torvalds 已提交
1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
/*
 * "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.
 */
1037
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1038
					     struct cache_entry *ce,
1039 1040
					     unsigned int options, int *err,
					     int *changed_ret)
L
Linus Torvalds 已提交
1041 1042 1043 1044
{
	struct stat st;
	struct cache_entry *updated;
	int changed, size;
1045
	int refresh = options & CE_MATCH_REFRESH;
1046
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1047
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1048
	int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
L
Linus Torvalds 已提交
1049

1050
	if (!refresh || ce_uptodate(ce))
1051 1052
		return ce;

1053
	/*
1054 1055 1056
	 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
	 * that the change to the work tree does not matter and told
	 * us not to worry.
1057
	 */
1058 1059 1060 1061
	if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
		ce_mark_uptodate(ce);
		return ce;
	}
1062 1063 1064 1065 1066
	if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
		ce_mark_uptodate(ce);
		return ce;
	}

1067 1068 1069 1070 1071 1072 1073 1074
	if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
		if (ignore_missing)
			return ce;
		if (err)
			*err = ENOENT;
		return NULL;
	}

1075
	if (lstat(ce->name, &st) < 0) {
1076 1077
		if (ignore_missing && errno == ENOENT)
			return ce;
1078 1079
		if (err)
			*err = errno;
1080 1081
		return NULL;
	}
L
Linus Torvalds 已提交
1082

1083
	changed = ie_match_stat(istate, ce, &st, options);
1084 1085
	if (changed_ret)
		*changed_ret = changed;
L
Linus Torvalds 已提交
1086
	if (!changed) {
1087 1088 1089 1090 1091 1092 1093 1094
		/*
		 * 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 &&
1095
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
1096
			; /* mark this one VALID again */
1097 1098 1099 1100 1101 1102
		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.
			 */
1103 1104
			if (!S_ISGITLINK(ce->ce_mode))
				ce_mark_uptodate(ce);
1105
			return ce;
1106
		}
L
Linus Torvalds 已提交
1107 1108
	}

1109
	if (ie_modified(istate, ce, &st, options)) {
1110 1111
		if (err)
			*err = EINVAL;
1112 1113
		return NULL;
	}
L
Linus Torvalds 已提交
1114 1115 1116 1117 1118

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1119 1120 1121 1122 1123
	/*
	 * 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 已提交
1124
	 */
1125
	if (!ignore_valid && assume_unchanged &&
1126 1127
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1128

1129
	/* istate->cache_changed is updated in the caller */
L
Linus Torvalds 已提交
1130 1131 1132
	return updated;
}

1133
static void show_file(const char * fmt, const char * name, int in_porcelain,
1134
		      int * first, const char *header_msg)
1135 1136 1137
{
	if (in_porcelain && *first && header_msg) {
		printf("%s\n", header_msg);
1138
		*first = 0;
1139 1140 1141 1142
	}
	printf(fmt, name);
}

1143 1144
int refresh_index(struct index_state *istate, unsigned int flags,
		  const struct pathspec *pathspec,
1145
		  char *seen, const char *header_msg)
L
Linus Torvalds 已提交
1146 1147 1148 1149 1150 1151 1152
{
	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;
1153
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1154 1155
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1156 1157
	unsigned int options = (CE_MATCH_REFRESH |
				(really ? CE_MATCH_IGNORE_VALID : 0) |
1158
				(not_new ? CE_MATCH_IGNORE_MISSING : 0));
J
Jeff King 已提交
1159
	const char *modified_fmt;
1160 1161 1162
	const char *deleted_fmt;
	const char *typechange_fmt;
	const char *added_fmt;
J
Jeff King 已提交
1163
	const char *unmerged_fmt;
L
Linus Torvalds 已提交
1164

J
Jeff King 已提交
1165
	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1166 1167 1168
	deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
	typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
	added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
J
Jeff King 已提交
1169
	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1170
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1171
		struct cache_entry *ce, *new;
1172
		int cache_errno = 0;
1173
		int changed = 0;
1174
		int filtered = 0;
1175

1176
		ce = istate->cache[i];
1177 1178 1179
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1180
		if (pathspec && !ce_path_match(ce, pathspec, seen))
1181 1182
			filtered = 1;

L
Linus Torvalds 已提交
1183
		if (ce_stage(ce)) {
1184 1185
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1186 1187 1188 1189
				i++;
			i--;
			if (allow_unmerged)
				continue;
1190 1191 1192
			if (!filtered)
				show_file(unmerged_fmt, ce->name, in_porcelain,
					  &first, header_msg);
L
Linus Torvalds 已提交
1193 1194 1195 1196
			has_errors = 1;
			continue;
		}

1197
		if (filtered)
1198 1199
			continue;

1200
		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1201
		if (new == ce)
L
Linus Torvalds 已提交
1202
			continue;
1203
		if (!new) {
1204 1205
			const char *fmt;

1206
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1207 1208 1209
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1210
				ce->ce_flags &= ~CE_VALID;
1211
				ce->ce_flags |= CE_UPDATE_IN_BASE;
1212
				istate->cache_changed |= CE_ENTRY_CHANGED;
L
Linus Torvalds 已提交
1213 1214 1215
			}
			if (quiet)
				continue;
1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226

			if (cache_errno == ENOENT)
				fmt = deleted_fmt;
			else if (ce->ce_flags & CE_INTENT_TO_ADD)
				fmt = added_fmt; /* must be before other checks */
			else if (changed & TYPE_CHANGED)
				fmt = typechange_fmt;
			else
				fmt = modified_fmt;
			show_file(fmt,
				  ce->name, in_porcelain, &first, header_msg);
L
Linus Torvalds 已提交
1227 1228 1229
			has_errors = 1;
			continue;
		}
1230 1231

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1232 1233 1234 1235
	}
	return has_errors;
}

1236 1237
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options)
1238
{
1239
	return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1240 1241
}

1242 1243 1244 1245 1246

/*****************************************************************
 * Index File I/O
 *****************************************************************/

1247 1248
#define INDEX_FORMAT_DEFAULT 3

1249 1250 1251
static unsigned int get_index_format_default(void)
{
	char *envversion = getenv("GIT_INDEX_VERSION");
1252
	char *endp;
1253
	int value;
1254 1255
	unsigned int version = INDEX_FORMAT_DEFAULT;

1256
	if (!envversion) {
1257 1258
		if (!git_config_get_int("index.version", &value))
			version = value;
1259 1260
		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
			warning(_("index.version set, but the value is invalid.\n"
1261
				  "Using version %i"), INDEX_FORMAT_DEFAULT);
1262
			return INDEX_FORMAT_DEFAULT;
1263 1264 1265
		}
		return version;
	}
1266 1267 1268 1269 1270 1271 1272 1273 1274

	version = strtoul(envversion, &endp, 10);
	if (*endp ||
	    version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
		warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
			  "Using version %i"), INDEX_FORMAT_DEFAULT);
		version = INDEX_FORMAT_DEFAULT;
	}
	return version;
1275 1276
}

1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287
/*
 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
 * Again - this is just a (very strong in practice) heuristic that
 * the inode hasn't changed.
 *
 * We save the fields in big-endian order to allow using the
 * index file over NFS transparently.
 */
struct ondisk_cache_entry {
	struct cache_time ctime;
	struct cache_time mtime;
1288 1289 1290 1291 1292 1293
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1294
	unsigned char sha1[20];
1295
	uint16_t flags;
1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306
	char name[FLEX_ARRAY]; /* more */
};

/*
 * This struct is used when CE_EXTENDED bit is 1
 * The struct must match ondisk_cache_entry exactly from
 * ctime till flags
 */
struct ondisk_cache_entry_extended {
	struct cache_time ctime;
	struct cache_time mtime;
1307 1308 1309 1310 1311 1312
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1313
	unsigned char sha1[20];
1314 1315
	uint16_t flags;
	uint16_t flags2;
1316 1317 1318
	char name[FLEX_ARRAY]; /* more */
};

1319
/* These are only used for v3 or lower */
1320 1321 1322 1323 1324 1325 1326
#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
			    ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
			    ondisk_cache_entry_size(ce_namelen(ce)))

1327
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1328
{
1329
	git_SHA_CTX c;
1330
	unsigned char sha1[20];
1331
	int hdr_version;
1332

1333
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1334
		return error("bad signature");
1335
	hdr_version = ntohl(hdr->hdr_version);
1336
	if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1337
		return error("bad index version %d", hdr_version);
1338 1339 1340
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1341
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1342
		return error("bad index file sha1 signature");
1343 1344 1345
	return 0;
}

1346 1347
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1348 1349 1350
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1351
		istate->cache_tree = cache_tree_read(data, sz);
1352
		break;
1353 1354 1355
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1356 1357 1358 1359
	case CACHE_EXT_LINK:
		if (read_link_extension(istate, data, sz))
			return -1;
		break;
1360 1361 1362 1363 1364 1365 1366 1367 1368 1369
	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;
}

1370
int read_index(struct index_state *istate)
1371
{
1372
	return read_index_from(istate, get_index_file());
1373 1374
}

1375 1376 1377 1378 1379 1380 1381
static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
						   unsigned int flags,
						   const char *name,
						   size_t len)
{
	struct cache_entry *ce = xmalloc(cache_entry_size(len));

1382 1383 1384 1385 1386 1387 1388 1389 1390 1391
	ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
	ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
	ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
	ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
	ce->ce_stat_data.sd_dev   = get_be32(&ondisk->dev);
	ce->ce_stat_data.sd_ino   = get_be32(&ondisk->ino);
	ce->ce_mode  = get_be32(&ondisk->mode);
	ce->ce_stat_data.sd_uid   = get_be32(&ondisk->uid);
	ce->ce_stat_data.sd_gid   = get_be32(&ondisk->gid);
	ce->ce_stat_data.sd_size  = get_be32(&ondisk->size);
1392 1393
	ce->ce_flags = flags & ~CE_NAMEMASK;
	ce->ce_namelen = len;
1394
	ce->index = 0;
1395 1396 1397 1398 1399 1400
	hashcpy(ce->sha1, ondisk->sha1);
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
	return ce;
}

1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421
/*
 * Adjacent cache entries tend to share the leading paths, so it makes
 * sense to only store the differences in later entries.  In the v4
 * on-disk format of the index, each on-disk cache entry stores the
 * number of bytes to be stripped from the end of the previous name,
 * and the bytes to append to the result, to come up with its name.
 */
static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
{
	const unsigned char *ep, *cp = (const unsigned char *)cp_;
	size_t len = decode_varint(&cp);

	if (name->len < len)
		die("malformed name field in the index");
	strbuf_remove(name, name->len - len, len);
	for (ep = cp; *ep; ep++)
		; /* find the end */
	strbuf_add(name, cp, ep - cp);
	return (const char *)ep + 1 - cp_;
}

1422
static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1423 1424
					    unsigned long *ent_size,
					    struct strbuf *previous_name)
1425
{
1426
	struct cache_entry *ce;
1427
	size_t len;
1428
	const char *name;
1429
	unsigned int flags;
1430

1431
	/* On-disk flags are just 16 bits */
1432
	flags = get_be16(&ondisk->flags);
1433
	len = flags & CE_NAMEMASK;
1434

1435
	if (flags & CE_EXTENDED) {
1436 1437 1438
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1439
		extended_flags = get_be16(&ondisk2->flags2) << 16;
1440 1441 1442
		/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
		if (extended_flags & ~CE_EXTENDED_FLAGS)
			die("Unknown index entry format %08x", extended_flags);
1443
		flags |= extended_flags;
1444 1445 1446 1447 1448
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
	if (!previous_name) {
		/* v3 and earlier */
		if (len == CE_NAMEMASK)
			len = strlen(name);
		ce = cache_entry_from_ondisk(ondisk, flags, name, len);

		*ent_size = ondisk_ce_size(ce);
	} else {
		unsigned long consumed;
		consumed = expand_name_field(previous_name, name);
		ce = cache_entry_from_ondisk(ondisk, flags,
					     previous_name->buf,
					     previous_name->len);

		*ent_size = (name - ((char *)ondisk)) + consumed;
	}
1465
	return ce;
1466 1467
}

1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482
static void check_ce_order(struct cache_entry *ce, struct cache_entry *next_ce)
{
	int name_compare = strcmp(ce->name, next_ce->name);
	if (0 < name_compare)
		die("unordered stage entries in index");
	if (!name_compare) {
		if (!ce_stage(ce))
			die("multiple stage entries for merged file '%s'",
				ce->name);
		if (ce_stage(ce) > ce_stage(next_ce))
			die("unordered stage entries for '%s'",
				ce->name);
	}
}

1483
/* remember to discard_cache() before reading a different cache! */
1484
int do_read_index(struct index_state *istate, const char *path, int must_exist)
1485 1486 1487
{
	int fd, i;
	struct stat st;
1488
	unsigned long src_offset;
1489
	struct cache_header *hdr;
1490 1491
	void *mmap;
	size_t mmap_size;
1492
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1493

1494
	if (istate->initialized)
1495
		return istate->cache_nr;
1496

K
Kjetil Barvik 已提交
1497 1498
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1499
	fd = open(path, O_RDONLY);
1500
	if (fd < 0) {
1501
		if (!must_exist && errno == ENOENT)
1502
			return 0;
1503
		die_errno("%s: index file open failed", path);
1504
	}
1505

1506
	if (fstat(fd, &st))
1507
		die_errno("cannot stat the open index");
1508

1509 1510
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1511 1512
		die("index file smaller than expected");

1513 1514
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
	if (mmap == MAP_FAILED)
1515
		die_errno("unable to map index file");
1516
	close(fd);
1517

1518 1519
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1520 1521
		goto unmap;

1522
	hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
1523
	istate->version = ntohl(hdr->hdr_version);
1524 1525
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
1526
	istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1527
	istate->initialized = 1;
1528

1529
	if (istate->version == 4)
1530 1531 1532 1533
		previous_name = &previous_name_buf;
	else
		previous_name = NULL;

1534
	src_offset = sizeof(*hdr);
1535
	for (i = 0; i < istate->cache_nr; i++) {
1536
		struct ondisk_cache_entry *disk_ce;
1537
		struct cache_entry *ce;
1538
		unsigned long consumed;
1539

1540
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1541
		ce = create_from_disk(disk_ce, &consumed, previous_name);
1542
		set_index_entry(istate, i, ce);
1543

1544 1545 1546
		if (i > 0)
			check_ce_order(istate->cache[i - 1], ce);

1547
		src_offset += consumed;
1548
	}
1549
	strbuf_release(&previous_name_buf);
K
Kjetil Barvik 已提交
1550
	istate->timestamp.sec = st.st_mtime;
1551
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1552

1553
	while (src_offset <= mmap_size - 20 - 8) {
1554 1555 1556 1557 1558 1559
		/* 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.
		 */
1560
		uint32_t extsize;
1561
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1562
		extsize = ntohl(extsize);
1563
		if (read_index_extension(istate,
1564 1565
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1566
					 extsize) < 0)
1567
			goto unmap;
1568 1569
		src_offset += 8;
		src_offset += extsize;
1570
	}
1571
	munmap(mmap, mmap_size);
1572
	return istate->cache_nr;
1573 1574

unmap:
1575
	munmap(mmap, mmap_size);
1576
	die("index file corrupt");
1577 1578
}

1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612
int read_index_from(struct index_state *istate, const char *path)
{
	struct split_index *split_index;
	int ret;

	/* istate->initialized covers both .git/index and .git/sharedindex.xxx */
	if (istate->initialized)
		return istate->cache_nr;

	ret = do_read_index(istate, path, 0);
	split_index = istate->split_index;
	if (!split_index)
		return ret;

	if (is_null_sha1(split_index->base_sha1))
		return ret;

	if (split_index->base)
		discard_index(split_index->base);
	else
		split_index->base = xcalloc(1, sizeof(*split_index->base));
	ret = do_read_index(split_index->base,
			    git_path("sharedindex.%s",
				     sha1_to_hex(split_index->base_sha1)), 1);
	if (hashcmp(split_index->base_sha1, split_index->base->sha1))
		die("broken index, expect %s in %s, got %s",
		    sha1_to_hex(split_index->base_sha1),
		    git_path("sharedindex.%s",
				     sha1_to_hex(split_index->base_sha1)),
		    sha1_to_hex(split_index->base->sha1));
	merge_base_index(istate);
	return ret;
}

1613 1614
int is_index_unborn(struct index_state *istate)
{
1615
	return (!istate->cache_nr && !istate->timestamp.sec);
1616 1617
}

1618
int discard_index(struct index_state *istate)
1619
{
1620 1621
	int i;

1622 1623 1624 1625 1626 1627 1628
	for (i = 0; i < istate->cache_nr; i++) {
		if (istate->cache[i]->index &&
		    istate->split_index &&
		    istate->split_index->base &&
		    istate->cache[i]->index <= istate->split_index->base->cache_nr &&
		    istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
			continue;
1629
		free(istate->cache[i]);
1630
	}
1631
	resolve_undo_clear_index(istate);
1632 1633
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1634 1635
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1636
	free_name_hash(istate);
1637
	cache_tree_free(&(istate->cache_tree));
1638
	istate->initialized = 0;
1639 1640 1641
	free(istate->cache);
	istate->cache = NULL;
	istate->cache_alloc = 0;
1642
	discard_split_index(istate);
1643
	return 0;
1644 1645
}

1646
int unmerged_index(const struct index_state *istate)
1647 1648 1649 1650 1651 1652 1653 1654 1655
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1656
#define WRITE_BUFFER_SIZE 8192
1657
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1658 1659
static unsigned long write_buffer_len;

1660
static int ce_write_flush(git_SHA_CTX *context, int fd)
1661 1662 1663
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1664
		git_SHA1_Update(context, write_buffer, buffered);
1665
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1666 1667 1668 1669 1670 1671
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1672
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1673 1674 1675 1676 1677 1678 1679 1680 1681
{
	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) {
1682 1683
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1684 1685 1686 1687 1688
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1689
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1690 1691
	}
	return 0;
1692 1693
}

1694
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1695
				  unsigned int ext, unsigned int sz)
1696 1697 1698
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1699 1700
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1701 1702
}

1703
static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
1704 1705
{
	unsigned int left = write_buffer_len;
1706

1707 1708
	if (left) {
		write_buffer_len = 0;
1709
		git_SHA1_Update(context, write_buffer, left);
1710
	}
1711

1712 1713
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1714
		if (write_in_full(fd, write_buffer, left) != left)
1715 1716 1717 1718
			return -1;
		left = 0;
	}

1719
	/* Append the SHA1 signature at the end */
1720
	git_SHA1_Final(write_buffer + left, context);
1721
	hashcpy(sha1, write_buffer + left);
1722
	left += 20;
1723
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1724 1725
}

J
Junio C Hamano 已提交
1726 1727 1728 1729 1730 1731
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
1732
	 * ce_stat_data.sd_mtime match the index file mtime.
1733 1734 1735 1736 1737
	 *
	 * Note that this actually does not do much for gitlinks, for
	 * which ce_match_stat_basic() always goes to the actual
	 * contents.  The caller checks with is_racy_timestamp() which
	 * always says "no" for gitlinks, so we are not called for them ;-)
J
Junio C Hamano 已提交
1738 1739 1740 1741 1742 1743 1744 1745
	 */
	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)) {
1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756
		/* 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
		 *
1757
		 * but it does not.  When the second update-index runs,
1758 1759 1760 1761 1762
		 * 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 已提交
1763
		 * obtain from the filesystem next time we stat("frotz").
1764 1765 1766 1767 1768 1769 1770
		 *
		 * 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.
		 */
1771
		ce->ce_stat_data.sd_size = 0;
J
Junio C Hamano 已提交
1772 1773 1774
	}
}

1775 1776 1777
/* Copy miscellaneous fields but not the name */
static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
				       struct cache_entry *ce)
1778
{
1779 1780
	short flags;

1781 1782 1783 1784 1785 1786
	ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
	ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
	ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
	ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
	ondisk->dev  = htonl(ce->ce_stat_data.sd_dev);
	ondisk->ino  = htonl(ce->ce_stat_data.sd_ino);
1787
	ondisk->mode = htonl(ce->ce_mode);
1788 1789 1790
	ondisk->uid  = htonl(ce->ce_stat_data.sd_uid);
	ondisk->gid  = htonl(ce->ce_stat_data.sd_gid);
	ondisk->size = htonl(ce->ce_stat_data.sd_size);
1791
	hashcpy(ondisk->sha1, ce->sha1);
1792

1793
	flags = ce->ce_flags & ~CE_NAMEMASK;
1794 1795
	flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
	ondisk->flags = htons(flags);
1796 1797 1798 1799
	if (ce->ce_flags & CE_EXTENDED) {
		struct ondisk_cache_entry_extended *ondisk2;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
		ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1800
		return ondisk2->name;
1801
	}
1802 1803 1804 1805 1806
	else {
		return ondisk->name;
	}
}

1807 1808
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
			  struct strbuf *previous_name)
1809
{
1810 1811
	int size;
	struct ondisk_cache_entry *ondisk;
1812
	int saved_namelen = saved_namelen; /* compiler workaround */
1813 1814 1815
	char *name;
	int result;

1816 1817 1818 1819 1820
	if (ce->ce_flags & CE_STRIP_NAME) {
		saved_namelen = ce_namelen(ce);
		ce->ce_namelen = 0;
	}

1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850
	if (!previous_name) {
		size = ondisk_ce_size(ce);
		ondisk = xcalloc(1, size);
		name = copy_cache_entry_to_ondisk(ondisk, ce);
		memcpy(name, ce->name, ce_namelen(ce));
	} else {
		int common, to_remove, prefix_size;
		unsigned char to_remove_vi[16];
		for (common = 0;
		     (ce->name[common] &&
		      common < previous_name->len &&
		      ce->name[common] == previous_name->buf[common]);
		     common++)
			; /* still matching */
		to_remove = previous_name->len - common;
		prefix_size = encode_varint(to_remove, to_remove_vi);

		if (ce->ce_flags & CE_EXTENDED)
			size = offsetof(struct ondisk_cache_entry_extended, name);
		else
			size = offsetof(struct ondisk_cache_entry, name);
		size += prefix_size + (ce_namelen(ce) - common + 1);

		ondisk = xcalloc(1, size);
		name = copy_cache_entry_to_ondisk(ondisk, ce);
		memcpy(name, to_remove_vi, prefix_size);
		memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);

		strbuf_splice(previous_name, common, to_remove,
			      ce->name + common, ce_namelen(ce) - common);
1851
	}
1852 1853 1854 1855
	if (ce->ce_flags & CE_STRIP_NAME) {
		ce->ce_namelen = saved_namelen;
		ce->ce_flags &= ~CE_STRIP_NAME;
	}
1856

1857 1858 1859
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1860 1861
}

1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905
/*
 * This function verifies if index_state has the correct sha1 of the
 * index file.  Don't die if we have any other failure, just return 0.
 */
static int verify_index_from(const struct index_state *istate, const char *path)
{
	int fd;
	ssize_t n;
	struct stat st;
	unsigned char sha1[20];

	if (!istate->initialized)
		return 0;

	fd = open(path, O_RDONLY);
	if (fd < 0)
		return 0;

	if (fstat(fd, &st))
		goto out;

	if (st.st_size < sizeof(struct cache_header) + 20)
		goto out;

	n = pread_in_full(fd, sha1, 20, st.st_size - 20);
	if (n != 20)
		goto out;

	if (hashcmp(istate->sha1, sha1))
		goto out;

	close(fd);
	return 1;

out:
	close(fd);
	return 0;
}

static int verify_index(const struct index_state *istate)
{
	return verify_index_from(istate, get_index_file());
}

1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918
static int has_racy_timestamp(struct index_state *istate)
{
	int entries = istate->cache_nr;
	int i;

	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = istate->cache[i];
		if (is_racy_timestamp(istate, ce))
			return 1;
	}
	return 0;
}

1919
/*
O
Ondřej Bílka 已提交
1920
 * Opportunistically update the index but do not complain if we can't
1921 1922 1923
 */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
1924
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
J
Junio C Hamano 已提交
1925
	    verify_index(istate) &&
1926
	    write_locked_index(istate, lockfile, COMMIT_LOCK))
1927 1928 1929
		rollback_lock_file(lockfile);
}

1930 1931
static int do_write_index(struct index_state *istate, int newfd,
			  int strip_extensions)
1932
{
1933
	git_SHA_CTX c;
1934
	struct cache_header hdr;
1935
	int i, err, removed, extended, hdr_version;
1936 1937
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1938
	struct stat st;
1939
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1940

1941
	for (i = removed = extended = 0; i < entries; i++) {
1942
		if (cache[i]->ce_flags & CE_REMOVE)
1943
			removed++;
1944

1945 1946 1947 1948 1949 1950 1951 1952
		/* reduce extended entries if possible */
		cache[i]->ce_flags &= ~CE_EXTENDED;
		if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
			extended++;
			cache[i]->ce_flags |= CE_EXTENDED;
		}
	}

1953
	if (!istate->version) {
1954
		istate->version = get_index_format_default();
1955 1956 1957
		if (getenv("GIT_TEST_SPLIT_INDEX"))
			init_split_index(istate);
	}
1958 1959 1960 1961 1962 1963 1964

	/* demote version 3 to version 2 when the latter suffices */
	if (istate->version == 3 || istate->version == 2)
		istate->version = extended ? 3 : 2;

	hdr_version = istate->version;

1965
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1966
	hdr.hdr_version = htonl(hdr_version);
1967
	hdr.hdr_entries = htonl(entries - removed);
1968

1969
	git_SHA1_Init(&c);
1970
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1971 1972
		return -1;

1973
	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1974 1975
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1976
		if (ce->ce_flags & CE_REMOVE)
1977
			continue;
1978
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1979
			ce_smudge_racily_clean_entry(ce);
1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990
		if (is_null_sha1(ce->sha1)) {
			static const char msg[] = "cache entry has null sha1: %s";
			static int allow = -1;

			if (allow < 0)
				allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
			if (allow)
				warning(msg, ce->name);
			else
				return error(msg, ce->name);
		}
1991
		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1992 1993
			return -1;
	}
1994
	strbuf_release(&previous_name_buf);
1995

1996
	/* Write extension data here */
1997
	if (!strip_extensions && istate->split_index) {
1998 1999 2000 2001 2002 2003 2004 2005 2006 2007
		struct strbuf sb = STRBUF_INIT;

		err = write_link_extension(&sb, istate) < 0 ||
			write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
					       sb.len) < 0 ||
			ce_write(&c, newfd, sb.buf, sb.len) < 0;
		strbuf_release(&sb);
		if (err)
			return -1;
	}
2008
	if (!strip_extensions && istate->cache_tree) {
2009
		struct strbuf sb = STRBUF_INIT;
2010 2011 2012 2013 2014 2015

		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)
2016 2017
			return -1;
	}
2018
	if (!strip_extensions && istate->resolve_undo) {
2019 2020 2021 2022 2023 2024 2025 2026 2027 2028
		struct strbuf sb = STRBUF_INIT;

		resolve_undo_write(&sb, istate->resolve_undo);
		err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
					     sb.len) < 0
			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
		strbuf_release(&sb);
		if (err)
			return -1;
	}
2029

2030
	if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2031
		return -1;
2032 2033
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
2034
	return 0;
2035
}
2036

2037 2038 2039 2040 2041 2042 2043 2044
void set_alternate_index_output(const char *name)
{
	alternate_index_output = name;
}

static int commit_locked_index(struct lock_file *lk)
{
	if (alternate_index_output) {
2045
		if (close_lock_file(lk))
2046 2047 2048 2049 2050 2051 2052 2053 2054 2055
			return -1;
		if (rename(lk->filename, alternate_index_output))
			return -1;
		lk->filename[0] = 0;
		return 0;
	} else {
		return commit_lock_file(lk);
	}
}

2056 2057 2058
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
				 unsigned flags)
{
2059
	int ret = do_write_index(istate, lock->fd, 0);
2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071
	if (ret)
		return ret;
	assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
	       (COMMIT_LOCK | CLOSE_LOCK));
	if (flags & COMMIT_LOCK)
		return commit_locked_index(lock);
	else if (flags & CLOSE_LOCK)
		return close_lock_file(lock);
	else
		return ret;
}

2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082
static int write_split_index(struct index_state *istate,
			     struct lock_file *lock,
			     unsigned flags)
{
	int ret;
	prepare_to_write_split_index(istate);
	ret = do_write_locked_index(istate, lock, flags);
	finish_writing_split_index(istate);
	return ret;
}

2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100
static char *temporary_sharedindex;

static void remove_temporary_sharedindex(void)
{
	if (temporary_sharedindex) {
		unlink_or_warn(temporary_sharedindex);
		free(temporary_sharedindex);
		temporary_sharedindex = NULL;
	}
}

static void remove_temporary_sharedindex_on_signal(int signo)
{
	remove_temporary_sharedindex();
	sigchain_pop(signo);
	raise(signo);
}

2101 2102
static int write_shared_index(struct index_state *istate,
			      struct lock_file *lock, unsigned flags)
2103 2104 2105 2106 2107 2108
{
	struct split_index *si = istate->split_index;
	static int installed_handler;
	int fd, ret;

	temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
2109 2110 2111 2112 2113 2114 2115
	fd = mkstemp(temporary_sharedindex);
	if (fd < 0) {
		free(temporary_sharedindex);
		temporary_sharedindex = NULL;
		hashclr(si->base_sha1);
		return do_write_locked_index(istate, lock, flags);
	}
2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135
	if (!installed_handler) {
		atexit(remove_temporary_sharedindex);
		sigchain_push_common(remove_temporary_sharedindex_on_signal);
	}
	move_cache_to_base_index(istate);
	ret = do_write_index(si->base, fd, 1);
	close(fd);
	if (ret) {
		remove_temporary_sharedindex();
		return ret;
	}
	ret = rename(temporary_sharedindex,
		     git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
	free(temporary_sharedindex);
	temporary_sharedindex = NULL;
	if (!ret)
		hashcpy(si->base_sha1, si->base->sha1);
	return ret;
}

2136 2137 2138
int write_locked_index(struct index_state *istate, struct lock_file *lock,
		       unsigned flags)
{
2139 2140
	struct split_index *si = istate->split_index;

2141 2142
	if (!si || alternate_index_output ||
	    (istate->cache_changed & ~EXTMASK)) {
2143 2144 2145 2146 2147
		if (si)
			hashclr(si->base_sha1);
		return do_write_locked_index(istate, lock, flags);
	}

2148 2149 2150 2151 2152
	if (getenv("GIT_TEST_SPLIT_INDEX")) {
		int v = si->base_sha1[0];
		if ((v & 15) < 6)
			istate->cache_changed |= SPLIT_INDEX_ORDERED;
	}
2153
	if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2154
		int ret = write_shared_index(istate, lock, flags);
2155 2156 2157 2158
		if (ret)
			return ret;
	}

2159
	return write_split_index(istate, lock, flags);
2160 2161
}

2162 2163
/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
2164
 * index_state, dropping any unmerged entries.  Returns true if
2165 2166 2167 2168 2169 2170 2171
 * the index is unmerged.  Callers who want to refuse to work
 * from an unmerged state can call this and check its return value,
 * instead of calling read_cache().
 */
int read_index_unmerged(struct index_state *istate)
{
	int i;
2172
	int unmerged = 0;
2173 2174 2175 2176

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
2177 2178 2179 2180
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
2181
			continue;
2182
		unmerged = 1;
2183
		len = ce_namelen(ce);
2184 2185 2186
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
2187 2188
		new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
		new_ce->ce_namelen = len;
2189 2190 2191
		new_ce->ce_mode = ce->ce_mode;
		if (add_index_entry(istate, new_ce, 0))
			return error("%s: cannot drop to stage #0",
2192
				     new_ce->name);
2193
	}
2194
	return unmerged;
2195
}
2196

2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223
/*
 * Returns 1 if the path is an "other" path with respect to
 * the index; that is, the path is not mentioned in the index at all,
 * either as a file, a directory with some files in the index,
 * or as an unmerged entry.
 *
 * We helpfully remove a trailing "/" from directories so that
 * the output of read_directory can be used as-is.
 */
int index_name_is_other(const struct index_state *istate, const char *name,
		int namelen)
{
	int pos;
	if (namelen && name[namelen - 1] == '/')
		namelen--;
	pos = index_name_pos(istate, name, namelen);
	if (0 <= pos)
		return 0;	/* exact match */
	pos = -pos - 1;
	if (pos < istate->cache_nr) {
		struct cache_entry *ce = istate->cache[pos];
		if (ce_namelen(ce) == namelen &&
		    !memcmp(ce->name, name, namelen))
			return 0; /* Yup, this one exists unmerged */
	}
	return 1;
}
2224

2225
void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253
{
	int pos, len;
	unsigned long sz;
	enum object_type type;
	void *data;

	len = strlen(path);
	pos = index_name_pos(istate, path, len);
	if (pos < 0) {
		/*
		 * We might be in the middle of a merge, in which
		 * case we would read stage #2 (ours).
		 */
		int i;
		for (i = -pos - 1;
		     (pos < 0 && i < istate->cache_nr &&
		      !strcmp(istate->cache[i]->name, path));
		     i++)
			if (ce_stage(istate->cache[i]) == 2)
				pos = i;
	}
	if (pos < 0)
		return NULL;
	data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
	if (!data || type != OBJ_BLOB) {
		free(data);
		return NULL;
	}
2254 2255
	if (size)
		*size = sz;
2256 2257
	return data;
}
M
Michael Haggerty 已提交
2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287

void stat_validity_clear(struct stat_validity *sv)
{
	free(sv->sd);
	sv->sd = NULL;
}

int stat_validity_check(struct stat_validity *sv, const char *path)
{
	struct stat st;

	if (stat(path, &st) < 0)
		return sv->sd == NULL;
	if (!sv->sd)
		return 0;
	return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
}

void stat_validity_update(struct stat_validity *sv, int fd)
{
	struct stat st;

	if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
		stat_validity_clear(sv);
	else {
		if (!sv->sd)
			sv->sd = xcalloc(1, sizeof(struct stat_data));
		fill_stat_data(sv->sd, &st);
	}
}