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

18 19
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options);
20

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

#define CE_NAMEMASK  (0x0fff)

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

38
struct index_state the_index;
39
static const char *alternate_index_output;
40

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

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

51
	remove_name_hash(istate, old);
52
	free(old);
L
Linus Torvalds 已提交
53
	set_index_entry(istate, nr, ce);
54
	istate->cache_changed |= CE_ENTRY_CHANGED;
55 56
}

57 58 59 60 61 62 63
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
	struct cache_entry *old = istate->cache[nr], *new;
	int namelen = strlen(new_name);

	new = xmalloc(cache_entry_size(namelen));
	copy_cache_entry(new, old);
64
	new->ce_flags &= ~CE_HASHED;
65
	new->ce_namelen = namelen;
66 67 68 69 70 71 72
	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);
}

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 125 126 127
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;
}

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

	if (assume_unchanged)
138
		ce->ce_flags |= CE_VALID;
139 140 141

	if (S_ISREG(st->st_mode))
		ce_mark_uptodate(ce);
142 143
}

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

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

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

166
	if (strbuf_readlink(&sb, ce->name, expected_size))
J
Junio C Hamano 已提交
167
		return -1;
168

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

179
static int ce_compare_gitlink(const struct cache_entry *ce)
180 181 182 183 184
{
	unsigned char sha1[20];

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

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

216
static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
217 218 219
{
	unsigned int changed = 0;

220 221 222 223
	if (ce->ce_flags & CE_REMOVE)
		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;

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

249
	changed |= match_stat_data(&ce->ce_stat_data, st);
250

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

J
Junio C Hamano 已提交
257 258 259
	return changed;
}

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

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

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

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

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

J
Junio C Hamano 已提交
329
	return changed;
330 331
}

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

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

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

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

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

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 423 424 425
/*
 * 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;
}

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

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

439
	if (stage1 < stage2)
440
		return -1;
441
	if (stage1 > stage2)
442
		return 1;
443 444 445
	return 0;
}

446 447 448 449 450
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);
}

451
static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
452 453 454 455
{
	int first, last;

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

472 473 474 475 476
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
{
	return index_name_stage_pos(istate, name, namelen, 0);
}

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

482
	record_resolve_undo(istate, ce);
483
	remove_name_hash(istate, ce);
484
	free(ce);
485
	istate->cache_changed |= CE_ENTRY_REMOVED;
486 487
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
488
		return 0;
489 490 491
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
492 493 494
	return 1;
}

495
/*
O
Ondřej Bílka 已提交
496
 * Remove all cache entries marked for removal, that is where
497 498 499 500 501 502 503 504 505
 * 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++) {
506
		if (ce_array[i]->ce_flags & CE_REMOVE) {
507
			remove_name_hash(istate, ce_array[i]);
508 509
			free(ce_array[i]);
		}
510 511 512
		else
			ce_array[j++] = ce_array[i];
	}
513 514
	if (j == istate->cache_nr)
		return;
515
	istate->cache_changed |= CE_ENTRY_REMOVED;
516 517 518
	istate->cache_nr = j;
}

519
int remove_file_from_index(struct index_state *istate, const char *path)
520
{
521
	int pos = index_name_pos(istate, path, strlen(path));
522 523
	if (pos < 0)
		pos = -pos-1;
J
Junio C Hamano 已提交
524
	cache_tree_invalidate_path(istate->cache_tree, path);
525 526
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
527 528 529
	return 0;
}

530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557
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;
}

558 559 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 588 589
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;
}

590
void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
J
Junio C Hamano 已提交
591 592 593 594 595 596 597
{
	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);
}

598
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
599
{
600
	int size, namelen, was_same;
601
	mode_t st_mode = st->st_mode;
602
	struct cache_entry *ce, *alias;
603
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
604 605
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
606 607 608
	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 已提交
609

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

	namelen = strlen(path);
614
	if (S_ISDIR(st_mode)) {
615 616 617
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
618 619 620
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
621
	ce->ce_namelen = namelen;
J
Junio C Hamano 已提交
622 623
	if (!intent_only)
		fill_stat_cache_info(ce, st);
624 625
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
626

627
	if (trust_executable_bit && has_symlinks)
628
		ce->ce_mode = create_ce_mode(st_mode);
629
	else {
630 631
		/* If there is an existing entry, pick the mode bits and type
		 * from it, otherwise assume unexecutable regular file.
J
Johannes Schindelin 已提交
632
		 */
