read-cache.c 60.6 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 "lockfile.h"
9
#include "cache-tree.h"
10
#include "refs.h"
11
#include "dir.h"
12 13
#include "tree.h"
#include "commit.h"
J
Junio C Hamano 已提交
14
#include "blob.h"
15
#include "resolve-undo.h"
16 17
#include "strbuf.h"
#include "varint.h"
18
#include "split-index.h"
19
#include "sigchain.h"
20
#include "utf8.h"
21

22 23
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options);
24

25 26 27 28
/* Mask for the name length in ce_flags in the on-disk index */

#define CE_NAMEMASK  (0x0fff)

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

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

48
struct index_state the_index;
49
static const char *alternate_index_output;
50

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

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

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

69 70 71 72 73 74 75
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);
76
	new->ce_flags &= ~CE_HASHED;
77
	new->ce_namelen = namelen;
78
	new->index = 0;
79 80
	memcpy(new->name, new_name, namelen + 1);

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

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 139 140
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;
}

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

	if (assume_unchanged)
151
		ce->ce_flags |= CE_VALID;
152 153 154

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
155 156
}

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

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

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

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

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

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

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

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

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

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

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

262
	changed |= match_stat_data(&ce->ce_stat_data, st);
263

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

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

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

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

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

309 310 311 312 313 314 315 316
	/*
	 * 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 已提交
317
	changed = ce_match_stat_basic(ce, st);
J
Junio C Hamano 已提交
318

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

J
Junio C Hamano 已提交
342
	return changed;
343 344
}

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

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

361 362 363 364 365 366 367 368 369 370 371 372 373
	/*
	 * 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.
374
	 */
375
	if ((changed & DATA_CHANGED) &&
376
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
377 378
		return changed;

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

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

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 437 438
/*
 * 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;
}

439
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
440
{
441 442
	size_t min_len = (len1 < len2) ? len1 : len2;
	int cmp = memcmp(name1, name2, min_len);
443 444 445 446 447 448
	if (cmp)
		return cmp;
	if (len1 < len2)
		return -1;
	if (len1 > len2)
		return 1;
449 450 451 452 453 454 455 456 457 458
	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 已提交
459

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

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

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

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

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

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

511
/*
O
Ondřej Bílka 已提交
512
 * Remove all cache entries marked for removal, that is where
513 514 515 516 517 518 519 520 521
 * 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++) {
522
		if (ce_array[i]->ce_flags & CE_REMOVE) {
523
			remove_name_hash(istate, ce_array[i]);
524
			save_or_free_index_entry(istate, ce_array[i]);
525
		}
526 527 528
		else
			ce_array[j++] = ce_array[i];
	}
529 530
	if (j == istate->cache_nr)
		return;
531
	istate->cache_changed |= CE_ENTRY_REMOVED;
532 533 534
	istate->cache_nr = j;
}

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

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 572 573
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;
}

574 575 576 577 578 579 580 581 582 583 584 585 586 587 588
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
 */
589 590 591
static struct cache_entry *create_alias_ce(struct index_state *istate,
					   struct cache_entry *ce,
					   struct cache_entry *alias)
592 593 594 595 596 597 598 599 600 601 602 603
{
	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);
604
	save_or_free_index_entry(istate, ce);
605 606 607
	return new;
}

608
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
J
Junio C Hamano 已提交
609 610 611 612 613 614 615
{
	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);
}

616
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
617
{
618
	int size, namelen, was_same;
619
	mode_t st_mode = st->st_mode;
620
	struct cache_entry *ce, *alias;
621
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
622 623
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
624 625 626
	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 已提交
627

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

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

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

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

658 659 660 661 662 663
	/* 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) {
664
		adjust_dirname_case(istate, ce->name);
665 666
	}

667
	alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
668
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
669 670
		/* Nothing changed, really */
		free(ce);
671 672
		if (!S_ISGITLINK(alias->ce_mode))
			ce_mark_uptodate(alias);
673
		alias->ce_flags |= CE_ADDED;
674 675
		return 0;
	}
J
Junio C Hamano 已提交
676
	if (!intent_only) {
677
		if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
J
Junio C Hamano 已提交
678 679
			return error("unable to index file %s", path);
	} else
