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

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

#define CE_NAMEMASK  (0x0fff)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return changed;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

static int is_racy_timestamp(const struct index_state *istate,
			     const struct cache_entry *ce)
{
	return (!S_ISGITLINK(ce->ce_mode) &&
		is_racy_stat(istate, &ce->ce_stat_data));
292 293
}

294 295 296 297 298 299
int match_stat_data_racy(const struct index_state *istate,
			 const struct stat_data *sd, struct stat *st)
{
	if (is_racy_stat(istate, sd))
		return MTIME_CHANGED;
	return match_stat_data(sd, st);
300 301
}

302
int ie_match_stat(const struct index_state *istate,
303
		  const struct cache_entry *ce, struct stat *st,
304
		  unsigned int options)
J
Junio C Hamano 已提交
305
{
J
Junio C Hamano 已提交
306
	unsigned int changed;
307
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
308
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
309
	int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
J
Junio C Hamano 已提交
310 311 312 313

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
314 315
	 *
	 * skip-worktree has the same effect with higher precedence
J
Junio C Hamano 已提交
316
	 */
317 318
	if (!ignore_skip_worktree && ce_skip_worktree(ce))
		return 0;
319
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
320 321
		return 0;

322 323 324 325 326
	/*
	 * 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.
	 */
327
	if (ce_intent_to_add(ce))
328 329
		return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;

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

J
Junio C Hamano 已提交
332 333 334 335 336 337 338 339 340 341 342 343 344 345
	/*
	 * 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 已提交
346
	 * carefully than others.
J
Junio C Hamano 已提交
347
	 */
348
	if (!changed && is_racy_timestamp(istate, ce)) {
349 350 351 352 353
		if (assume_racy_is_modified)
			changed |= DATA_CHANGED;
		else
			changed |= ce_modified_check_fs(ce, st);
	}
354

J
Junio C Hamano 已提交
355
	return changed;
356 357
}

358
int ie_modified(const struct index_state *istate,
359 360
		const struct cache_entry *ce,
		struct stat *st, unsigned int options)
361
{
J
Junio C Hamano 已提交
362
	int changed, changed_fs;
363 364

	changed = ie_match_stat(istate, ce, st, options);
365 366 367 368 369 370 371 372 373
	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;

374 375 376 377 378 379 380 381 382 383 384 385 386
	/*
	 * 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.
387
	 */
388
	if ((changed & DATA_CHANGED) &&
389
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
390 391
		return changed;

J
Junio C Hamano 已提交
392 393 394
	changed_fs = ce_modified_check_fs(ce, st);
	if (changed_fs)
		return changed | changed_fs;
395 396 397
	return 0;
}

398 399 400 401 402 403 404 405 406 407 408 409
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];
410
	if (!c1 && S_ISDIR(mode1))
411
		c1 = '/';
412
	if (!c2 && S_ISDIR(mode2))
413 414 415 416
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451
/*
 * 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;
}

452
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
453
{
454 455
	size_t min_len = (len1 < len2) ? len1 : len2;
	int cmp = memcmp(name1, name2, min_len);
456 457 458 459 460 461
	if (cmp)
		return cmp;
	if (len1 < len2)
		return -1;
	if (len1 > len2)
		return 1;
462 463 464 465 466 467 468 469 470 471
	return 0;
}

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

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

473
	if (stage1 < stage2)
474
		return -1;
475
	if (stage1 > stage2)
476
		return 1;
477 478 479
	return 0;
}

480
static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
481 482 483 484
{
	int first, last;

	first = 0;
485
	last = istate->cache_nr;
486 487
	while (last > first) {
		int next = (last + first) >> 1;
488
		struct cache_entry *ce = istate->cache[next];
489
		int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
490
		if (!cmp)
491
			return next;
492 493 494 495 496 497
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
498
	return -first-1;
499 500
}

501 502 503 504 505
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
{
	return index_name_stage_pos(istate, name, namelen, 0);
}

506
/* Remove entry, return true if there are more entries to go.. */
507
int remove_index_entry_at(struct index_state *istate, int pos)
508
{
509 510
	struct cache_entry *ce = istate->cache[pos];

511
	record_resolve_undo(istate, ce);
512
	remove_name_hash(istate, ce);
513
	save_or_free_index_entry(istate, ce);
514
	istate->cache_changed |= CE_ENTRY_REMOVED;
515 516
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
517
		return 0;
518 519 520
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
521 522 523
	return 1;
}

524
/*
O
Ondřej Bílka 已提交
525
 * Remove all cache entries marked for removal, that is where
526 527 528 529 530 531 532 533 534
 * 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++) {
535
		if (ce_array[i]->ce_flags & CE_REMOVE) {
536
			remove_name_hash(istate, ce_array[i]);
537
			save_or_free_index_entry(istate, ce_array[i]);
538
		}
539 540 541
		else
			ce_array[j++] = ce_array[i];
	}
542 543
	if (j == istate->cache_nr)
		return;
544
	istate->cache_changed |= CE_ENTRY_REMOVED;
545 546 547
	istate->cache_nr = j;
}

548
int remove_file_from_index(struct index_state *istate, const char *path)
549
{
550
	int pos = index_name_pos(istate, path, strlen(path));
551 552
	if (pos < 0)
		pos = -pos-1;
553
	cache_tree_invalidate_path(istate, path);
554
	untracked_cache_remove_from_index(istate, path);
555 556
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
557 558 559
	return 0;
}

560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587
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;
}

588 589 590 591 592 593 594 595 596 597 598 599 600 601 602
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
 */
603 604 605
static struct cache_entry *create_alias_ce(struct index_state *istate,
					   struct cache_entry *ce,
					   struct cache_entry *alias)
