read-cache.c 44.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 13 14 15
#include "tree.h"
#include "commit.h"
#include "diff.h"
#include "diffcore.h"
#include "revision.h"
J
Junio C Hamano 已提交
16
#include "blob.h"
17 18 19 20 21 22 23 24 25 26 27 28

/* Index extensions.
 *
 * The first letter should be 'A'..'Z' for extensions that are not
 * necessary for a correct operation (i.e. optimization data).
 * When new extensions are added that _needs_ to be understood in
 * order to correctly interpret the index file, pick character that
 * is outside the range, to cause the reader to abort.
 */

#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
#define CACHE_EXT_TREE 0x54524545	/* "TREE" */
29

30
struct index_state the_index;
31

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

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

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

47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
	struct cache_entry *old = istate->cache[nr], *new;
	int namelen = strlen(new_name);

	new = xmalloc(cache_entry_size(namelen));
	copy_cache_entry(new, old);
	new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
	new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
	memcpy(new->name, new_name, namelen + 1);

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

63 64 65 66 67 68 69
/*
 * This only updates the "non-critical" parts of the directory
 * cache, ie the parts that aren't tracked by GIT, and only used
 * to validate the cache.
 */
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
{
K
Kjetil Barvik 已提交
70 71
	ce->ce_ctime.sec = (unsigned int)st->st_ctime;
	ce->ce_mtime.sec = (unsigned int)st->st_mtime;
72 73
	ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
	ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
74 75 76 77 78
	ce->ce_dev = st->st_dev;
	ce->ce_ino = st->st_ino;
	ce->ce_uid = st->st_uid;
	ce->ce_gid = st->st_gid;
	ce->ce_size = st->st_size;
J
Junio C Hamano 已提交
79 80

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

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

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

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

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

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

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

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

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

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

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

	return !hashcmp(sha1, empty_blob_sha1);
}

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

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

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

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

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

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

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

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

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

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

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

	/*
	 * If it's marked as always valid in the index, it's
	 * valid whatever the checked-out copy says.
	 */
268
	if (!ignore_valid && (ce->ce_flags & CE_VALID))
J
Junio C Hamano 已提交
269 270
		return 0;

271 272 273 274 275 276 277 278
	/*
	 * 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 已提交
279
	changed = ce_match_stat_basic(ce, st);
J
Junio C Hamano 已提交
280

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

J
Junio C Hamano 已提交
304
	return changed;
305 306
}

307
int ie_modified(const struct index_state *istate,
308
		struct cache_entry *ce, struct stat *st, unsigned int options)
309
{
J
Junio C Hamano 已提交
310
	int changed, changed_fs;
311 312

	changed = ie_match_stat(istate, ce, st, options);
313 314 315 316 317 318 319 320 321
	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;

322 323 324 325 326 327 328 329 330 331 332 333 334
	/*
	 * 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.
335
	 */
336 337
	if ((changed & DATA_CHANGED) &&
	    (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
338 339
		return changed;

J
Junio C Hamano 已提交
340 341 342
	changed_fs = ce_modified_check_fs(ce, st);
	if (changed_fs)
		return changed | changed_fs;
343 344 345
	return 0;
}

346 347 348 349 350 351 352 353 354 355 356 357
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];
358
	if (!c1 && S_ISDIR(mode1))
359
		c1 = '/';
360
	if (!c2 && S_ISDIR(mode2))
361 362 363 364
		c2 = '/';
	return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
}

365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
/*
 * 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;
}

400
int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
401
{
402 403
	int len1 = flags1 & CE_NAMEMASK;
	int len2 = flags2 & CE_NAMEMASK;
404 405 406 407 408 409 410 411 412 413
	int len = len1 < len2 ? len1 : len2;
	int cmp;

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

415 416 417
	/* Compare stages  */
	flags1 &= CE_STAGEMASK;
	flags2 &= CE_STAGEMASK;
J
Junio C Hamano 已提交
418

419 420 421 422
	if (flags1 < flags2)
		return -1;
	if (flags1 > flags2)
		return 1;
423 424 425
	return 0;
}

