read-cache.c 45.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 "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, 0, OBJ_BLOB, ce->name))
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 644 645 646 647 648
	if (!intent_only) {
		if (index_path(ce->sha1, path, st, 1))
			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 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
int ce_path_match(const struct cache_entry *ce, const char **pathspec)
{
	const char *match, *name;
	int len;

	if (!pathspec)
		return 1;

	len = ce_namelen(ce);
	name = ce->name;
	while ((match = *pathspec++) != NULL) {
		int matchlen = strlen(match);
		if (matchlen > len)
			continue;
		if (memcmp(name, match, matchlen))
			continue;
		if (matchlen && name[matchlen-1] == '/')
			return 1;
		if (name[matchlen] == '/' || !name[matchlen])
			return 1;
729 730
		if (!matchlen)
			return 1;
731 732 733 734
	}
	return 0;
}

735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776
/*
 * We fundamentally don't like some paths: we don't want
 * dot or dot-dot anywhere, and for obvious reasons don't
 * want to recurse into ".git" either.
 *
 * Also, we don't want double slashes or slashes at the
 * end that can make pathnames ambiguous.
 */
static int verify_dotfile(const char *rest)
{
	/*
	 * The first character was '.', but that
	 * has already been discarded, we now test
	 * the rest.
	 */
	switch (*rest) {
	/* "." is not allowed */
	case '\0': case '/':
		return 0;

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

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

777 778 779
	if (has_dos_drive_prefix(path))
		return 0;

780 781 782 783
	goto inside;
	for (;;) {
		if (!c)
			return 1;
784
		if (is_dir_sep(c)) {
785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801
inside:
			c = *path++;
			switch (c) {
			default:
				continue;
			case '/': case '\0':
				break;
			case '.':
				if (verify_dotfile(path))
					continue;
			}
			return 0;
		}
		c = *path++;
	}
}

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

814 815
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
816

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

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

847 848
	for (;;) {
		int len;
849

850 851 852 853 854 855 856
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
857

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

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

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

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

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

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

J
Junio C Hamano 已提交
947
	cache_tree_invalidate_path(istate->cache_tree, ce->name);
948
	pos = index_name_pos(istate, ce->name, ce->ce_flags);
949

J
Junio C Hamano 已提交
950
	/* existing match? Just replace it. */
951
	if (pos >= 0) {
J
Junio C Hamano 已提交
952 953
		if (!new_only)
			replace_index_entry(istate, pos, ce);
954 955
		return 0;
	}
956
	pos = -pos-1;
957

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

970 971
	if (!ok_to_add)
		return -1;
972
	if (!verify_path(ce->name))
973
		return error("Invalid path '%s'", ce->name);
974

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

1000
	/* Make sure the array is big enough .. */
1001 1002 1003 1004
	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 *));
1005 1006 1007
	}

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

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

1039 1040 1041
	if (ce_uptodate(ce))
		return ce;

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

1056
	if (lstat(ce->name, &st) < 0) {
1057 1058
		if (err)
			*err = errno;
1059 1060
		return NULL;
	}
L
Linus Torvalds 已提交
1061

1062
	changed = ie_match_stat(istate, ce, &st, options);
L
Linus Torvalds 已提交
1063
	if (!changed) {
1064 1065 1066 1067 1068 1069 1070 1071
		/*
		 * 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 &&
1072
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
1073
			; /* mark this one VALID again */
1074 1075 1076 1077 1078 1079
		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.
			 */
1080 1081
			if (!S_ISGITLINK(ce->ce_mode))
				ce_mark_uptodate(ce);
1082
			return ce;
1083
		}
L
Linus Torvalds 已提交
1084 1085
	}

1086
	if (ie_modified(istate, ce, &st, options)) {
1087 1088
		if (err)
			*err = EINVAL;
1089 1090
		return NULL;
	}
L
Linus Torvalds 已提交
1091 1092 1093 1094 1095

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1096 1097 1098 1099 1100
	/*
	 * 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 已提交
1101
	 */
1102
	if (!ignore_valid && assume_unchanged &&
1103 1104
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1105 1106 1107 1108

	return updated;
}

