read-cache.c 47.3 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 17
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);

18 19 20 21 22 23 24 25 26 27 28
/* 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" */
29
#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
30

31
struct index_state the_index;
32

J
Junio C Hamano 已提交
33 34 35
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
	istate->cache[nr] = ce;
36
	add_name_hash(istate, ce);
J
Junio C Hamano 已提交
37 38
}

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

43
	remove_name_hash(old);
L
Linus Torvalds 已提交
44
	set_index_entry(istate, nr, ce);
45 46 47
	istate->cache_changed = 1;
}

48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
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);
	new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
	new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
	memcpy(new->name, new_name, namelen + 1);

	cache_tree_invalidate_path(istate->cache_tree, old->name);
	remove_index_entry_at(istate, nr);
	add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}

64 65 66 67 68 69 70
/*
 * 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)
{
K
Kjetil Barvik 已提交
71 72
	ce->ce_ctime.sec = (unsigned int)st->st_ctime;
	ce->ce_mtime.sec = (unsigned int)st->st_mtime;
73 74
	ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
	ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
75 76 77 78 79
	ce->ce_dev = st->st_dev;
	ce->ce_ino = st->st_ino;
	ce->ce_uid = st->st_uid;
	ce->ce_gid = st->st_gid;
	ce->ce_size = st->st_size;
J
Junio C Hamano 已提交
80 81

	if (assume_unchanged)
82
		ce->ce_flags |= CE_VALID;
83 84 85

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
86 87
}

J
Junio C Hamano 已提交
88 89 90 91 92 93 94
static int ce_compare_data(struct cache_entry *ce, struct stat *st)
{
	int match = -1;
	int fd = open(ce->name, O_RDONLY);

	if (fd >= 0) {
		unsigned char sha1[20];
95
		if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
96
			match = hashcmp(sha1, ce->sha1);
97
		/* index_fd() closed the file descriptor already */
J
Junio C Hamano 已提交
98 99 100 101
	}
	return match;
}

102
static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
J
Junio C Hamano 已提交
103 104 105 106
{
	int match = -1;
	void *buffer;
	unsigned long size;
107
	enum object_type type;
108
	struct strbuf sb = STRBUF_INIT;
J
Junio C Hamano 已提交
109

110
	if (strbuf_readlink(&sb, ce->name, expected_size))
J
Junio C Hamano 已提交
111
		return -1;
112

113
	buffer = read_sha1_file(ce->sha1, &type, &size);
114 115 116 117
	if (buffer) {
		if (size == sb.len)
			match = memcmp(buffer, sb.buf, size);
		free(buffer);
J
Junio C Hamano 已提交
118
	}
119
	strbuf_release(&sb);
J
Junio C Hamano 已提交
120 121 122
	return match;
}

123 124 125 126 127 128
static int ce_compare_gitlink(struct cache_entry *ce)
{
	unsigned char sha1[20];

	/*
	 * We don't actually require that the .git directory
M
Martin Waitz 已提交
129
	 * under GITLINK directory be a valid git directory. It
130 131 132 133 134 135 136 137 138 139
	 * might even be missing (in case nobody populated that
	 * sub-project).
	 *
	 * If so, we consider it always to match.
	 */
	if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
		return 0;
	return hashcmp(sha1, ce->sha1);
}

J
Junio C Hamano 已提交
140 141 142 143 144 145 146 147
static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
{
	switch (st->st_mode & S_IFMT) {
	case S_IFREG:
		if (ce_compare_data(ce, st))
			return DATA_CHANGED;
		break;
	case S_IFLNK:
148
		if (ce_compare_link(ce, xsize_t(st->st_size)))
J
Junio C Hamano 已提交
149 150
			return DATA_CHANGED;
		break;
151
	case S_IFDIR:
152
		if (S_ISGITLINK(ce->ce_mode))
153
			return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
J
Junio C Hamano 已提交
154 155 156 157 158 159
	default:
		return TYPE_CHANGED;
	}
	return 0;
}

160
static int is_empty_blob_sha1(const unsigned char *sha1)
161 162 163 164 165 166 167 168 169
{
	static const unsigned char empty_blob_sha1[20] = {
		0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
		0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
	};

	return !hashcmp(sha1, empty_blob_sha1);
}

