read-cache.c 52.9 KB
Newer Older
L
Linus Torvalds 已提交
1 2 3 4 5
/*
 * GIT - The information manager from hell
 *
 * Copyright (C) Linus Torvalds, 2005
 */
6
#define NO_THE_INDEX_COMPATIBILITY_MACROS
7
#include "cache.h"
8
#include "cache-tree.h"
9
#include "refs.h"
10
#include "dir.h"
11 12
#include "tree.h"
#include "commit.h"
J
Junio C Hamano 已提交
13
#include "blob.h"
14
#include "resolve-undo.h"
15 16
#include "strbuf.h"
#include "varint.h"
17

18 19
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);

20 21 22 23
/* Mask for the name length in ce_flags in the on-disk index */

#define CE_NAMEMASK  (0x0fff)

24 25 26 27 28 29 30 31 32 33 34
/* 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" */
35
#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
36

37
struct index_state the_index;
38

J
Junio C Hamano 已提交
39 40 41
static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
	istate->cache[nr] = ce;
42
	add_name_hash(istate, ce);
J
Junio C Hamano 已提交
43 44
}

45 46 47 48
static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
{
	struct cache_entry *old = istate->cache[nr];

49
	remove_name_hash(istate, old);
L
Linus Torvalds 已提交
50
	set_index_entry(istate, nr, ce);
51 52 53
	istate->cache_changed = 1;
}

54 55 56 57 58 59 60
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);
61 62
	new->ce_flags &= ~CE_STATE_MASK;
	new->ce_namelen = namelen;
63 64 65 66 67 68 69
	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);
}

70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
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;
}

125 126 127 128 129 130 131
/*
 * 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)
{
132
	fill_stat_data(&ce->ce_stat_data, st);
J
Junio C Hamano 已提交
133 134

	if (assume_unchanged)
135
		ce->ce_flags |= CE_VALID;
136 137 138

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
139 140
}

141
static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
J
Junio C Hamano 已提交
142 143 144 145 146 147
{
	int match = -1;
	int fd = open(ce->name, O_RDONLY);

	if (fd >= 0) {
		unsigned char sha1[20];
148
		if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
149
			match = hashcmp(sha1, ce->sha1);
150
		/* index_fd() closed the file descriptor already */
J
Junio C Hamano 已提交
151 152 153 154
	}
	return match;
}

155
static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
J
Junio C Hamano 已提交
156 157 158 159
{
	int match = -1;
	void *buffer;
	unsigned long size;
160
	enum object_type type;
161
	struct strbuf sb = STRBUF_INIT;
J
Junio C Hamano 已提交
162

163
	if (strbuf_readlink(&sb, ce->name, expected_size))
J
Junio C Hamano 已提交
164
		return -1;
165

166
	buffer = read_sha1_file(ce->sha1, &type, &size);
167 168 169 170
	if (buffer) {
		if (size == sb.len)
			match = memcmp(buffer, sb.buf, size);
		free(buffer);
J
Junio C Hamano 已提交
171
	}
172
	strbuf_release(&sb);
J
Junio C Hamano 已提交
173 174 175
	return match;
}