1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120
static void show_file(const char * fmt, const char * name, int in_porcelain,
		      int * first, char *header_msg)
{
	if (in_porcelain && *first && header_msg) {
		printf("%s\n", header_msg);
		*first=0;
	}
	printf(fmt, name);
}

int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
		  char *seen, char *header_msg)
L
Linus Torvalds 已提交
1121 1122 1123 1124 1125 1126 1127
{
	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;
1128
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1129 1130
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1131
	unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1132 1133
	const char *needs_update_fmt;
	const char *needs_merge_fmt;
L
Linus Torvalds 已提交
1134

1135 1136
	needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
	needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1137
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1138
		struct cache_entry *ce, *new;
1139 1140
		int cache_errno = 0;

1141
		ce = istate->cache[i];
1142 1143 1144
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

L
Linus Torvalds 已提交
1145
		if (ce_stage(ce)) {
1146 1147
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1148 1149 1150 1151
				i++;
			i--;
			if (allow_unmerged)
				continue;
1152
			show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);
L
Linus Torvalds 已提交
1153 1154 1155 1156
			has_errors = 1;
			continue;
		}

1157 1158 1159
		if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
			continue;

1160
		new = refresh_cache_ent(istate, ce, options, &cache_errno);
1161
		if (new == ce)
L
Linus Torvalds 已提交
1162
			continue;
1163 1164
		if (!new) {
			if (not_new && cache_errno == ENOENT)
L
Linus Torvalds 已提交
1165
				continue;
1166
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1167 1168 1169
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1170
				ce->ce_flags &= ~CE_VALID;
1171
				istate->cache_changed = 1;
L
Linus Torvalds 已提交
1172 1173 1174
			}
			if (quiet)
				continue;
1175
			show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);
L
Linus Torvalds 已提交
1176 1177 1178
			has_errors = 1;
			continue;
		}
1179 1180

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

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

1190
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1191
{
1192
	git_SHA_CTX c;
1193
	unsigned char sha1[20];
1194

1195
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1196
		return error("bad signature");
1197
	if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
1198
		return error("bad index version");
1199 1200 1201
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1202
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1203
		return error("bad index file sha1 signature");
1204 1205 1206
	return 0;
}

1207 1208
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1209 1210 1211
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1212
		istate->cache_tree = cache_tree_read(data, sz);
1213
		break;
1214 1215 1216
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1217 1218 1219 1220 1221 1222 1223 1224 1225 1226
	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;
}

1227
int read_index(struct index_state *istate)
1228
{
1229
	return read_index_from(istate, get_index_file());
1230 1231
}

1232 1233
static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
{
1234
	size_t len;
1235
	const char *name;
1236

K
Kjetil Barvik 已提交
1237 1238 1239 1240
	ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
	ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
	ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
	ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
1241 1242 1243 1244 1245 1246 1247 1248
	ce->ce_dev   = ntohl(ondisk->dev);
	ce->ce_ino   = ntohl(ondisk->ino);
	ce->ce_mode  = ntohl(ondisk->mode);
	ce->ce_uid   = ntohl(ondisk->uid);
	ce->ce_gid   = ntohl(ondisk->gid);
	ce->ce_size  = ntohl(ondisk->size);
	/* On-disk flags are just 16 bits */
	ce->ce_flags = ntohs(ondisk->flags);
1249

1250
	hashcpy(ce->sha1, ondisk->sha1);
1251 1252

	len = ce->ce_flags & CE_NAMEMASK;
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267

	if (ce->ce_flags & CE_EXTENDED) {
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
		extended_flags = ntohs(ondisk2->flags2) << 16;
		/* 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);
		ce->ce_flags |= extended_flags;
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1268
	if (len == CE_NAMEMASK)
1269
		len = strlen(name);
1270 1271 1272 1273
	/*
	 * NEEDSWORK: If the original index is crafted, this copy could
	 * go unchecked.
	 */
1274
	memcpy(ce->name, name, len + 1);
1275 1276
}

1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
{
	long per_entry;

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

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

1291
/* remember to discard_cache() before reading a different cache! */
1292
int read_index_from(struct index_state *istate, const char *path)
1293 1294 1295
{
	int fd, i;
	struct stat st;
1296
	unsigned long src_offset, dst_offset;
1297
	struct cache_header *hdr;
1298 1299
	void *mmap;
	size_t mmap_size;
1300 1301

	errno = EBUSY;
1302
	if (istate->initialized)
1303
		return istate->cache_nr;
1304

1305
	errno = ENOENT;
K
Kjetil Barvik 已提交
1306 1307
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1308
	fd = open(path, O_RDONLY);
1309 1310 1311
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
1312
		die_errno("index file open failed");
1313
	}
1314

1315
	if (fstat(fd, &st))
1316
		die_errno("cannot stat the open index");
1317 1318

	errno = EINVAL;
1319 1320
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1321 1322
		die("index file smaller than expected");

1323
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1324
	close(fd);
1325
	if (mmap == MAP_FAILED)
1326
		die_errno("unable to map index file");
1327

1328 1329
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1330 1331
		goto unmap;

1332 1333 1334
	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 *));