J
Junio C Hamano 已提交
170
static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
171 172 173
{
	unsigned int changed = 0;

174 175 176 177
	if (ce->ce_flags & CE_REMOVE)
		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;

	switch (ce->ce_mode & S_IFMT) {
178 179
	case S_IFREG:
		changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
J
Junio C Hamano 已提交
180 181 182 183
		/* We consider only the owner x bit to be relevant for
		 * "mode changes"
		 */
		if (trust_executable_bit &&
184
		    (0100 & (ce->ce_mode ^ st->st_mode)))
185
			changed |= MODE_CHANGED;
186 187
		break;
	case S_IFLNK:
188 189 190
		if (!S_ISLNK(st->st_mode) &&
		    (has_symlinks || !S_ISREG(st->st_mode)))
			changed |= TYPE_CHANGED;
191
		break;
M
Martin Waitz 已提交
192
	case S_IFGITLINK:
193
		/* We ignore most of the st_xxx fields for gitlinks */
194 195 196 197
		if (!S_ISDIR(st->st_mode))
			changed |= TYPE_CHANGED;
		else if (ce_compare_gitlink(ce))
			changed |= DATA_CHANGED;
198
		return changed;
199
	default:
200
		die("internal error: ce_mode is %o", ce->ce_mode);
201
	}
K
Kjetil Barvik 已提交
202
	if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
203
		changed |= MTIME_CHANGED;
K
Kjetil Barvik 已提交
204
	if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
205
		changed |= CTIME_CHANGED;
206

K
Kjetil Barvik 已提交
207
#ifdef USE_NSEC
208
	if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
K
Kjetil Barvik 已提交
209
		changed |= MTIME_CHANGED;
210
	if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
K
Kjetil Barvik 已提交
211 212 213
		changed |= CTIME_CHANGED;
#endif

214 215
	if (ce->ce_uid != (unsigned int) st->st_uid ||
	    ce->ce_gid != (unsigned int) st->st_gid)
216
		changed |= OWNER_CHANGED;
217
	if (ce->ce_ino != (unsigned int) st->st_ino)
218
		changed |= INODE_CHANGED;
219 220 221 222 223 224 225

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

230
	if (ce->ce_size != (unsigned int) st->st_size)
231
		changed |= DATA_CHANGED;
232

233 234 235 236 237 238
	/* Racily smudged entry? */
	if (!ce->ce_size) {
		if (!is_empty_blob_sha1(ce->sha1))
			changed |= DATA_CHANGED;
	}

J
Junio C Hamano 已提交
239 240 241
	return changed;
}

242
static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
243
{
244
	return (!S_ISGITLINK(ce->ce_mode) &&
K
Kjetil Barvik 已提交
245 246 247 248 249 250 251 252 253 254
		istate->timestamp.sec &&
#ifdef USE_NSEC
		 /* nanosecond timestamped files can also be racy! */
		(istate->timestamp.sec < ce->ce_mtime.sec ||
		 (istate->timestamp.sec == ce->ce_mtime.sec &&
		  istate->timestamp.nsec <= ce->ce_mtime.nsec))
#else
		istate->timestamp.sec <= ce->ce_mtime.sec
#endif
		 );
255 256
}

257
int ie_match_stat(const struct index_state *istate,
258 259
		  struct cache_entry *ce, struct stat *st,
		  unsigned int options)
J
Junio C Hamano 已提交
260
{
J
Junio C Hamano 已提交
261
	unsigned int changed;
262
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
263
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
264
	int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
J
Junio C Hamano 已提交
265 266 267 268

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
269 270
	 *
	 * skip-worktree has the same effect with higher precedence
J
Junio C Hamano 已提交
271
	 */
272 273
	if (!ignore_skip_worktree && ce_skip_worktree(ce))
		return 0;
274
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
275 276
		return 0;

277 278 279 280 281 282 283 284
	/*
	 * 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 已提交
285
	changed = ce_match_stat_basic(ce, st);
J
Junio C Hamano 已提交
286

J
Junio C Hamano 已提交
287 288 289 290 291 292 293 294 295 296 297 298 299 300
	/*
	 * 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 已提交
301
	 * carefully than others.
J
Junio C Hamano 已提交
302
	 */
303
	if (!changed && is_racy_timestamp(istate, ce)) {
304 305 306 307 308
		if (assume_racy_is_modified)
			changed |= DATA_CHANGED;
		else
			changed |= ce_modified_check_fs(ce, st);
	}
309

J
Junio C Hamano 已提交
310
	return changed;
311 312
}

313
int ie_modified(const struct index_state *istate,
314
		struct cache_entry *ce, struct stat *st, unsigned int options)
315
{
J
Junio C Hamano 已提交
316
	int changed, changed_fs;
317 318

	changed = ie_match_stat(istate, ce, st, options);
319 320 321 322 323 324 325 326 327
	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;

328 329 330 331 332 333 334 335 336 337 338 339 340
	/*
	 * 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.
341
	 */
342 343
	if ((changed & DATA_CHANGED) &&
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
344 345
		return changed;

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

352 353 354 355 356 357 358 359 360 361 362 363
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];
364
	if (!c1 && S_ISDIR(mode1))
365
		c1 = '/';
366
	if (!c2 && S_ISDIR(mode2))
367 368 369 370
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
/*
 * 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;
}

406
int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
407
{
408 409
	int len1 = flags1 & CE_NAMEMASK;
	int len2 = flags2 & CE_NAMEMASK;
410 411 412 413 414 415 416 417 418 419
	int len = len1 < len2 ? len1 : len2;
	int cmp;

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

421 422 423
	/* Compare stages  */
	flags1 &= CE_STAGEMASK;
	flags2 &= CE_STAGEMASK;
J
Junio C Hamano 已提交
424

425 426 427 428
	if (flags1 < flags2)
		return -1;
	if (flags1 > flags2)
		return 1;
429 430 431
	return 0;
}