606 607 608 609 610 611 612 613 614 615 616 617
{
	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);
618
	save_or_free_index_entry(istate, ce);
619 620 621
	return new;
}

622
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
J
Junio C Hamano 已提交
623 624 625 626
{
	unsigned char sha1[20];
	if (write_sha1_file("", 0, blob_type, sha1))
		die("cannot create an empty blob in the object database");
627
	hashcpy(ce->oid.hash, sha1);
J
Junio C Hamano 已提交
628 629
}

630
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
631
{
632
	int size, namelen, was_same;
633
	mode_t st_mode = st->st_mode;
634
	struct cache_entry *ce, *alias;
635
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
636 637
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
638 639 640
	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 已提交
641

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

	namelen = strlen(path);
646
	if (S_ISDIR(st_mode)) {
647 648 649
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
650 651 652
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
653
	ce->ce_namelen = namelen;
J
Junio C Hamano 已提交
654 655
	if (!intent_only)
		fill_stat_cache_info(ce, st);
656 657
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
658

659 660

	if (trust_executable_bit && has_symlinks) {
661
		ce->ce_mode = create_ce_mode(st_mode);
662
	} else {
663 664
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
665
		 */
666
		struct cache_entry *ent;
667
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
668

669
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
670
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
671 672
	}

673 674 675 676 677 678
	/* 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) {
679
		adjust_dirname_case(istate, ce->name);
680 681
	}

682
	alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
683
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
684
		/* Nothing changed, really */
685 686
		if (!S_ISGITLINK(alias->ce_mode))
			ce_mark_uptodate(alias);
687
		alias->ce_flags |= CE_ADDED;
688 689

		free(ce);
690 691
		return 0;
	}
J
Junio C Hamano 已提交
692
	if (!intent_only) {
693
		if (index_path(ce->oid.hash, path, st, HASH_WRITE_OBJECT)) {
694
			free(ce);
J
Junio C Hamano 已提交
695
			return error("unable to index file %s", path);
696
		}
J
Junio C Hamano 已提交
697
	} else
698
		set_object_name_for_intent_to_add_entry(ce);
J
Junio C Hamano 已提交
699

700
	if (ignore_case && alias && different_name(ce, alias))
701
		ce = create_alias_ce(istate, ce, alias);
702
	ce->ce_flags |= CE_ADDED;
703

J
Junio C Hamano 已提交
704
	/* It was suspected to be racily clean, but it turns out to be Ok */
705 706
	was_same = (alias &&
		    !ce_stage(alias) &&
707
		    !oidcmp(&alias->oid, &ce->oid) &&
708 709 710
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
711 712 713 714 715
		free(ce);
	else if (add_index_entry(istate, ce, add_option)) {
		free(ce);
		return error("unable to add %s to index", path);
	}
716
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
717 718 719 720
		printf("add '%s'\n", path);
	return 0;
}

721
int add_file_to_index(struct index_state *istate, const char *path, int flags)
722 723 724
{
	struct stat st;
	if (lstat(path, &st))
725
		die_errno("unable to stat '%s'", path);
726
	return add_to_index(istate, path, &st, flags);
727 728
}

729 730
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
731
		unsigned int refresh_options)
732 733
{
	int size, len;
734
	struct cache_entry *ce, *ret;
735

736 737
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
738
		return NULL;
739
	}
740 741 742 743 744

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

745
	hashcpy(ce->oid.hash, sha1);
746
	memcpy(ce->name, path, len);
747 748
	ce->ce_flags = create_ce_flags(stage);
	ce->ce_namelen = len;
749 750
	ce->ce_mode = create_ce_mode(mode);

751
	ret = refresh_cache_entry(ce, refresh_options);
S
Stefan Beller 已提交
752
	if (ret != ce)
753
		free(ce);
S
Stefan Beller 已提交
754
	return ret;
755 756
}

757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785
/*
 * Chmod an index entry with either +x or -x.
 *
 * Returns -1 if the chmod for the particular cache entry failed (if it's
 * not a regular file), -2 if an invalid flip argument is passed in, 0
 * otherwise.
 */
int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
		      char flip)
{
	if (!S_ISREG(ce->ce_mode))
		return -1;
	switch (flip) {
	case '+':
		ce->ce_mode |= 0111;
		break;
	case '-':
		ce->ce_mode &= ~0111;
		break;
	default:
		return -2;
	}
	cache_tree_invalidate_path(istate, ce->name);
	ce->ce_flags |= CE_UPDATE_IN_BASE;
	istate->cache_changed |= CE_ENTRY_CHANGED;

	return 0;
}

786
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
787 788 789 790 791
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

792 793 794 795 796 797 798 799 800 801 802 803 804 805 806
/*
 * 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.
	 */
807

808
	/* "." is not allowed */
809
	if (*rest == '\0' || is_dir_sep(*rest))
810 811
		return 0;

812
	switch (*rest) {
813 814 815 816 817
	/*
	 * ".git" followed by  NUL or slash is bad. This
	 * shares the path end test with the ".." case.
	 */
	case 'g':
818 819
	case 'G':
		if (rest[1] != 'i' && rest[1] != 'I')
820
			break;
821
		if (rest[2] != 't' && rest[2] != 'T')
822 823 824 825
			break;
		rest += 2;
	/* fallthrough */
	case '.':
826
		if (rest[1] == '\0' || is_dir_sep(rest[1]))
827 828 829 830 831 832 833 834 835
			return 0;
	}
	return 1;
}

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

836 837 838
	if (has_dos_drive_prefix(path))
		return 0;