1335

1336 1337 1338 1339 1340 1341
	/*
	 * The disk format is actually larger than the in-memory format,
	 * due to space for nsec etc, so even though the in-memory one
	 * has room for a few  more flags, we can allocate using the same
	 * index size
	 */
1342
	istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
1343
	istate->initialized = 1;
1344 1345 1346

	src_offset = sizeof(*hdr);
	dst_offset = 0;
1347
	for (i = 0; i < istate->cache_nr; i++) {
1348
		struct ondisk_cache_entry *disk_ce;
1349 1350
		struct cache_entry *ce;

1351 1352 1353
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
		ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
		convert_from_disk(disk_ce, ce);
1354
		set_index_entry(istate, i, ce);
1355 1356 1357

		src_offset += ondisk_ce_size(ce);
		dst_offset += ce_size(ce);
1358
	}
K
Kjetil Barvik 已提交
1359
	istate->timestamp.sec = st.st_mtime;
1360
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1361

1362
	while (src_offset <= mmap_size - 20 - 8) {
1363 1364 1365 1366 1367 1368
		/* 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.
		 */
1369
		uint32_t extsize;
1370
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1371
		extsize = ntohl(extsize);
1372
		if (read_index_extension(istate,
1373 1374
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1375
					 extsize) < 0)
1376
			goto unmap;
1377 1378
		src_offset += 8;
		src_offset += extsize;
1379
	}
1380
	munmap(mmap, mmap_size);
1381
	return istate->cache_nr;
1382 1383

unmap:
1384
	munmap(mmap, mmap_size);
1385
	errno = EINVAL;
1386
	die("index file corrupt");
1387 1388
}

1389 1390
int is_index_unborn(struct index_state *istate)
{
K
Kjetil Barvik 已提交
1391
	return (!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);
1392 1393
}

1394
int discard_index(struct index_state *istate)
1395
{
1396
	resolve_undo_clear_index(istate);
1397 1398
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1399 1400
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1401
	istate->name_hash_initialized = 0;
1402
	free_hash(&istate->name_hash);
1403
	cache_tree_free(&(istate->cache_tree));
1404 1405
	free(istate->alloc);
	istate->alloc = NULL;
1406
	istate->initialized = 0;
1407 1408

	/* no need to throw away allocated active_cache */
1409
	return 0;
1410 1411
}

1412
int unmerged_index(const struct index_state *istate)
1413 1414 1415 1416 1417 1418 1419 1420 1421
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1422
#define WRITE_BUFFER_SIZE 8192
1423
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1424 1425
static unsigned long write_buffer_len;

1426
static int ce_write_flush(git_SHA_CTX *context, int fd)
1427 1428 1429
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1430
		git_SHA1_Update(context, write_buffer, buffered);
1431
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1432 1433 1434 1435 1436 1437
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1438
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1439 1440 1441 1442 1443 1444 1445 1446 1447
{
	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) {
1448 1449
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1450 1451 1452 1453 1454
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1455
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1456 1457
	}
	return 0;
1458 1459
}

1460
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1461
				  unsigned int ext, unsigned int sz)
1462 1463 1464
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1465 1466
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1467 1468
}