432
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
433 434 435 436
{
	int first, last;

	first = 0;
437
	last = istate->cache_nr;
438 439
	while (last > first) {
		int next = (last + first) >> 1;
440
		struct cache_entry *ce = istate->cache[next];
441
		int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
442
		if (!cmp)
443
			return next;
444 445 446 447 448 449
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
450
	return -first-1;
451 452
}

453
/* Remove entry, return true if there are more entries to go.. */
454
int remove_index_entry_at(struct index_state *istate, int pos)
455
{
456 457
	struct cache_entry *ce = istate->cache[pos];

458
	record_resolve_undo(istate, ce);
459
	remove_name_hash(ce);
460 461 462
	istate->cache_changed = 1;
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
463
		return 0;
464 465 466
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
467 468 469
	return 1;
}

470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489
/*
 * Remove all cache ententries marked for removal, that is where
 * 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++) {
		if (ce_array[i]->ce_flags & CE_REMOVE)
			remove_name_hash(ce_array[i]);
		else
			ce_array[j++] = ce_array[i];
	}
	istate->cache_changed = 1;
	istate->cache_nr = j;
}

490
int remove_file_from_index(struct index_state *istate, const char *path)
491
{
492
	int pos = index_name_pos(istate, path, strlen(path));
493 494
	if (pos < 0)
		pos = -pos-1;
J
Junio C Hamano 已提交
495
	cache_tree_invalidate_path(istate->cache_tree, path);
496 497
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
498 499 500
	return 0;
}

501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528
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;
}

529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560
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
 */
static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
{
	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);
	free(ce);
	return new;
}

J
Junio C Hamano 已提交
561 562 563 564 565 566 567 568
static void record_intent_to_add(struct cache_entry *ce)
{
	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);
}

569
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
570
{
571
	int size, namelen, was_same;
572
	mode_t st_mode = st->st_mode;
573
	struct cache_entry *ce, *alias;
574
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
575 576
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
577 578 579
	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 已提交
580

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

	namelen = strlen(path);
585
	if (S_ISDIR(st_mode)) {
586 587 588
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
589 590 591
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
592
	ce->ce_flags = namelen;
J
Junio C Hamano 已提交
593 594
	if (!intent_only)
		fill_stat_cache_info(ce, st);
595 596
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
597

598
	if (trust_executable_bit && has_symlinks)
599
		ce->ce_mode = create_ce_mode(st_mode);
600
	else {
601 602
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
603
		 */
604
		struct cache_entry *ent;
605
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
606

607
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
608
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
609 610
	}

611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
	/* 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;
				foundce = index_name_exists(&the_index, ce->name, ptr - ce->name, ignore_case);
				if (foundce) {
					memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
					startPtr = ptr;
				}
			}
		}
	}

634
	alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
635
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
636 637
		/* Nothing changed, really */
		free(ce);
638 639
		if (!S_ISGITLINK(alias->ce_mode))
			ce_mark_uptodate(alias);
640
		alias->ce_flags |= CE_ADDED;
641 642
		return 0;
	}
J
Junio C Hamano 已提交
643
	if (!intent_only) {
644
		if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
J
Junio C Hamano 已提交
645 646 647 648
			return error("unable to index file %s", path);
	} else
		record_intent_to_add(ce);

649 650 651
	if (ignore_case && alias && different_name(ce, alias))
		ce = create_alias_ce(ce, alias);
	ce->ce_flags |= CE_ADDED;
652

J
Junio C Hamano 已提交
653
	/* It was suspected to be racily clean, but it turns out to be Ok */
654 655 656 657 658 659 660
	was_same = (alias &&
		    !ce_stage(alias) &&
		    !hashcmp(alias->sha1, ce->sha1) &&
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
		;
J
Junio C Hamano 已提交
661
	else if (add_index_entry(istate, ce, add_option))
662
		return error("unable to add %s to index",path);
663
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
664 665 666 667
		printf("add '%s'\n", path);
	return 0;
}

668
int add_file_to_index(struct index_state *istate, const char *path, int flags)
669 670 671
{
	struct stat st;
	if (lstat(path, &st))
672
		die_errno("unable to stat '%s'", path);
673
	return add_to_index(istate, path, &st, flags);
674 675
}

676 677 678 679 680 681 682
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
		int refresh)
{
	int size, len;
	struct cache_entry *ce;

683 684
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
685
		return NULL;
686
	}