426
int index_name_pos(const struct index_state *istate, const char *name, int namelen)
427 428 429 430
{
	int first, last;

	first = 0;
431
	last = istate->cache_nr;
432 433
	while (last > first) {
		int next = (last + first) >> 1;
434
		struct cache_entry *ce = istate->cache[next];
435
		int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
436
		if (!cmp)
437
			return next;
438 439 440 441 442 443
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
444
	return -first-1;
445 446
}

447
/* Remove entry, return true if there are more entries to go.. */
448
int remove_index_entry_at(struct index_state *istate, int pos)
449
{
450 451
	struct cache_entry *ce = istate->cache[pos];

452
	remove_name_hash(ce);
453 454 455
	istate->cache_changed = 1;
	istate->cache_nr--;
	if (pos >= istate->cache_nr)
456
		return 0;
457 458 459
	memmove(istate->cache + pos,
		istate->cache + pos + 1,
		(istate->cache_nr - pos) * sizeof(struct cache_entry *));
460 461 462
	return 1;
}

463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482
/*
 * Remove all cache ententries marked for removal, that is where
 * CE_REMOVE is set in ce_flags.  This is much more effective than
 * calling remove_index_entry_at() for each entry to be removed.
 */
void remove_marked_cache_entries(struct index_state *istate)
{
	struct cache_entry **ce_array = istate->cache;
	unsigned int i, j;

	for (i = j = 0; i < istate->cache_nr; i++) {
		if (ce_array[i]->ce_flags & CE_REMOVE)
			remove_name_hash(ce_array[i]);
		else
			ce_array[j++] = ce_array[i];
	}
	istate->cache_changed = 1;
	istate->cache_nr = j;
}

483
int remove_file_from_index(struct index_state *istate, const char *path)
484
{
485
	int pos = index_name_pos(istate, path, strlen(path));
486 487
	if (pos < 0)
		pos = -pos-1;
J
Junio C Hamano 已提交
488
	cache_tree_invalidate_path(istate->cache_tree, path);
489 490
	while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
		remove_index_entry_at(istate, pos);
491 492 493
	return 0;
}

494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521
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;
}

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 550 551 552 553
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 已提交
554 555 556 557 558 559 560 561
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);
}

562
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
J
Johannes Schindelin 已提交
563
{
564
	int size, namelen, was_same;
565
	mode_t st_mode = st->st_mode;
566
	struct cache_entry *ce, *alias;
567
	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
568 569
	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
	int pretend = flags & ADD_CACHE_PRETEND;
J
Junio C Hamano 已提交
570 571 572
	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 已提交
573

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

	namelen = strlen(path);
578
	if (S_ISDIR(st_mode)) {
579 580 581
		while (namelen && path[namelen-1] == '/')
			namelen--;
	}
J
Johannes Schindelin 已提交
582 583 584
	size = cache_entry_size(namelen);
	ce = xcalloc(1, size);
	memcpy(ce->name, path, namelen);
585
	ce->ce_flags = namelen;
J
Junio C Hamano 已提交
586 587
	if (!intent_only)
		fill_stat_cache_info(ce, st);
588 589
	else
		ce->ce_flags |= CE_INTENT_TO_ADD;
J
Johannes Schindelin 已提交
590

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

600
		ent = (0 <= pos) ? istate->cache[pos] : NULL;
601
		ce->ce_mode = ce_mode_from_stat(ent, st_mode);
J
Johannes Schindelin 已提交
602 603
	}

604
	alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
605
	if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
606 607
		/* Nothing changed, really */
		free(ce);
608
		ce_mark_uptodate(alias);
609
		alias->ce_flags |= CE_ADDED;
610 611
		return 0;
	}
J
Junio C Hamano 已提交
612 613 614 615 616 617
	if (!intent_only) {
		if (index_path(ce->sha1, path, st, 1))
			return error("unable to index file %s", path);
	} else
		record_intent_to_add(ce);

618 619 620
	if (ignore_case && alias && different_name(ce, alias))
		ce = create_alias_ce(ce, alias);
	ce->ce_flags |= CE_ADDED;
621

J
Junio C Hamano 已提交
622
	/* It was suspected to be racily clean, but it turns out to be Ok */
623 624 625 626 627 628 629
	was_same = (alias &&
		    !ce_stage(alias) &&
		    !hashcmp(alias->sha1, ce->sha1) &&
		    ce->ce_mode == alias->ce_mode);

	if (pretend)
		;
J
Junio C Hamano 已提交
630
	else if (add_index_entry(istate, ce, add_option))
631
		return error("unable to add %s to index",path);
632
	if (verbose && !was_same)
J
Johannes Schindelin 已提交
633 634 635 636
		printf("add '%s'\n", path);
	return 0;
}

637
int add_file_to_index(struct index_state *istate, const char *path, int flags)
638 639 640 641
{
	struct stat st;
	if (lstat(path, &st))
		die("%s: unable to stat (%s)", path, strerror(errno));
642
	return add_to_index(istate, path, &st, flags);
643 644
}