839 840 841 842
	goto inside;
	for (;;) {
		if (!c)
			return 1;
843
		if (is_dir_sep(c)) {
844
inside:
845 846
			if (protect_hfs && is_hfs_dotgit(path))
				return 0;
847 848
			if (protect_ntfs && is_ntfs_dotgit(path))
				return 0;
849
			c = *path++;
850 851 852
			if ((c == '.' && !verify_dotfile(path)) ||
			    is_dir_sep(c) || c == '\0')
				return 0;
853 854 855 856 857
		}
		c = *path++;
	}
}

858 859 860
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
861
 */
862 863
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
864
{
865 866
	int retval = 0;
	int len = ce_namelen(ce);
867
	int stage = ce_stage(ce);
868
	const char *name = ce->name;
869

870 871
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
872

873
		if (len >= ce_namelen(p))
874
			break;
875 876
		if (memcmp(name, p->name, len))
			break;
877 878
		if (ce_stage(p) != stage)
			continue;
879 880
		if (p->name[len] != '/')
			continue;
881
		if (p->ce_flags & CE_REMOVE)
882
			continue;
883 884 885
		retval = -1;
		if (!ok_to_replace)
			break;
886
		remove_index_entry_at(istate, --pos);
887
	}
888 889
	return retval;
}
890

891 892 893 894
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
895 896
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
897 898
{
	int retval = 0;
899
	int stage = ce_stage(ce);
900 901
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
902

903 904
	for (;;) {
		int len;
905

906 907 908 909 910 911 912
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
913

914
		pos = index_name_stage_pos(istate, name, len, stage);
915
		if (pos >= 0) {
916 917 918 919 920 921 922 923
			/*
			 * 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.
			 */
924
			if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
925 926 927
				retval = -1;
				if (!ok_to_replace)
					break;
928
				remove_index_entry_at(istate, pos);
929 930
				continue;
			}
931
		}
932 933
		else
			pos = -pos-1;
934 935 936 937

		/*
		 * Trivial optimization: if we find an entry that
		 * already matches the sub-directory, then we know
938
		 * we're ok, and we can exit.
939
		 */
940 941
		while (pos < istate->cache_nr) {
			struct cache_entry *p = istate->cache[pos];
942 943 944 945
			if ((ce_namelen(p) <= len) ||
			    (p->name[len] != '/') ||
			    memcmp(p->name, name, len))
				break; /* not our subdirectory */
946 947 948
			if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
				/*
				 * p is at the same stage as our entry, and
949 950 951 952 953 954
				 * is a subdirectory of what we are looking
				 * at, so we cannot have conflicts at our
				 * level or anything shorter.
				 */
				return retval;
			pos++;
955
		}
956
	}
957 958 959 960 961 962 963
	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 已提交
964
 *
965 966 967 968
 * 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.
 */
969 970 971
static int check_file_directory_conflict(struct index_state *istate,
					 const struct cache_entry *ce,
					 int pos, int ok_to_replace)
972
{
973 974 975 976 977
	int retval;

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

981 982 983
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
984
	 * in the array.
985
	 */
986
	retval = has_file_name(istate, ce, pos, ok_to_replace);
987

988 989 990 991
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
992
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
993 994
}

995
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
996 997
{
	int pos;
998 999
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
1000
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
1001
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
1002

1003 1004
	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
		cache_tree_invalidate_path(istate, ce->name);
1005
	pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1006

J
Junio C Hamano 已提交
1007
	/* existing match? Just replace it. */
1008
	if (pos >= 0) {
J
Junio C Hamano 已提交
1009 1010
		if (!new_only)
			replace_index_entry(istate, pos, ce);
1011 1012
		return 0;
	}
1013
	pos = -pos-1;
1014

1015 1016
	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
		untracked_cache_add_to_index(istate, ce->name);
1017

1018 1019 1020 1021
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
1022 1023
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
1024
			ok_to_add = 1;
1025
			if (!remove_index_entry_at(istate, pos))
1026 1027 1028 1029
				break;
		}
	}

1030 1031
	if (!ok_to_add)
		return -1;
1032
	if (!verify_path(ce->name))
1033
		return error("Invalid path '%s'", ce->name);
1034

J
Junio C Hamano 已提交
1035
	if (!skip_df_check &&
1036
	    check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1037
		if (!ok_to_replace)
1038 1039
			return error("'%s' appears as both a file and as a directory",
				     ce->name);
1040
		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1041 1042
		pos = -pos-1;
	}
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058
	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;
	}
1059

1060
	/* Make sure the array is big enough .. */
1061
	ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1062 1063

	/* Add it in.. */
1064
	istate->cache_nr++;
1065
	if (istate->cache_nr > pos + 1)
1066 1067 1068
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
1069
	set_index_entry(istate, pos, ce);
1070
	istate->cache_changed |= CE_ENTRY_ADDED;
1071 1072 1073
	return 0;
}

L
Linus Torvalds 已提交
1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084
/*
 * "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.
 */
1085
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1086
					     struct cache_entry *ce,
1087 1088
					     unsigned int options, int *err,
					     int *changed_ret)
L
Linus Torvalds 已提交
1089 1090 1091 1092
{
	struct stat st;
	struct cache_entry *updated;
	int changed, size;
1093
	int refresh = options & CE_MATCH_REFRESH;
1094
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1095
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1096
	int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
L
Linus Torvalds 已提交
1097

1098
	if (!refresh || ce_uptodate(ce))
1099 1100
		return ce;

1101
	/*
1102 1103 1104
	 * 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.
1105
	 */
1106 1107 1108 1109
	if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
		ce_mark_uptodate(ce);
		return ce;
	}
1110 1111 1112 1113 1114
	if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
		ce_mark_uptodate(ce);
		return ce;
	}

1115 1116 1117 1118 1119 1120 1121 1122
	if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
		if (ignore_missing)
			return ce;
		if (err)
			*err = ENOENT;
		return NULL;
	}