176
static int ce_compare_gitlink(const struct cache_entry *ce)
177 178 179 180 181
{
	unsigned char sha1[20];

	/*
	 * We don't actually require that the .git directory
M
Martin Waitz 已提交
182
	 * under GITLINK directory be a valid git directory. It
183 184 185 186 187 188 189 190 191 192
	 * 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);
}

193
static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
J
Junio C Hamano 已提交
194 195 196 197 198 199 200
{
	switch (st->st_mode & S_IFMT) {
	case S_IFREG:
		if (ce_compare_data(ce, st))
			return DATA_CHANGED;
		break;
	case S_IFLNK:
201
		if (ce_compare_link(ce, xsize_t(st->st_size)))
J
Junio C Hamano 已提交
202 203
			return DATA_CHANGED;
		break;
204
	case S_IFDIR:
205
		if (S_ISGITLINK(ce->ce_mode))
206
			return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
J
Junio C Hamano 已提交
207 208 209 210 211 212
	default:
		return TYPE_CHANGED;
	}
	return 0;
}

213
static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
214 215 216
{
	unsigned int changed = 0;

217 218 219 220
	if (ce->ce_flags & CE_REMOVE)
		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;

	switch (ce->ce_mode & S_IFMT) {
221 222
	case S_IFREG:
		changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
J
Junio C Hamano 已提交
223 224 225 226
		/* We consider only the owner x bit to be relevant for
		 * "mode changes"
		 */
		if (trust_executable_bit &&
227
		    (0100 & (ce->ce_mode ^ st->st_mode)))
228
			changed |= MODE_CHANGED;
229 230
		break;
	case S_IFLNK:
231 232 233
		if (!S_ISLNK(st->st_mode) &&
		    (has_symlinks || !S_ISREG(st->st_mode)))
			changed |= TYPE_CHANGED;
234
		break;
M
Martin Waitz 已提交
235
	case S_IFGITLINK:
236
		/* We ignore most of the st_xxx fields for gitlinks */
237 238 239 240
		if (!S_ISDIR(st->st_mode))
			changed |= TYPE_CHANGED;
		else if (ce_compare_gitlink(ce))
			changed |= DATA_CHANGED;
241
		return changed;
242
	default:
243
		die("internal error: ce_mode is %o", ce->ce_mode);
244
	}
245

246
	changed |= match_stat_data(&ce->ce_stat_data, st);
247

248
	/* Racily smudged entry? */
249
	if (!ce->ce_stat_data.sd_size) {
250 251 252 253
		if (!is_empty_blob_sha1(ce->sha1))
			changed |= DATA_CHANGED;
	}

J
Junio C Hamano 已提交
254 255 256
	return changed;
}

257 258
static int is_racy_timestamp(const struct index_state *istate,
			     const struct cache_entry *ce)