680
		set_object_name_for_intent_to_add_entry(ce);
J
Junio C Hamano 已提交
681

682
	if (ignore_case && alias && different_name(ce, alias))
683
		ce = create_alias_ce(istate, ce, alias);
684
	ce->ce_flags |= CE_ADDED;
685

J
Junio C Hamano 已提交
686
	/* It was suspected to be racily clean, but it turns out to be Ok */
687 688 689 690 691 692 693
	was_same = (alias &&
		    !ce_stage(alias) &&
		    !hashcmp(alias->sha1, ce->sha1) &&
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
		;
J
Junio C Hamano 已提交
694
	else if (add_index_entry(istate, ce, add_option))
695
		return error("unable to add %s to index",path);
696
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
697 698 699 700
		printf("add '%s'\n", path);
	return 0;
}

701
int add_file_to_index(struct index_state *istate, const char *path, int flags)
702 703 704
{
	struct stat st;
	if (lstat(path, &st))
705
		die_errno("unable to stat '%s'", path);
706
	return add_to_index(istate, path, &st, flags);
707 708
}

709 710
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
711
		unsigned int refresh_options)
712 713 714 715
{
	int size, len;
	struct cache_entry *ce;

716 717
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
718
		return NULL;
719
	}
720 721 722 723 724 725 726

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

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

731
	return refresh_cache_entry(ce, refresh_options);
732 733
}

734
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
735 736 737 738 739
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

740 741 742 743 744 745 746 747 748 749 750 751 752 753 754
/*
 * 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.
	 */
755

756
	/* "." is not allowed */
757
	if (*rest == '\0' || is_dir_sep(*rest))
758 759
		return 0;

760
	switch (*rest) {
761 762 763 764 765
	/*
	 * ".git" followed by  NUL or slash is bad. This
	 * shares the path end test with the ".." case.
	 */
	case 'g':
766 767
	case 'G':
		if (rest[1] != 'i' && rest[1] != 'I')
768
			break;
769
		if (rest[2] != 't' && rest[2] != 'T')
770 771 772 773
			break;
		rest += 2;
	/* fallthrough */
	case '.':
774
		if (rest[1] == '\0' || is_dir_sep(rest[1]))
775 776 777 778 779 780 781 782 783
			return 0;
	}
	return 1;
}

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

784 785 786
	if (has_dos_drive_prefix(path))
		return 0;

787 788 789 790
	goto inside;
	for (;;) {
		if (!c)
			return 1;
791
		if (is_dir_sep(c)) {
792
inside:
793 794
			if (protect_hfs && is_hfs_dotgit(path))
				return 0;
795 796
			if (protect_ntfs && is_ntfs_dotgit(path))
				return 0;
797
			c = *path++;
798 799 800
			if ((c == '.' && !verify_dotfile(path)) ||
			    is_dir_sep(c) || c == '\0')
				return 0;
801 802 803 804 805
		}
		c = *path++;
	}
}

806 807 808
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
809
 */
810 811
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
812
{
813 814
	int retval = 0;
	int len = ce_namelen(ce);
815
	int stage = ce_stage(ce);
816
	const char *name = ce->name;
817

818 819
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
820

821
		if (len >= ce_namelen(p))
822
			break;
823 824
		if (memcmp(name, p->name, len))
			break;
825 826
		if (ce_stage(p) != stage)
			continue;
827 828
		if (p->name[len] != '/')
			continue;
829
		if (p->ce_flags & CE_REMOVE)
830
			continue;
831 832 833
		retval = -1;
		if (!ok_to_replace)
			break;
834
		remove_index_entry_at(istate, --pos);
835
	}
836 837
	return retval;
}
838

839 840 841 842
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
843 844
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
845 846
{
	int retval = 0;
847
	int stage = ce_stage(ce);
848 849
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
850

851 852
	for (;;) {
		int len;
853

854 855 856 857 858 859 860
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
861

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

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

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

929 930 931
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
932
	 * in the array.
933
	 */
934
	retval = has_file_name(istate, ce, pos, ok_to_replace);
935

936 937 938 939
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
940
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
941 942
}

943
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
944 945
{
	int pos;
946 947
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
948
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
949
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
950

951 952
	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
		cache_tree_invalidate_path(istate, ce->name);
953
	pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
954

J
Junio C Hamano 已提交
955
	/* existing match? Just replace it. */
956
	if (pos >= 0) {
J
Junio C Hamano 已提交
957 958
		if (!new_only)
			replace_index_entry(istate, pos, ce);
959 960
		return 0;
	}
961
	pos = -pos-1;
962

963 964 965 966
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
967 968
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
969
			ok_to_add = 1;
970
			if (!remove_index_entry_at(istate, pos))
971 972 973 974
				break;
		}
	}