633
		struct cache_entry *ent;
634
		int pos = index_name_pos_also_unmerged(istate, path, namelen);
635

636
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
637
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
638 639
	}

640 641 642 643 644 645 646 647 648 649 650 651 652 653
	/* 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;
654
				foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
655 656 657 658 659 660 661 662
				if (foundce) {
					memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
					startPtr = ptr;
				}
			}
		}
	}

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

678 679 680
	if (ignore_case && alias && different_name(ce, alias))
		ce = create_alias_ce(ce, alias);
	ce->ce_flags |= CE_ADDED;
681

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

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

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

705 706
struct cache_entry *make_cache_entry(unsigned int mode,
		const unsigned char *sha1, const char *path, int stage,
707
		unsigned int refresh_options)
708 709 710 711
{
	int size, len;
	struct cache_entry *ce;

712 713
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
714
		return NULL;
715
	}
716 717 718 719 720 721 722

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

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

727
	return refresh_cache_entry(ce, refresh_options);
728 729
}

730
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
731 732 733 734 735
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

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
	ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
997 998

	/* Add it in.. */
999
	istate->cache_nr++;
1000
	if (istate->cache_nr > pos + 1)
1001 1002 1003
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
1004
	set_index_entry(istate, pos, ce);
1005
	istate->cache_changed |= CE_ENTRY_ADDED;
1006 1007 1008
	return 0;
}

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

1033
	if (!refresh || ce_uptodate(ce))
1034 1035
		return ce;

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

1050
	if (lstat(ce->name, &st) < 0) {
1051 1052
		if (ignore_missing && errno == ENOENT)
			return ce;
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
	/* istate->cache_changed is updated in the caller */
L
Linus Torvalds 已提交
1105 1106 1107
	return updated;
}

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

1118 1119
int refresh_index(struct index_state *istate, unsigned int flags,
		  const struct pathspec *pathspec,
1120
		  char *seen, const char *header_msg)
L
Linus Torvalds 已提交
1121 1122 1123 1124 1125 1126 1127
{
	int i;
	int has_errors = 0;
	int really = (flags & REFRESH_REALLY) != 0;
	int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
	int quiet = (flags & REFRESH_QUIET) != 0;
	int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1128
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1129 1130
	int first = 1;
	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1131 1132
	unsigned int options = (CE_MATCH_REFRESH |
				(really ? CE_MATCH_IGNORE_VALID : 0) |
1133
				(not_new ? CE_MATCH_IGNORE_MISSING : 0));
J
Jeff King 已提交
1134
	const char *modified_fmt;
1135 1136 1137
	const char *deleted_fmt;
	const char *typechange_fmt;
	const char *added_fmt;
J
Jeff King 已提交
1138
	const char *unmerged_fmt;
L
Linus Torvalds 已提交
1139

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

1151
		ce = istate->cache[i];
1152 1153 1154
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

1155
		if (pathspec && !ce_path_match(ce, pathspec, seen))
1156 1157
			filtered = 1;

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

1172
		if (filtered)
1173 1174
			continue;

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

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 |= CE_ENTRY_CHANGED;
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 1211
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
					       unsigned int options)
1212
{
1213
	return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1214 1215
}

1216 1217 1218 1219 1220

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

1221 1222
#define INDEX_FORMAT_DEFAULT 3

1223 1224 1225 1226 1227 1228 1229 1230 1231 1232
static int index_format_config(const char *var, const char *value, void *cb)
{
	unsigned int *version = cb;
	if (!strcmp(var, "index.version")) {
		*version = git_config_int(var, value);
		return 0;
	}
	return 1;
}

1233 1234 1235
static unsigned int get_index_format_default(void)
{
	char *envversion = getenv("GIT_INDEX_VERSION");
1236 1237 1238
	char *endp;
	unsigned int version = INDEX_FORMAT_DEFAULT;

1239
	if (!envversion) {
1240 1241 1242
		git_config(index_format_config, &version);
		if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
			warning(_("index.version set, but the value is invalid.\n"
1243
				  "Using version %i"), INDEX_FORMAT_DEFAULT);
1244
			return INDEX_FORMAT_DEFAULT;
1245 1246 1247
		}
		return version;
	}
1248 1249 1250 1251 1252 1253 1254 1255 1256

	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;
1257 1258
}