259
{
260
	return (!S_ISGITLINK(ce->ce_mode) &&
K
Kjetil Barvik 已提交
261 262 263
		istate->timestamp.sec &&
#ifdef USE_NSEC
		 /* nanosecond timestamped files can also be racy! */
264 265 266
		(istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
		 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
		  istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
K
Kjetil Barvik 已提交
267
#else
268
		istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
K
Kjetil Barvik 已提交
269 270
#endif
		 );
271 272
}

273
int ie_match_stat(const struct index_state *istate,
274
		  const struct cache_entry *ce, struct stat *st,
275
		  unsigned int options)
J
Junio C Hamano 已提交
276
{
J
Junio C Hamano 已提交
277
	unsigned int changed;
278
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
279
	int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
280
	int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
J
Junio C Hamano 已提交
281 282 283 284

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
285 286
	 *
	 * skip-worktree has the same effect with higher precedence
J
Junio C Hamano 已提交
287
	 */
288 289
	if (!ignore_skip_worktree && ce_skip_worktree(ce))
		return 0;
290
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
291 292
		return 0;

293 294 295 296 297 298 299 300
	/*
	 * 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 已提交
301
	changed = ce_match_stat_basic(ce, st);
J
Junio C Hamano 已提交
302

J
Junio C Hamano 已提交
303 304 305 306 307 308 309 310 311 312 313 314 315 316
	/*
	 * 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 已提交
317
	 * carefully than others.
J
Junio C Hamano 已提交
318
	 */
319
	if (!changed && is_racy_timestamp(istate, ce)) {
320 321 322 323 324
		if (assume_racy_is_modified)
			changed |= DATA_CHANGED;
		else
			changed |= ce_modified_check_fs(ce, st);
	}
325

J
Junio C Hamano 已提交
326
	return changed;
327 328
}

329
int ie_modified(const struct index_state *istate,
330 331
		const struct cache_entry *ce,
		struct stat *st, unsigned int options)
332
{
J
Junio C Hamano 已提交
333
	int changed, changed_fs;
334 335

	changed = ie_match_stat(istate, ce, st, options);
336 337 338 339 340 341 342 343 344
	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;

345 346 347 348 349 350 351 352 353 354 355 356 357
	/*
	 * 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.
358
	 */
359
	if ((changed & DATA_CHANGED) &&
360
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
361 362
		return changed;

J
Junio C Hamano 已提交
363 364 365
	changed_fs = ce_modified_check_fs(ce, st);
	if (changed_fs)
		return changed | changed_fs;
366 367 368
	return 0;
}

369 370 371 372 373 374 375 376 377 378 379 380
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];
381
	if (!c1 && S_ISDIR(mode1))
382
		c1 = '/';
383
	if (!c2 && S_ISDIR(mode2))
384 385 386 387
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
/*
 * 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;
}

423
int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
424
{
425 426
	int len = len1 < len2 ? len1 : len2;
	int cmp;
427 428 429 430 431 432 433 434

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

436
	if (stage1 < stage2)
437
		return -1;
438
	if (stage1 > stage2)
439
		return 1;
440 441 442
	return 0;
}

443 444 445 446 447
int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
{
	return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
}

448
static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
449 450 451 452
{
	int first, last;

	first = 0;
453
	last = istate->cache_nr;
454 455
	while (last > first) {
		int next = (last + first) >> 1;
456
		struct cache_entry *ce = istate->cache[next];
457
		int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
458
		if (!cmp)
459
			return next;
460 461 462 463 464 465
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
466
	return -first-1;
467 468
}

469 470 471 472 473
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
{
	return index_name_stage_pos(istate, name, namelen, 0);
}

474
/* Remove entry, return true if there are more entries to go.. */
475
int remove_index_entry_at(struct index_state *istate, int pos)
476
{
477 478
	struct cache_entry *ce = istate->cache[pos];

479
	record_resolve_undo(istate, ce);
480
	remove_name_hash(istate, ce);
481 482 483
	istate->cache_changed = 1;
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
484
		return 0;
485 486 487
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
488 489 490
	return 1;
}

491
/*
O
Ondřej Bílka 已提交
492
 * Remove all cache entries marked for removal, that is where
493 494 495 496 497 498 499 500 501 502
 * 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)
503
			remove_name_hash(istate, ce_array[i]);
504 505 506 507 508 509 510
		else
			ce_array[j++] = ce_array[i];
	}
	istate->cache_changed = 1;
	istate->cache_nr = j;
}

511
int remove_file_from_index(struct index_state *istate, const char *path)
512
{
513
	int pos = index_name_pos(istate, path, strlen(path));
514 515
	if (pos < 0)
		pos = -pos-1;
J
Junio C Hamano 已提交
516
	cache_tree_invalidate_path(istate->cache_tree, path);
517 518
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
519 520 521
	return 0;
}

522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
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;
}

550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581
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 已提交
582 583 584 585 586 587 588 589
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);
}

590
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
591
{
592
	int size, namelen, was_same;
593
	mode_t st_mode = st->st_mode;
594
	struct cache_entry *ce, *alias;
595
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
596 597
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
598 599 600
	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 已提交
601

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

	namelen = strlen(path);
606
	if (S_ISDIR(st_mode)) {
607 608 609
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
610 611 612
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
613
	ce->ce_namelen = namelen;
J
Junio C Hamano 已提交
614 615
	if (!intent_only)
		fill_stat_cache_info(ce, st);
616 617
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
618

619
	if (trust_executable_bit && has_symlinks)
620
		ce->ce_mode = create_ce_mode(st_mode);
621
	else {
622 623
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
624
		 */
625
		struct cache_entry *ent;
626
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
627

628
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
629
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
630 631
	}

632 633 634 635 636 637 638 639 640 641 642 643 644 645
	/* 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;
646
				foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
647 648 649 650 651 652 653 654
				if (foundce) {
					memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
					startPtr = ptr;
				}
			}
		}
	}

655
	alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
656
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
657 658
		/* Nothing changed, really */
		free(ce);
659 660
		if (!S_ISGITLINK(alias->ce_mode))
			ce_mark_uptodate(alias);
661
		alias->ce_flags |= CE_ADDED;
662 663
		return 0;
	}
J
Junio C Hamano 已提交
664
	if (!intent_only) {
665
		if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
J
Junio C Hamano 已提交
666 667 668 669
			return error("unable to index file %s", path);
	} else
		record_intent_to_add(ce);

670 671 672
	if (ignore_case && alias && different_name(ce, alias))
		ce = create_alias_ce(ce, alias);
	ce->ce_flags |= CE_ADDED;
673