1123
	if (lstat(ce->name, &st) < 0) {
1124 1125
		if (ignore_missing && errno == ENOENT)
			return ce;
1126 1127
		if (err)
			*err = errno;
1128 1129
		return NULL;
	}
L
Linus Torvalds 已提交
1130

1131
	changed = ie_match_stat(istate, ce, &st, options);
1132 1133
	if (changed_ret)
		*changed_ret = changed;
L
Linus Torvalds 已提交
1134
	if (!changed) {
1135 1136 1137 1138 1139 1140 1141 1142
		/*
		 * 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 &&
1143
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
1144
			; /* mark this one VALID again */
1145 1146 1147 1148 1149 1150
		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.
			 */
1151 1152
			if (!S_ISGITLINK(ce->ce_mode))
				ce_mark_uptodate(ce);
1153
			return ce;
1154
		}
L
Linus Torvalds 已提交
1155 1156
	}

1157
	if (ie_modified(istate, ce, &st, options)) {
1158 1159
		if (err)
			*err = EINVAL;
1160 1161
		return NULL;
	}
L
Linus Torvalds 已提交
1162 1163 1164 1165 1166

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1167 1168 1169 1170 1171
	/*
	 * 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 已提交
1172
	 */
1173
	if (!ignore_valid && assume_unchanged &&
1174 1175
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1176

1177
	/* istate->cache_changed is updated in the caller */
L
Linus Torvalds 已提交
1178 1179 1180
	return updated;
}

1181
static void show_file(const char * fmt, const char * name, int in_porcelain,
1182
		      int * first, const char *header_msg)
1183 1184 1185
{
	if (in_porcelain && *first && header_msg) {
		printf("%s\n", header_msg);
1186
		*first = 0;
1187 1188 1189 1190
	}
	printf(fmt, name);
}

1191 1192
int refresh_index(struct index_state *istate, unsigned int flags,
		  const struct pathspec *pathspec,
1193
		  char *seen, const char *header_msg)
L
Linus Torvalds 已提交
1194 1195 1196 1197 1198 1199 1200
{
	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;
1201
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1202 1203
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1204 1205
	unsigned int options = (CE_MATCH_REFRESH |
				(really ? CE_MATCH_IGNORE_VALID : 0) |
1206
				(not_new ? CE_MATCH_IGNORE_MISSING : 0));
J
Jeff King 已提交
1207
	const char *modified_fmt;
1208 1209 1210
	const char *deleted_fmt;
	const char *typechange_fmt;
	const char *added_fmt;
J
Jeff King 已提交
1211
	const char *unmerged_fmt;
L
Linus Torvalds 已提交
1212

J
Jeff King 已提交
1213
	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1214 1215 1216
	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 已提交
1217
	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1218
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1219
		struct cache_entry *ce, *new;
1220
		int cache_errno = 0;
1221
		int changed = 0;
1222
		int filtered = 0;
1223

1224
		ce = istate->cache[i];
1225 1226 1227
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1228
		if (pathspec && !ce_path_match(ce, pathspec, seen))
1229 1230
			filtered = 1;

L
Linus Torvalds 已提交
1231
		if (ce_stage(ce)) {
1232 1233
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1234 1235 1236 1237
				i++;
			i--;
			if (allow_unmerged)
				continue;
1238 1239 1240
			if (!filtered)
				show_file(unmerged_fmt, ce->name, in_porcelain,
					  &first, header_msg);
L
Linus Torvalds 已提交
1241 1242 1243 1244
			has_errors = 1;
			continue;
		}

1245
		if (filtered)
1246 1247
			continue;

1248
		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1249
		if (new == ce)
L
Linus Torvalds 已提交
1250
			continue;
1251
		if (!new) {
1252 1253
			const char *fmt;

1254
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1255 1256 1257
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1258
				ce->ce_flags &= ~CE_VALID;
1259
				ce->ce_flags |= CE_UPDATE_IN_BASE;
1260
				istate->cache_changed |= CE_ENTRY_CHANGED;
L
Linus Torvalds 已提交
1261 1262 1263
			}
			if (quiet)
				continue;
1264 1265 1266

			if (cache_errno == ENOENT)
				fmt = deleted_fmt;
1267
			else if (ce_intent_to_add(ce))
1268 1269 1270 1271 1272 1273 1274
				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 已提交
1275 1276 1277
			has_errors = 1;
			continue;
		}
1278 1279

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1280 1281 1282 1283
	}
	return has_errors;
}

1284
struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1285
					       unsigned int options)
1286
{
1287
	return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1288 1289
}

1290 1291 1292 1293 1294

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

1295 1296
#define INDEX_FORMAT_DEFAULT 3

1297 1298 1299
static unsigned int get_index_format_default(void)
{
	char *envversion = getenv("GIT_INDEX_VERSION");
1300
	char *endp;
1301
	int value;
1302 1303
	unsigned int version = INDEX_FORMAT_DEFAULT;

1304
	if (!envversion) {
1305 1306
		if (!git_config_get_int("index.version", &value))
			version = value;
1307 1308
		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
			warning(_("index.version set, but the value is invalid.\n"
1309
				  "Using version %i"), INDEX_FORMAT_DEFAULT);
1310
			return INDEX_FORMAT_DEFAULT;
1311 1312 1313
		}
		return version;
	}
1314 1315 1316 1317 1318 1319 1320 1321 1322

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

1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335
/*
 * 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;
1336 1337 1338 1339 1340 1341
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1342
	unsigned char sha1[20];
1343
	uint16_t flags;
1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354
	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;
1355 1356 1357 1358 1359 1360
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1361
	unsigned char sha1[20];
1362 1363
	uint16_t flags;
	uint16_t flags2;
1364 1365 1366
	char name[FLEX_ARRAY]; /* more */
};