1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269
/*
 * 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;
1270 1271 1272 1273 1274 1275
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1276
	unsigned char sha1[20];
1277
	uint16_t flags;
1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288
	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;
1289 1290 1291 1292 1293 1294
	uint32_t dev;
	uint32_t ino;
	uint32_t mode;
	uint32_t uid;
	uint32_t gid;
	uint32_t size;
1295
	unsigned char sha1[20];
1296 1297
	uint16_t flags;
	uint16_t flags2;
1298 1299 1300
	char name[FLEX_ARRAY]; /* more */
};

1301
/* These are only used for v3 or lower */
1302 1303 1304 1305 1306 1307 1308
#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)))

1309
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1310
{
1311
	git_SHA_CTX c;
1312
	unsigned char sha1[20];
1313
	int hdr_version;
1314

1315
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1316
		return error("bad signature");
1317
	hdr_version = ntohl(hdr->hdr_version);
1318
	if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1319
		return error("bad index version %d", hdr_version);
1320 1321 1322
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1323
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1324
		return error("bad index file sha1 signature");
1325 1326 1327
	return 0;
}

1328 1329
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1330 1331 1332
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1333
		istate->cache_tree = cache_tree_read(data, sz);
1334
		break;
1335 1336 1337
	case CACHE_EXT_RESOLVE_UNDO:
		istate->resolve_undo = resolve_undo_read(data, sz);
		break;
1338 1339 1340 1341 1342 1343 1344 1345 1346 1347
	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;
}

1348
int read_index(struct index_state *istate)
1349
{
1350
	return read_index_from(istate, get_index_file());
1351 1352
}

1353 1354 1355 1356 1357 1358 1359
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));

1360 1361 1362 1363 1364 1365 1366 1367 1368 1369
	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);
1370 1371
	ce->ce_flags = flags & ~CE_NAMEMASK;
	ce->ce_namelen = len;
1372 1373 1374 1375 1376 1377
	hashcpy(ce->sha1, ondisk->sha1);
	memcpy(ce->name, name, len);
	ce->name[len] = '\0';
	return ce;
}

1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398
/*
 * 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_;
}

1399
static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1400 1401
					    unsigned long *ent_size,
					    struct strbuf *previous_name)
1402
{
1403
	struct cache_entry *ce;
1404
	size_t len;
1405
	const char *name;
1406
	unsigned int flags;
1407

1408
	/* On-disk flags are just 16 bits */
1409
	flags = get_be16(&ondisk->flags);
1410
	len = flags & CE_NAMEMASK;
1411

1412
	if (flags & CE_EXTENDED) {
1413 1414 1415
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1416
		extended_flags = get_be16(&ondisk2->flags2) << 16;
1417 1418 1419
		/* 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);
1420
		flags |= extended_flags;
1421 1422 1423 1424 1425
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441
	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;
	}
1442
	return ce;
1443 1444
}

1445
/* remember to discard_cache() before reading a different cache! */
1446
int read_index_from(struct index_state *istate, const char *path)
1447 1448 1449
{
	int fd, i;
	struct stat st;
1450
	unsigned long src_offset;
1451
	struct cache_header *hdr;
1452 1453
	void *mmap;
	size_t mmap_size;
1454
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1455

1456
	if (istate->initialized)
1457
		return istate->cache_nr;
1458

K
Kjetil Barvik 已提交
1459 1460
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1461
	fd = open(path, O_RDONLY);
1462 1463 1464
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
1465
		die_errno("index file open failed");
1466
	}
1467

1468
	if (fstat(fd, &st))
1469
		die_errno("cannot stat the open index");
1470

1471 1472
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1473 1474
		die("index file smaller than expected");

1475 1476
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
	if (mmap == MAP_FAILED)
1477
		die_errno("unable to map index file");
1478
	close(fd);
1479

1480 1481
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1482 1483
		goto unmap;

1484
	istate->version = ntohl(hdr->hdr_version);
1485 1486
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
1487
	istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1488
	istate->initialized = 1;
1489

1490
	if (istate->version == 4)
1491 1492 1493 1494
		previous_name = &previous_name_buf;
	else
		previous_name = NULL;

1495
	src_offset = sizeof(*hdr);
1496
	for (i = 0; i < istate->cache_nr; i++) {
1497
		struct ondisk_cache_entry *disk_ce;
1498
		struct cache_entry *ce;
1499
		unsigned long consumed;
1500

1501
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1502
		ce = create_from_disk(disk_ce, &consumed, previous_name);
1503
		set_index_entry(istate, i, ce);
1504

1505
		src_offset += consumed;
1506
	}
1507
	strbuf_release(&previous_name_buf);
K
Kjetil Barvik 已提交
1508
	istate->timestamp.sec = st.st_mtime;
1509
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1510

1511
	while (src_offset <= mmap_size - 20 - 8) {
1512 1513 1514 1515 1516 1517
		/* 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.
		 */
1518
		uint32_t extsize;
1519
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1520
		extsize = ntohl(extsize);
1521
		if (read_index_extension(istate,
1522 1523
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1524
					 extsize) < 0)
1525
			goto unmap;
1526 1527
		src_offset += 8;
		src_offset += extsize;
1528
	}
1529
	munmap(mmap, mmap_size);
1530
	return istate->cache_nr;
1531 1532

unmap:
1533
	munmap(mmap, mmap_size);
1534
	die("index file corrupt");
1535 1536
}