687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702

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

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

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

	return ce;
}

703
int ce_same_name(struct cache_entry *a, struct cache_entry *b)
704 705 706 707 708
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

709
int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
710
{
711
	return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
712 713
}

714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
/*
 * 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.
	 */
729

730
	/* "." is not allowed */
731
	if (*rest == '\0' || is_dir_sep(*rest))
732 733
		return 0;

734
	switch (*rest) {
735 736 737 738 739 740 741 742 743 744 745 746
	/*
	 * ".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 '.':
747
		if (rest[1] == '\0' || is_dir_sep(rest[1]))
748 749 750 751 752 753 754 755 756
			return 0;
	}
	return 1;
}

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

757 758 759
	if (has_dos_drive_prefix(path))
		return 0;

760 761 762 763
	goto inside;
	for (;;) {
		if (!c)
			return 1;
764
		if (is_dir_sep(c)) {
765 766
inside:
			c = *path++;
767 768 769
			if ((c == '.' && !verify_dotfile(path)) ||
			    is_dir_sep(c) || c == '\0')
				return 0;
770 771 772 773 774
		}
		c = *path++;
	}
}

775 776 777
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
778
 */
779 780
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
781
{
782 783
	int retval = 0;
	int len = ce_namelen(ce);
784
	int stage = ce_stage(ce);
785
	const char *name = ce->name;
786

787 788
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
789

790
		if (len >= ce_namelen(p))
791
			break;
792 793
		if (memcmp(name, p->name, len))
			break;
794 795
		if (ce_stage(p) != stage)
			continue;
796 797
		if (p->name[len] != '/')
			continue;
798
		if (p->ce_flags & CE_REMOVE)
799
			continue;
800 801 802
		retval = -1;
		if (!ok_to_replace)
			break;
803
		remove_index_entry_at(istate, --pos);
804
	}
805 806
	return retval;
}
807

808 809 810 811
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
812 813
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
814 815
{
	int retval = 0;
816
	int stage = ce_stage(ce);
817 818
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
819

820 821
	for (;;) {
		int len;
822

823 824 825 826 827 828 829
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
830

831
		pos = index_name_pos(istate, name, create_ce_flags(len, stage));
832
		if (pos >= 0) {
833 834 835 836 837 838 839 840
			/*
			 * 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.
			 */
841
			if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
842 843 844
				retval = -1;
				if (!ok_to_replace)
					break;
845
				remove_index_entry_at(istate, pos);
846 847
				continue;
			}
848
		}
849 850
		else
			pos = -pos-1;
851 852 853 854

		/*
		 * Trivial optimization: if we find an entry that
		 * already matches the sub-directory, then we know
855
		 * we're ok, and we can exit.
856
		 */
857 858
		while (pos < istate->cache_nr) {
			struct cache_entry *p = istate->cache[pos];
859 860 861 862
			if ((ce_namelen(p) <= len) ||
			    (p->name[len] != '/') ||
			    memcmp(p->name, name, len))
				break; /* not our subdirectory */
863 864 865
			if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
				/*
				 * p is at the same stage as our entry, and
866 867 868 869 870 871
				 * is a subdirectory of what we are looking
				 * at, so we cannot have conflicts at our
				 * level or anything shorter.
				 */
				return retval;
			pos++;
872
		}
873
	}
874 875 876 877 878 879 880
	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 已提交
881
 *
882 883 884 885
 * 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.
 */
886 887 888
static int check_file_directory_conflict(struct index_state *istate,
					 const struct cache_entry *ce,
					 int pos, int ok_to_replace)
889
{
890 891 892 893 894
	int retval;

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

898 899 900
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
901
	 * in the array.
902
	 */
903
	retval = has_file_name(istate, ce, pos, ok_to_replace);
904

905 906 907 908
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
909
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
910 911
}

912
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
913 914
{
	int pos;
915 916
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
917
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
918
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
919

J
Junio C Hamano 已提交
920
	cache_tree_invalidate_path(istate->cache_tree, ce->name);
921
	pos = index_name_pos(istate, ce->name, ce->ce_flags);
922

J
Junio C Hamano 已提交
923
	/* existing match? Just replace it. */
924
	if (pos >= 0) {
J
Junio C Hamano 已提交
925 926
		if (!new_only)
			replace_index_entry(istate, pos, ce);
927 928
		return 0;
	}
929
	pos = -pos-1;
930

931 932 933 934
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
935 936
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
937
			ok_to_add = 1;
938
			if (!remove_index_entry_at(istate, pos))
939 940 941 942
				break;
		}
	}