1367
/* These are only used for v3 or lower */
1368 1369 1370 1371 1372 1373 1374
#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)))

1375
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1376
{
1377
	git_SHA_CTX c;
1378
	unsigned char sha1[20];
1379
	int hdr_version;
1380

1381
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1382
		return error("bad signature");
1383
	hdr_version = ntohl(hdr->hdr_version);
1384
	if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1385
		return error("bad index version %d", hdr_version);
1386 1387 1388
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1389
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1390
		return error("bad index file sha1 signature");
1391 1392 1393
	return 0;
}

1394 1395
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1396 1397 1398
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1399
		istate->cache_tree = cache_tree_read(data, sz);
1400
		break;
1401 1402 1403
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1404 1405 1406 1407
	case CACHE_EXT_LINK:
		if (read_link_extension(istate, data, sz))
			return -1;
		break;
1408 1409 1410
	case CACHE_EXT_UNTRACKED:
		istate->untracked = read_untracked_extension(data, sz);
		break;
1411 1412 1413 1414 1415 1416 1417 1418 1419 1420
	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;
}

1421 1422 1423 1424 1425 1426 1427 1428
int hold_locked_index(struct lock_file *lk, int die_on_error)
{
	return hold_lock_file_for_update(lk, get_index_file(),
					 die_on_error
					 ? LOCK_DIE_ON_ERROR
					 : 0);
}

1429
int read_index(struct index_state *istate)
1430
{
1431
	return read_index_from(istate, get_index_file());
1432 1433
}

1434 1435 1436 1437 1438 1439 1440
static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
						   unsigned int flags,
						   const char *name,
						   size_t len)
{
	struct cache_entry *ce = xmalloc(cache_entry_size(len));

1441 1442 1443 1444 1445 1446 1447 1448 1449 1450
	ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
	ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
	ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
	ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
	ce->ce_stat_data.sd_dev   = get_be32(&ondisk->dev);
	ce->ce_stat_data.sd_ino   = get_be32(&ondisk->ino);
	ce->ce_mode  = get_be32(&ondisk->mode);
	ce->ce_stat_data.sd_uid   = get_be32(&ondisk->uid);
	ce->ce_stat_data.sd_gid   = get_be32(&ondisk->gid);
	ce->ce_stat_data.sd_size  = get_be32(&ondisk->size);
1451 1452
	ce->ce_flags = flags & ~CE_NAMEMASK;
	ce->ce_namelen = len;
1453
	ce->index = 0;
1454
	hashcpy(ce->oid.hash, ondisk->sha1);
1455 1456 1457 1458 1459
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
	return ce;
}

1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480
/*
 * Adjacent cache entries tend to share the leading paths, so it makes
 * sense to only store the differences in later entries.  In the v4
 * on-disk format of the index, each on-disk cache entry stores the
 * number of bytes to be stripped from the end of the previous name,
 * and the bytes to append to the result, to come up with its name.
 */
static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
{
	const unsigned char *ep, *cp = (const unsigned char *)cp_;
	size_t len = decode_varint(&cp);

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

1481
static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1482 1483
					    unsigned long *ent_size,
					    struct strbuf *previous_name)
1484
{
1485
	struct cache_entry *ce;
1486
	size_t len;
1487
	const char *name;
1488
	unsigned int flags;
1489

1490
	/* On-disk flags are just 16 bits */
1491
	flags = get_be16(&ondisk->flags);
1492
	len = flags & CE_NAMEMASK;
1493

1494
	if (flags & CE_EXTENDED) {
1495 1496 1497
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1498
		extended_flags = get_be16(&ondisk2->flags2) << 16;
1499 1500 1501
		/* 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);
1502
		flags |= extended_flags;
1503 1504 1505 1506 1507
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523
	if (!previous_name) {
		/* v3 and earlier */
		if (len == CE_NAMEMASK)
			len = strlen(name);
		ce = cache_entry_from_ondisk(ondisk, flags, name, len);

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

		*ent_size = (name - ((char *)ondisk)) + consumed;
	}
1524
	return ce;
1525 1526
}

1527
static void check_ce_order(struct index_state *istate)
1528
{
1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545
	unsigned int i;

	for (i = 1; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i - 1];
		struct cache_entry *next_ce = istate->cache[i];
		int name_compare = strcmp(ce->name, next_ce->name);

		if (0 < name_compare)
			die("unordered stage entries in index");
		if (!name_compare) {
			if (!ce_stage(ce))
				die("multiple stage entries for merged file '%s'",
				    ce->name);
			if (ce_stage(ce) > ce_stage(next_ce))
				die("unordered stage entries for '%s'",
				    ce->name);
		}
1546 1547 1548
	}
}

1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570
static void tweak_untracked_cache(struct index_state *istate)
{
	switch (git_config_get_untracked_cache()) {
	case -1: /* keep: do nothing */
		break;
	case 0: /* false */
		remove_untracked_cache(istate);
		break;
	case 1: /* true */
		add_untracked_cache(istate);
		break;
	default: /* unknown value: do nothing */
		break;
	}
}

static void post_read_index_from(struct index_state *istate)
{
	check_ce_order(istate);
	tweak_untracked_cache(istate);
}