J
Junio C Hamano 已提交
674
	/* It was suspected to be racily clean, but it turns out to be Ok */
675 676 677 678 679 680 681
	was_same = (alias &&
		    !ce_stage(alias) &&
		    !hashcmp(alias->sha1, ce->sha1) &&
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
		;
J
Junio C Hamano 已提交
682
	else if (add_index_entry(istate, ce, add_option))
683
		return error("unable to add %s to index",path);
684
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
685 686 687 688
		printf("add '%s'\n", path);
	return 0;
}

689
int add_file_to_index(struct index_state *istate, const char *path, int flags)
690 691 692
{
	struct stat st;
	if (lstat(path, &st))
693
		die_errno("unable to stat '%s'", path);
694
	return add_to_index(istate, path, &st, flags);
695 696
}

697 698 699 700 701 702 703
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;

704 705
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
706
		return NULL;
707
	}
708 709 710 711 712 713 714

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

	hashcpy(ce->sha1, sha1);
	memcpy(ce->name, path, len);
715 716
	ce->ce_flags = create_ce_flags(stage);
	ce->ce_namelen = len;
717 718 719 720 721 722 723 724
	ce->ce_mode = create_ce_mode(mode);

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

	return ce;
}

725
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
726 727 728 729 730
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

731
int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
732
{
733
	return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
734 735
}

736 737 738 739 740 741 742 743 744 745 746 747 748 749 750
/*
 * 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.
	 */
751

752
	/* "." is not allowed */
753
	if (*rest == '\0' || is_dir_sep(*rest))
754 755
		return 0;

756
	switch (*rest) {
757 758 759 760 761 762 763 764 765 766 767 768
	/*
	 * ".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 '.':
769
		if (rest[1] == '\0' || is_dir_sep(rest[1]))
770 771 772 773 774 775 776 777 778
			return 0;
	}
	return 1;
}

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

779 780 781
	if (has_dos_drive_prefix(path))
		return 0;

782 783 784 785
	goto inside;
	for (;;) {
		if (!c)
			return 1;
786
		if (is_dir_sep(c)) {
787 788
inside:
			c = *path++;
789 790 791
			if ((c == '.' && !verify_dotfile(path)) ||
			    is_dir_sep(c) || c == '\0')
				return 0;
792 793 794 795 796
		}
		c = *path++;
	}
}

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

809 810
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
811

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

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

842 843
	for (;;) {
		int len;
844

845 846 847 848 849 850 851
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
852

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

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

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

920 921 922
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
923
	 * in the array.
924
	 */
925
	retval = has_file_name(istate, ce, pos, ok_to_replace);
926

927 928 929 930
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
931
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
932 933
}

934
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
935 936
{
	int pos;
937 938
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
939
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
940
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
941

J
Junio C Hamano 已提交
942
	cache_tree_invalidate_path(istate->cache_tree, ce->name);
943
	pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
944

J
Junio C Hamano 已提交
945
	/* existing match? Just replace it. */
946
	if (pos >= 0) {
J
Junio C Hamano 已提交
947 948
		if (!new_only)
			replace_index_entry(istate, pos, ce);
949 950
		return 0;
	}
951
	pos = -pos-1;
952

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

965 966
	if (!ok_to_add)
		return -1;
967
	if (!verify_path(ce->name))
968
		return error("Invalid path '%s'", ce->name);
969

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

995
	/* Make sure the array is big enough .. */
996 997 998
	if (istate->cache_nr == istate->cache_alloc) {
		istate->cache_alloc = alloc_nr(istate->cache_alloc);
		istate->cache = xrealloc(istate->cache,
999
					istate->cache_alloc * sizeof(*istate->cache));
1000 1001 1002
	}

	/* Add it in.. */
1003
	istate->cache_nr++;
1004
	if (istate->cache_nr > pos + 1)
1005 1006 1007
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
1008
	set_index_entry(istate, pos, ce);
1009
	istate->cache_changed = 1;
1010 1011 1012
	return 0;
}

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

1035 1036 1037
	if (ce_uptodate(ce))
		return ce;

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

1052
	if (lstat(ce->name, &st) < 0) {
1053 1054
		if (err)
			*err = errno;
1055 1056
		return NULL;
	}