943 944
	if (!ok_to_add)
		return -1;
945
	if (!verify_path(ce->name))
946
		return error("Invalid path '%s'", ce->name);
947

J
Junio C Hamano 已提交
948
	if (!skip_df_check &&
949
	    check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
950
		if (!ok_to_replace)
951 952
			return error("'%s' appears as both a file and as a directory",
				     ce->name);
953
		pos = index_name_pos(istate, ce->name, ce->ce_flags);
954 955
		pos = -pos-1;
	}
956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971
	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;
	}
972

973
	/* Make sure the array is big enough .. */
974 975 976 977
	if (istate->cache_nr == istate->cache_alloc) {
		istate->cache_alloc = alloc_nr(istate->cache_alloc);
		istate->cache = xrealloc(istate->cache,
					istate->cache_alloc * sizeof(struct cache_entry *));
978 979 980
	}

	/* Add it in.. */
981
	istate->cache_nr++;
982
	if (istate->cache_nr > pos + 1)
983 984 985
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
986
	set_index_entry(istate, pos, ce);
987
	istate->cache_changed = 1;
988 989 990
	return 0;
}

L
Linus Torvalds 已提交
991 992 993 994 995 996 997 998 999 1000 1001
/*
 * "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.
 */
1002
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1003
					     struct cache_entry *ce,
1004 1005
					     unsigned int options, int *err,
					     int *changed_ret)
L
Linus Torvalds 已提交
1006 1007 1008 1009
{
	struct stat st;
	struct cache_entry *updated;
	int changed, size;
1010
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1011
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
L
Linus Torvalds 已提交
1012

1013 1014 1015
	if (ce_uptodate(ce))
		return ce;

1016
	/*
1017 1018 1019
	 * 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.
1020
	 */
1021 1022 1023 1024
	if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
		ce_mark_uptodate(ce);
		return ce;
	}
1025 1026 1027 1028 1029
	if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
		ce_mark_uptodate(ce);
		return ce;
	}

1030
	if (lstat(ce->name, &st) < 0) {
1031 1032
		if (err)
			*err = errno;
1033 1034
		return NULL;
	}
L
Linus Torvalds 已提交
1035

1036
	changed = ie_match_stat(istate, ce, &st, options);
1037 1038
	if (changed_ret)
		*changed_ret = changed;
L
Linus Torvalds 已提交
1039
	if (!changed) {
1040 1041 1042 1043 1044 1045 1046 1047
		/*
		 * 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 &&
1048
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
1049
			; /* mark this one VALID again */
1050 1051 1052 1053 1054 1055
		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.
			 */
1056 1057
			if (!S_ISGITLINK(ce->ce_mode))
				ce_mark_uptodate(ce);
1058
			return ce;
1059
		}
L
Linus Torvalds 已提交
1060 1061
	}

1062
	if (ie_modified(istate, ce, &st, options)) {
1063 1064
		if (err)
			*err = EINVAL;
1065 1066
		return NULL;
	}
L
Linus Torvalds 已提交
1067 1068 1069 1070 1071

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1072 1073 1074 1075 1076
	/*
	 * 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 已提交
1077
	 */
1078
	if (!ignore_valid && assume_unchanged &&
1079 1080
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1081 1082 1083 1084

	return updated;
}

1085
static void show_file(const char * fmt, const char * name, int in_porcelain,
1086
		      int * first, const char *header_msg)
1087 1088 1089
{
	if (in_porcelain && *first && header_msg) {
		printf("%s\n", header_msg);
1090
		*first = 0;
1091 1092 1093 1094 1095
	}
	printf(fmt, name);
}

int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
1096
		  char *seen, const char *header_msg)
L
Linus Torvalds 已提交
1097 1098 1099 1100 1101 1102 1103
{
	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;
1104
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1105 1106
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1107
	unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
J
Jeff King 已提交
1108
	const char *modified_fmt;
1109 1110 1111
	const char *deleted_fmt;
	const char *typechange_fmt;
	const char *added_fmt;
J
Jeff King 已提交
1112
	const char *unmerged_fmt;
L
Linus Torvalds 已提交
1113

J
Jeff King 已提交
1114
	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1115 1116 1117
	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 已提交
1118
	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1119
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1120
		struct cache_entry *ce, *new;
1121
		int cache_errno = 0;
1122
		int changed = 0;
1123
		int filtered = 0;
1124

1125
		ce = istate->cache[i];
1126 1127 1128
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1129 1130 1131 1132
		if (pathspec &&
		    !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
			filtered = 1;

L
Linus Torvalds 已提交
1133
		if (ce_stage(ce)) {
1134 1135
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1136 1137 1138 1139
				i++;
			i--;
			if (allow_unmerged)
				continue;
1140 1141 1142
			if (!filtered)
				show_file(unmerged_fmt, ce->name, in_porcelain,
					  &first, header_msg);
L
Linus Torvalds 已提交
1143 1144 1145 1146
			has_errors = 1;
			continue;
		}

1147
		if (filtered)
1148 1149
			continue;

1150
		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1151
		if (new == ce)
L
Linus Torvalds 已提交
1152
			continue;
1153
		if (!new) {
1154 1155
			const char *fmt;

1156
			if (not_new && cache_errno == ENOENT)
L
Linus Torvalds 已提交
1157
				continue;
1158
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1159 1160 1161
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1162
				ce->ce_flags &= ~CE_VALID;
1163
				istate->cache_changed = 1;
L
Linus Torvalds 已提交
1164 1165 1166
			}
			if (quiet)
				continue;
1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177

			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 已提交
1178 1179 1180
			has_errors = 1;
			continue;
		}
1181 1182

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1183 1184 1185 1186
	}
	return has_errors;
}