1571
/* remember to discard_cache() before reading a different cache! */
1572
int do_read_index(struct index_state *istate, const char *path, int must_exist)
1573 1574 1575
{
	int fd, i;
	struct stat st;
1576
	unsigned long src_offset;
1577
	struct cache_header *hdr;
1578 1579
	void *mmap;
	size_t mmap_size;
1580
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1581

1582
	if (istate->initialized)
1583
		return istate->cache_nr;
1584

K
Kjetil Barvik 已提交
1585 1586
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1587
	fd = open(path, O_RDONLY);
1588
	if (fd < 0) {
1589
		if (!must_exist && errno == ENOENT)
1590
			return 0;
1591
		die_errno("%s: index file open failed", path);
1592
	}
1593

1594
	if (fstat(fd, &st))
1595
		die_errno("cannot stat the open index");
1596

1597 1598
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1599 1600
		die("index file smaller than expected");

1601
	mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
1602
	if (mmap == MAP_FAILED)
1603
		die_errno("unable to map index file");
1604
	close(fd);
1605

1606 1607
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1608 1609
		goto unmap;

1610
	hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
1611
	istate->version = ntohl(hdr->hdr_version);
1612 1613
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
1614
	istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1615
	istate->initialized = 1;
1616

1617
	if (istate->version == 4)
1618 1619 1620 1621
		previous_name = &previous_name_buf;
	else
		previous_name = NULL;

1622
	src_offset = sizeof(*hdr);
1623
	for (i = 0; i < istate->cache_nr; i++) {
1624
		struct ondisk_cache_entry *disk_ce;
1625
		struct cache_entry *ce;
1626
		unsigned long consumed;
1627

1628
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1629
		ce = create_from_disk(disk_ce, &consumed, previous_name);
1630
		set_index_entry(istate, i, ce);
1631

1632
		src_offset += consumed;
1633
	}
1634
	strbuf_release(&previous_name_buf);
K
Kjetil Barvik 已提交
1635
	istate->timestamp.sec = st.st_mtime;
1636
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1637

1638
	while (src_offset <= mmap_size - 20 - 8) {
1639 1640 1641 1642 1643 1644
		/* 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.
		 */
1645
		uint32_t extsize;
1646
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1647
		extsize = ntohl(extsize);
1648
		if (read_index_extension(istate,
1649 1650
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1651
					 extsize) < 0)
1652
			goto unmap;
1653 1654
		src_offset += 8;
		src_offset += extsize;
1655
	}
1656
	munmap(mmap, mmap_size);
1657
	return istate->cache_nr;
1658 1659

unmap:
1660
	munmap(mmap, mmap_size);
1661
	die("index file corrupt");
1662 1663
}

1664 1665 1666 1667 1668 1669 1670 1671 1672 1673
int read_index_from(struct index_state *istate, const char *path)
{
	struct split_index *split_index;
	int ret;

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

	ret = do_read_index(istate, path, 0);
1674

1675
	split_index = istate->split_index;
1676
	if (!split_index || is_null_sha1(split_index->base_sha1)) {
1677
		post_read_index_from(istate);
1678
		return ret;
1679
	}
1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691

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

1699 1700
int is_index_unborn(struct index_state *istate)
{
1701
	return (!istate->cache_nr && !istate->timestamp.sec);
1702 1703
}

1704
int discard_index(struct index_state *istate)
1705
{
1706 1707
	int i;

1708 1709 1710 1711 1712 1713 1714
	for (i = 0; i < istate->cache_nr; i++) {
		if (istate->cache[i]->index &&
		    istate->split_index &&
		    istate->split_index->base &&
		    istate->cache[i]->index <= istate->split_index->base->cache_nr &&
		    istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
			continue;
1715
		free(istate->cache[i]);
1716
	}
1717
	resolve_undo_clear_index(istate);
1718 1719
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1720 1721
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1722
	free_name_hash(istate);
1723
	cache_tree_free(&(istate->cache_tree));
1724
	istate->initialized = 0;
1725 1726 1727
	free(istate->cache);
	istate->cache = NULL;
	istate->cache_alloc = 0;
1728
	discard_split_index(istate);
1729 1730
	free_untracked_cache(istate->untracked);
	istate->untracked = NULL;
1731
	return 0;
1732 1733
}

1734
int unmerged_index(const struct index_state *istate)
1735 1736 1737 1738 1739 1740 1741 1742 1743
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1744
#define WRITE_BUFFER_SIZE 8192
1745
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1746 1747
static unsigned long write_buffer_len;

1748
static int ce_write_flush(git_SHA_CTX *context, int fd)
1749 1750 1751
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1752
		git_SHA1_Update(context, write_buffer, buffered);
1753
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1754 1755 1756 1757 1758 1759
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1760
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1761 1762 1763 1764 1765 1766 1767 1768 1769
{
	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) {
1770 1771
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1772 1773 1774 1775 1776
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1777
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1778 1779
	}
	return 0;
1780 1781
}

1782
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1783
				  unsigned int ext, unsigned int sz)
1784 1785 1786
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1787 1788
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1789 1790
}

1791
static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
1792 1793
{
	unsigned int left = write_buffer_len;
1794

1795 1796
	if (left) {
		write_buffer_len = 0;
1797
		git_SHA1_Update(context, write_buffer, left);
1798
	}
1799

1800 1801
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1802
		if (write_in_full(fd, write_buffer, left) != left)
1803 1804 1805 1806
			return -1;
		left = 0;
	}

1807
	/* Append the SHA1 signature at the end */
1808
	git_SHA1_Final(write_buffer + left, context);
1809
	hashcpy(sha1, write_buffer + left);
1810
	left += 20;
1811
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1812 1813
}

J
Junio C Hamano 已提交
1814 1815 1816 1817 1818 1819
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
1820
	 * ce_stat_data.sd_mtime match the index file mtime.
1821 1822 1823 1824 1825
	 *
	 * 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 已提交
1826 1827 1828 1829 1830 1831 1832 1833
	 */
	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)) {
1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844
		/* 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
		 *
1845
		 * but it does not.  When the second update-index runs,
1846 1847 1848 1849 1850
		 * 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 已提交
1851
		 * obtain from the filesystem next time we stat("frotz").
1852 1853 1854 1855 1856 1857 1858
		 *
		 * 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.
		 */
1859
		ce->ce_stat_data.sd_size = 0;
J
Junio C Hamano 已提交
1860 1861 1862
	}
}