645 646 647 648 649 650 651
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;

652 653
	if (!verify_path(path)) {
		error("Invalid path '%s'", path);
654
		return NULL;
655
	}
656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671

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

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

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

	return ce;
}

672
int ce_same_name(struct cache_entry *a, struct cache_entry *b)
673 674 675 676 677
{
	int len = ce_namelen(a);
	return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}

678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697
int ce_path_match(const struct cache_entry *ce, const char **pathspec)
{
	const char *match, *name;
	int len;

	if (!pathspec)
		return 1;

	len = ce_namelen(ce);
	name = ce->name;
	while ((match = *pathspec++) != NULL) {
		int matchlen = strlen(match);
		if (matchlen > len)
			continue;
		if (memcmp(name, match, matchlen))
			continue;
		if (matchlen && name[matchlen-1] == '/')
			return 1;
		if (name[matchlen] == '/' || !name[matchlen])
			return 1;
698 699
		if (!matchlen)
			return 1;
700 701 702 703
	}
	return 0;
}

704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767
/*
 * We fundamentally don't like some paths: we don't want
 * dot or dot-dot anywhere, and for obvious reasons don't
 * want to recurse into ".git" either.
 *
 * Also, we don't want double slashes or slashes at the
 * end that can make pathnames ambiguous.
 */