1537 1538
int is_index_unborn(struct index_state *istate)
{
1539
	return (!istate->cache_nr && !istate->timestamp.sec);
1540 1541
}

1542
int discard_index(struct index_state *istate)
1543
{
1544 1545 1546 1547
	int i;

	for (i = 0; i < istate->cache_nr; i++)
		free(istate->cache[i]);
1548
	resolve_undo_clear_index(istate);
1549 1550
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1551 1552
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1553
	free_name_hash(istate);
1554
	cache_tree_free(&(istate->cache_tree));
1555
	istate->initialized = 0;
1556 1557 1558
	free(istate->cache);
	istate->cache = NULL;
	istate->cache_alloc = 0;
1559
	return 0;
1560 1561
}

1562
int unmerged_index(const struct index_state *istate)
1563 1564 1565 1566 1567 1568 1569 1570 1571
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1572
#define WRITE_BUFFER_SIZE 8192
1573
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1574 1575
static unsigned long write_buffer_len;

1576
static int ce_write_flush(git_SHA_CTX *context, int fd)
1577 1578 1579
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1580
		git_SHA1_Update(context, write_buffer, buffered);
1581
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1582 1583 1584 1585 1586 1587
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1588
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1589 1590 1591 1592 1593 1594 1595 1596 1597
{
	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) {
1598 1599
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1600 1601 1602 1603 1604
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1605
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1606 1607
	}
	return 0;
1608 1609
}

1610
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1611
				  unsigned int ext, unsigned int sz)
1612 1613 1614
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1615 1616
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1617 1618
}

1619
static int ce_flush(git_SHA_CTX *context, int fd)
1620 1621
{
	unsigned int left = write_buffer_len;
1622

1623 1624
	if (left) {
		write_buffer_len = 0;
1625
		git_SHA1_Update(context, write_buffer, left);
1626
	}
1627

1628 1629
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1630
		if (write_in_full(fd, write_buffer, left) != left)
1631 1632 1633 1634
			return -1;
		left = 0;
	}

1635
	/* Append the SHA1 signature at the end */
1636
	git_SHA1_Final(write_buffer + left, context);
1637
	left += 20;
1638
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1639 1640
}

J
Junio C Hamano 已提交
1641 1642 1643 1644 1645 1646
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
1647
	 * ce_stat_data.sd_mtime match the index file mtime.
1648 1649 1650 1651 1652
	 *
	 * 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 已提交
1653 1654 1655 1656 1657 1658 1659 1660
	 */
	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)) {
1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671
		/* 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
		 *
1672
		 * but it does not.  When the second update-index runs,
1673 1674 1675 1676 1677
		 * 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 已提交
1678
		 * obtain from the filesystem next time we stat("frotz").
1679 1680 1681 1682 1683 1684 1685
		 *
		 * 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.
		 */
1686
		ce->ce_stat_data.sd_size = 0;
J
Junio C Hamano 已提交
1687 1688 1689
	}
}

1690 1691 1692
/* Copy miscellaneous fields but not the name */
static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
				       struct cache_entry *ce)
1693
{
1694 1695
	short flags;

1696 1697 1698 1699 1700 1701
	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);
1702
	ondisk->mode = htonl(ce->ce_mode);
1703 1704 1705
	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);
1706
	hashcpy(ondisk->sha1, ce->sha1);
1707

1708
	flags = ce->ce_flags & ~CE_NAMEMASK;