975 976
	if (!ok_to_add)
		return -1;
977
	if (!verify_path(ce->name))
978
		return error("Invalid path '%s'", ce->name);
979

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

1005
	/* Make sure the array is big enough .. */
1006
	ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1007 1008

	/* Add it in.. */
1009
	istate->cache_nr++;
1010
	if (istate->cache_nr > pos + 1)
1011 1012 1013
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
1014
	set_index_entry(istate, pos, ce);
1015
	istate->cache_changed |= CE_ENTRY_ADDED;
1016 1017 1018
	return 0;
}

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

1043
	if (!refresh || ce_uptodate(ce))
1044 1045
		return ce;

1046
	/*
1047 1048 1049
	 * 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.
1050
	 */
1051 1052 1053 1054
	if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
		ce_mark_uptodate(ce);
		return ce;
	}
1055 1056 1057 1058 1059
	if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
		ce_mark_uptodate(ce);
		return ce;
	}

1060 1061 1062 1063 1064 1065 1066 1067
	if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
		if (ignore_missing)
			return ce;
		if (err)
			*err = ENOENT;
		return NULL;
	}

1068
	if (lstat(ce->name, &st) < 0) {
1069 1070
		if (ignore_missing && errno == ENOENT)
			return ce;
1071 1072
		if (err)
			*err = errno;
1073 1074
		return NULL;
	}
L
Linus Torvalds 已提交
1075

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

1102
	if (ie_modified(istate, ce, &st, options)) {
1103 1104
		if (err)
			*err = EINVAL;
1105 1106
		return NULL;
	}
L
Linus Torvalds 已提交
1107 1108 1109 1110 1111

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1112 1113 1114 1115 1116
	/*
	 * 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 已提交
1117
	 */
1118
	if (!ignore_valid && assume_unchanged &&
1119 1120
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1121

1122
	/* istate->cache_changed is updated in the caller */
L
Linus Torvalds 已提交
1123 1124 1125
	return updated;
}

1126
static void show_file(const char * fmt, const char * name, int in_porcelain,
1127
		      int * first, const char *header_msg)
1128 1129 1130
{
	if (in_porcelain && *first && header_msg) {
		printf("%s\n", header_msg);
1131
		*first = 0;
1132 1133 1134 1135
	}
	printf(fmt, name);
}

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

J
Jeff King 已提交
1158
	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1159 1160 1161
	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 已提交
1162
	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1163
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1164
		struct cache_entry *ce, *new;
1165
		int cache_errno = 0;
1166
		int changed = 0;
1167
		int filtered = 0;
1168

1169
		ce = istate->cache[i];
1170 1171 1172
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1173
		if (pathspec && !ce_path_match(ce, pathspec, seen))
1174 1175
			filtered = 1;

L
Linus Torvalds 已提交
1176
		if (ce_stage(ce)) {
1177 1178
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1179 1180 1181 1182
				i++;
			i--;
			if (allow_unmerged)
				continue;
1183 1184 1185
			if (!filtered)
				show_file(unmerged_fmt, ce->name, in_porcelain,
					  &first, header_msg);
L
Linus Torvalds 已提交
1186 1187 1188 1189
			has_errors = 1;
			continue;
		}

1190
		if (filtered)
1191 1192
			continue;

1193
		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1194
		if (new == ce)
L
Linus Torvalds 已提交
1195
			continue;
1196
		if (!new) {
1197 1198
			const char *fmt;

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

			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 已提交
1220 1221 1222
			has_errors = 1;
			continue;
		}
1223 1224

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1225 1226 1227 1228
	}
	return has_errors;
}

1229 1230
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options)
1231
{
1232
	return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1233 1234
}

1235 1236 1237 1238 1239

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