static int verify_dotfile(const char *rest)
{
	/*
	 * The first character was '.', but that
	 * has already been discarded, we now test
	 * the rest.
	 */
	switch (*rest) {
	/* "." is not allowed */
	case '\0': case '/':
		return 0;

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

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

	goto inside;
	for (;;) {
		if (!c)
			return 1;
		if (c == '/') {
inside:
			c = *path++;
			switch (c) {
			default:
				continue;
			case '/': case '\0':
				break;
			case '.':
				if (verify_dotfile(path))
					continue;
			}
			return 0;
		}
		c = *path++;
	}
}

768 769 770
/*
 * Do we have another file that has the beginning components being a
 * proper superset of the name we're trying to add?
771
 */
772 773
static int has_file_name(struct index_state *istate,
			 const struct cache_entry *ce, int pos, int ok_to_replace)
774
{
775 776
	int retval = 0;
	int len = ce_namelen(ce);
777
	int stage = ce_stage(ce);
778
	const char *name = ce->name;
779

780 781
	while (pos < istate->cache_nr) {
		struct cache_entry *p = istate->cache[pos++];
782

783
		if (len >= ce_namelen(p))
784
			break;
785 786
		if (memcmp(name, p->name, len))
			break;
787 788
		if (ce_stage(p) != stage)
			continue;
789 790
		if (p->name[len] != '/')
			continue;
791
		if (p->ce_flags & CE_REMOVE)
792
			continue;
793 794 795
		retval = -1;
		if (!ok_to_replace)
			break;
796
		remove_index_entry_at(istate, --pos);
797
	}
798 799
	return retval;
}
800

801 802 803 804
/*
 * Do we have another file with a pathname that is a proper
 * subset of the name we're trying to add?
 */
805 806
static int has_dir_name(struct index_state *istate,
			const struct cache_entry *ce, int pos, int ok_to_replace)
807 808
{
	int retval = 0;
809
	int stage = ce_stage(ce);
810 811
	const char *name = ce->name;
	const char *slash = name + ce_namelen(ce);
812

813 814
	for (;;) {
		int len;
815

816 817 818 819 820 821 822
		for (;;) {
			if (*--slash == '/')
				break;
			if (slash <= ce->name)
				return retval;
		}
		len = slash - name;
823

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

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

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

891 892 893
	/*
	 * We check if the path is a sub-path of a subsequent pathname
	 * first, since removing those will not change the position
894
	 * in the array.
895
	 */
896
	retval = has_file_name(istate, ce, pos, ok_to_replace);
897

898 899 900 901
	/*
	 * Then check if the path might have a clashing sub-directory
	 * before it.
	 */
902
	return retval + has_dir_name(istate, ce, pos, ok_to_replace);
903 904
}

905
static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
906 907
{
	int pos;
908 909
	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
910
	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
J
Junio C Hamano 已提交
911
	int new_only = option & ADD_CACHE_NEW_ONLY;
J
Junio C Hamano 已提交
912

J
Junio C Hamano 已提交
913
	cache_tree_invalidate_path(istate->cache_tree, ce->name);
914
	pos = index_name_pos(istate, ce->name, ce->ce_flags);
915

J
Junio C Hamano 已提交
916
	/* existing match? Just replace it. */
917
	if (pos >= 0) {
J
Junio C Hamano 已提交
918 919
		if (!new_only)
			replace_index_entry(istate, pos, ce);
920 921
		return 0;
	}
922
	pos = -pos-1;
923

924 925 926 927
	/*
	 * Inserting a merged entry ("stage 0") into the index
	 * will always replace all non-merged entries..
	 */
928 929
	if (pos < istate->cache_nr && ce_stage(ce) == 0) {
		while (ce_same_name(istate->cache[pos], ce)) {
930
			ok_to_add = 1;
931
			if (!remove_index_entry_at(istate, pos))
932 933 934 935
				break;
		}
	}

936 937
	if (!ok_to_add)
		return -1;
938
	if (!verify_path(ce->name))
939
		return error("Invalid path '%s'", ce->name);
940

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

966
	/* Make sure the array is big enough .. */
967 968 969 970
	if (istate->cache_nr == istate->cache_alloc) {
		istate->cache_alloc = alloc_nr(istate->cache_alloc);
		istate->cache = xrealloc(istate->cache,
					istate->cache_alloc * sizeof(struct cache_entry *));
971 972 973
	}

	/* Add it in.. */
974
	istate->cache_nr++;
975
	if (istate->cache_nr > pos + 1)
976 977 978
		memmove(istate->cache + pos + 1,
			istate->cache + pos,
			(istate->cache_nr - pos - 1) * sizeof(ce));
979
	set_index_entry(istate, pos, ce);
980
	istate->cache_changed = 1;
981 982 983
	return 0;
}

L
Linus Torvalds 已提交
984 985 986 987 988 989 990 991 992 993 994
/*
 * "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.
 */
995
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
996 997
					     struct cache_entry *ce,
					     unsigned int options, int *err)
L
Linus Torvalds 已提交
998 999 1000 1001
{
	struct stat st;
	struct cache_entry *updated;
	int changed, size;
1002
	int ignore_valid = options & CE_MATCH_IGNORE_VALID;
L
Linus Torvalds 已提交
1003

1004 1005 1006
	if (ce_uptodate(ce))
		return ce;

1007 1008 1009 1010 1011 1012 1013 1014 1015
	/*
	 * CE_VALID means the user promised us that the change to
	 * the work tree does not matter and told us not to worry.
	 */
	if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
		ce_mark_uptodate(ce);
		return ce;
	}

1016
	if (lstat(ce->name, &st) < 0) {
1017 1018
		if (err)
			*err = errno;
1019 1020
		return NULL;
	}
L
Linus Torvalds 已提交
1021

1022
	changed = ie_match_stat(istate, ce, &st, options);
L
Linus Torvalds 已提交
1023
	if (!changed) {
1024 1025 1026 1027 1028 1029 1030 1031
		/*
		 * 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 &&
1032
		    !(ce->ce_flags & CE_VALID))
L
Linus Torvalds 已提交
1033
			; /* mark this one VALID again */
1034 1035 1036 1037 1038 1039 1040
		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.
			 */
			ce_mark_uptodate(ce);
1041
			return ce;
1042
		}
L
Linus Torvalds 已提交
1043 1044
	}

1045
	if (ie_modified(istate, ce, &st, options)) {
1046 1047
		if (err)
			*err = EINVAL;
1048 1049
		return NULL;
	}
L
Linus Torvalds 已提交
1050 1051 1052 1053 1054

	size = ce_size(ce);
	updated = xmalloc(size);
	memcpy(updated, ce, size);
	fill_stat_cache_info(updated, &st);
1055 1056 1057 1058 1059
	/*
	 * 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 已提交
1060
	 */
1061
	if (!ignore_valid && assume_unchanged &&
1062 1063
	    !(ce->ce_flags & CE_VALID))
		updated->ce_flags &= ~CE_VALID;
L
Linus Torvalds 已提交
1064 1065 1066 1067

	return updated;
}