1187
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
1188
{
1189
	return refresh_cache_ent(&the_index, ce, really, NULL, NULL);
1190 1191
}

1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245

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

/*
 * 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;
	unsigned int dev;
	unsigned int ino;
	unsigned int mode;
	unsigned int uid;
	unsigned int gid;
	unsigned int size;
	unsigned char sha1[20];
	unsigned short flags;
	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;
	unsigned int dev;
	unsigned int ino;
	unsigned int mode;
	unsigned int uid;
	unsigned int gid;
	unsigned int size;
	unsigned char sha1[20];
	unsigned short flags;
	unsigned short flags2;
	char name[FLEX_ARRAY]; /* more */
};

#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)))

1246
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1247
{
1248
	git_SHA_CTX c;
1249
	unsigned char sha1[20];
1250
	int hdr_version;
1251

1252
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1253
		return error("bad signature");
1254 1255 1256
	hdr_version = ntohl(hdr->hdr_version);
	if (hdr_version < 2 || 3 < hdr_version)
		return error("bad index version %d", hdr_version);
1257 1258 1259
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1260
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1261
		return error("bad index file sha1 signature");
1262 1263 1264
	return 0;
}

1265 1266
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1267 1268 1269
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1270
		istate->cache_tree = cache_tree_read(data, sz);
1271
		break;
1272 1273 1274
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1275 1276 1277 1278 1279 1280 1281 1282 1283 1284
	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;
}

1285
int read_index(struct index_state *istate)
1286
{
1287
	return read_index_from(istate, get_index_file());
1288 1289
}

1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309
#ifndef NEEDS_ALIGNED_ACCESS
#define ntoh_s(var) ntohs(var)
#define ntoh_l(var) ntohl(var)
#else
static inline uint16_t ntoh_s_force_align(void *p)
{
	uint16_t x;
	memcpy(&x, p, sizeof(x));
	return ntohs(x);
}
static inline uint32_t ntoh_l_force_align(void *p)
{
	uint32_t x;
	memcpy(&x, p, sizeof(x));
	return ntohl(x);
}
#define ntoh_s(var) ntoh_s_force_align(&(var))
#define ntoh_l(var) ntoh_l_force_align(&(var))
#endif

1310 1311
static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
					    unsigned long *ent_size)