1469
static int ce_flush(git_SHA_CTX *context, int fd)
1470 1471
{
	unsigned int left = write_buffer_len;
1472

1473 1474
	if (left) {
		write_buffer_len = 0;
1475
		git_SHA1_Update(context, write_buffer, left);
1476
	}
1477

1478 1479
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1480
		if (write_in_full(fd, write_buffer, left) != left)
1481 1482 1483 1484
			return -1;
		left = 0;
	}

1485
	/* Append the SHA1 signature at the end */
1486
	git_SHA1_Final(write_buffer + left, context);
1487
	left += 20;
1488
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1489 1490
}

J
Junio C Hamano 已提交
1491 1492 1493 1494 1495 1496 1497
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.
1498 1499 1500 1501 1502
	 *
	 * 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 已提交
1503 1504 1505 1506 1507 1508 1509 1510
	 */
	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)) {
1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521
		/* 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
		 *
1522
		 * but it does not.  When the second update-index runs,
1523 1524 1525 1526 1527
		 * 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 已提交
1528
		 * obtain from the filesystem next time we stat("frotz").
1529 1530 1531 1532 1533 1534 1535
		 *
		 * 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.
		 */
1536
		ce->ce_size = 0;
J
Junio C Hamano 已提交
1537 1538 1539
	}
}

1540
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
1541 1542 1543
{
	int size = ondisk_ce_size(ce);
	struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1544
	char *name;
1545
	int result;
1546

K
Kjetil Barvik 已提交
1547 1548 1549 1550
	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);
1551 1552 1553 1554 1555 1556 1557 1558
	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);
1559 1560 1561 1562 1563 1564 1565 1566 1567
	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));
1568

1569 1570 1571
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1572 1573
}

1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586
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;
}

1587 1588 1589 1590 1591
/*
 * 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)
{
1592
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1593 1594 1595 1596 1597 1598
	    !write_index(istate, lockfile->fd))
		commit_locked_index(lockfile);
	else
		rollback_lock_file(lockfile);
}

1599
int write_index(struct index_state *istate, int newfd)
1600
{
1601
	git_SHA_CTX c;
1602
	struct cache_header hdr;
1603
	int i, err, removed, extended;
1604 1605
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1606
	struct stat st;
1607

1608
	for (i = removed = extended = 0; i < entries; i++) {
1609
		if (cache[i]->ce_flags & CE_REMOVE)
1610
			removed++;
1611

1612 1613 1614 1615 1616 1617 1618 1619
		/* 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;
		}
	}

1620
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1621 1622
	/* for extended format, increase version so older git won't try to read it */
	hdr.hdr_version = htonl(extended ? 3 : 2);
1623
	hdr.hdr_entries = htonl(entries - removed);
1624

1625
	git_SHA1_Init(&c);
1626
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1627 1628 1629 1630
		return -1;

	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1631
		if (ce->ce_flags & CE_REMOVE)
1632
			continue;
1633
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1634
			ce_smudge_racily_clean_entry(ce);
1635
		if (ce_write_entry(&c, newfd, ce) < 0)
1636 1637
			return -1;
	}
1638

1639
	/* Write extension data here */
1640
	if (istate->cache_tree) {
1641
		struct strbuf sb = STRBUF_INIT;
1642 1643 1644 1645 1646 1647

		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)
1648 1649
			return -1;
	}
1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660
	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;
	}
1661 1662 1663

	if (ce_flush(&c, newfd) || fstat(newfd, &st))
		return -1;
1664 1665
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
1666
	return 0;
1667
}
1668 1669 1670

/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
1671
 * index_state, dropping any unmerged entries.  Returns true if
1672 1673 1674 1675 1676 1677 1678
 * 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;
1679
	int unmerged = 0;
1680 1681 1682 1683

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
1684 1685 1686 1687
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
1688
			continue;
1689 1690 1691 1692 1693
		unmerged = 1;
		len = strlen(ce->name);
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
1694
		new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;
1695 1696 1697 1698 1699
		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);
1700
	}
1701
	return unmerged;
1702
}
1703

1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730
/*
 * 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;
}