1068
int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen)
L
Linus Torvalds 已提交
1069 1070 1071 1072 1073 1074 1075
{
	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;
1076
	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1077
	unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1078
	const char *needs_update_message;
L
Linus Torvalds 已提交
1079

1080 1081
	needs_update_message = ((flags & REFRESH_SAY_CHANGED)
				? "locally modified" : "needs update");
1082
	for (i = 0; i < istate->cache_nr; i++) {
L
Linus Torvalds 已提交
1083
		struct cache_entry *ce, *new;
1084 1085
		int cache_errno = 0;

1086
		ce = istate->cache[i];
1087 1088 1089
		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
			continue;

L
Linus Torvalds 已提交
1090
		if (ce_stage(ce)) {
1091 1092
			while ((i < istate->cache_nr) &&
			       ! strcmp(istate->cache[i]->name, ce->name))
L
Linus Torvalds 已提交
1093 1094 1095 1096 1097 1098 1099 1100 1101
				i++;
			i--;
			if (allow_unmerged)
				continue;
			printf("%s: needs merge\n", ce->name);
			has_errors = 1;
			continue;
		}

1102 1103 1104
		if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
			continue;

1105
		new = refresh_cache_ent(istate, ce, options, &cache_errno);
1106
		if (new == ce)
L
Linus Torvalds 已提交
1107
			continue;
1108 1109
		if (!new) {
			if (not_new && cache_errno == ENOENT)
L
Linus Torvalds 已提交
1110
				continue;
1111
			if (really && cache_errno == EINVAL) {
L
Linus Torvalds 已提交
1112 1113 1114
				/* If we are doing --really-refresh that
				 * means the index is not valid anymore.
				 */
1115
				ce->ce_flags &= ~CE_VALID;
1116
				istate->cache_changed = 1;
L
Linus Torvalds 已提交
1117 1118 1119
			}
			if (quiet)
				continue;
1120
			printf("%s: %s\n", ce->name, needs_update_message);
L
Linus Torvalds 已提交
1121 1122 1123
			has_errors = 1;
			continue;
		}
1124 1125

		replace_index_entry(istate, i, new);
L
Linus Torvalds 已提交
1126 1127 1128 1129
	}
	return has_errors;
}

1130 1131
struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
{
1132
	return refresh_cache_ent(&the_index, ce, really, NULL);
1133 1134
}

1135
static int verify_hdr(struct cache_header *hdr, unsigned long size)
1136
{
1137
	git_SHA_CTX c;
1138
	unsigned char sha1[20];
1139

1140
	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1141
		return error("bad signature");
1142
	if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
1143
		return error("bad index version");
1144 1145 1146
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, size - 20);
	git_SHA1_Final(sha1, &c);
1147
	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1148
		return error("bad index file sha1 signature");
1149 1150 1151
	return 0;
}

1152 1153
static int read_index_extension(struct index_state *istate,
				const char *ext, void *data, unsigned long sz)