1312
{
1313
	struct cache_entry *ce;
1314
	size_t len;
1315
	const char *name;
1316
	unsigned int flags;
1317

1318
	/* On-disk flags are just 16 bits */
1319
	flags = ntoh_s(ondisk->flags);
1320
	len = flags & CE_NAMEMASK;
1321

1322
	if (flags & CE_EXTENDED) {
1323 1324 1325
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1326
		extended_flags = ntoh_s(ondisk2->flags2) << 16;
1327 1328 1329
		/* 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);
1330
		flags |= extended_flags;
1331 1332 1333 1334 1335
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1336
	if (len == CE_NAMEMASK)
1337
		len = strlen(name);
1338

1339
	ce = xmalloc(cache_entry_size(len));
1340

1341 1342 1343 1344 1345 1346 1347 1348 1349 1350
	ce->ce_ctime.sec = ntoh_l(ondisk->ctime.sec);
	ce->ce_mtime.sec = ntoh_l(ondisk->mtime.sec);
	ce->ce_ctime.nsec = ntoh_l(ondisk->ctime.nsec);
	ce->ce_mtime.nsec = ntoh_l(ondisk->mtime.nsec);
	ce->ce_dev   = ntoh_l(ondisk->dev);
	ce->ce_ino   = ntoh_l(ondisk->ino);
	ce->ce_mode  = ntoh_l(ondisk->mode);
	ce->ce_uid   = ntoh_l(ondisk->uid);
	ce->ce_gid   = ntoh_l(ondisk->gid);
	ce->ce_size  = ntoh_l(ondisk->size);
1351
	ce->ce_flags = flags;
1352

1353
	hashcpy(ce->sha1, ondisk->sha1);
1354

1355 1356
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
1357
	*ent_size = ondisk_ce_size(ce);
1358
	return ce;
1359 1360
}

1361
/* remember to discard_cache() before reading a different cache! */
1362
int read_index_from(struct index_state *istate, const char *path)
1363 1364 1365
{
	int fd, i;
	struct stat st;
1366
	unsigned long src_offset;
1367
	struct cache_header *hdr;
1368 1369
	void *mmap;
	size_t mmap_size;
1370 1371

	errno = EBUSY;
1372
	if (istate->initialized)
1373
		return istate->cache_nr;
1374

1375
	errno = ENOENT;
K
Kjetil Barvik 已提交
1376 1377
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1378
	fd = open(path, O_RDONLY);
1379 1380 1381
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
1382
		die_errno("index file open failed");
1383
	}
1384

1385
	if (fstat(fd, &st))
1386
		die_errno("cannot stat the open index");
1387 1388

	errno = EINVAL;
1389 1390
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1391 1392
		die("index file smaller than expected");

1393
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1394
	close(fd);
1395
	if (mmap == MAP_FAILED)
1396
		die_errno("unable to map index file");
1397

1398 1399
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1400 1401
		goto unmap;

1402 1403 1404
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
	istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
1405
	istate->initialized = 1;
1406 1407

	src_offset = sizeof(*hdr);
1408
	for (i = 0; i < istate->cache_nr; i++) {
1409
		struct ondisk_cache_entry *disk_ce;
1410
		struct cache_entry *ce;
1411
		unsigned long consumed;
1412

1413
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1414
		ce = create_from_disk(disk_ce, &consumed);
1415
		set_index_entry(istate, i, ce);
1416

1417
		src_offset += consumed;
1418
	}
K
Kjetil Barvik 已提交
1419
	istate->timestamp.sec = st.st_mtime;
1420
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1421

1422
	while (src_offset <= mmap_size - 20 - 8) {
1423 1424 1425 1426 1427 1428
		/* 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.
		 */
1429
		uint32_t extsize;
1430
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1431
		extsize = ntohl(extsize);
1432
		if (read_index_extension(istate,
1433 1434
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1435
					 extsize) < 0)
1436
			goto unmap;
1437 1438
		src_offset += 8;
		src_offset += extsize;
1439
	}
1440
	munmap(mmap, mmap_size);
1441
	return istate->cache_nr;
1442 1443

unmap:
1444
	munmap(mmap, mmap_size);
1445
	errno = EINVAL;
1446
	die("index file corrupt");
1447 1448
}

1449 1450
int is_index_unborn(struct index_state *istate)
{
1451
	return (!istate->cache_nr && !istate->timestamp.sec);
1452 1453
}

1454
int discard_index(struct index_state *istate)
1455
{
1456 1457 1458 1459
	int i;

	for (i = 0; i < istate->cache_nr; i++)
		free(istate->cache[i]);
1460
	resolve_undo_clear_index(istate);
1461 1462
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1463 1464
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1465
	istate->name_hash_initialized = 0;
1466
	free_hash(&istate->name_hash);
1467
	cache_tree_free(&(istate->cache_tree));
1468
	istate->initialized = 0;
1469 1470

	/* no need to throw away allocated active_cache */
1471
	return 0;
1472 1473
}

1474
int unmerged_index(const struct index_state *istate)
1475 1476 1477 1478 1479 1480 1481 1482 1483
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1484
#define WRITE_BUFFER_SIZE 8192
1485
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1486 1487
static unsigned long write_buffer_len;

1488
static int ce_write_flush(git_SHA_CTX *context, int fd)
1489 1490 1491
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1492
		git_SHA1_Update(context, write_buffer, buffered);
1493
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1494 1495 1496 1497 1498 1499
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1500
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1501 1502 1503 1504 1505 1506 1507 1508 1509
{
	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) {
1510 1511
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1512 1513 1514 1515 1516
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1517
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1518 1519
	}
	return 0;
1520 1521
}

1522
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1523
				  unsigned int ext, unsigned int sz)
1524 1525 1526
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1527 1528
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1529 1530
}

1531
static int ce_flush(git_SHA_CTX *context, int fd)
1532 1533
{
	unsigned int left = write_buffer_len;
1534

1535 1536
	if (left) {
		write_buffer_len = 0;
1537
		git_SHA1_Update(context, write_buffer, left);
1538
	}
1539

1540 1541
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1542
		if (write_in_full(fd, write_buffer, left) != left)
1543 1544 1545 1546
			return -1;
		left = 0;
	}