L
Linus Torvalds 已提交
1057

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

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

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

	return updated;
}

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

1117 1118
int refresh_index(struct index_state *istate, unsigned int flags,
		  const struct pathspec *pathspec,
1119
		  char *seen, const char *header_msg)
L
Linus Torvalds 已提交
1120 1121 1122 1123 1124 1125 1126
{
	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;
1127
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1128 1129
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1130
	unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
J
Jeff King 已提交
1131
	const char *modified_fmt;
1132 1133 1134
	const char *deleted_fmt;
	const char *typechange_fmt;
	const char *added_fmt;
J
Jeff King 已提交
1135
	const char *unmerged_fmt;
L
Linus Torvalds 已提交
1136

J
Jeff King 已提交
1137
	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1138 1139 1140
	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 已提交
1141
	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1142
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1143
		struct cache_entry *ce, *new;
1144
		int cache_errno = 0;
1145
		int changed = 0;
1146
		int filtered = 0;
1147

1148
		ce = istate->cache[i];
1149 1150 1151
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1152
		if (pathspec &&
1153
		    !match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, seen))
1154 1155
			filtered = 1;

L
Linus Torvalds 已提交
1156
		if (ce_stage(ce)) {
1157 1158
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1159 1160 1161 1162
				i++;
			i--;
			if (allow_unmerged)
				continue;
1163 1164 1165
			if (!filtered)
				show_file(unmerged_fmt, ce->name, in_porcelain,
					  &first, header_msg);
L
Linus Torvalds 已提交
1166 1167 1168 1169
			has_errors = 1;
			continue;
		}

1170
		if (filtered)
1171 1172
			continue;

1173
		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1174
		if (new == ce)
L
Linus Torvalds 已提交
1175
			continue;
1176
		if (!new) {
1177 1178
			const char *fmt;

1179
			if (not_new && cache_errno == ENOENT)
L
Linus Torvalds 已提交
1180
				continue;
1181
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1182 1183 1184
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1185
				ce->ce_flags &= ~CE_VALID;
1186
				istate->cache_changed = 1;
L
Linus Torvalds 已提交
1187 1188 1189
			}
			if (quiet)
				continue;
1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200

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

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1206 1207 1208 1209
	}
	return has_errors;
}

1210
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
1211
{
1212
	return refresh_cache_ent(&the_index, ce, really, NULL, NULL);
1213 1214
}

1215 1216 1217 1218 1219

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

1220 1221
#define INDEX_FORMAT_DEFAULT 3

1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232
/*
 * 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;
1233 1234 1235 1236 1237 1238
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1239
	unsigned char sha1[20];
1240
	uint16_t flags;
1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251
	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;
1252 1253 1254 1255 1256 1257
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1258
	unsigned char sha1[20];
1259 1260
	uint16_t flags;
	uint16_t flags2;
1261 1262 1263
	char name[FLEX_ARRAY]; /* more */
};

1264
/* These are only used for v3 or lower */
1265 1266 1267 1268 1269 1270 1271
#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)))

1272
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1273
{
1274
	git_SHA_CTX c;
1275
	unsigned char sha1[20];
1276
	int hdr_version;
1277

1278
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1279
		return error("bad signature");
1280
	hdr_version = ntohl(hdr->hdr_version);
1281
	if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1282
		return error("bad index version %d", hdr_version);
1283 1284 1285
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1286
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1287
		return error("bad index file sha1 signature");
1288 1289 1290
	return 0;
}

1291 1292
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1293 1294 1295
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1296
		istate->cache_tree = cache_tree_read(data, sz);
1297
		break;
1298 1299 1300
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310
	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;
}

1311
int read_index(struct index_state *istate)
1312
{
1313
	return read_index_from(istate, get_index_file());
1314 1315
}

1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335
#ifndef NEEDS_ALIGNED_ACCESS
#define ntoh_s(var) ntohs(var)
#define ntoh_l(var) ntohl(var)
#else
static inline uint16_t ntoh_s_force_align(void *p)
{
	uint16_t x;
	memcpy(&x, p, sizeof(x));
	return ntohs(x);
}
static inline uint32_t ntoh_l_force_align(void *p)
{
	uint32_t x;
	memcpy(&x, p, sizeof(x));
	return ntohl(x);
}
#define ntoh_s(var) ntoh_s_force_align(&(var))
#define ntoh_l(var) ntoh_l_force_align(&(var))
#endif