1154 1155 1156
{
	switch (CACHE_EXT(ext)) {
	case CACHE_EXT_TREE:
1157
		istate->cache_tree = cache_tree_read(data, sz);
1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
		break;
	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;
}

1169
int read_index(struct index_state *istate)
1170
{
1171
	return read_index_from(istate, get_index_file());
1172 1173
}

1174 1175
static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
{
1176
	size_t len;
1177
	const char *name;
1178

K
Kjetil Barvik 已提交
1179 1180 1181 1182
	ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
	ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
	ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
	ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
1183 1184 1185 1186 1187 1188 1189 1190
	ce->ce_dev   = ntohl(ondisk->dev);
	ce->ce_ino   = ntohl(ondisk->ino);
	ce->ce_mode  = ntohl(ondisk->mode);
	ce->ce_uid   = ntohl(ondisk->uid);
	ce->ce_gid   = ntohl(ondisk->gid);
	ce->ce_size  = ntohl(ondisk->size);
	/* On-disk flags are just 16 bits */
	ce->ce_flags = ntohs(ondisk->flags);
1191

1192
	hashcpy(ce->sha1, ondisk->sha1);
1193 1194

	len = ce->ce_flags & CE_NAMEMASK;
1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209

	if (ce->ce_flags & CE_EXTENDED) {
		struct ondisk_cache_entry_extended *ondisk2;
		int extended_flags;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
		extended_flags = ntohs(ondisk2->flags2) << 16;
		/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
		if (extended_flags & ~CE_EXTENDED_FLAGS)
			die("Unknown index entry format %08x", extended_flags);
		ce->ce_flags |= extended_flags;
		name = ondisk2->name;
	}
	else
		name = ondisk->name;

1210
	if (len == CE_NAMEMASK)
1211
		len = strlen(name);
1212 1213 1214 1215
	/*
	 * NEEDSWORK: If the original index is crafted, this copy could
	 * go unchecked.
	 */
1216
	memcpy(ce->name, name, len + 1);
1217 1218
}

1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232
static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
{
	long per_entry;

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

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

1233
/* remember to discard_cache() before reading a different cache! */
1234
int read_index_from(struct index_state *istate, const char *path)
1235 1236 1237
{
	int fd, i;
	struct stat st;
1238
	unsigned long src_offset, dst_offset;
1239
	struct cache_header *hdr;
1240 1241
	void *mmap;
	size_t mmap_size;
1242 1243

	errno = EBUSY;
1244
	if (istate->initialized)
1245
		return istate->cache_nr;
1246

1247
	errno = ENOENT;
K
Kjetil Barvik 已提交
1248 1249
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1250
	fd = open(path, O_RDONLY);
1251 1252 1253 1254 1255
	if (fd < 0) {
		if (errno == ENOENT)
			return 0;
		die("index file open failed (%s)", strerror(errno));
	}
1256

1257
	if (fstat(fd, &st))
1258
		die("cannot stat the open index (%s)", strerror(errno));
1259 1260

	errno = EINVAL;
1261 1262
	mmap_size = xsize_t(st.st_size);
	if (mmap_size < sizeof(struct cache_header) + 20)
1263 1264
		die("index file smaller than expected");

1265
	mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1266
	close(fd);
1267 1268
	if (mmap == MAP_FAILED)
		die("unable to map index file");
1269

1270 1271
	hdr = mmap;
	if (verify_hdr(hdr, mmap_size) < 0)
1272 1273
		goto unmap;

1274 1275 1276
	istate->cache_nr = ntohl(hdr->hdr_entries);
	istate->cache_alloc = alloc_nr(istate->cache_nr);
	istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
1277

1278 1279 1280 1281 1282 1283
	/*
	 * The disk format is actually larger than the in-memory format,
	 * due to space for nsec etc, so even though the in-memory one
	 * has room for a few  more flags, we can allocate using the same
	 * index size
	 */
1284
	istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
1285
	istate->initialized = 1;
1286 1287 1288

	src_offset = sizeof(*hdr);
	dst_offset = 0;
1289
	for (i = 0; i < istate->cache_nr; i++) {
1290
		struct ondisk_cache_entry *disk_ce;
1291 1292
		struct cache_entry *ce;

1293 1294 1295
		disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
		ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
		convert_from_disk(disk_ce, ce);
1296
		set_index_entry(istate, i, ce);
1297 1298 1299

		src_offset += ondisk_ce_size(ce);
		dst_offset += ce_size(ce);
1300
	}
K
Kjetil Barvik 已提交
1301
	istate->timestamp.sec = st.st_mtime;
1302
	istate->timestamp.nsec = ST_MTIME_NSEC(st);
K
Kjetil Barvik 已提交
1303

1304
	while (src_offset <= mmap_size - 20 - 8) {
1305 1306 1307 1308 1309 1310 1311
		/* 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.
		 */
		unsigned long extsize;
1312
		memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1313
		extsize = ntohl(extsize);
1314
		if (read_index_extension(istate,
1315 1316
					 (const char *) mmap + src_offset,
					 (char *) mmap + src_offset + 8,
1317
					 extsize) < 0)
1318
			goto unmap;
1319 1320
		src_offset += 8;
		src_offset += extsize;
1321
	}
1322
	munmap(mmap, mmap_size);
1323
	return istate->cache_nr;
1324 1325

unmap:
1326
	munmap(mmap, mmap_size);
1327
	errno = EINVAL;
1328
	die("index file corrupt");
1329 1330
}

1331 1332
int is_index_unborn(struct index_state *istate)
{
K
Kjetil Barvik 已提交
1333
	return (!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);
1334 1335
}

1336
int discard_index(struct index_state *istate)
1337
{
1338 1339
	istate->cache_nr = 0;
	istate->cache_changed = 0;
K
Kjetil Barvik 已提交
1340 1341
	istate->timestamp.sec = 0;
	istate->timestamp.nsec = 0;
1342
	istate->name_hash_initialized = 0;
1343
	free_hash(&istate->name_hash);
1344
	cache_tree_free(&(istate->cache_tree));
1345 1346
	free(istate->alloc);
	istate->alloc = NULL;
1347
	istate->initialized = 0;
1348 1349

	/* no need to throw away allocated active_cache */
1350
	return 0;
1351 1352
}

1353
int unmerged_index(const struct index_state *istate)
1354 1355 1356 1357 1358 1359 1360 1361 1362
{
	int i;
	for (i = 0; i < istate->cache_nr; i++) {
		if (ce_stage(istate->cache[i]))
			return 1;
	}
	return 0;
}

1363
#define WRITE_BUFFER_SIZE 8192
1364
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1365 1366
static unsigned long write_buffer_len;

1367
static int ce_write_flush(git_SHA_CTX *context, int fd)
1368 1369 1370
{
	unsigned int buffered = write_buffer_len;
	if (buffered) {
1371
		git_SHA1_Update(context, write_buffer, buffered);
1372
		if (write_in_full(fd, write_buffer, buffered) != buffered)
1373 1374 1375 1376 1377 1378
			return -1;
		write_buffer_len = 0;
	}
	return 0;
}

1379
static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1380 1381 1382 1383 1384 1385 1386 1387 1388
{
	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) {
1389 1390
			write_buffer_len = buffered;
			if (ce_write_flush(context, fd))
1391 1392 1393 1394 1395
				return -1;
			buffered = 0;
		}
		write_buffer_len = buffered;
		len -= partial;
1396
		data = (char *) data + partial;
J
Junio C Hamano 已提交
1397 1398
	}
	return 0;
1399 1400
}