1547
	/* Append the SHA1 signature at the end */
1548
	git_SHA1_Final(write_buffer + left, context);
1549
	left += 20;
1550
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1551 1552
}

J
Junio C Hamano 已提交
1553 1554 1555 1556 1557 1558 1559
static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
{
	/*
	 * The only thing we care about in this function is to smudge the
	 * falsely clean entry due to touch-update-touch race, so we leave
	 * everything else as they are.  We are called for entries whose
	 * ce_mtime match the index file mtime.
1560 1561 1562 1563 1564
	 *
	 * 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 已提交
1565 1566 1567 1568 1569 1570 1571 1572
	 */
	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)) {
1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583
		/* 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
		 *
1584
		 * but it does not.  When the second update-index runs,
1585 1586 1587 1588 1589
		 * 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 已提交
1590
		 * obtain from the filesystem next time we stat("frotz").
1591 1592 1593 1594 1595 1596 1597
		 *
		 * 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.
		 */
1598
		ce->ce_size = 0;
J
Junio C Hamano 已提交
1599 1600 1601
	}
}

1602
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
1603 1604 1605
{
	int size = ondisk_ce_size(ce);
	struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1606
	char *name;
1607
	int result;
1608

K
Kjetil Barvik 已提交
1609 1610 1611 1612
	ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
	ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
	ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
	ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
1613 1614 1615 1616 1617 1618 1619 1620
	ondisk->dev  = htonl(ce->ce_dev);
	ondisk->ino  = htonl(ce->ce_ino);
	ondisk->mode = htonl(ce->ce_mode);
	ondisk->uid  = htonl(ce->ce_uid);
	ondisk->gid  = htonl(ce->ce_gid);
	ondisk->size = htonl(ce->ce_size);
	hashcpy(ondisk->sha1, ce->sha1);
	ondisk->flags = htons(ce->ce_flags);
1621 1622 1623 1624 1625 1626 1627 1628 1629
	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);
		name = ondisk2->name;
	}
	else
		name = ondisk->name;
	memcpy(name, ce->name, ce_namelen(ce));
1630

1631 1632 1633
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1634 1635
}

1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648
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;
}

1649 1650 1651 1652 1653
/*
 * Opportunisticly update the index but do not complain if we can't
 */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
1654
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1655 1656 1657 1658 1659 1660
	    !write_index(istate, lockfile->fd))
		commit_locked_index(lockfile);
	else
		rollback_lock_file(lockfile);
}

1661
int write_index(struct index_state *istate, int newfd)
1662
{
1663
	git_SHA_CTX c;
1664
	struct cache_header hdr;
1665
	int i, err, removed, extended;
1666 1667
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1668
	struct stat st;
1669

1670
	for (i = removed = extended = 0; i < entries; i++) {
1671
		if (cache[i]->ce_flags & CE_REMOVE)
1672
			removed++;
1673

1674 1675 1676 1677 1678 1679 1680 1681
		/* 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;
		}
	}

1682
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1683 1684
	/* for extended format, increase version so older git won't try to read it */
	hdr.hdr_version = htonl(extended ? 3 : 2);
1685
	hdr.hdr_entries = htonl(entries - removed);
1686

1687
	git_SHA1_Init(&c);
1688
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1689 1690 1691 1692
		return -1;

	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1693
		if (ce->ce_flags & CE_REMOVE)
1694
			continue;
1695
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1696
			ce_smudge_racily_clean_entry(ce);
1697
		if (ce_write_entry(&c, newfd, ce) < 0)
1698 1699
			return -1;
	}
1700

1701
	/* Write extension data here */
1702
	if (istate->cache_tree) {
1703
		struct strbuf sb = STRBUF_INIT;
1704 1705 1706 1707 1708 1709

		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)
1710 1711
			return -1;
	}
1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722
	if (istate->resolve_undo) {
		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;
	}
1723 1724 1725

	if (ce_flush(&c, newfd) || fstat(newfd, &st))
		return -1;
1726 1727
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
1728
	return 0;
1729
}
1730 1731 1732

/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
1733
 * index_state, dropping any unmerged entries.  Returns true if
1734 1735 1736 1737 1738 1739 1740
 * 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;
1741
	int unmerged = 0;
1742 1743 1744 1745

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
1746 1747 1748 1749
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
1750
			continue;
1751 1752 1753 1754 1755
		unmerged = 1;
		len = strlen(ce->name);
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
1756
		new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;
1757 1758 1759 1760 1761
		new_ce->ce_mode = ce->ce_mode;
		if (add_index_entry(istate, new_ce, 0))
			return error("%s: cannot drop to stage #0",
				     ce->name);
		i = index_name_pos(istate, new_ce->name, len);
1762
	}
1763
	return unmerged;
1764
}
1765

1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792
/*
 * 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;
}