1336 1337 1338 1339 1340 1341 1342
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));

1343 1344 1345 1346 1347 1348
	ce->ce_stat_data.sd_ctime.sec = ntoh_l(ondisk->ctime.sec);
	ce->ce_stat_data.sd_mtime.sec = ntoh_l(ondisk->mtime.sec);
	ce->ce_stat_data.sd_ctime.nsec = ntoh_l(ondisk->ctime.nsec);
	ce->ce_stat_data.sd_mtime.nsec = ntoh_l(ondisk->mtime.nsec);
	ce->ce_stat_data.sd_dev   = ntoh_l(ondisk->dev);
	ce->ce_stat_data.sd_ino   = ntoh_l(ondisk->ino);
1349
	ce->ce_mode  = ntoh_l(ondisk->mode);
1350 1351 1352
	ce->ce_stat_data.sd_uid   = ntoh_l(ondisk->uid);
	ce->ce_stat_data.sd_gid   = ntoh_l(ondisk->gid);
	ce->ce_stat_data.sd_size  = ntoh_l(ondisk->size);
1353 1354
	ce->ce_flags = flags & ~CE_NAMEMASK;
	ce->ce_namelen = len;
1355 1356 1357 1358 1359 1360
	hashcpy(ce->sha1, ondisk->sha1);
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
	return ce;
}

1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381
/*
 * 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_;
}

1382
static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1383 1384
					    unsigned long *ent_size,
					    struct strbuf *previous_name)
1385
{
1386
	struct cache_entry *ce;
1387
	size_t len;
1388
	const char *name;
1389
	unsigned int flags;
1390

1391
	/* On-disk flags are just 16 bits */
1392
	flags = ntoh_s(ondisk->flags);
1393
	len = flags & CE_NAMEMASK;
1394

1395
	if (flags & CE_EXTENDED) {
1396 1397 1398
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1399
		extended_flags = ntoh_s(ondisk2->flags2) << 16;
1400 1401 1402
		/* 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);
1403
		flags |= extended_flags;
1404 1405 1406 1407 1408
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424
	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;
	}
1425
	return ce;
1426 1427
}

1428
/* remember to discard_cache() before reading a different cache! */
1429
int read_index_from(struct index_state *istate, const char *path)
1430 1431 1432
{
	int fd, i;
	struct stat st;
1433
	unsigned long src_offset;
1434
	struct cache_header *hdr;
1435 1436
	void *mmap;
	size_t mmap_size;
1437
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1438

1439
	if (istate->initialized)
1440
		return istate->cache_nr;
1441

K
Kjetil Barvik 已提交
1442 1443
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1444
	fd = open(path, O_RDONLY);
1445 1446 1447
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
1448
		die_errno("index file open failed");
1449
	}
1450

1451
	if (fstat(fd, &st))
1452
		die_errno("cannot stat the open index");
1453

1454 1455
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1456 1457
		die("index file smaller than expected");

1458 1459
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
	if (mmap == MAP_FAILED)
1460
		die_errno("unable to map index file");
1461
	close(fd);
1462

1463 1464
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1465 1466
		goto unmap;

1467
	istate->version = ntohl(hdr->hdr_version);
1468 1469
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
1470
	istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1471
	istate->initialized = 1;
1472

1473
	if (istate->version == 4)
1474 1475 1476 1477
		previous_name = &previous_name_buf;
	else
		previous_name = NULL;

1478
	src_offset = sizeof(*hdr);
1479
	for (i = 0; i < istate->cache_nr; i++) {
1480
		struct ondisk_cache_entry *disk_ce;
1481
		struct cache_entry *ce;
1482
		unsigned long consumed;
1483

1484
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1485
		ce = create_from_disk(disk_ce, &consumed, previous_name);
1486
		set_index_entry(istate, i, ce);
1487

1488
		src_offset += consumed;
1489
	}
1490
	strbuf_release(&previous_name_buf);
K
Kjetil Barvik 已提交
1491
	istate->timestamp.sec = st.st_mtime;
1492
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1493

1494
	while (src_offset <= mmap_size - 20 - 8) {
1495 1496 1497 1498 1499 1500
		/* 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.
		 */
1501
		uint32_t extsize;
1502
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1503
		extsize = ntohl(extsize);
1504
		if (read_index_extension(istate,
1505 1506
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1507
					 extsize) < 0)
1508
			goto unmap;
1509 1510
		src_offset += 8;
		src_offset += extsize;
1511
	}
1512
	munmap(mmap, mmap_size);
1513
	return istate->cache_nr;
1514 1515

unmap:
1516
	munmap(mmap, mmap_size);
1517
	die("index file corrupt");
1518 1519
}