1240 1241
#define INDEX_FORMAT_DEFAULT 3

1242 1243 1244
static unsigned int get_index_format_default(void)
{
	char *envversion = getenv("GIT_INDEX_VERSION");
1245
	char *endp;
1246
	int value;
1247 1248
	unsigned int version = INDEX_FORMAT_DEFAULT;

1249
	if (!envversion) {
1250 1251
		if (!git_config_get_int("index.version", &value))
			version = value;
1252 1253
		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
			warning(_("index.version set, but the value is invalid.\n"
1254
				  "Using version %i"), INDEX_FORMAT_DEFAULT);
1255
			return INDEX_FORMAT_DEFAULT;
1256 1257 1258
		}
		return version;
	}
1259 1260 1261 1262 1263 1264 1265 1266 1267

	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;
1268 1269
}

1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280
/*
 * 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;
1281 1282 1283 1284 1285 1286
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1287
	unsigned char sha1[20];
1288
	uint16_t flags;
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299
	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;
1300 1301 1302 1303 1304 1305
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1306
	unsigned char sha1[20];
1307 1308
	uint16_t flags;
	uint16_t flags2;
1309 1310 1311
	char name[FLEX_ARRAY]; /* more */
};

1312
/* These are only used for v3 or lower */
1313 1314 1315 1316 1317 1318 1319
#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)))

1320
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1321
{
1322
	git_SHA_CTX c;
1323
	unsigned char sha1[20];
1324
	int hdr_version;
1325

1326
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1327
		return error("bad signature");
1328
	hdr_version = ntohl(hdr->hdr_version);
1329
	if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1330
		return error("bad index version %d", hdr_version);
1331 1332 1333
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1334
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1335
		return error("bad index file sha1 signature");
1336 1337 1338
	return 0;
}

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

1363 1364 1365 1366 1367 1368 1369 1370
int hold_locked_index(struct lock_file *lk, int die_on_error)
{
	return hold_lock_file_for_update(lk, get_index_file(),
					 die_on_error
					 ? LOCK_DIE_ON_ERROR
					 : 0);
}

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

1376 1377 1378 1379 1380 1381 1382
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));

1383 1384 1385 1386 1387 1388 1389 1390 1391 1392
	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);
1393 1394
	ce->ce_flags = flags & ~CE_NAMEMASK;
	ce->ce_namelen = len;
1395
	ce->index = 0;
1396 1397 1398 1399 1400 1401
	hashcpy(ce->sha1, ondisk->sha1);
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
	return ce;
}

1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422
/*
 * 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_;
}

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

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

1436
	if (flags & CE_EXTENDED) {
1437 1438 1439
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1440
		extended_flags = get_be16(&ondisk2->flags2) << 16;
1441 1442 1443
		/* 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);
1444
		flags |= extended_flags;
1445 1446 1447 1448 1449
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465
	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;
	}
1466
	return ce;
1467 1468
}

1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483
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);
	}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

unmap:
1576
	munmap(mmap, mmap_size);
1577
	die("index file corrupt");
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 1613
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;
}

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

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

1623 1624 1625 1626 1627 1628 1629
	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;
1630
		free(istate->cache[i]);
1631
	}
1632
	resolve_undo_clear_index(istate);
1633 1634
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1635 1636
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1637
	free_name_hash(istate);
1638
	cache_tree_free(&(istate->cache_tree));
1639
	istate->initialized = 0;
1640 1641 1642
	free(istate->cache);
	istate->cache = NULL;
	istate->cache_alloc = 0;
1643
	discard_split_index(istate);
1644
	return 0;
1645 1646
}

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

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

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

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

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

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

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

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

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

J
Junio C Hamano 已提交
1727 1728 1729 1730 1731 1732
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
1733
	 * ce_stat_data.sd_mtime match the index file mtime.
1734 1735 1736 1737 1738
	 *
	 * 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 已提交
1739 1740 1741 1742 1743 1744 1745 1746
	 */
	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)) {
1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757
		/* 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
		 *
1758
		 * but it does not.  When the second update-index runs,
1759 1760 1761 1762 1763
		 * 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 已提交
1764
		 * obtain from the filesystem next time we stat("frotz").
1765 1766 1767 1768 1769 1770 1771
		 *
		 * 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.
		 */
1772
		ce->ce_stat_data.sd_size = 0;
J
Junio C Hamano 已提交
1773 1774 1775
	}
}

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