1709 1710
	flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
	ondisk->flags = htons(flags);
1711 1712 1713 1714
	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);
1715
		return ondisk2->name;
1716
	}
1717 1718 1719 1720 1721
	else {
		return ondisk->name;
	}
}

1722 1723
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
			  struct strbuf *previous_name)
1724
{
1725 1726
	int size;
	struct ondisk_cache_entry *ondisk;
1727 1728 1729
	char *name;
	int result;

1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759
	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);
1760
	}
1761

1762 1763 1764
	result = ce_write(c, fd, ondisk, size);
	free(ondisk);
	return result;
1765 1766
}

1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779
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;
}

1780
/*
O
Ondřej Bílka 已提交
1781
 * Opportunistically update the index but do not complain if we can't
1782 1783 1784
 */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
1785
	if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1786
	    write_locked_index(istate, lockfile, COMMIT_LOCK))
1787 1788 1789
		rollback_lock_file(lockfile);
}

1790
static int do_write_index(struct index_state *istate, int newfd)
1791
{
1792
	git_SHA_CTX c;
1793
	struct cache_header hdr;
1794
	int i, err, removed, extended, hdr_version;
1795 1796
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1797
	struct stat st;
1798
	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1799

1800
	for (i = removed = extended = 0; i < entries; i++) {
1801
		if (cache[i]->ce_flags & CE_REMOVE)
1802
			removed++;
1803

1804 1805 1806 1807 1808 1809 1810 1811
		/* 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;
		}
	}

1812
	if (!istate->version)
1813
		istate->version = get_index_format_default();
1814 1815 1816 1817 1818 1819 1820

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

1821
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1822
	hdr.hdr_version = htonl(hdr_version);
1823
	hdr.hdr_entries = htonl(entries - removed);
1824

1825
	git_SHA1_Init(&c);
1826
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1827 1828
		return -1;

1829
	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1830 1831
	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1832
		if (ce->ce_flags & CE_REMOVE)
1833
			continue;
1834
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1835
			ce_smudge_racily_clean_entry(ce);
1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846
		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);
		}
1847
		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1848 1849
			return -1;
	}
1850
	strbuf_release(&previous_name_buf);
1851

1852
	/* Write extension data here */
1853
	if (istate->cache_tree) {
1854
		struct strbuf sb = STRBUF_INIT;
1855 1856 1857 1858 1859 1860

		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)
1861 1862
			return -1;
	}
1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873
	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;
	}
1874 1875 1876

	if (ce_flush(&c, newfd) || fstat(newfd, &st))
		return -1;
1877 1878
	istate->timestamp.sec = (unsigned int)st.st_mtime;
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
1879
	return 0;
1880
}
1881

1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900
void set_alternate_index_output(const char *name)
{
	alternate_index_output = name;
}

static int commit_locked_index(struct lock_file *lk)
{
	if (alternate_index_output) {
		if (lk->fd >= 0 && close_lock_file(lk))
			return -1;
		if (rename(lk->filename, alternate_index_output))
			return -1;
		lk->filename[0] = 0;
		return 0;
	} else {
		return commit_lock_file(lk);
	}
}

1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
				 unsigned flags)
{
	int ret = do_write_index(istate, lock->fd);
	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;
}

int write_locked_index(struct index_state *istate, struct lock_file *lock,
		       unsigned flags)
{
	return do_write_locked_index(istate, lock, flags);
}

1923 1924
/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
1925
 * index_state, dropping any unmerged entries.  Returns true if
1926 1927 1928 1929 1930 1931 1932
 * 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;
1933
	int unmerged = 0;
1934 1935 1936 1937

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
1938 1939 1940 1941
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
1942
			continue;
1943
		unmerged = 1;
1944
		len = ce_namelen(ce);
1945 1946 1947
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		memcpy(new_ce->name, ce->name, len);
1948 1949
		new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
		new_ce->ce_namelen = len;
1950 1951 1952
		new_ce->ce_mode = ce->ce_mode;
		if (add_index_entry(istate, new_ce, 0))
			return error("%s: cannot drop to stage #0",
1953
				     new_ce->name);
1954
		i = index_name_pos(istate, new_ce->name, len);
1955
	}
1956
	return unmerged;
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
/*
 * 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;
}
1986

1987
void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015
{
	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;
	}
2016 2017
	if (size)
		*size = sz;
2018 2019
	return data;
}
M
Michael Haggerty 已提交
2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049

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