1520 1521
int is_index_unborn(struct index_state *istate)
{
1522
	return (!istate->cache_nr && !istate->timestamp.sec);
1523 1524
}

1525
int discard_index(struct index_state *istate)
1526
{
1527 1528 1529 1530
	int i;

	for (i = 0; i < istate->cache_nr; i++)
		free(istate->cache[i]);
1531
	resolve_undo_clear_index(istate);
1532 1533
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1534 1535
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1536
	free_name_hash(istate);
1537
	cache_tree_free(&(istate->cache_tree));
1538
	istate->initialized = 0;
1539 1540 1541
	free(istate->cache);
	istate->cache = NULL;
	istate->cache_alloc = 0;
1542
	return 0;
1543 1544
}

1545
int unmerged_index(const struct index_state *istate)
1546 1547 1548 1549 1550 1551 1552 1553 1554
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1555
#define WRITE_BUFFER_SIZE 8192
1556
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1557 1558
static unsigned long write_buffer_len;

1559
static int ce_write_flush(git_SHA_CTX *context, int fd)
1560 1561 1562
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1563
		git_SHA1_Update(context, write_buffer, buffered);
1564
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1565 1566 1567 1568 1569 1570
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1571
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1572 1573 1574 1575 1576 1577 1578 1579 1580
{
	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) {
1581 1582
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1583 1584 1585 1586 1587
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1588
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1589 1590
	}
	return 0;
1591 1592
}

1593
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1594
				  unsigned int ext, unsigned int sz)
1595 1596 1597
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1598 1599
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1600 1601
}

1602
static int ce_flush(git_SHA_CTX *context, int fd)
1603 1604
{
	unsigned int left = write_buffer_len;
1605

1606 1607
	if (left) {
		write_buffer_len = 0;
1608
		git_SHA1_Update(context, write_buffer, left);
1609
	}
1610

1611 1612
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1613
		if (write_in_full(fd, write_buffer, left) != left)
1614 1615 1616 1617
			return -1;
		left = 0;
	}

1618
	/* Append the SHA1 signature at the end */
1619
	git_SHA1_Final(write_buffer + left, context);
1620
	left += 20;
1621
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1622 1623
}

J
Junio C Hamano 已提交
1624 1625 1626 1627 1628 1629
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
1630
	 * ce_stat_data.sd_mtime match the index file mtime.
1631 1632 1633 1634 1635
	 *
	 * 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 已提交
1636 1637 1638 1639 1640 1641 1642 1643
	 */
	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)) {
1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654
		/* 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
		 *
1655
		 * but it does not.  When the second update-index runs,
1656 1657 1658 1659 1660
		 * 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 已提交
1661
		 * obtain from the filesystem next time we stat("frotz").
1662 1663 1664 1665 1666 1667 1668
		 *
		 * 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.
		 */
1669
		ce->ce_stat_data.sd_size = 0;
J
Junio C Hamano 已提交
1670 1671 1672
	}
}

1673 1674 1675
/* Copy miscellaneous fields but not the name */
static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
				       struct cache_entry *ce)
1676
{
1677 1678
	short flags;

1679 1680 1681 1682 1683 1684
	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);
1685
	ondisk->mode = htonl(ce->ce_mode);
1686 1687 1688
	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);
1689
	hashcpy(ondisk->sha1, ce->sha1);
1690 1691 1692 1693

	flags = ce->ce_flags;
	flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
	ondisk->flags = htons(flags);