1782 1783 1784 1785 1786 1787
	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);
1788
	ondisk->mode = htonl(ce->ce_mode);
1789 1790 1791
	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);
1792
	hashcpy(ondisk->sha1, ce->sha1);
1793

1794
	flags = ce->ce_flags & ~CE_NAMEMASK;
1795 1796
	flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
	ondisk->flags = htons(flags);
1797 1798 1799 1800
	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);
1801
		return ondisk2->name;
1802
	}
1803 1804 1805 1806 1807
	else {
		return ondisk->name;
	}
}

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

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

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 1851
	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);
1852
	}
1853 1854 1855 1856
	if (ce->ce_flags & CE_STRIP_NAME) {
		ce->ce_namelen = saved_namelen;
		ce->ce_flags &= ~CE_STRIP_NAME;
	}
1857

1858 1859 1860
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
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 1906
/*
 * 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());
}

1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919
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;
}

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

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

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

1946 1947 1948 1949 1950 1951 1952 1953
		/* 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;
		}
	}

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

	/* 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;

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

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

1974
	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1975 1976
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1977
		if (ce->ce_flags & CE_REMOVE)
1978
			continue;
1979
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1980
			ce_smudge_racily_clean_entry(ce);
1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991
		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);
		}
1992
		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1993 1994
			return -1;
	}
1995
	strbuf_release(&previous_name_buf);
1996

1997
	/* Write extension data here */
1998
	if (!strip_extensions && istate->split_index) {
1999 2000 2001 2002 2003 2004 2005 2006 2007 2008
		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;
	}
2009
	if (!strip_extensions && istate->cache_tree) {
2010
		struct strbuf sb = STRBUF_INIT;
2011 2012 2013 2014 2015 2016

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

2031
	if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2032
		return -1;
2033 2034
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
2035
	return 0;
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)
{
2045 2046 2047
	if (alternate_index_output)
		return commit_lock_file_to(lk, alternate_index_output);
	else
2048 2049 2050
		return commit_lock_file(lk);
}

2051 2052 2053
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
				 unsigned flags)
{
2054
	int ret = do_write_index(istate, lock->fd, 0);
2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066
	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;
}

2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077
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;
}

2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095
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);
}

2096 2097
static int write_shared_index(struct index_state *istate,
			      struct lock_file *lock, unsigned flags)
2098 2099 2100 2101 2102 2103
{
	struct split_index *si = istate->split_index;
	static int installed_handler;
	int fd, ret;

	temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
2104 2105 2106 2107 2108 2109 2110
	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);
	}
2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130
	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;
}

2131 2132 2133
int write_locked_index(struct index_state *istate, struct lock_file *lock,
		       unsigned flags)
{
2134 2135
	struct split_index *si = istate->split_index;

2136 2137
	if (!si || alternate_index_output ||
	    (istate->cache_changed & ~EXTMASK)) {
2138 2139 2140 2141 2142
		if (si)
			hashclr(si->base_sha1);
		return do_write_locked_index(istate, lock, flags);
	}

2143 2144 2145 2146 2147
	if (getenv("GIT_TEST_SPLIT_INDEX")) {
		int v = si->base_sha1[0];
		if ((v & 15) < 6)
			istate->cache_changed |= SPLIT_INDEX_ORDERED;
	}
2148
	if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2149
		int ret = write_shared_index(istate, lock, flags);
2150 2151 2152 2153
		if (ret)
			return ret;
	}

2154
	return write_split_index(istate, lock, flags);
2155 2156
}

2157 2158
/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
2159
 * index_state, dropping any unmerged entries.  Returns true if
2160 2161 2162 2163 2164 2165 2166
 * 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;
2167
	int unmerged = 0;
2168 2169 2170 2171

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
2172 2173 2174 2175
		struct cache_entry *new_ce;
		int size, len;

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

2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218
/*
 * 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;
}
2219

2220
void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248
{
	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;
	}
2249 2250
	if (size)
		*size = sz;
2251 2252
	return data;
}
M
Michael Haggerty 已提交
2253 2254 2255 2256 2257 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

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);
	}
}