1863 1864 1865
/* Copy miscellaneous fields but not the name */
static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
				       struct cache_entry *ce)
1866
{
1867 1868
	short flags;

1869 1870 1871 1872 1873 1874
	ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
	ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
	ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
	ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
	ondisk->dev  = htonl(ce->ce_stat_data.sd_dev);
	ondisk->ino  = htonl(ce->ce_stat_data.sd_ino);
1875
	ondisk->mode = htonl(ce->ce_mode);
1876 1877 1878
	ondisk->uid  = htonl(ce->ce_stat_data.sd_uid);
	ondisk->gid  = htonl(ce->ce_stat_data.sd_gid);
	ondisk->size = htonl(ce->ce_stat_data.sd_size);
1879
	hashcpy(ondisk->sha1, ce->oid.hash);
1880

1881
	flags = ce->ce_flags & ~CE_NAMEMASK;
1882 1883
	flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
	ondisk->flags = htons(flags);
1884 1885 1886 1887
	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);
1888
		return ondisk2->name;
1889
	}
1890 1891 1892 1893 1894
	else {
		return ondisk->name;
	}
}

1895 1896
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
			  struct strbuf *previous_name)
1897
{
1898 1899
	int size;
	struct ondisk_cache_entry *ondisk;
1900
	int saved_namelen = saved_namelen; /* compiler workaround */
1901 1902 1903
	char *name;
	int result;

1904 1905 1906 1907 1908
	if (ce->ce_flags & CE_STRIP_NAME) {
		saved_namelen = ce_namelen(ce);
		ce->ce_namelen = 0;
	}

1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938
	if (!previous_name) {
		size = ondisk_ce_size(ce);
		ondisk = xcalloc(1, size);
		name = copy_cache_entry_to_ondisk(ondisk, ce);
		memcpy(name, ce->name, ce_namelen(ce));
	} else {
		int common, to_remove, prefix_size;
		unsigned char to_remove_vi[16];
		for (common = 0;
		     (ce->name[common] &&
		      common < previous_name->len &&
		      ce->name[common] == previous_name->buf[common]);
		     common++)
			; /* still matching */
		to_remove = previous_name->len - common;
		prefix_size = encode_varint(to_remove, to_remove_vi);

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

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

		strbuf_splice(previous_name, common, to_remove,
			      ce->name + common, ce_namelen(ce) - common);
1939
	}
1940 1941 1942 1943
	if (ce->ce_flags & CE_STRIP_NAME) {
		ce->ce_namelen = saved_namelen;
		ce->ce_flags &= ~CE_STRIP_NAME;
	}
1944

1945 1946 1947
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1948 1949
}

1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993
/*
 * This function verifies if index_state has the correct sha1 of the
 * index file.  Don't die if we have any other failure, just return 0.
 */
static int verify_index_from(const struct index_state *istate, const char *path)
{
	int fd;
	ssize_t n;
	struct stat st;
	unsigned char sha1[20];

	if (!istate->initialized)
		return 0;

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

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

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

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

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

	close(fd);
	return 1;

out:
	close(fd);
	return 0;
}

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

1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
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;
}

2007
/*
O
Ondřej Bílka 已提交
2008
 * Opportunistically update the index but do not complain if we can't
2009 2010 2011
 */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
2012
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
J
Junio C Hamano 已提交
2013
	    verify_index(istate) &&
2014
	    write_locked_index(istate, lockfile, COMMIT_LOCK))
2015 2016 2017
		rollback_lock_file(lockfile);
}

2018 2019
static int do_write_index(struct index_state *istate, int newfd,
			  int strip_extensions)
2020
{
2021
	git_SHA_CTX c;
2022
	struct cache_header hdr;
2023
	int i, err, removed, extended, hdr_version;
2024 2025
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
2026
	struct stat st;
2027
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
2028

2029
	for (i = removed = extended = 0; i < entries; i++) {
2030
		if (cache[i]->ce_flags & CE_REMOVE)
2031
			removed++;
2032

2033 2034 2035 2036 2037 2038 2039 2040
		/* 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;
		}
	}

2041
	if (!istate->version) {
2042
		istate->version = get_index_format_default();
2043 2044 2045
		if (getenv("GIT_TEST_SPLIT_INDEX"))
			init_split_index(istate);
	}
2046 2047 2048 2049 2050 2051 2052

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

	hdr_version = istate->version;

2053
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
2054
	hdr.hdr_version = htonl(hdr_version);
2055
	hdr.hdr_entries = htonl(entries - removed);
2056

2057
	git_SHA1_Init(&c);
2058
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
2059 2060
		return -1;

2061
	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2062 2063
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
2064
		if (ce->ce_flags & CE_REMOVE)
2065
			continue;
2066
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
2067
			ce_smudge_racily_clean_entry(ce);
2068
		if (is_null_oid(&ce->oid)) {
2069 2070 2071 2072 2073 2074 2075 2076 2077 2078
			static const char msg[] = "cache entry has null sha1: %s";
			static int allow = -1;

			if (allow < 0)
				allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
			if (allow)
				warning(msg, ce->name);
			else
				return error(msg, ce->name);
		}
2079
		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
2080 2081
			return -1;
	}
2082
	strbuf_release(&previous_name_buf);
2083

2084
	/* Write extension data here */
2085
	if (!strip_extensions && istate->split_index) {
2086 2087 2088 2089 2090 2091 2092 2093 2094 2095
		struct strbuf sb = STRBUF_INIT;

		err = write_link_extension(&sb, istate) < 0 ||
			write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
					       sb.len) < 0 ||
			ce_write(&c, newfd, sb.buf, sb.len) < 0;
		strbuf_release(&sb);
		if (err)
			return -1;
	}
2096
	if (!strip_extensions && istate->cache_tree) {
2097
		struct strbuf sb = STRBUF_INIT;
2098 2099 2100 2101 2102 2103

		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)
2104 2105
			return -1;
	}