1401
static int write_index_ext_header(git_SHA_CTX *context, int fd,
1402
				  unsigned int ext, unsigned int sz)
1403 1404 1405
{
	ext = htonl(ext);
	sz = htonl(sz);
D
David Rientjes 已提交
1406 1407
	return ((ce_write(context, fd, &ext, 4) < 0) ||
		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1408 1409
}

1410
static int ce_flush(git_SHA_CTX *context, int fd)
1411 1412
{
	unsigned int left = write_buffer_len;
1413

1414 1415
	if (left) {
		write_buffer_len = 0;
1416
		git_SHA1_Update(context, write_buffer, left);
1417
	}
1418

1419 1420
	/* Flush first if not enough space for SHA1 signature */
	if (left + 20 > WRITE_BUFFER_SIZE) {
1421
		if (write_in_full(fd, write_buffer, left) != left)
1422 1423 1424 1425
			return -1;
		left = 0;
	}

1426
	/* Append the SHA1 signature at the end */
1427
	git_SHA1_Final(write_buffer + left, context);
1428
	left += 20;
1429
	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1430 1431
}

J
Junio C Hamano 已提交
1432 1433 1434 1435 1436 1437 1438
static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
{
	/*
	 * The only thing we care about in this function is to smudge the
	 * falsely clean entry due to touch-update-touch race, so we leave
	 * everything else as they are.  We are called for entries whose
	 * ce_mtime match the index file mtime.
1439 1440 1441 1442 1443
	 *
	 * 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 已提交
1444 1445 1446 1447 1448 1449 1450 1451
	 */
	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)) {
1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462
		/* 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
		 *
1463
		 * but it does not.  When the second update-index runs,
1464 1465 1466 1467 1468
		 * 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 已提交
1469
		 * obtain from the filesystem next time we stat("frotz").
1470 1471 1472 1473 1474 1475 1476
		 *
		 * 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.
		 */
1477
		ce->ce_size = 0;
J
Junio C Hamano 已提交
1478 1479 1480
	}
}

1481
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
1482 1483 1484
{
	int size = ondisk_ce_size(ce);
	struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1485
	char *name;
1486

K
Kjetil Barvik 已提交
1487 1488 1489 1490
	ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
	ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
	ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
	ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
1491 1492 1493 1494 1495 1496 1497 1498
	ondisk->dev  = htonl(ce->ce_dev);
	ondisk->ino  = htonl(ce->ce_ino);
	ondisk->mode = htonl(ce->ce_mode);
	ondisk->uid  = htonl(ce->ce_uid);
	ondisk->gid  = htonl(ce->ce_gid);
	ondisk->size = htonl(ce->ce_size);
	hashcpy(ondisk->sha1, ce->sha1);
	ondisk->flags = htons(ce->ce_flags);
1499 1500 1501 1502 1503 1504 1505 1506 1507
	if (ce->ce_flags & CE_EXTENDED) {
		struct ondisk_cache_entry_extended *ondisk2;
		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
		ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
		name = ondisk2->name;
	}
	else
		name = ondisk->name;
	memcpy(name, ce->name, ce_namelen(ce));
1508 1509 1510 1511

	return ce_write(c, fd, ondisk, size);
}