1694 1695 1696 1697
	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);
1698
		return ondisk2->name;
1699
	}
1700 1701 1702 1703 1704
	else {
		return ondisk->name;
	}
}

1705 1706
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
			  struct strbuf *previous_name)
1707
{
1708 1709
	int size;
	struct ondisk_cache_entry *ondisk;
1710 1711 1712
	char *name;
	int result;

1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742
	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);
1743
	}
1744

1745 1746 1747
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1748 1749
}

1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762
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;
}

1763
/*
O
Ondřej Bílka 已提交
1764
 * Opportunistically update the index but do not complain if we can't
1765 1766 1767
 */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
1768
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1769 1770 1771 1772 1773 1774
	    !write_index(istate, lockfile->fd))
		commit_locked_index(lockfile);
	else
		rollback_lock_file(lockfile);
}

1775
int write_index(struct index_state *istate, int newfd)
1776
{
1777
	git_SHA_CTX c;
1778
	struct cache_header hdr;
1779
	int i, err, removed, extended, hdr_version;
1780 1781
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1782
	struct stat st;
1783
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1784

1785
	for (i = removed = extended = 0; i < entries; i++) {
1786
		if (cache[i]->ce_flags & CE_REMOVE)
1787
			removed++;
1788

1789 1790 1791 1792 1793 1794 1795 1796
		/* 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;
		}
	}

1797 1798 1799 1800 1801 1802 1803 1804 1805
	if (!istate->version)
		istate->version = INDEX_FORMAT_DEFAULT;

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

1806
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1807
	hdr.hdr_version = htonl(hdr_version);
1808
	hdr.hdr_entries = htonl(entries - removed);
1809

1810
	git_SHA1_Init(&c);
1811
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1812 1813
		return -1;

1814
	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1815 1816
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1817
		if (ce->ce_flags & CE_REMOVE)
1818
			continue;
1819
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1820
			ce_smudge_racily_clean_entry(ce);
1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831
		if (is_null_sha1(ce->sha1)) {
			static const char msg[] = "cache entry has null sha1: %s";
			static int allow = -1;

			if (allow < 0)
				allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
			if (allow)
				warning(msg, ce->name);
			else
				return error(msg, ce->name);
		}
1832
		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1833 1834
			return -1;
	}
1835
	strbuf_release(&previous_name_buf);
1836

1837
	/* Write extension data here */
1838
	if (istate->cache_tree) {
1839
		struct strbuf sb = STRBUF_INIT;
1840 1841 1842 1843 1844 1845

		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)
1846 1847
			return -1;
	}
1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858
	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;
	}
1859 1860 1861

	if (ce_flush(&c, newfd) || fstat(newfd, &st))
		return -1;
1862 1863
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
1864
	return 0;
1865
}
1866 1867 1868

/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
1869
 * index_state, dropping any unmerged entries.  Returns true if
1870 1871 1872 1873 1874 1875 1876
 * 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;
1877
	int unmerged = 0;
1878 1879 1880 1881

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
1882 1883 1884 1885
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
1886
			continue;
1887
		unmerged = 1;
1888
		len = ce_namelen(ce);
1889 1890 1891
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
1892 1893
		new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
		new_ce->ce_namelen = len;
1894 1895 1896 1897 1898
		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);
1899
	}
1900
	return unmerged;
1901
}
1902

1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929
/*
 * 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;
}
1930

1931
void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959
{
	int pos, len;
	unsigned long sz;
	enum object_type type;
	void *data;

	len = strlen(path);
	pos = index_name_pos(istate, path, len);
	if (pos < 0) {
		/*
		 * We might be in the middle of a merge, in which
		 * case we would read stage #2 (ours).
		 */
		int i;
		for (i = -pos - 1;
		     (pos < 0 && i < istate->cache_nr &&
		      !strcmp(istate->cache[i]->name, path));
		     i++)
			if (ce_stage(istate->cache[i]) == 2)
				pos = i;
	}
	if (pos < 0)
		return NULL;
	data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
	if (!data || type != OBJ_BLOB) {
		free(data);
		return NULL;
	}
1960 1961
	if (size)
		*size = sz;
1962 1963
	return data;
}
M
Michael Haggerty 已提交
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

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