2106
	if (!strip_extensions && istate->resolve_undo) {
2107 2108 2109 2110 2111 2112 2113 2114 2115 2116
		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;
	}
2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127
	if (!strip_extensions && istate->untracked) {
		struct strbuf sb = STRBUF_INIT;

		write_untracked_extension(&sb, istate->untracked);
		err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
					     sb.len) < 0 ||
			ce_write(&c, newfd, sb.buf, sb.len) < 0;
		strbuf_release(&sb);
		if (err)
			return -1;
	}
2128

2129
	if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2130
		return -1;
2131 2132
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
2133
	return 0;
2134
}
2135

2136 2137 2138 2139 2140 2141 2142
void set_alternate_index_output(const char *name)
{
	alternate_index_output = name;
}

static int commit_locked_index(struct lock_file *lk)
{
2143 2144 2145
	if (alternate_index_output)
		return commit_lock_file_to(lk, alternate_index_output);
	else
2146 2147 2148
		return commit_lock_file(lk);
}

2149 2150 2151
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
				 unsigned flags)
{
2152
	int ret = do_write_index(istate, get_lock_file_fd(lock), 0);
2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164
	if (ret)
		return ret;
	assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
	       (COMMIT_LOCK | CLOSE_LOCK));
	if (flags & COMMIT_LOCK)
		return commit_locked_index(lock);
	else if (flags & CLOSE_LOCK)
		return close_lock_file(lock);
	else
		return ret;
}

2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175
static int write_split_index(struct index_state *istate,
			     struct lock_file *lock,
			     unsigned flags)
{
	int ret;
	prepare_to_write_split_index(istate);
	ret = do_write_locked_index(istate, lock, flags);
	finish_writing_split_index(istate);
	return ret;
}

2176
static struct tempfile temporary_sharedindex;
2177

2178 2179
static int write_shared_index(struct index_state *istate,
			      struct lock_file *lock, unsigned flags)
2180 2181 2182 2183
{
	struct split_index *si = istate->split_index;
	int fd, ret;

2184
	fd = mks_tempfile(&temporary_sharedindex, git_path("sharedindex_XXXXXX"));
2185 2186 2187 2188
	if (fd < 0) {
		hashclr(si->base_sha1);
		return do_write_locked_index(istate, lock, flags);
	}
2189 2190 2191
	move_cache_to_base_index(istate);
	ret = do_write_index(si->base, fd, 1);
	if (ret) {
2192
		delete_tempfile(&temporary_sharedindex);
2193 2194
		return ret;
	}
2195 2196
	ret = rename_tempfile(&temporary_sharedindex,
			      git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
2197 2198 2199 2200 2201
	if (!ret)
		hashcpy(si->base_sha1, si->base->sha1);
	return ret;
}

2202 2203 2204
int write_locked_index(struct index_state *istate, struct lock_file *lock,
		       unsigned flags)
{
2205 2206
	struct split_index *si = istate->split_index;

2207 2208
	if (!si || alternate_index_output ||
	    (istate->cache_changed & ~EXTMASK)) {
2209 2210 2211 2212 2213
		if (si)
			hashclr(si->base_sha1);
		return do_write_locked_index(istate, lock, flags);
	}

2214 2215 2216 2217 2218
	if (getenv("GIT_TEST_SPLIT_INDEX")) {
		int v = si->base_sha1[0];
		if ((v & 15) < 6)
			istate->cache_changed |= SPLIT_INDEX_ORDERED;
	}
2219
	if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2220
		int ret = write_shared_index(istate, lock, flags);
2221 2222 2223 2224
		if (ret)
			return ret;
	}

2225
	return write_split_index(istate, lock, flags);
2226 2227
}

2228 2229
/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
2230
 * index_state, dropping any unmerged entries.  Returns true if
2231 2232 2233 2234 2235 2236 2237
 * 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;
2238
	int unmerged = 0;
2239 2240 2241 2242

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
2243 2244 2245 2246
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
2247
			continue;
2248
		unmerged = 1;
2249
		len = ce_namelen(ce);
2250 2251 2252
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
2253 2254
		new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
		new_ce->ce_namelen = len;
2255 2256 2257
		new_ce->ce_mode = ce->ce_mode;
		if (add_index_entry(istate, new_ce, 0))
			return error("%s: cannot drop to stage #0",
2258
				     new_ce->name);
2259
	}
2260
	return unmerged;
2261
}
2262

2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289
/*
 * 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;
}
2290

2291
void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314
{
	int pos, len;
	unsigned long sz;
	enum object_type type;
	void *data;

	len = strlen(path);
	pos = index_name_pos(istate, path, len);
	if (pos < 0) {
		/*
		 * We might be in the middle of a merge, in which
		 * case we would read stage #2 (ours).
		 */
		int i;
		for (i = -pos - 1;
		     (pos < 0 && i < istate->cache_nr &&
		      !strcmp(istate->cache[i]->name, path));
		     i++)
			if (ce_stage(istate->cache[i]) == 2)
				pos = i;
	}
	if (pos < 0)
		return NULL;
2315
	data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
2316 2317 2318 2319
	if (!data || type != OBJ_BLOB) {
		free(data);
		return NULL;
	}
2320 2321
	if (size)
		*size = sz;
2322 2323
	return data;
}
M
Michael Haggerty 已提交
2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353

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

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

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

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

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