1512
int write_index(struct index_state *istate, int newfd)
1513
{
1514
	git_SHA_CTX c;
1515
	struct cache_header hdr;
1516
	int i, err, removed, extended;
1517 1518
	struct cache_entry **cache = istate->cache;
	int entries = istate->cache_nr;
1519
	struct stat st;
1520

1521
	for (i = removed = extended = 0; i < entries; i++) {
1522
		if (cache[i]->ce_flags & CE_REMOVE)
1523
			removed++;
1524

1525 1526 1527 1528 1529 1530 1531 1532
		/* 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;
		}
	}

1533
	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1534 1535
	/* for extended format, increase version so older git won't try to read it */
	hdr.hdr_version = htonl(extended ? 3 : 2);
1536
	hdr.hdr_entries = htonl(entries - removed);
1537

1538
	git_SHA1_Init(&c);
1539
	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1540 1541 1542 1543
		return -1;

	for (i = 0; i < entries; i++) {
		struct cache_entry *ce = cache[i];
1544
		if (ce->ce_flags & CE_REMOVE)
1545
			continue;
1546
		if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
J
Junio C Hamano 已提交
1547
			ce_smudge_racily_clean_entry(ce);
1548
		if (ce_write_entry(&c, newfd, ce) < 0)
1549 1550
			return -1;
	}
1551

1552
	/* Write extension data here */
1553
	if (istate->cache_tree) {
1554
		struct strbuf sb = STRBUF_INIT;
1555 1556 1557 1558 1559 1560

		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)
1561 1562
			return -1;
	}
1563 1564 1565 1566

	if (ce_flush(&c, newfd) || fstat(newfd, &st))
		return -1;
	istate->timestamp.sec = (unsigned int)st.st_ctime;
1567
	istate->timestamp.nsec = ST_CTIME_NSEC(st);
1568
	return 0;
1569
}
1570 1571 1572

/*
 * Read the index file that is potentially unmerged into given
J
Junio C Hamano 已提交
1573
 * index_state, dropping any unmerged entries.  Returns true if
1574 1575 1576 1577 1578 1579 1580
 * 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;
1581
	int unmerged = 0;
1582 1583 1584 1585

	read_index(istate);
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
1586 1587 1588 1589
		struct cache_entry *new_ce;
		int size, len;

		if (!ce_stage(ce))
1590
			continue;
1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602
		unmerged = 1;
		len = strlen(ce->name);
		size = cache_entry_size(len);
		new_ce = xcalloc(1, size);
		hashcpy(new_ce->sha1, ce->sha1);
		memcpy(new_ce->name, ce->name, len);
		new_ce->ce_flags = create_ce_flags(len, 0);
		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);
1603
	}
1604
	return unmerged;
1605
}
1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625

struct update_callback_data
{
	int flags;
	int add_errors;
};

static void update_callback(struct diff_queue_struct *q,
			    struct diff_options *opt, void *cbdata)
{
	int i;
	struct update_callback_data *data = cbdata;

	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		const char *path = p->one->path;
		switch (p->status) {
		default:
			die("unexpected diff status %c", p->status);
		case DIFF_STATUS_UNMERGED:
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645
			/*
			 * ADD_CACHE_IGNORE_REMOVAL is unset if "git
			 * add -u" is calling us, In such a case, a
			 * missing work tree file needs to be removed
			 * if there is an unmerged entry at stage #2,
			 * but such a diff record is followed by
			 * another with DIFF_STATUS_DELETED (and if
			 * there is no stage #2, we won't see DELETED
			 * nor MODIFIED).  We can simply continue
			 * either way.
			 */
			if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
				continue;
			/*
			 * Otherwise, it is "git add path" is asking
			 * to explicitly add it; we fall through.  A
			 * missing work tree file is an error and is
			 * caught by add_file_to_index() in such a
			 * case.
			 */
1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681
		case DIFF_STATUS_MODIFIED:
		case DIFF_STATUS_TYPE_CHANGED:
			if (add_file_to_index(&the_index, path, data->flags)) {
				if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
					die("updating files failed");
				data->add_errors++;
			}
			break;
		case DIFF_STATUS_DELETED:
			if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
				break;
			if (!(data->flags & ADD_CACHE_PRETEND))
				remove_file_from_index(&the_index, path);
			if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
				printf("remove '%s'\n", path);
			break;
		}
	}
}

int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
{
	struct update_callback_data data;
	struct rev_info rev;
	init_revisions(&rev, prefix);
	setup_revisions(0, NULL, &rev, NULL);
	rev.prune_data = pathspec;
	rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
	rev.diffopt.format_callback = update_callback;
	data.flags = flags;
	data.add_errors = 0;
	rev.diffopt.format_callback_data = &data;
	run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
	return !!data.add_errors;
}

1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708
/*
 * 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;
}