]> git.ipfire.org Git - thirdparty/git.git/blame - read-cache.c
Merge branch 'rs/fast-import-simplify-mempool-allocation' into maint-2.43
[thirdparty/git.git] / read-cache.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
bc5c5ec0 6#include "git-compat-util.h"
6cee5ebc 7#include "bulk-checkin.h"
b2141fc1 8#include "config.h"
d4a4f929 9#include "date.h"
cffbfad5
EN
10#include "diff.h"
11#include "diffcore.h"
41771fa4 12#include "hex.h"
f6ecc62d 13#include "tempfile.h"
697cc8ef 14#include "lockfile.h"
bad68ec9 15#include "cache-tree.h"
f35a6d3b 16#include "refs.h"
d616813d 17#include "dir.h"
87bed179 18#include "object-file.h"
a034e910 19#include "object-store-ll.h"
6f2d7430 20#include "oid-array.h"
041aee31
JH
21#include "tree.h"
22#include "commit.h"
32a8f510 23#include "environment.h"
f394e093 24#include "gettext.h"
5bc07225 25#include "mem-pool.h"
f5653856 26#include "name-hash.h"
dabab1d6 27#include "object-name.h"
c339932b 28#include "path.h"
fbffdfb1 29#include "preload-index.h"
08c46a49 30#include "read-cache.h"
cfc5789a 31#include "resolve-undo.h"
6cee5ebc 32#include "revision.h"
6c9cd161 33#include "strbuf.h"
74ea5c95 34#include "trace2.h"
6c9cd161 35#include "varint.h"
5fc2fc8f 36#include "split-index.h"
cb2a5135 37#include "symlinks.h"
a42643aa 38#include "utf8.h"
883e248b 39#include "fsmonitor.h"
abb4bb83 40#include "thread-utils.h"
ae9af122 41#include "progress.h"
6e773527 42#include "sparse-index.h"
410334ed 43#include "csum-file.h"
b2896d27 44#include "promisor-remote.h"
dbb1c613 45#include "hook.h"
bad68ec9 46
b60e188c
TG
47/* Mask for the name length in ce_flags in the on-disk index */
48
49#define CE_NAMEMASK (0x0fff)
50
bad68ec9
JH
51/* Index extensions.
52 *
53 * The first letter should be 'A'..'Z' for extensions that are not
54 * necessary for a correct operation (i.e. optimization data).
55 * When new extensions are added that _needs_ to be understood in
56 * order to correctly interpret the index file, pick character that
57 * is outside the range, to cause the reader to abort.
58 */
59
60#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
61#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
b659b49b 62#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
5fc2fc8f 63#define CACHE_EXT_LINK 0x6c696e6b /* "link" */
83c094ad 64#define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
883e248b 65#define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
3b1d9e04 66#define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
3255089a 67#define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
cd42415f 68#define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
5fc2fc8f
NTND
69
70/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
e0cf0d7d 71#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
c18b80a0 72 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
883e248b 73 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
e83c5163 74
8e72d675
JM
75
76/*
77 * This is an estimate of the pathname length in the index. We use
78 * this for V4 index files to guess the un-deltafied size of the index
79 * in memory because of pathname deltafication. This is not required
80 * for V2/V3 index formats because their pathnames are not compressed.
81 * If the initial amount of memory set aside is not sufficient, the
82 * mem pool will allocate extra memory.
83 */
84#define CACHE_ENTRY_PATH_LENGTH 80
85
20ec2d03
VD
86enum index_search_mode {
87 NO_EXPAND_SPARSE = 0,
88 EXPAND_SPARSE = 1
89};
90
8e72d675
JM
91static inline struct cache_entry *mem_pool__ce_alloc(struct mem_pool *mem_pool, size_t len)
92{
93 struct cache_entry *ce;
94 ce = mem_pool_alloc(mem_pool, cache_entry_size(len));
95 ce->mem_pool_allocated = 1;
96 return ce;
97}
98
99static inline struct cache_entry *mem_pool__ce_calloc(struct mem_pool *mem_pool, size_t len)
100{
101 struct cache_entry * ce;
102 ce = mem_pool_calloc(mem_pool, 1, cache_entry_size(len));
103 ce->mem_pool_allocated = 1;
104 return ce;
105}
106
107static struct mem_pool *find_mem_pool(struct index_state *istate)
108{
109 struct mem_pool **pool_ptr;
110
111 if (istate->split_index && istate->split_index->base)
112 pool_ptr = &istate->split_index->base->ce_mem_pool;
113 else
114 pool_ptr = &istate->ce_mem_pool;
115
44c7e1a7
EN
116 if (!*pool_ptr) {
117 *pool_ptr = xmalloc(sizeof(**pool_ptr));
118 mem_pool_init(*pool_ptr, 0);
119 }
8e72d675
JM
120
121 return *pool_ptr;
122}
123
626f35c8 124static const char *alternate_index_output;
8fd2cb40 125
9cb76b8c
JH
126static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
127{
4300f844 128 if (S_ISSPARSEDIR(ce->ce_mode))
9fadb373 129 istate->sparse_index = INDEX_COLLAPSED;
4300f844 130
9cb76b8c 131 istate->cache[nr] = ce;
96872bc2 132 add_name_hash(istate, ce);
9cb76b8c
JH
133}
134
cf558704
LT
135static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
136{
137 struct cache_entry *old = istate->cache[nr];
138
078a58e8 139 replace_index_entry_in_base(istate, old, ce);
2092678c 140 remove_name_hash(istate, old);
a849735b 141 discard_cache_entry(old);
0e267b7a 142 ce->ce_flags &= ~CE_HASHED;
a22c6371 143 set_index_entry(istate, nr, ce);
078a58e8 144 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 145 mark_fsmonitor_invalid(istate, ce);
e636a7b4 146 istate->cache_changed |= CE_ENTRY_CHANGED;
cf558704
LT
147}
148
81dc2307
PB
149void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
150{
b7f9130a 151 struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
81dc2307
PB
152 int namelen = strlen(new_name);
153
a849735b 154 new_entry = make_empty_cache_entry(istate, namelen);
285c2e25
BW
155 copy_cache_entry(new_entry, old_entry);
156 new_entry->ce_flags &= ~CE_HASHED;
157 new_entry->ce_namelen = namelen;
158 new_entry->index = 0;
159 memcpy(new_entry->name, new_name, namelen + 1);
81dc2307 160
285c2e25
BW
161 cache_tree_invalidate_path(istate, old_entry->name);
162 untracked_cache_remove_from_index(istate, old_entry->name);
81dc2307 163 remove_index_entry_at(istate, nr);
b7f9130a
VD
164
165 /*
166 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
167 * we only update stat info if the entry is otherwise up-to-date (i.e.,
168 * the contents/mode haven't changed). This ensures that we reflect the
169 * 'ctime' of the rename in the index without (incorrectly) updating
170 * the cached stat info to reflect unstaged changes on disk.
171 */
172 refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
173 if (refreshed && refreshed != new_entry) {
174 add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
175 discard_cache_entry(new_entry);
176 } else
177 add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
81dc2307
PB
178}
179
415e96c8
JH
180/*
181 * This only updates the "non-critical" parts of the directory
182 * cache, ie the parts that aren't tracked by GIT, and only used
183 * to validate the cache.
184 */
d4c0a3ac 185void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
415e96c8 186{
c21d39d7 187 fill_stat_data(&ce->ce_stat_data, st);
5f73076c
JH
188
189 if (assume_unchanged)
7a51ed66 190 ce->ce_flags |= CE_VALID;
eadb5831 191
883e248b 192 if (S_ISREG(st->st_mode)) {
eadb5831 193 ce_mark_uptodate(ce);
b5a81697 194 mark_fsmonitor_valid(istate, ce);
883e248b 195 }
415e96c8
JH
196}
197
58bf2a4c
NTND
198static int ce_compare_data(struct index_state *istate,
199 const struct cache_entry *ce,
200 struct stat *st)
29e4d363
JH
201{
202 int match = -1;
1b8ac5ea 203 int fd = git_open_cloexec(ce->name, O_RDONLY);
29e4d363
JH
204
205 if (fd >= 0) {
bebfecb9 206 struct object_id oid;
58bf2a4c 207 if (!index_fd(istate, &oid, fd, st, OBJ_BLOB, ce->name, 0))
6a29d7b7 208 match = !oideq(&oid, &ce->oid);
7f8508e8 209 /* index_fd() closed the file descriptor already */
29e4d363
JH
210 }
211 return match;
212}
213
21a6b9fa 214static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
29e4d363
JH
215{
216 int match = -1;
29e4d363
JH
217 void *buffer;
218 unsigned long size;
21666f1a 219 enum object_type type;
a60272b3 220 struct strbuf sb = STRBUF_INIT;
29e4d363 221
a60272b3 222 if (strbuf_readlink(&sb, ce->name, expected_size))
29e4d363 223 return -1;
a60272b3 224
bc726bd0 225 buffer = repo_read_object_file(the_repository, &ce->oid, &type, &size);
a60272b3
LT
226 if (buffer) {
227 if (size == sb.len)
228 match = memcmp(buffer, sb.buf, size);
229 free(buffer);
29e4d363 230 }
a60272b3 231 strbuf_release(&sb);
29e4d363
JH
232 return match;
233}
234
21a6b9fa 235static int ce_compare_gitlink(const struct cache_entry *ce)
f35a6d3b 236{
1053fe82 237 struct object_id oid;
f35a6d3b
LT
238
239 /*
240 * We don't actually require that the .git directory
302b9282 241 * under GITLINK directory be a valid git directory. It
f35a6d3b
LT
242 * might even be missing (in case nobody populated that
243 * sub-project).
244 *
245 * If so, we consider it always to match.
246 */
a98e6101 247 if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0)
f35a6d3b 248 return 0;
6a29d7b7 249 return !oideq(&oid, &ce->oid);
f35a6d3b
LT
250}
251
58bf2a4c
NTND
252static int ce_modified_check_fs(struct index_state *istate,
253 const struct cache_entry *ce,
254 struct stat *st)
29e4d363
JH
255{
256 switch (st->st_mode & S_IFMT) {
257 case S_IFREG:
58bf2a4c 258 if (ce_compare_data(istate, ce, st))
29e4d363
JH
259 return DATA_CHANGED;
260 break;
261 case S_IFLNK:
dc49cd76 262 if (ce_compare_link(ce, xsize_t(st->st_size)))
29e4d363
JH
263 return DATA_CHANGED;
264 break;
a8ee75bc 265 case S_IFDIR:
7a51ed66 266 if (S_ISGITLINK(ce->ce_mode))
c70115b4 267 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
1cf01a34 268 /* else fallthrough */
29e4d363
JH
269 default:
270 return TYPE_CHANGED;
271 }
272 return 0;
273}
274
21a6b9fa 275static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
734aab75
LT
276{
277 unsigned int changed = 0;
278
7a51ed66
LT
279 if (ce->ce_flags & CE_REMOVE)
280 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
281
282 switch (ce->ce_mode & S_IFMT) {
8ae0a8c5
KS
283 case S_IFREG:
284 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
3e09cdfd
JH
285 /* We consider only the owner x bit to be relevant for
286 * "mode changes"
287 */
288 if (trust_executable_bit &&
7a51ed66 289 (0100 & (ce->ce_mode ^ st->st_mode)))
ffbe1add 290 changed |= MODE_CHANGED;
8ae0a8c5
KS
291 break;
292 case S_IFLNK:
78a8d641
JS
293 if (!S_ISLNK(st->st_mode) &&
294 (has_symlinks || !S_ISREG(st->st_mode)))
295 changed |= TYPE_CHANGED;
8ae0a8c5 296 break;
302b9282 297 case S_IFGITLINK:
c70115b4 298 /* We ignore most of the st_xxx fields for gitlinks */
f35a6d3b
LT
299 if (!S_ISDIR(st->st_mode))
300 changed |= TYPE_CHANGED;
301 else if (ce_compare_gitlink(ce))
302 changed |= DATA_CHANGED;
a8ee75bc 303 return changed;
8ae0a8c5 304 default:
391408e5 305 BUG("unsupported ce_mode: %o", ce->ce_mode);
8ae0a8c5 306 }
2cb45e95 307
c21d39d7 308 changed |= match_stat_data(&ce->ce_stat_data, st);
b0391890 309
f49c2c22 310 /* Racily smudged entry? */
c21d39d7 311 if (!ce->ce_stat_data.sd_size) {
99d1a986 312 if (!is_empty_blob_sha1(ce->oid.hash))
f49c2c22
LT
313 changed |= DATA_CHANGED;
314 }
315
407c8eb0
JH
316 return changed;
317}
318
2bb4cda1
NTND
319static int is_racy_stat(const struct index_state *istate,
320 const struct stat_data *sd)
6d91da6d 321{
2bb4cda1 322 return (istate->timestamp.sec &&
fba2f38a
KB
323#ifdef USE_NSEC
324 /* nanosecond timestamped files can also be racy! */
2bb4cda1
NTND
325 (istate->timestamp.sec < sd->sd_mtime.sec ||
326 (istate->timestamp.sec == sd->sd_mtime.sec &&
327 istate->timestamp.nsec <= sd->sd_mtime.nsec))
fba2f38a 328#else
2bb4cda1 329 istate->timestamp.sec <= sd->sd_mtime.sec
fba2f38a 330#endif
2bb4cda1
NTND
331 );
332}
333
5581a019 334int is_racy_timestamp(const struct index_state *istate,
2bb4cda1
NTND
335 const struct cache_entry *ce)
336{
337 return (!S_ISGITLINK(ce->ce_mode) &&
338 is_racy_stat(istate, &ce->ce_stat_data));
6d91da6d
JH
339}
340
ed4efab1
NTND
341int match_stat_data_racy(const struct index_state *istate,
342 const struct stat_data *sd, struct stat *st)
343{
344 if (is_racy_stat(istate, sd))
345 return MTIME_CHANGED;
346 return match_stat_data(sd, st);
6d91da6d
JH
347}
348
883e248b 349int ie_match_stat(struct index_state *istate,
21a6b9fa 350 const struct cache_entry *ce, struct stat *st,
4bd5b7da 351 unsigned int options)
407c8eb0 352{
5f73076c 353 unsigned int changed;
4bd5b7da 354 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 355 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
4bd5b7da 356 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
883e248b 357 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
5f73076c 358
883e248b
BP
359 if (!ignore_fsmonitor)
360 refresh_fsmonitor(istate);
5f73076c
JH
361 /*
362 * If it's marked as always valid in the index, it's
363 * valid whatever the checked-out copy says.
56cac48c
NTND
364 *
365 * skip-worktree has the same effect with higher precedence
5f73076c 366 */
56cac48c
NTND
367 if (!ignore_skip_worktree && ce_skip_worktree(ce))
368 return 0;
7a51ed66 369 if (!ignore_valid && (ce->ce_flags & CE_VALID))
5f73076c 370 return 0;
883e248b
BP
371 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID))
372 return 0;
5f73076c 373
331fcb59
JH
374 /*
375 * Intent-to-add entries have not been added, so the index entry
376 * by definition never matches what is in the work tree until it
377 * actually gets added.
378 */
895ff3b2 379 if (ce_intent_to_add(ce))
331fcb59
JH
380 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
381
5f73076c 382 changed = ce_match_stat_basic(ce, st);
407c8eb0 383
29e4d363
JH
384 /*
385 * Within 1 second of this sequence:
386 * echo xyzzy >file && git-update-index --add file
387 * running this command:
388 * echo frotz >file
389 * would give a falsely clean cache entry. The mtime and
390 * length match the cache, and other stat fields do not change.
391 *
392 * We could detect this at update-index time (the cache entry
393 * being registered/updated records the same time as "now")
394 * and delay the return from git-update-index, but that would
395 * effectively mean we can make at most one commit per second,
396 * which is not acceptable. Instead, we check cache entries
397 * whose mtime are the same as the index file timestamp more
5f73076c 398 * carefully than others.
29e4d363 399 */
6d91da6d 400 if (!changed && is_racy_timestamp(istate, ce)) {
42f77406
JH
401 if (assume_racy_is_modified)
402 changed |= DATA_CHANGED;
403 else
58bf2a4c 404 changed |= ce_modified_check_fs(istate, ce, st);
42f77406 405 }
b0391890 406
29e4d363 407 return changed;
b0391890
JH
408}
409
883e248b 410int ie_modified(struct index_state *istate,
21a6b9fa
RS
411 const struct cache_entry *ce,
412 struct stat *st, unsigned int options)
b0391890 413{
29e4d363 414 int changed, changed_fs;
4bd5b7da
JH
415
416 changed = ie_match_stat(istate, ce, st, options);
b0391890
JH
417 if (!changed)
418 return 0;
b0391890
JH
419 /*
420 * If the mode or type has changed, there's no point in trying
421 * to refresh the entry - it's not going to match
422 */
423 if (changed & (MODE_CHANGED | TYPE_CHANGED))
424 return changed;
425
c70115b4
JH
426 /*
427 * Immediately after read-tree or update-index --cacheinfo,
428 * the length field is zero, as we have never even read the
429 * lstat(2) information once, and we cannot trust DATA_CHANGED
430 * returned by ie_match_stat() which in turn was returned by
431 * ce_match_stat_basic() to signal that the filesize of the
432 * blob changed. We have to actually go to the filesystem to
433 * see if the contents match, and if so, should answer "unchanged".
434 *
435 * The logic does not apply to gitlinks, as ce_match_stat_basic()
436 * already has checked the actual HEAD from the filesystem in the
437 * subproject. If ie_match_stat() already said it is different,
438 * then we know it is.
b0391890 439 */
c70115b4 440 if ((changed & DATA_CHANGED) &&
c21d39d7 441 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
b0391890
JH
442 return changed;
443
58bf2a4c 444 changed_fs = ce_modified_check_fs(istate, ce, st);
29e4d363
JH
445 if (changed_fs)
446 return changed | changed_fs;
b0391890
JH
447 return 0;
448}
449
aabc5617
EN
450static int cache_name_stage_compare(const char *name1, int len1, int stage1,
451 const char *name2, int len2, int stage2)
958ba6c9 452{
958ba6c9
LT
453 int cmp;
454
ccdd4a0f 455 cmp = name_compare(name1, len1, name2, len2);
0ab9e1e8
LT
456 if (cmp)
457 return cmp;
0ab9e1e8 458
b60e188c 459 if (stage1 < stage2)
eb38c22f 460 return -1;
b60e188c 461 if (stage1 > stage2)
eb38c22f 462 return 1;
ccdd4a0f
JM
463 return 0;
464}
465
aabc5617 466int cmp_cache_name_compare(const void *a_, const void *b_)
ccdd4a0f 467{
aabc5617 468 const struct cache_entry *ce1, *ce2;
ccdd4a0f 469
aabc5617
EN
470 ce1 = *((const struct cache_entry **)a_);
471 ce2 = *((const struct cache_entry **)b_);
472 return cache_name_stage_compare(ce1->name, ce1->ce_namelen, ce_stage(ce1),
473 ce2->name, ce2->ce_namelen, ce_stage(ce2));
eb38c22f
LT
474}
475
20ec2d03
VD
476static int index_name_stage_pos(struct index_state *istate,
477 const char *name, int namelen,
478 int stage,
479 enum index_search_mode search_mode)
eb38c22f
LT
480{
481 int first, last;
482
483 first = 0;
4aab5b46 484 last = istate->cache_nr;
eb38c22f 485 while (last > first) {
568a05c5 486 int next = first + ((last - first) >> 1);
4aab5b46 487 struct cache_entry *ce = istate->cache[next];
b60e188c 488 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
eb38c22f 489 if (!cmp)
76e7f4ec 490 return next;
eb38c22f
LT
491 if (cmp < 0) {
492 last = next;
493 continue;
494 }
495 first = next+1;
496 }
95e0321c 497
20ec2d03 498 if (search_mode == EXPAND_SPARSE && istate->sparse_index &&
95e0321c
DS
499 first > 0) {
500 /* Note: first <= istate->cache_nr */
501 struct cache_entry *ce = istate->cache[first - 1];
502
503 /*
504 * If we are in a sparse-index _and_ the entry before the
505 * insertion position is a sparse-directory entry that is
506 * an ancestor of 'name', then we need to expand the index
507 * and search again. This will only trigger once, because
508 * thereafter the index is fully expanded.
509 */
510 if (S_ISSPARSEDIR(ce->ce_mode) &&
511 ce_namelen(ce) < namelen &&
512 !strncmp(name, ce->name, ce_namelen(ce))) {
513 ensure_full_index(istate);
20ec2d03 514 return index_name_stage_pos(istate, name, namelen, stage, search_mode);
95e0321c
DS
515 }
516 }
517
76e7f4ec 518 return -first-1;
eb38c22f
LT
519}
520
847a9e5d 521int index_name_pos(struct index_state *istate, const char *name, int namelen)
b60e188c 522{
20ec2d03
VD
523 return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE);
524}
525
9553aa0f
VD
526int index_name_pos_sparse(struct index_state *istate, const char *name, int namelen)
527{
528 return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE);
529}
530
20ec2d03
VD
531int index_entry_exists(struct index_state *istate, const char *name, int namelen)
532{
533 return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0;
b60e188c
TG
534}
535
4aab5b46 536int remove_index_entry_at(struct index_state *istate, int pos)
7b937ca3 537{
cf558704
LT
538 struct cache_entry *ce = istate->cache[pos];
539
cfc5789a 540 record_resolve_undo(istate, ce);
2092678c 541 remove_name_hash(istate, ce);
045113a5 542 save_or_free_index_entry(istate, ce);
e636a7b4 543 istate->cache_changed |= CE_ENTRY_REMOVED;
4aab5b46
JH
544 istate->cache_nr--;
545 if (pos >= istate->cache_nr)
7b937ca3 546 return 0;
f331ab9d
RS
547 MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1,
548 istate->cache_nr - pos);
7b937ca3
LT
549 return 1;
550}
551
36419c8e 552/*
98e023de 553 * Remove all cache entries marked for removal, that is where
36419c8e
KB
554 * CE_REMOVE is set in ce_flags. This is much more effective than
555 * calling remove_index_entry_at() for each entry to be removed.
556 */
6fdc2057 557void remove_marked_cache_entries(struct index_state *istate, int invalidate)
36419c8e
KB
558{
559 struct cache_entry **ce_array = istate->cache;
560 unsigned int i, j;
561
562 for (i = j = 0; i < istate->cache_nr; i++) {
5699d17e 563 if (ce_array[i]->ce_flags & CE_REMOVE) {
6fdc2057
TG
564 if (invalidate) {
565 cache_tree_invalidate_path(istate,
566 ce_array[i]->name);
567 untracked_cache_remove_from_index(istate,
568 ce_array[i]->name);
569 }
2092678c 570 remove_name_hash(istate, ce_array[i]);
045113a5 571 save_or_free_index_entry(istate, ce_array[i]);
5699d17e 572 }
36419c8e
KB
573 else
574 ce_array[j++] = ce_array[i];
575 }
ad837d9e
NTND
576 if (j == istate->cache_nr)
577 return;
e636a7b4 578 istate->cache_changed |= CE_ENTRY_REMOVED;
36419c8e
KB
579 istate->cache_nr = j;
580}
581
4aab5b46 582int remove_file_from_index(struct index_state *istate, const char *path)
197ee8c9 583{
4aab5b46 584 int pos = index_name_pos(istate, path, strlen(path));
c4e3cca1
JH
585 if (pos < 0)
586 pos = -pos-1;
a5400efe 587 cache_tree_invalidate_path(istate, path);
e931371a 588 untracked_cache_remove_from_index(istate, path);
4aab5b46
JH
589 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
590 remove_index_entry_at(istate, pos);
197ee8c9
LT
591 return 0;
592}
593
20314271
JS
594static int compare_name(struct cache_entry *ce, const char *path, int namelen)
595{
596 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
597}
598
599static int index_name_pos_also_unmerged(struct index_state *istate,
600 const char *path, int namelen)
601{
602 int pos = index_name_pos(istate, path, namelen);
603 struct cache_entry *ce;
604
605 if (pos >= 0)
606 return pos;
607
608 /* maybe unmerged? */
609 pos = -1 - pos;
610 if (pos >= istate->cache_nr ||
611 compare_name((ce = istate->cache[pos]), path, namelen))
612 return -1;
613
614 /* order of preference: stage 2, 1, 3 */
615 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
616 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
617 !compare_name(ce, path, namelen))
618 pos++;
619 return pos;
620}
621
1102952b
LT
622static int different_name(struct cache_entry *ce, struct cache_entry *alias)
623{
624 int len = ce_namelen(ce);
625 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
626}
627
628/*
629 * If we add a filename that aliases in the cache, we will use the
630 * name that we already have - but we don't want to update the same
631 * alias twice, because that implies that there were actually two
632 * different files with aliasing names!
633 *
634 * So we use the CE_ADDED flag to verify that the alias was an old
635 * one before we accept it as
636 */
045113a5
NTND
637static struct cache_entry *create_alias_ce(struct index_state *istate,
638 struct cache_entry *ce,
639 struct cache_entry *alias)
1102952b
LT
640{
641 int len;
285c2e25 642 struct cache_entry *new_entry;
1102952b
LT
643
644 if (alias->ce_flags & CE_ADDED)
9d0a9e90
NTND
645 die(_("will not add file alias '%s' ('%s' already exists in index)"),
646 ce->name, alias->name);
1102952b
LT
647
648 /* Ok, create the new entry using the name of the existing alias */
649 len = ce_namelen(alias);
a849735b 650 new_entry = make_empty_cache_entry(istate, len);
285c2e25
BW
651 memcpy(new_entry->name, alias->name, len);
652 copy_cache_entry(new_entry, ce);
045113a5 653 save_or_free_index_entry(istate, ce);
285c2e25 654 return new_entry;
1102952b
LT
655}
656
b4b313f9 657void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
39425819 658{
a09c985e 659 struct object_id oid;
c80d226a 660 if (write_object_file("", 0, OBJ_BLOB, &oid))
9d0a9e90 661 die(_("cannot create an empty blob in the object database"));
a09c985e 662 oidcpy(&ce->oid, &oid);
39425819
JH
663}
664
610d55af 665int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
11be42a4 666{
a849735b 667 int namelen, was_same;
d177cab0 668 mode_t st_mode = st->st_mode;
9472935d 669 struct cache_entry *ce, *alias = NULL;
56cac48c 670 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
38ed1d89
JH
671 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
672 int pretend = flags & ADD_CACHE_PRETEND;
39425819
JH
673 int intent_only = flags & ADD_CACHE_INTENT;
674 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
675 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
e578d031 676 unsigned hash_flags = pretend ? 0 : HASH_WRITE_OBJECT;
f937bc2f 677 struct object_id oid;
9472935d 678
9e5da3d0
JK
679 if (flags & ADD_CACHE_RENORMALIZE)
680 hash_flags |= HASH_RENORMALIZE;
11be42a4 681
d177cab0 682 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
9d0a9e90 683 return error(_("%s: can only add regular files, symbolic links or git-directories"), path);
11be42a4
JS
684
685 namelen = strlen(path);
d177cab0 686 if (S_ISDIR(st_mode)) {
f937bc2f
KM
687 if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
688 return error(_("'%s' does not have a commit checked out"), path);
09595258
LT
689 while (namelen && path[namelen-1] == '/')
690 namelen--;
691 }
a849735b 692 ce = make_empty_cache_entry(istate, namelen);
11be42a4 693 memcpy(ce->name, path, namelen);
b60e188c 694 ce->ce_namelen = namelen;
39425819 695 if (!intent_only)
d4c0a3ac 696 fill_stat_cache_info(istate, ce, st);
388b2acd
JH
697 else
698 ce->ce_flags |= CE_INTENT_TO_ADD;
11be42a4 699
610d55af
TG
700
701 if (trust_executable_bit && has_symlinks) {
d177cab0 702 ce->ce_mode = create_ce_mode(st_mode);
610d55af 703 } else {
78a8d641
JS
704 /* If there is an existing entry, pick the mode bits and type
705 * from it, otherwise assume unexecutable regular file.
11be42a4 706 */
185c975f 707 struct cache_entry *ent;
20314271 708 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 709
4aab5b46 710 ent = (0 <= pos) ? istate->cache[pos] : NULL;
d177cab0 711 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
11be42a4
JS
712 }
713
dc1ae704
JJ
714 /* When core.ignorecase=true, determine if a directory of the same name but differing
715 * case already exists within the Git repository. If it does, ensure the directory
716 * case of the file being added to the repository matches (is folded into) the existing
717 * entry's directory case.
718 */
719 if (ignore_case) {
41284eb0 720 adjust_dirname_case(istate, ce->name);
dc1ae704 721 }
e2c2a375 722 if (!(flags & ADD_CACHE_RENORMALIZE)) {
9472935d
TB
723 alias = index_file_exists(istate, ce->name,
724 ce_namelen(ce), ignore_case);
725 if (alias &&
726 !ce_stage(alias) &&
727 !ie_match_stat(istate, alias, st, ce_option)) {
728 /* Nothing changed, really */
729 if (!S_ISGITLINK(alias->ce_mode))
730 ce_mark_uptodate(alias);
731 alias->ce_flags |= CE_ADDED;
dc1ae704 732
a849735b 733 discard_cache_entry(ce);
9472935d
TB
734 return 0;
735 }
0781b8a9 736 }
39425819 737 if (!intent_only) {
1c418243 738 if (index_path(istate, &ce->oid, path, st, hash_flags)) {
a849735b 739 discard_cache_entry(ce);
9d0a9e90 740 return error(_("unable to index file '%s'"), path);
2d9426b0 741 }
39425819 742 } else
b4b313f9 743 set_object_name_for_intent_to_add_entry(ce);
39425819 744
1102952b 745 if (ignore_case && alias && different_name(ce, alias))
045113a5 746 ce = create_alias_ce(istate, ce, alias);
1102952b 747 ce->ce_flags |= CE_ADDED;
38ed1d89 748
3bf0dd1f 749 /* It was suspected to be racily clean, but it turns out to be Ok */
38ed1d89
JH
750 was_same = (alias &&
751 !ce_stage(alias) &&
4a7e27e9 752 oideq(&alias->oid, &ce->oid) &&
38ed1d89
JH
753 ce->ce_mode == alias->ce_mode);
754
755 if (pretend)
a849735b 756 discard_cache_entry(ce);
067178ed 757 else if (add_index_entry(istate, ce, add_option)) {
a849735b 758 discard_cache_entry(ce);
9d0a9e90 759 return error(_("unable to add '%s' to index"), path);
067178ed 760 }
38ed1d89 761 if (verbose && !was_same)
11be42a4 762 printf("add '%s'\n", path);
11be42a4
JS
763 return 0;
764}
765
610d55af 766int add_file_to_index(struct index_state *istate, const char *path, int flags)
d177cab0
LT
767{
768 struct stat st;
769 if (lstat(path, &st))
9d0a9e90 770 die_errno(_("unable to stat '%s'"), path);
610d55af 771 return add_to_index(istate, path, &st, flags);
d177cab0
LT
772}
773
a849735b
JM
774struct cache_entry *make_empty_cache_entry(struct index_state *istate, size_t len)
775{
8e72d675 776 return mem_pool__ce_calloc(find_mem_pool(istate), len);
a849735b
JM
777}
778
96168827
MT
779struct cache_entry *make_empty_transient_cache_entry(size_t len,
780 struct mem_pool *ce_mem_pool)
a849735b 781{
96168827
MT
782 if (ce_mem_pool)
783 return mem_pool__ce_calloc(ce_mem_pool, len);
a849735b
JM
784 return xcalloc(1, cache_entry_size(len));
785}
786
2a1ae649
RS
787enum verify_path_result {
788 PATH_OK,
789 PATH_INVALID,
790 PATH_DIR_WITH_SEP,
791};
792
793static enum verify_path_result verify_path_internal(const char *, unsigned);
794
795int verify_path(const char *path, unsigned mode)
796{
c8ad9d04 797 return verify_path_internal(path, mode) == PATH_OK;
2a1ae649
RS
798}
799
a849735b
JM
800struct cache_entry *make_cache_entry(struct index_state *istate,
801 unsigned int mode,
825ed4d9
JM
802 const struct object_id *oid,
803 const char *path,
804 int stage,
805 unsigned int refresh_options)
6640f881 806{
bc1c2caa 807 struct cache_entry *ce, *ret;
a849735b 808 int len;
6640f881 809
c8ad9d04 810 if (verify_path_internal(path, mode) == PATH_INVALID) {
9d0a9e90 811 error(_("invalid path '%s'"), path);
6640f881 812 return NULL;
7e7abea9 813 }
6640f881
CR
814
815 len = strlen(path);
a849735b 816 ce = make_empty_cache_entry(istate, len);
6640f881 817
825ed4d9 818 oidcpy(&ce->oid, oid);
6640f881 819 memcpy(ce->name, path, len);
b60e188c
TG
820 ce->ce_flags = create_ce_flags(stage);
821 ce->ce_namelen = len;
6640f881
CR
822 ce->ce_mode = create_ce_mode(mode);
823
d7b665c3 824 ret = refresh_cache_entry(istate, ce, refresh_options);
915e44c6 825 if (ret != ce)
a849735b 826 discard_cache_entry(ce);
915e44c6 827 return ret;
6640f881
CR
828}
829
96168827
MT
830struct cache_entry *make_transient_cache_entry(unsigned int mode,
831 const struct object_id *oid,
832 const char *path,
833 int stage,
834 struct mem_pool *ce_mem_pool)
a849735b
JM
835{
836 struct cache_entry *ce;
837 int len;
838
839 if (!verify_path(path, mode)) {
9d0a9e90 840 error(_("invalid path '%s'"), path);
a849735b
JM
841 return NULL;
842 }
843
844 len = strlen(path);
96168827 845 ce = make_empty_transient_cache_entry(len, ce_mem_pool);
a849735b
JM
846
847 oidcpy(&ce->oid, oid);
848 memcpy(ce->name, path, len);
849 ce->ce_flags = create_ce_flags(stage);
850 ce->ce_namelen = len;
851 ce->ce_mode = create_ce_mode(mode);
852
853 return ce;
854}
855
d9d70966
TG
856/*
857 * Chmod an index entry with either +x or -x.
858 *
859 * Returns -1 if the chmod for the particular cache entry failed (if it's
860 * not a regular file), -2 if an invalid flip argument is passed in, 0
861 * otherwise.
862 */
863int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
864 char flip)
865{
866 if (!S_ISREG(ce->ce_mode))
867 return -1;
868 switch (flip) {
869 case '+':
870 ce->ce_mode |= 0111;
871 break;
872 case '-':
873 ce->ce_mode &= ~0111;
874 break;
875 default:
876 return -2;
877 }
878 cache_tree_invalidate_path(istate, ce->name);
879 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 880 mark_fsmonitor_invalid(istate, ce);
d9d70966
TG
881 istate->cache_changed |= CE_ENTRY_CHANGED;
882
883 return 0;
884}
885
9c5e6c80 886int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
7b937ca3
LT
887{
888 int len = ce_namelen(a);
889 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
890}
891
8dcf39c4
LT
892/*
893 * We fundamentally don't like some paths: we don't want
894 * dot or dot-dot anywhere, and for obvious reasons don't
895 * want to recurse into ".git" either.
896 *
897 * Also, we don't want double slashes or slashes at the
898 * end that can make pathnames ambiguous.
899 */
10ecfa76 900static int verify_dotfile(const char *rest, unsigned mode)
8dcf39c4
LT
901{
902 /*
903 * The first character was '.', but that
904 * has already been discarded, we now test
905 * the rest.
906 */
e0f530ff 907
8dcf39c4 908 /* "." is not allowed */
e0f530ff 909 if (*rest == '\0' || is_dir_sep(*rest))
8dcf39c4
LT
910 return 0;
911
e0f530ff 912 switch (*rest) {
8dcf39c4 913 /*
641084b6
JK
914 * ".git" followed by NUL or slash is bad. Note that we match
915 * case-insensitively here, even if ignore_case is not set.
916 * This outlaws ".GIT" everywhere out of an abundance of caution,
917 * since there's really no good reason to allow it.
10ecfa76
JK
918 *
919 * Once we've seen ".git", we can also find ".gitmodules", etc (also
920 * case-insensitively).
8dcf39c4
LT
921 */
922 case 'g':
cc2fc7c2
JK
923 case 'G':
924 if (rest[1] != 'i' && rest[1] != 'I')
8dcf39c4 925 break;
cc2fc7c2 926 if (rest[2] != 't' && rest[2] != 'T')
8dcf39c4 927 break;
e19e5e66
JK
928 if (rest[3] == '\0' || is_dir_sep(rest[3]))
929 return 0;
10ecfa76
JK
930 if (S_ISLNK(mode)) {
931 rest += 3;
932 if (skip_iprefix(rest, "modules", &rest) &&
933 (*rest == '\0' || is_dir_sep(*rest)))
934 return 0;
935 }
e19e5e66 936 break;
8dcf39c4 937 case '.':
e0f530ff 938 if (rest[1] == '\0' || is_dir_sep(rest[1]))
8dcf39c4
LT
939 return 0;
940 }
941 return 1;
942}
943
2a1ae649
RS
944static enum verify_path_result verify_path_internal(const char *path,
945 unsigned mode)
8dcf39c4 946{
49e268e2 947 char c = 0;
8dcf39c4 948
56948cb6 949 if (has_dos_drive_prefix(path))
2a1ae649 950 return PATH_INVALID;
56948cb6 951
d2c84dad 952 if (!is_valid_path(path))
2a1ae649 953 return PATH_INVALID;
d2c84dad 954
8dcf39c4
LT
955 goto inside;
956 for (;;) {
957 if (!c)
2a1ae649 958 return PATH_OK;
56948cb6 959 if (is_dir_sep(c)) {
8dcf39c4 960inside:
10ecfa76 961 if (protect_hfs) {
49e268e2 962
10ecfa76 963 if (is_hfs_dotgit(path))
2a1ae649 964 return PATH_INVALID;
10ecfa76
JK
965 if (S_ISLNK(mode)) {
966 if (is_hfs_dotgitmodules(path))
2a1ae649 967 return PATH_INVALID;
10ecfa76
JK
968 }
969 }
970 if (protect_ntfs) {
bccc37fd 971#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
49e268e2 972 if (c == '\\')
2a1ae649 973 return PATH_INVALID;
49e268e2 974#endif
10ecfa76 975 if (is_ntfs_dotgit(path))
2a1ae649 976 return PATH_INVALID;
10ecfa76
JK
977 if (S_ISLNK(mode)) {
978 if (is_ntfs_dotgitmodules(path))
2a1ae649 979 return PATH_INVALID;
10ecfa76
JK
980 }
981 }
982
8dcf39c4 983 c = *path++;
10ecfa76 984 if ((c == '.' && !verify_dotfile(path, mode)) ||
6e773527 985 is_dir_sep(c))
2a1ae649 986 return PATH_INVALID;
6e773527
DS
987 /*
988 * allow terminating directory separators for
989 * sparse directory entries.
990 */
991 if (c == '\0')
2a1ae649
RS
992 return S_ISDIR(mode) ? PATH_DIR_WITH_SEP :
993 PATH_INVALID;
288a74bc
JS
994 } else if (c == '\\' && protect_ntfs) {
995 if (is_ntfs_dotgit(path))
2a1ae649 996 return PATH_INVALID;
288a74bc
JS
997 if (S_ISLNK(mode)) {
998 if (is_ntfs_dotgitmodules(path))
2a1ae649 999 return PATH_INVALID;
288a74bc 1000 }
8dcf39c4 1001 }
288a74bc 1002
8dcf39c4
LT
1003 c = *path++;
1004 }
1005}
1006
12676608
LT
1007/*
1008 * Do we have another file that has the beginning components being a
1009 * proper superset of the name we're trying to add?
0f1e4f04 1010 */
4aab5b46
JH
1011static int has_file_name(struct index_state *istate,
1012 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 1013{
12676608
LT
1014 int retval = 0;
1015 int len = ce_namelen(ce);
b155725d 1016 int stage = ce_stage(ce);
12676608 1017 const char *name = ce->name;
0f1e4f04 1018
4aab5b46
JH
1019 while (pos < istate->cache_nr) {
1020 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 1021
12676608 1022 if (len >= ce_namelen(p))
0f1e4f04 1023 break;
12676608
LT
1024 if (memcmp(name, p->name, len))
1025 break;
b155725d
JH
1026 if (ce_stage(p) != stage)
1027 continue;
12676608
LT
1028 if (p->name[len] != '/')
1029 continue;
7a51ed66 1030 if (p->ce_flags & CE_REMOVE)
21cd8d00 1031 continue;
12676608
LT
1032 retval = -1;
1033 if (!ok_to_replace)
1034 break;
4aab5b46 1035 remove_index_entry_at(istate, --pos);
0f1e4f04 1036 }
12676608
LT
1037 return retval;
1038}
0f1e4f04 1039
a6db3fbb
JH
1040
1041/*
1042 * Like strcmp(), but also return the offset of the first change.
1043 * If strings are equal, return the length.
1044 */
1045int strcmp_offset(const char *s1, const char *s2, size_t *first_change)
1046{
1047 size_t k;
1048
1049 if (!first_change)
1050 return strcmp(s1, s2);
1051
1052 for (k = 0; s1[k] == s2[k]; k++)
1053 if (s1[k] == '\0')
1054 break;
1055
1056 *first_change = k;
1057 return (unsigned char)s1[k] - (unsigned char)s2[k];
1058}
1059
12676608
LT
1060/*
1061 * Do we have another file with a pathname that is a proper
1062 * subset of the name we're trying to add?
06b6d81b
JH
1063 *
1064 * That is, is there another file in the index with a path
1065 * that matches a sub-directory in the given entry?
12676608 1066 */
4aab5b46
JH
1067static int has_dir_name(struct index_state *istate,
1068 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
1069{
1070 int retval = 0;
b155725d 1071 int stage = ce_stage(ce);
12676608
LT
1072 const char *name = ce->name;
1073 const char *slash = name + ce_namelen(ce);
06b6d81b
JH
1074 size_t len_eq_last;
1075 int cmp_last = 0;
1076
1077 /*
1078 * We are frequently called during an iteration on a sorted
1079 * list of pathnames and while building a new index. Therefore,
1080 * there is a high probability that this entry will eventually
1081 * be appended to the index, rather than inserted in the middle.
1082 * If we can confirm that, we can avoid binary searches on the
1083 * components of the pathname.
1084 *
1085 * Compare the entry's full path with the last path in the index.
1086 */
1087 if (istate->cache_nr > 0) {
1088 cmp_last = strcmp_offset(name,
1089 istate->cache[istate->cache_nr - 1]->name,
1090 &len_eq_last);
1091 if (cmp_last > 0) {
1092 if (len_eq_last == 0) {
1093 /*
1094 * The entry sorts AFTER the last one in the
1095 * index and their paths have no common prefix,
1096 * so there cannot be a F/D conflict.
1097 */
1098 return retval;
1099 } else {
1100 /*
1101 * The entry sorts AFTER the last one in the
1102 * index, but has a common prefix. Fall through
1103 * to the loop below to disect the entry's path
1104 * and see where the difference is.
1105 */
1106 }
1107 } else if (cmp_last == 0) {
1108 /*
1109 * The entry exactly matches the last one in the
1110 * index, but because of multiple stage and CE_REMOVE
1111 * items, we fall through and let the regular search
1112 * code handle it.
1113 */
1114 }
1115 }
0f1e4f04 1116
12676608 1117 for (;;) {
b986df5c 1118 size_t len;
0f1e4f04 1119
12676608
LT
1120 for (;;) {
1121 if (*--slash == '/')
1122 break;
1123 if (slash <= ce->name)
1124 return retval;
1125 }
1126 len = slash - name;
0f1e4f04 1127
b986df5c
JH
1128 if (cmp_last > 0) {
1129 /*
1130 * (len + 1) is a directory boundary (including
1131 * the trailing slash). And since the loop is
1132 * decrementing "slash", the first iteration is
1133 * the longest directory prefix; subsequent
1134 * iterations consider parent directories.
1135 */
1136
1137 if (len + 1 <= len_eq_last) {
1138 /*
1139 * The directory prefix (including the trailing
1140 * slash) also appears as a prefix in the last
1141 * entry, so the remainder cannot collide (because
1142 * strcmp said the whole path was greater).
1143 *
1144 * EQ: last: xxx/A
1145 * this: xxx/B
1146 *
1147 * LT: last: xxx/file_A
1148 * this: xxx/file_B
1149 */
1150 return retval;
1151 }
1152
1153 if (len > len_eq_last) {
1154 /*
1155 * This part of the directory prefix (excluding
1156 * the trailing slash) is longer than the known
1157 * equal portions, so this sub-directory cannot
1158 * collide with a file.
1159 *
1160 * GT: last: xxxA
1161 * this: xxxB/file
1162 */
1163 return retval;
1164 }
1165
b986df5c
JH
1166 /*
1167 * This is a possible collision. Fall through and
1168 * let the regular search code handle it.
1169 *
1170 * last: xxx
1171 * this: xxx/file
1172 */
1173 }
1174
20ec2d03 1175 pos = index_name_stage_pos(istate, name, len, stage, EXPAND_SPARSE);
12676608 1176 if (pos >= 0) {
21cd8d00
JH
1177 /*
1178 * Found one, but not so fast. This could
1179 * be a marker that says "I was here, but
1180 * I am being removed". Such an entry is
1181 * not a part of the resulting tree, and
1182 * it is Ok to have a directory at the same
1183 * path.
1184 */
077c48df 1185 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
1186 retval = -1;
1187 if (!ok_to_replace)
1188 break;
4aab5b46 1189 remove_index_entry_at(istate, pos);
21cd8d00
JH
1190 continue;
1191 }
12676608 1192 }
21cd8d00
JH
1193 else
1194 pos = -pos-1;
12676608
LT
1195
1196 /*
1197 * Trivial optimization: if we find an entry that
1198 * already matches the sub-directory, then we know
b155725d 1199 * we're ok, and we can exit.
12676608 1200 */
4aab5b46
JH
1201 while (pos < istate->cache_nr) {
1202 struct cache_entry *p = istate->cache[pos];
b155725d
JH
1203 if ((ce_namelen(p) <= len) ||
1204 (p->name[len] != '/') ||
1205 memcmp(p->name, name, len))
1206 break; /* not our subdirectory */
077c48df
JH
1207 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
1208 /*
1209 * p is at the same stage as our entry, and
b155725d
JH
1210 * is a subdirectory of what we are looking
1211 * at, so we cannot have conflicts at our
1212 * level or anything shorter.
1213 */
1214 return retval;
1215 pos++;
192268c1 1216 }
0f1e4f04 1217 }
12676608
LT
1218 return retval;
1219}
1220
1221/* We may be in a situation where we already have path/file and path
1222 * is being added, or we already have path and path/file is being
1223 * added. Either one would result in a nonsense tree that has path
1224 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 1225 *
12676608
LT
1226 * If ok-to-replace is specified, we remove the conflicting entries
1227 * from the cache so the caller should recompute the insert position.
1228 * When this happens, we return non-zero.
1229 */
4aab5b46
JH
1230static int check_file_directory_conflict(struct index_state *istate,
1231 const struct cache_entry *ce,
1232 int pos, int ok_to_replace)
12676608 1233{
21cd8d00
JH
1234 int retval;
1235
1236 /*
1237 * When ce is an "I am going away" entry, we allow it to be added
1238 */
7a51ed66 1239 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
1240 return 0;
1241
12676608
LT
1242 /*
1243 * We check if the path is a sub-path of a subsequent pathname
1244 * first, since removing those will not change the position
21cd8d00 1245 * in the array.
12676608 1246 */
4aab5b46 1247 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 1248
12676608
LT
1249 /*
1250 * Then check if the path might have a clashing sub-directory
1251 * before it.
1252 */
4aab5b46 1253 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
1254}
1255
af3785dc 1256static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
1257{
1258 int pos;
192268c1
JH
1259 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1260 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 1261 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 1262 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 1263
e5494631
JH
1264 /*
1265 * If this entry's path sorts after the last entry in the index,
1266 * we can avoid searching for it.
1267 */
1268 if (istate->cache_nr > 0 &&
1269 strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
c097b95a 1270 pos = index_pos_to_insert_pos(istate->cache_nr);
e5494631 1271 else
20ec2d03 1272 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
197ee8c9 1273
c35e9f5e
VD
1274 /*
1275 * Cache tree path should be invalidated only after index_name_stage_pos,
1276 * in case it expands a sparse index.
1277 */
1278 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1279 cache_tree_invalidate_path(istate, ce->name);
1280
3e09cdfd 1281 /* existing match? Just replace it. */
76e7f4ec 1282 if (pos >= 0) {
39425819
JH
1283 if (!new_only)
1284 replace_index_entry(istate, pos, ce);
197ee8c9
LT
1285 return 0;
1286 }
76e7f4ec 1287 pos = -pos-1;
197ee8c9 1288
ffcc9ba7
NTND
1289 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1290 untracked_cache_add_to_index(istate, ce->name);
e931371a 1291
7b937ca3
LT
1292 /*
1293 * Inserting a merged entry ("stage 0") into the index
1294 * will always replace all non-merged entries..
1295 */
4aab5b46
JH
1296 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1297 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 1298 ok_to_add = 1;
4aab5b46 1299 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
1300 break;
1301 }
1302 }
1303
121481ab
LT
1304 if (!ok_to_add)
1305 return -1;
c8ad9d04 1306 if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
9d0a9e90 1307 return error(_("invalid path '%s'"), ce->name);
121481ab 1308
3e09cdfd 1309 if (!skip_df_check &&
4aab5b46 1310 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 1311 if (!ok_to_replace)
9d0a9e90 1312 return error(_("'%s' appears as both a file and as a directory"),
4aab5b46 1313 ce->name);
20ec2d03 1314 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
192268c1
JH
1315 pos = -pos-1;
1316 }
af3785dc
JH
1317 return pos + 1;
1318}
1319
1320int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1321{
1322 int pos;
1323
1324 if (option & ADD_CACHE_JUST_APPEND)
1325 pos = istate->cache_nr;
1326 else {
1327 int ret;
1328 ret = add_index_entry_with_check(istate, ce, option);
1329 if (ret <= 0)
1330 return ret;
1331 pos = ret - 1;
1332 }
0f1e4f04 1333
197ee8c9 1334 /* Make sure the array is big enough .. */
999f5660 1335 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
197ee8c9
LT
1336
1337 /* Add it in.. */
4aab5b46 1338 istate->cache_nr++;
af3785dc 1339 if (istate->cache_nr > pos + 1)
f919ffeb
SG
1340 MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos,
1341 istate->cache_nr - pos - 1);
cf558704 1342 set_index_entry(istate, pos, ce);
e636a7b4 1343 istate->cache_changed |= CE_ENTRY_ADDED;
197ee8c9
LT
1344 return 0;
1345}
1346
405e5b2f
LT
1347/*
1348 * "refresh" does not calculate a new sha1 file or bring the
1349 * cache up-to-date for mode/content changes. But what it
1350 * _does_ do is to "re-match" the stat information of a file
1351 * with the cache, so that you can refresh the cache for a
1352 * file that hasn't been changed but where the stat entry is
1353 * out of date.
1354 *
1355 * For example, you'd want to do this after doing a "git-read-tree",
1356 * to link up the stat cache details with the proper files.
1357 */
4aab5b46 1358static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da 1359 struct cache_entry *ce,
d05e6970 1360 unsigned int options, int *err,
a98e0f2d 1361 int *changed_ret,
15268d12
JH
1362 int *t2_did_lstat,
1363 int *t2_did_scan)
405e5b2f
LT
1364{
1365 struct stat st;
1366 struct cache_entry *updated;
a849735b 1367 int changed;
25762726 1368 int refresh = options & CE_MATCH_REFRESH;
4bd5b7da 1369 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 1370 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
2e2e7ec1 1371 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
883e248b 1372 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
405e5b2f 1373
25762726 1374 if (!refresh || ce_uptodate(ce))
eadb5831
JH
1375 return ce;
1376
883e248b
BP
1377 if (!ignore_fsmonitor)
1378 refresh_fsmonitor(istate);
aa9349d4 1379 /*
56cac48c
NTND
1380 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1381 * that the change to the work tree does not matter and told
1382 * us not to worry.
aa9349d4 1383 */
56cac48c
NTND
1384 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1385 ce_mark_uptodate(ce);
1386 return ce;
1387 }
aa9349d4
MSO
1388 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1389 ce_mark_uptodate(ce);
1390 return ce;
1391 }
883e248b
BP
1392 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) {
1393 ce_mark_uptodate(ce);
1394 return ce;
1395 }
aa9349d4 1396
ccad42d4
RS
1397 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1398 if (ignore_missing)
1399 return ce;
1400 if (err)
1401 *err = ENOENT;
1402 return NULL;
1403 }
1404
a98e0f2d
JH
1405 if (t2_did_lstat)
1406 *t2_did_lstat = 1;
8fd2cb40 1407 if (lstat(ce->name, &st) < 0) {
2e2e7ec1
BK
1408 if (ignore_missing && errno == ENOENT)
1409 return ce;
ec0cc704
JH
1410 if (err)
1411 *err = errno;
8fd2cb40
JS
1412 return NULL;
1413 }
405e5b2f 1414
4bd5b7da 1415 changed = ie_match_stat(istate, ce, &st, options);
d05e6970
JK
1416 if (changed_ret)
1417 *changed_ret = changed;
405e5b2f 1418 if (!changed) {
4bd5b7da
JH
1419 /*
1420 * The path is unchanged. If we were told to ignore
1421 * valid bit, then we did the actual stat check and
1422 * found that the entry is unmodified. If the entry
1423 * is not marked VALID, this is the place to mark it
1424 * valid again, under "assume unchanged" mode.
1425 */
1426 if (ignore_valid && assume_unchanged &&
7a51ed66 1427 !(ce->ce_flags & CE_VALID))
405e5b2f 1428 ; /* mark this one VALID again */
eadb5831
JH
1429 else {
1430 /*
1431 * We do not mark the index itself "modified"
1432 * because CE_UPTODATE flag is in-core only;
1433 * we are not going to write this change out.
1434 */
883e248b 1435 if (!S_ISGITLINK(ce->ce_mode)) {
125fd984 1436 ce_mark_uptodate(ce);
b5a81697 1437 mark_fsmonitor_valid(istate, ce);
883e248b 1438 }
8fd2cb40 1439 return ce;
eadb5831 1440 }
405e5b2f
LT
1441 }
1442
15268d12
JH
1443 if (t2_did_scan)
1444 *t2_did_scan = 1;
4bd5b7da 1445 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1446 if (err)
1447 *err = EINVAL;
8fd2cb40
JS
1448 return NULL;
1449 }
405e5b2f 1450
a849735b 1451 updated = make_empty_cache_entry(istate, ce_namelen(ce));
0e267b7a
BP
1452 copy_cache_entry(updated, ce);
1453 memcpy(updated->name, ce->name, ce->ce_namelen + 1);
d4c0a3ac 1454 fill_stat_cache_info(istate, updated, &st);
4bd5b7da
JH
1455 /*
1456 * If ignore_valid is not set, we should leave CE_VALID bit
1457 * alone. Otherwise, paths marked with --no-assume-unchanged
1458 * (i.e. things to be edited) will reacquire CE_VALID bit
1459 * automatically, which is not really what we want.
405e5b2f 1460 */
4bd5b7da 1461 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1462 !(ce->ce_flags & CE_VALID))
1463 updated->ce_flags &= ~CE_VALID;
405e5b2f 1464
e636a7b4 1465 /* istate->cache_changed is updated in the caller */
405e5b2f
LT
1466 return updated;
1467}
1468
3deffc52 1469static void show_file(const char * fmt, const char * name, int in_porcelain,
046613c5 1470 int * first, const char *header_msg)
3deffc52
MM
1471{
1472 if (in_porcelain && *first && header_msg) {
1473 printf("%s\n", header_msg);
cd2b8ae9 1474 *first = 0;
3deffc52
MM
1475 }
1476 printf(fmt, name);
1477}
1478
22184497
TG
1479int repo_refresh_and_write_index(struct repository *repo,
1480 unsigned int refresh_flags,
1481 unsigned int write_flags,
1482 int gentle,
1483 const struct pathspec *pathspec,
1484 char *seen, const char *header_msg)
1485{
1486 struct lock_file lock_file = LOCK_INIT;
1487 int fd, ret = 0;
1488
1489 fd = repo_hold_locked_index(repo, &lock_file, 0);
1490 if (!gentle && fd < 0)
1491 return -1;
1492 if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg))
1493 ret = 1;
1494 if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags))
1495 ret = -1;
1496 return ret;
1497}
1498
1499
9b2d6149
NTND
1500int refresh_index(struct index_state *istate, unsigned int flags,
1501 const struct pathspec *pathspec,
046613c5 1502 char *seen, const char *header_msg)
405e5b2f
LT
1503{
1504 int i;
1505 int has_errors = 0;
1506 int really = (flags & REFRESH_REALLY) != 0;
1507 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1508 int quiet = (flags & REFRESH_QUIET) != 0;
1509 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1510 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
b243012c 1511 int ignore_skip_worktree = (flags & REFRESH_IGNORE_SKIP_WORKTREE) != 0;
3deffc52
MM
1512 int first = 1;
1513 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
25762726
BK
1514 unsigned int options = (CE_MATCH_REFRESH |
1515 (really ? CE_MATCH_IGNORE_VALID : 0) |
2e2e7ec1 1516 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
4bd4e730 1517 const char *modified_fmt;
73b7eae6
JK
1518 const char *deleted_fmt;
1519 const char *typechange_fmt;
1520 const char *added_fmt;
4bd4e730 1521 const char *unmerged_fmt;
ae9af122 1522 struct progress *progress = NULL;
a98e0f2d 1523 int t2_sum_lstat = 0;
15268d12 1524 int t2_sum_scan = 0;
ae9af122
NTND
1525
1526 if (flags & REFRESH_PROGRESS && isatty(2))
1527 progress = start_delayed_progress(_("Refresh index"),
1528 istate->cache_nr);
405e5b2f 1529
c46c406a 1530 trace_performance_enter();
a71806a7
NTND
1531 modified_fmt = in_porcelain ? "M\t%s\n" : "%s: needs update\n";
1532 deleted_fmt = in_porcelain ? "D\t%s\n" : "%s: needs update\n";
1533 typechange_fmt = in_porcelain ? "T\t%s\n" : "%s: needs update\n";
1534 added_fmt = in_porcelain ? "A\t%s\n" : "%s: needs update\n";
1535 unmerged_fmt = in_porcelain ? "U\t%s\n" : "%s: needs merge\n";
99ce720c
BP
1536 /*
1537 * Use the multi-threaded preload_index() to refresh most of the
1538 * cache entries quickly then in the single threaded loop below,
1539 * we only have to do the special cases that are left.
1540 */
1541 preload_index(istate, pathspec, 0);
a98e0f2d 1542 trace2_region_enter("index", "refresh", NULL);
d76723ee 1543
4aab5b46 1544 for (i = 0; i < istate->cache_nr; i++) {
285c2e25 1545 struct cache_entry *ce, *new_entry;
ec0cc704 1546 int cache_errno = 0;
73b7eae6 1547 int changed = 0;
3d1f148c 1548 int filtered = 0;
a98e0f2d 1549 int t2_did_lstat = 0;
15268d12 1550 int t2_did_scan = 0;
ec0cc704 1551
4aab5b46 1552 ce = istate->cache[i];
5fdeacb0
JS
1553 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1554 continue;
b243012c
MT
1555 if (ignore_skip_worktree && ce_skip_worktree(ce))
1556 continue;
5fdeacb0 1557
d76723ee
DS
1558 /*
1559 * If this entry is a sparse directory, then there isn't
1560 * any stat() information to update. Ignore the entry.
1561 */
1562 if (S_ISSPARSEDIR(ce->ce_mode))
1563 continue;
1564
d7b665c3 1565 if (pathspec && !ce_path_match(istate, ce, pathspec, seen))
3d1f148c
JH
1566 filtered = 1;
1567
405e5b2f 1568 if (ce_stage(ce)) {
4aab5b46
JH
1569 while ((i < istate->cache_nr) &&
1570 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1571 i++;
1572 i--;
1573 if (allow_unmerged)
1574 continue;
3d1f148c
JH
1575 if (!filtered)
1576 show_file(unmerged_fmt, ce->name, in_porcelain,
1577 &first, header_msg);
405e5b2f
LT
1578 has_errors = 1;
1579 continue;
1580 }
1581
3d1f148c 1582 if (filtered)
d616813d
AJ
1583 continue;
1584
a98e0f2d
JH
1585 new_entry = refresh_cache_ent(istate, ce, options,
1586 &cache_errno, &changed,
15268d12 1587 &t2_did_lstat, &t2_did_scan);
a98e0f2d 1588 t2_sum_lstat += t2_did_lstat;
15268d12 1589 t2_sum_scan += t2_did_scan;
285c2e25 1590 if (new_entry == ce)
405e5b2f 1591 continue;
b7b793d1 1592 display_progress(progress, i);
285c2e25 1593 if (!new_entry) {
73b7eae6
JK
1594 const char *fmt;
1595
8fd2cb40 1596 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1597 /* If we are doing --really-refresh that
1598 * means the index is not valid anymore.
1599 */
7a51ed66 1600 ce->ce_flags &= ~CE_VALID;
078a58e8 1601 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 1602 mark_fsmonitor_invalid(istate, ce);
e636a7b4 1603 istate->cache_changed |= CE_ENTRY_CHANGED;
405e5b2f
LT
1604 }
1605 if (quiet)
1606 continue;
73b7eae6
JK
1607
1608 if (cache_errno == ENOENT)
1609 fmt = deleted_fmt;
895ff3b2 1610 else if (ce_intent_to_add(ce))
73b7eae6
JK
1611 fmt = added_fmt; /* must be before other checks */
1612 else if (changed & TYPE_CHANGED)
1613 fmt = typechange_fmt;
1614 else
1615 fmt = modified_fmt;
1616 show_file(fmt,
1617 ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1618 has_errors = 1;
1619 continue;
1620 }
cf558704 1621
285c2e25 1622 replace_index_entry(istate, i, new_entry);
405e5b2f 1623 }
a98e0f2d 1624 trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat);
15268d12 1625 trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
a98e0f2d 1626 trace2_region_leave("index", "refresh", NULL);
b7b793d1
ÆAB
1627 display_progress(progress, istate->cache_nr);
1628 stop_progress(&progress);
c46c406a 1629 trace_performance_leave("refresh index");
405e5b2f
LT
1630 return has_errors;
1631}
1632
768d7965
JM
1633struct cache_entry *refresh_cache_entry(struct index_state *istate,
1634 struct cache_entry *ce,
1635 unsigned int options)
ec0cc704 1636{
15268d12 1637 return refresh_cache_ent(istate, ce, options, NULL, NULL, NULL, NULL);
ec0cc704
JH
1638}
1639
db3b313c
JH
1640
1641/*****************************************************************
1642 * Index File I/O
1643 *****************************************************************/
1644
9d227781
JH
1645#define INDEX_FORMAT_DEFAULT 3
1646
7211b9e7 1647static unsigned int get_index_format_default(struct repository *r)
136347d7
TG
1648{
1649 char *envversion = getenv("GIT_INDEX_VERSION");
3c09d684
TG
1650 char *endp;
1651 unsigned int version = INDEX_FORMAT_DEFAULT;
1652
136347d7 1653 if (!envversion) {
7211b9e7
DS
1654 prepare_repo_settings(r);
1655
1656 if (r->settings.index_version >= 0)
1657 version = r->settings.index_version;
3c09d684
TG
1658 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1659 warning(_("index.version set, but the value is invalid.\n"
136347d7 1660 "Using version %i"), INDEX_FORMAT_DEFAULT);
3c09d684 1661 return INDEX_FORMAT_DEFAULT;
136347d7
TG
1662 }
1663 return version;
1664 }
3c09d684
TG
1665
1666 version = strtoul(envversion, &endp, 10);
1667 if (*endp ||
1668 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1669 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1670 "Using version %i"), INDEX_FORMAT_DEFAULT);
1671 version = INDEX_FORMAT_DEFAULT;
1672 }
1673 return version;
136347d7
TG
1674}
1675
db3b313c
JH
1676/*
1677 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1678 * Again - this is just a (very strong in practice) heuristic that
1679 * the inode hasn't changed.
1680 *
1681 * We save the fields in big-endian order to allow using the
1682 * index file over NFS transparently.
1683 */
1684struct ondisk_cache_entry {
1685 struct cache_time ctime;
1686 struct cache_time mtime;
7800c1eb
TG
1687 uint32_t dev;
1688 uint32_t ino;
1689 uint32_t mode;
1690 uint32_t uid;
1691 uint32_t gid;
1692 uint32_t size;
575fa8a3 1693 /*
1694 * unsigned char hash[hashsz];
1695 * uint16_t flags;
1696 * if (flags & CE_EXTENDED)
1697 * uint16_t flags2;
1698 */
1699 unsigned char data[GIT_MAX_RAWSZ + 2 * sizeof(uint16_t)];
1700 char name[FLEX_ARRAY];
db3b313c
JH
1701};
1702
6c9cd161 1703/* These are only used for v3 or lower */
ce012deb 1704#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
575fa8a3 1705#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
db3b313c 1706#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
575fa8a3 1707#define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1708 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1709#define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1710#define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
db3b313c 1711
a33fc72f
JH
1712/* Allow fsck to force verification of the index checksum. */
1713int verify_index_checksum;
1714
00ec50e5
BP
1715/* Allow fsck to force verification of the cache entry order. */
1716int verify_ce_order;
1717
371ed0de 1718static int verify_hdr(const struct cache_header *hdr, unsigned long size)
e83c5163 1719{
aab61359 1720 git_hash_ctx c;
1721 unsigned char hash[GIT_MAX_RAWSZ];
0136bac9 1722 int hdr_version;
ee1f0c24
DS
1723 unsigned char *start, *end;
1724 struct object_id oid;
e83c5163 1725
ccc4feb5 1726 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
9d0a9e90 1727 return error(_("bad signature 0x%08x"), hdr->hdr_signature);
0136bac9 1728 hdr_version = ntohl(hdr->hdr_version);
b82a7b5b 1729 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
9d0a9e90 1730 return error(_("bad index version %d"), hdr_version);
a33fc72f
JH
1731
1732 if (!verify_index_checksum)
1733 return 0;
1734
ee1f0c24
DS
1735 end = (unsigned char *)hdr + size;
1736 start = end - the_hash_algo->rawsz;
1737 oidread(&oid, start);
1738 if (oideq(&oid, null_oid()))
1739 return 0;
1740
aab61359 1741 the_hash_algo->init_fn(&c);
1742 the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
1743 the_hash_algo->final_fn(hash, &c);
ee1f0c24 1744 if (!hasheq(hash, start))
9d0a9e90 1745 return error(_("bad index file sha1 signature"));
e83c5163
LT
1746 return 0;
1747}
1748
4aab5b46 1749static int read_index_extension(struct index_state *istate,
371ed0de 1750 const char *ext, const char *data, unsigned long sz)
bad68ec9
JH
1751{
1752 switch (CACHE_EXT(ext)) {
1753 case CACHE_EXT_TREE:
4aab5b46 1754 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9 1755 break;
cfc5789a
JH
1756 case CACHE_EXT_RESOLVE_UNDO:
1757 istate->resolve_undo = resolve_undo_read(data, sz);
1758 break;
5fc2fc8f
NTND
1759 case CACHE_EXT_LINK:
1760 if (read_link_extension(istate, data, sz))
1761 return -1;
1762 break;
f9e6c649
NTND
1763 case CACHE_EXT_UNTRACKED:
1764 istate->untracked = read_untracked_extension(data, sz);
1765 break;
883e248b
BP
1766 case CACHE_EXT_FSMONITOR:
1767 read_fsmonitor_extension(istate, data, sz);
1768 break;
3b1d9e04 1769 case CACHE_EXT_ENDOFINDEXENTRIES:
3255089a 1770 case CACHE_EXT_INDEXENTRYOFFSETTABLE:
3b1d9e04
BP
1771 /* already handled in do_read_index() */
1772 break;
cd42415f
DS
1773 case CACHE_EXT_SPARSE_DIRECTORIES:
1774 /* no content, only an indicator */
9fadb373 1775 istate->sparse_index = INDEX_COLLAPSED;
cd42415f 1776 break;
bad68ec9
JH
1777 default:
1778 if (*ext < 'A' || 'Z' < *ext)
9d0a9e90 1779 return error(_("index uses %.4s extension, which we do not understand"),
bad68ec9 1780 ext);
9d0a9e90 1781 fprintf_ln(stderr, _("ignoring %.4s extension"), ext);
bad68ec9
JH
1782 break;
1783 }
1784 return 0;
1785}
1786
4a6ed30f
VD
1787/*
1788 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1789 * into a new incore 'cache_entry'.
1790 *
1791 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1792 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1793 * its members. Instead, we use the byte offsets of members within the struct to
1794 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1795 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1796 * into the corresponding incore 'cache_entry' members.
1797 */
77ff1127
BP
1798static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
1799 unsigned int version,
4a6ed30f 1800 const char *ondisk,
6c9cd161 1801 unsigned long *ent_size,
252d079c 1802 const struct cache_entry *previous_ce)
7a51ed66 1803{
debed2a6 1804 struct cache_entry *ce;
7fec10b7 1805 size_t len;
06aaaa0b 1806 const char *name;
575fa8a3 1807 const unsigned hashsz = the_hash_algo->rawsz;
4a6ed30f 1808 const char *flagsp = ondisk + offsetof(struct ondisk_cache_entry, data) + hashsz;
debed2a6 1809 unsigned int flags;
f5c4a9af 1810 size_t copy_len = 0;
252d079c
NTND
1811 /*
1812 * Adjacent cache entries tend to share the leading paths, so it makes
1813 * sense to only store the differences in later entries. In the v4
1814 * on-disk format of the index, each on-disk cache entry stores the
1815 * number of bytes to be stripped from the end of the previous name,
1816 * and the bytes to append to the result, to come up with its name.
1817 */
77ff1127 1818 int expand_name_field = version == 4;
7fec10b7 1819
7a51ed66 1820 /* On-disk flags are just 16 bits */
575fa8a3 1821 flags = get_be16(flagsp);
debed2a6 1822 len = flags & CE_NAMEMASK;
7fec10b7 1823
debed2a6 1824 if (flags & CE_EXTENDED) {
06aaaa0b 1825 int extended_flags;
4a6ed30f 1826 extended_flags = get_be16(flagsp + sizeof(uint16_t)) << 16;
06aaaa0b
NTND
1827 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1828 if (extended_flags & ~CE_EXTENDED_FLAGS)
9d0a9e90 1829 die(_("unknown index entry format 0x%08x"), extended_flags);
debed2a6 1830 flags |= extended_flags;
4a6ed30f 1831 name = (const char *)(flagsp + 2 * sizeof(uint16_t));
06aaaa0b
NTND
1832 }
1833 else
4a6ed30f 1834 name = (const char *)(flagsp + sizeof(uint16_t));
06aaaa0b 1835
252d079c
NTND
1836 if (expand_name_field) {
1837 const unsigned char *cp = (const unsigned char *)name;
1838 size_t strip_len, previous_len;
6c9cd161 1839
15beaaa3 1840 /* If we're at the beginning of a block, ignore the previous name */
252d079c 1841 strip_len = decode_varint(&cp);
77ff1127
BP
1842 if (previous_ce) {
1843 previous_len = previous_ce->ce_namelen;
1844 if (previous_len < strip_len)
252d079c 1845 die(_("malformed name field in the index, near path '%s'"),
77ff1127
BP
1846 previous_ce->name);
1847 copy_len = previous_len - strip_len;
252d079c 1848 }
252d079c
NTND
1849 name = (const char *)cp;
1850 }
6c9cd161 1851
252d079c
NTND
1852 if (len == CE_NAMEMASK) {
1853 len = strlen(name);
1854 if (expand_name_field)
1855 len += copy_len;
1856 }
6c9cd161 1857
77ff1127 1858 ce = mem_pool__ce_alloc(ce_mem_pool, len);
252d079c 1859
4a6ed30f
VD
1860 /*
1861 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1862 * with something more akin to 'load_bitmap_entries_v1()'s use of
1863 * 'read_be16'/'read_be32'. For consistency with the corresponding
1864 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1865 * should be done at the same time as removing references to
1866 * 'ondisk_cache_entry' there.
1867 */
1868 ce->ce_stat_data.sd_ctime.sec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ctime)
1869 + offsetof(struct cache_time, sec));
1870 ce->ce_stat_data.sd_mtime.sec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mtime)
1871 + offsetof(struct cache_time, sec));
1872 ce->ce_stat_data.sd_ctime.nsec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ctime)
1873 + offsetof(struct cache_time, nsec));
1874 ce->ce_stat_data.sd_mtime.nsec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mtime)
1875 + offsetof(struct cache_time, nsec));
1876 ce->ce_stat_data.sd_dev = get_be32(ondisk + offsetof(struct ondisk_cache_entry, dev));
1877 ce->ce_stat_data.sd_ino = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ino));
1878 ce->ce_mode = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mode));
1879 ce->ce_stat_data.sd_uid = get_be32(ondisk + offsetof(struct ondisk_cache_entry, uid));
1880 ce->ce_stat_data.sd_gid = get_be32(ondisk + offsetof(struct ondisk_cache_entry, gid));
1881 ce->ce_stat_data.sd_size = get_be32(ondisk + offsetof(struct ondisk_cache_entry, size));
252d079c
NTND
1882 ce->ce_flags = flags & ~CE_NAMEMASK;
1883 ce->ce_namelen = len;
1884 ce->index = 0;
4a6ed30f 1885 oidread(&ce->oid, (const unsigned char *)ondisk + offsetof(struct ondisk_cache_entry, data));
6c9cd161 1886
252d079c
NTND
1887 if (expand_name_field) {
1888 if (copy_len)
1889 memcpy(ce->name, previous_ce->name, copy_len);
1890 memcpy(ce->name + copy_len, name, len + 1 - copy_len);
1891 *ent_size = (name - ((char *)ondisk)) + len + 1 - copy_len;
1892 } else {
1893 memcpy(ce->name, name, len + 1);
1894 *ent_size = ondisk_ce_size(ce);
6c9cd161 1895 }
debed2a6 1896 return ce;
cf558704
LT
1897}
1898
03f15a79 1899static void check_ce_order(struct index_state *istate)
15999d0b 1900{
03f15a79
TG
1901 unsigned int i;
1902
00ec50e5
BP
1903 if (!verify_ce_order)
1904 return;
1905
03f15a79
TG
1906 for (i = 1; i < istate->cache_nr; i++) {
1907 struct cache_entry *ce = istate->cache[i - 1];
1908 struct cache_entry *next_ce = istate->cache[i];
1909 int name_compare = strcmp(ce->name, next_ce->name);
1910
1911 if (0 < name_compare)
9d0a9e90 1912 die(_("unordered stage entries in index"));
03f15a79
TG
1913 if (!name_compare) {
1914 if (!ce_stage(ce))
9d0a9e90 1915 die(_("multiple stage entries for merged file '%s'"),
03f15a79
TG
1916 ce->name);
1917 if (ce_stage(ce) > ce_stage(next_ce))
9d0a9e90 1918 die(_("unordered stage entries for '%s'"),
03f15a79
TG
1919 ce->name);
1920 }
15999d0b
JSP
1921 }
1922}
1923
435ec090
CC
1924static void tweak_untracked_cache(struct index_state *istate)
1925{
ad0fb659
DS
1926 struct repository *r = the_repository;
1927
1928 prepare_repo_settings(r);
1929
f1bee828
ÆAB
1930 switch (r->settings.core_untracked_cache) {
1931 case UNTRACKED_CACHE_REMOVE:
435ec090 1932 remove_untracked_cache(istate);
f1bee828
ÆAB
1933 break;
1934 case UNTRACKED_CACHE_WRITE:
ad0fb659 1935 add_untracked_cache(istate);
f1bee828
ÆAB
1936 break;
1937 case UNTRACKED_CACHE_KEEP:
3050b6df
ÆAB
1938 /*
1939 * Either an explicit "core.untrackedCache=keep", the
1940 * default if "core.untrackedCache" isn't configured,
1941 * or a fallback on an unknown "core.untrackedCache"
1942 * value.
1943 */
f1bee828 1944 break;
f1bee828 1945 }
435ec090
CC
1946}
1947
43925312
CC
1948static void tweak_split_index(struct index_state *istate)
1949{
1950 switch (git_config_get_split_index()) {
1951 case -1: /* unset: do nothing */
1952 break;
1953 case 0: /* false */
1954 remove_split_index(istate);
1955 break;
1956 case 1: /* true */
1957 add_split_index(istate);
1958 break;
1959 default: /* unknown value: do nothing */
1960 break;
1961 }
1962}
1963
435ec090
CC
1964static void post_read_index_from(struct index_state *istate)
1965{
1966 check_ce_order(istate);
1967 tweak_untracked_cache(istate);
43925312 1968 tweak_split_index(istate);
883e248b 1969 tweak_fsmonitor(istate);
435ec090
CC
1970}
1971
8e72d675
JM
1972static size_t estimate_cache_size_from_compressed(unsigned int entries)
1973{
1974 return entries * (sizeof(struct cache_entry) + CACHE_ENTRY_PATH_LENGTH);
1975}
1976
1977static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
1978{
1979 long per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);
1980
1981 /*
1982 * Account for potential alignment differences.
1983 */
c097b95a 1984 per_entry += align_padding_size(per_entry, 0);
8e72d675
JM
1985 return ondisk_size + entries * per_entry;
1986}
1987
3255089a
BP
1988struct index_entry_offset
1989{
1990 /* starting byte offset into index file, count of index entries in this block */
1991 int offset, nr;
1992};
1993
1994struct index_entry_offset_table
1995{
1996 int nr;
1997 struct index_entry_offset entries[FLEX_ARRAY];
1998};
1999
3255089a
BP
2000static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset);
2001static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot);
3255089a 2002
3b1d9e04
BP
2003static size_t read_eoie_extension(const char *mmap, size_t mmap_size);
2004static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset);
2005
abb4bb83
BP
2006struct load_index_extensions
2007{
abb4bb83 2008 pthread_t pthread;
abb4bb83
BP
2009 struct index_state *istate;
2010 const char *mmap;
2011 size_t mmap_size;
2012 unsigned long src_offset;
2013};
2014
2015static void *load_index_extensions(void *_data)
2016{
2017 struct load_index_extensions *p = _data;
2018 unsigned long src_offset = p->src_offset;
2019
2020 while (src_offset <= p->mmap_size - the_hash_algo->rawsz - 8) {
2021 /* After an array of active_nr index entries,
2022 * there can be arbitrary number of extended
2023 * sections, each of which is prefixed with
2024 * extension name (4-byte) and section length
2025 * in 4-byte network byte order.
2026 */
2027 uint32_t extsize = get_be32(p->mmap + src_offset + 4);
2028 if (read_index_extension(p->istate,
2029 p->mmap + src_offset,
2030 p->mmap + src_offset + 8,
2031 extsize) < 0) {
2032 munmap((void *)p->mmap, p->mmap_size);
2033 die(_("index file corrupt"));
2034 }
2035 src_offset += 8;
2036 src_offset += extsize;
2037 }
2038
2039 return NULL;
2040}
2041
77ff1127
BP
2042/*
2043 * A helper function that will load the specified range of cache entries
2044 * from the memory mapped file and add them to the given index.
2045 */
2046static unsigned long load_cache_entry_block(struct index_state *istate,
2047 struct mem_pool *ce_mem_pool, int offset, int nr, const char *mmap,
2048 unsigned long start_offset, const struct cache_entry *previous_ce)
2049{
2050 int i;
2051 unsigned long src_offset = start_offset;
2052
2053 for (i = offset; i < offset + nr; i++) {
77ff1127
BP
2054 struct cache_entry *ce;
2055 unsigned long consumed;
2056
4a6ed30f
VD
2057 ce = create_from_disk(ce_mem_pool, istate->version,
2058 mmap + src_offset,
2059 &consumed, previous_ce);
77ff1127
BP
2060 set_index_entry(istate, i, ce);
2061
2062 src_offset += consumed;
2063 previous_ce = ce;
2064 }
2065 return src_offset - start_offset;
2066}
2067
2068static unsigned long load_all_cache_entries(struct index_state *istate,
2069 const char *mmap, size_t mmap_size, unsigned long src_offset)
2070{
2071 unsigned long consumed;
2072
44c7e1a7 2073 istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
77ff1127 2074 if (istate->version == 4) {
44c7e1a7 2075 mem_pool_init(istate->ce_mem_pool,
77ff1127
BP
2076 estimate_cache_size_from_compressed(istate->cache_nr));
2077 } else {
44c7e1a7 2078 mem_pool_init(istate->ce_mem_pool,
77ff1127
BP
2079 estimate_cache_size(mmap_size, istate->cache_nr));
2080 }
2081
2082 consumed = load_cache_entry_block(istate, istate->ce_mem_pool,
2083 0, istate->cache_nr, mmap, src_offset, NULL);
2084 return consumed;
2085}
2086
3255089a
BP
2087/*
2088 * Mostly randomly chosen maximum thread counts: we
2089 * cap the parallelism to online_cpus() threads, and we want
2090 * to have at least 10000 cache entries per thread for it to
2091 * be worth starting a thread.
2092 */
2093
2094#define THREAD_COST (10000)
2095
77ff1127
BP
2096struct load_cache_entries_thread_data
2097{
2098 pthread_t pthread;
2099 struct index_state *istate;
2100 struct mem_pool *ce_mem_pool;
2101 int offset;
2102 const char *mmap;
2103 struct index_entry_offset_table *ieot;
2104 int ieot_start; /* starting index into the ieot array */
2105 int ieot_blocks; /* count of ieot entries to process */
2106 unsigned long consumed; /* return # of bytes in index file processed */
2107};
2108
2109/*
2110 * A thread proc to run the load_cache_entries() computation
2111 * across multiple background threads.
2112 */
2113static void *load_cache_entries_thread(void *_data)
2114{
2115 struct load_cache_entries_thread_data *p = _data;
2116 int i;
2117
2118 /* iterate across all ieot blocks assigned to this thread */
2119 for (i = p->ieot_start; i < p->ieot_start + p->ieot_blocks; i++) {
2120 p->consumed += load_cache_entry_block(p->istate, p->ce_mem_pool,
2121 p->offset, p->ieot->entries[i].nr, p->mmap, p->ieot->entries[i].offset, NULL);
2122 p->offset += p->ieot->entries[i].nr;
2123 }
2124 return NULL;
2125}
2126
2127static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size,
7bd9631b 2128 int nr_threads, struct index_entry_offset_table *ieot)
77ff1127
BP
2129{
2130 int i, offset, ieot_blocks, ieot_start, err;
2131 struct load_cache_entries_thread_data *data;
2132 unsigned long consumed = 0;
2133
2134 /* a little sanity checking */
2135 if (istate->name_hash_initialized)
2136 BUG("the name hash isn't thread safe");
2137
44c7e1a7
EN
2138 istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
2139 mem_pool_init(istate->ce_mem_pool, 0);
77ff1127
BP
2140
2141 /* ensure we have no more threads than we have blocks to process */
2142 if (nr_threads > ieot->nr)
2143 nr_threads = ieot->nr;
ca56dadb 2144 CALLOC_ARRAY(data, nr_threads);
77ff1127
BP
2145
2146 offset = ieot_start = 0;
2147 ieot_blocks = DIV_ROUND_UP(ieot->nr, nr_threads);
2148 for (i = 0; i < nr_threads; i++) {
2149 struct load_cache_entries_thread_data *p = &data[i];
2150 int nr, j;
2151
2152 if (ieot_start + ieot_blocks > ieot->nr)
2153 ieot_blocks = ieot->nr - ieot_start;
2154
2155 p->istate = istate;
2156 p->offset = offset;
2157 p->mmap = mmap;
2158 p->ieot = ieot;
2159 p->ieot_start = ieot_start;
2160 p->ieot_blocks = ieot_blocks;
2161
2162 /* create a mem_pool for each thread */
2163 nr = 0;
2164 for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++)
2165 nr += p->ieot->entries[j].nr;
bcd2c5ee 2166 p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
77ff1127 2167 if (istate->version == 4) {
44c7e1a7 2168 mem_pool_init(p->ce_mem_pool,
77ff1127
BP
2169 estimate_cache_size_from_compressed(nr));
2170 } else {
44c7e1a7 2171 mem_pool_init(p->ce_mem_pool,
77ff1127
BP
2172 estimate_cache_size(mmap_size, nr));
2173 }
2174
2175 err = pthread_create(&p->pthread, NULL, load_cache_entries_thread, p);
2176 if (err)
2177 die(_("unable to create load_cache_entries thread: %s"), strerror(err));
2178
2179 /* increment by the number of cache entries in the ieot block being processed */
2180 for (j = 0; j < ieot_blocks; j++)
2181 offset += ieot->entries[ieot_start + j].nr;
2182 ieot_start += ieot_blocks;
2183 }
2184
2185 for (i = 0; i < nr_threads; i++) {
2186 struct load_cache_entries_thread_data *p = &data[i];
2187
2188 err = pthread_join(p->pthread, NULL);
2189 if (err)
2190 die(_("unable to join load_cache_entries thread: %s"), strerror(err));
2191 mem_pool_combine(istate->ce_mem_pool, p->ce_mem_pool);
2192 consumed += p->consumed;
2193 }
2194
2195 free(data);
2196
2197 return consumed;
2198}
77ff1127 2199
491df5f6
VD
2200static void set_new_index_sparsity(struct index_state *istate)
2201{
2202 /*
2203 * If the index's repo exists, mark it sparse according to
2204 * repo settings.
2205 */
5bdf6d4a
ÆAB
2206 prepare_repo_settings(istate->repo);
2207 if (!istate->repo->settings.command_requires_full_index &&
2208 is_sparse_index_allowed(istate, 0))
2209 istate->sparse_index = 1;
491df5f6
VD
2210}
2211
8fd2cb40 2212/* remember to discard_cache() before reading a different cache! */
3e52f70b 2213int do_read_index(struct index_state *istate, const char *path, int must_exist)
e83c5163 2214{
77ff1127 2215 int fd;
e83c5163 2216 struct stat st;
debed2a6 2217 unsigned long src_offset;
371ed0de
BP
2218 const struct cache_header *hdr;
2219 const char *mmap;
7a51ed66 2220 size_t mmap_size;
abb4bb83
BP
2221 struct load_index_extensions p;
2222 size_t extension_offset = 0;
77ff1127
BP
2223 int nr_threads, cpus;
2224 struct index_entry_offset_table *ieot = NULL;
e83c5163 2225
913e0e99 2226 if (istate->initialized)
4aab5b46 2227 return istate->cache_nr;
5d1a5c02 2228
fba2f38a
KB
2229 istate->timestamp.sec = 0;
2230 istate->timestamp.nsec = 0;
8fd2cb40 2231 fd = open(path, O_RDONLY);
5d1a5c02 2232 if (fd < 0) {
491df5f6
VD
2233 if (!must_exist && errno == ENOENT) {
2234 set_new_index_sparsity(istate);
866b43e6 2235 istate->initialized = 1;
5d1a5c02 2236 return 0;
491df5f6 2237 }
9d0a9e90 2238 die_errno(_("%s: index file open failed"), path);
5d1a5c02 2239 }
e83c5163 2240
3511a377 2241 if (fstat(fd, &st))
9d0a9e90 2242 die_errno(_("%s: cannot stat the open index"), path);
3511a377 2243
7a51ed66 2244 mmap_size = xsize_t(st.st_size);
aab61359 2245 if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
9d0a9e90 2246 die(_("%s: index file smaller than expected"), path);
3511a377 2247
02638d1e 2248 mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
7a51ed66 2249 if (mmap == MAP_FAILED)
dc059294
EW
2250 die_errno(_("%s: unable to map index file%s"), path,
2251 mmap_os_err());
57d84f8d 2252 close(fd);
e83c5163 2253
371ed0de 2254 hdr = (const struct cache_header *)mmap;
7a51ed66 2255 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
2256 goto unmap;
2257
92e2cab9 2258 oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
9d227781 2259 istate->version = ntohl(hdr->hdr_version);
4aab5b46
JH
2260 istate->cache_nr = ntohl(hdr->hdr_entries);
2261 istate->cache_alloc = alloc_nr(istate->cache_nr);
ca56dadb 2262 CALLOC_ARRAY(istate->cache, istate->cache_alloc);
913e0e99 2263 istate->initialized = 1;
7a51ed66 2264
abb4bb83
BP
2265 p.istate = istate;
2266 p.mmap = mmap;
2267 p.mmap_size = mmap_size;
6c9cd161 2268
7a51ed66 2269 src_offset = sizeof(*hdr);
4aab5b46 2270
2a9dedef
JN
2271 if (git_config_get_index_threads(&nr_threads))
2272 nr_threads = 1;
7a51ed66 2273
77ff1127
BP
2274 /* TODO: does creating more threads than cores help? */
2275 if (!nr_threads) {
2276 nr_threads = istate->cache_nr / THREAD_COST;
2277 cpus = online_cpus();
2278 if (nr_threads > cpus)
2279 nr_threads = cpus;
e83c5163 2280 }
abb4bb83 2281
88168b9b
NTND
2282 if (!HAVE_THREADS)
2283 nr_threads = 1;
2284
abb4bb83
BP
2285 if (nr_threads > 1) {
2286 extension_offset = read_eoie_extension(mmap, mmap_size);
2287 if (extension_offset) {
2288 int err;
2289
2290 p.src_offset = extension_offset;
2291 err = pthread_create(&p.pthread, NULL, load_index_extensions, &p);
2292 if (err)
2293 die(_("unable to create load_index_extensions thread: %s"), strerror(err));
2294
2295 nr_threads--;
2296 }
2297 }
abb4bb83 2298
77ff1127
BP
2299 /*
2300 * Locate and read the index entry offset table so that we can use it
2301 * to multi-thread the reading of the cache entries.
2302 */
2303 if (extension_offset && nr_threads > 1)
2304 ieot = read_ieot_extension(mmap, mmap_size, extension_offset);
2305
2306 if (ieot) {
7bd9631b 2307 src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot);
77ff1127 2308 free(ieot);
8e72d675 2309 } else {
77ff1127 2310 src_offset += load_all_cache_entries(istate, mmap, mmap_size, src_offset);
8e72d675 2311 }
6c9cd161 2312
fba2f38a 2313 istate->timestamp.sec = st.st_mtime;
c06ff490 2314 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 2315
abb4bb83 2316 /* if we created a thread, join it otherwise load the extensions on the primary thread */
abb4bb83
BP
2317 if (extension_offset) {
2318 int ret = pthread_join(p.pthread, NULL);
2319 if (ret)
2320 die(_("unable to join load_index_extensions thread: %s"), strerror(ret));
88168b9b 2321 } else {
abb4bb83
BP
2322 p.src_offset = src_offset;
2323 load_index_extensions(&p);
bad68ec9 2324 }
371ed0de 2325 munmap((void *)mmap, mmap_size);
42fee7a3
JH
2326
2327 /*
2328 * TODO trace2: replace "the_repository" with the actual repo instance
2329 * that is associated with the given "istate".
2330 */
2331 trace2_data_intmax("index", the_repository, "read/version",
2332 istate->version);
2333 trace2_data_intmax("index", the_repository, "read/cache_nr",
2334 istate->cache_nr);
2335
7ca4fc88
VD
2336 /*
2337 * If the command explicitly requires a full index, force it
2338 * to be full. Otherwise, correct the sparsity based on repository
2339 * settings and other properties of the index (if necessary).
2340 */
4300f844
DS
2341 prepare_repo_settings(istate->repo);
2342 if (istate->repo->settings.command_requires_full_index)
2343 ensure_full_index(istate);
7ca4fc88
VD
2344 else
2345 ensure_correct_sparsity(istate);
4300f844 2346
4aab5b46 2347 return istate->cache_nr;
e83c5163
LT
2348
2349unmap:
371ed0de 2350 munmap((void *)mmap, mmap_size);
9d0a9e90 2351 die(_("index file corrupt"));
e83c5163
LT
2352}
2353
0d59ffb4
CC
2354/*
2355 * Signal that the shared index is used by updating its mtime.
2356 *
2357 * This way, shared index can be removed if they have not been used
2358 * for some time.
2359 */
a125a223 2360static void freshen_shared_index(const char *shared_index, int warn)
0d59ffb4 2361{
0d59ffb4 2362 if (!check_and_freshen_file(shared_index, 1) && warn)
9d0a9e90 2363 warning(_("could not freshen shared index '%s'"), shared_index);
0d59ffb4
CC
2364}
2365
a125a223
TG
2366int read_index_from(struct index_state *istate, const char *path,
2367 const char *gitdir)
5fc2fc8f
NTND
2368{
2369 struct split_index *split_index;
2370 int ret;
2182abd9 2371 char *base_oid_hex;
a125a223 2372 char *base_path;
5fc2fc8f
NTND
2373
2374 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2375 if (istate->initialized)
2376 return istate->cache_nr;
2377
42fee7a3
JH
2378 /*
2379 * TODO trace2: replace "the_repository" with the actual repo instance
2380 * that is associated with the given "istate".
2381 */
2382 trace2_region_enter_printf("index", "do_read_index", the_repository,
2383 "%s", path);
c46c406a 2384 trace_performance_enter();
5fc2fc8f 2385 ret = do_read_index(istate, path, 0);
c46c406a 2386 trace_performance_leave("read cache %s", path);
42fee7a3
JH
2387 trace2_region_leave_printf("index", "do_read_index", the_repository,
2388 "%s", path);
435ec090 2389
5fc2fc8f 2390 split_index = istate->split_index;
2182abd9 2391 if (!split_index || is_null_oid(&split_index->base_oid)) {
435ec090 2392 post_read_index_from(istate);
5fc2fc8f 2393 return ret;
03f15a79 2394 }
5fc2fc8f 2395
c46c406a 2396 trace_performance_enter();
5fc2fc8f 2397 if (split_index->base)
2f6b1eb7 2398 release_index(split_index->base);
5fc2fc8f 2399 else
2f6b1eb7 2400 ALLOC_ARRAY(split_index->base, 1);
6269f8ea 2401 index_state_init(split_index->base, istate->repo);
de6ae5f9 2402
2182abd9 2403 base_oid_hex = oid_to_hex(&split_index->base_oid);
2404 base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
7667f4f0
JS
2405 if (file_exists(base_path)) {
2406 trace2_region_enter_printf("index", "shared/do_read_index",
2407 the_repository, "%s", base_path);
2408
2409 ret = do_read_index(split_index->base, base_path, 0);
2410 trace2_region_leave_printf("index", "shared/do_read_index",
2411 the_repository, "%s", base_path);
2412 } else {
998330ac 2413 char *path_copy = xstrdup(path);
652891de
JS
2414 char *base_path2 = xstrfmt("%s/sharedindex.%s",
2415 dirname(path_copy), base_oid_hex);
998330ac
SG
2416 free(path_copy);
2417 trace2_region_enter_printf("index", "shared/do_read_index",
2418 the_repository, "%s", base_path2);
2419 ret = do_read_index(split_index->base, base_path2, 1);
2420 trace2_region_leave_printf("index", "shared/do_read_index",
2421 the_repository, "%s", base_path2);
652891de 2422 free(base_path2);
998330ac 2423 }
9001dc2a 2424 if (!oideq(&split_index->base_oid, &split_index->base->oid))
9d0a9e90 2425 die(_("broken index, expect %s in %s, got %s"),
2182abd9 2426 base_oid_hex, base_path,
75691ea3 2427 oid_to_hex(&split_index->base->oid));
de6ae5f9 2428
a125a223 2429 freshen_shared_index(base_path, 0);
5fc2fc8f 2430 merge_base_index(istate);
435ec090 2431 post_read_index_from(istate);
c46c406a 2432 trace_performance_leave("read cache %s", base_path);
b42ad7d5 2433 free(base_path);
5fc2fc8f
NTND
2434 return ret;
2435}
2436
fa7b3c2f
JH
2437int is_index_unborn(struct index_state *istate)
2438{
debed2a6 2439 return (!istate->cache_nr && !istate->timestamp.sec);
fa7b3c2f
JH
2440}
2441
6269f8ea 2442void index_state_init(struct index_state *istate, struct repository *r)
2f6b1eb7 2443{
6269f8ea 2444 struct index_state blank = INDEX_STATE_INIT(r);
2f6b1eb7
ÆAB
2445 memcpy(istate, &blank, sizeof(*istate));
2446}
2447
2448void release_index(struct index_state *istate)
6d297f81 2449{
8e72d675
JM
2450 /*
2451 * Cache entries in istate->cache[] should have been allocated
2452 * from the memory pool associated with this index, or from an
2453 * associated split_index. There is no need to free individual
8616a2d0
JM
2454 * cache entries. validate_cache_entries can detect when this
2455 * assertion does not hold.
8e72d675 2456 */
8616a2d0 2457 validate_cache_entries(istate);
debed2a6 2458
cfc5789a 2459 resolve_undo_clear_index(istate);
2092678c 2460 free_name_hash(istate);
4aab5b46 2461 cache_tree_free(&(istate->cache_tree));
2f6b1eb7
ÆAB
2462 free(istate->fsmonitor_last_update);
2463 free(istate->cache);
5fc2fc8f 2464 discard_split_index(istate);
f9e6c649 2465 free_untracked_cache(istate->untracked);
8e72d675 2466
b5fcb1c0
ÆAB
2467 if (istate->sparse_checkout_patterns) {
2468 clear_pattern_list(istate->sparse_checkout_patterns);
2469 FREE_AND_NULL(istate->sparse_checkout_patterns);
2470 }
2471
8e72d675 2472 if (istate->ce_mem_pool) {
8616a2d0 2473 mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries());
44c7e1a7 2474 FREE_AND_NULL(istate->ce_mem_pool);
8e72d675 2475 }
6d297f81
JS
2476}
2477
2f6b1eb7
ÆAB
2478void discard_index(struct index_state *istate)
2479{
2480 release_index(istate);
6269f8ea 2481 index_state_init(istate, istate->repo);
2f6b1eb7
ÆAB
2482}
2483
8616a2d0
JM
2484/*
2485 * Validate the cache entries of this index.
2486 * All cache entries associated with this index
2487 * should have been allocated by the memory pool
2488 * associated with this index, or by a referenced
2489 * split index.
2490 */
2491void validate_cache_entries(const struct index_state *istate)
2492{
2493 int i;
2494
2495 if (!should_validate_cache_entries() ||!istate || !istate->initialized)
2496 return;
2497
2498 for (i = 0; i < istate->cache_nr; i++) {
2499 if (!istate) {
391408e5 2500 BUG("cache entry is not allocated from expected memory pool");
8616a2d0
JM
2501 } else if (!istate->ce_mem_pool ||
2502 !mem_pool_contains(istate->ce_mem_pool, istate->cache[i])) {
2503 if (!istate->split_index ||
2504 !istate->split_index->base ||
2505 !istate->split_index->base->ce_mem_pool ||
2506 !mem_pool_contains(istate->split_index->base->ce_mem_pool, istate->cache[i])) {
391408e5 2507 BUG("cache entry is not allocated from expected memory pool");
8616a2d0
JM
2508 }
2509 }
2510 }
2511
2512 if (istate->split_index)
2513 validate_cache_entries(istate->split_index->base);
2514}
2515
d1f128b0 2516int unmerged_index(const struct index_state *istate)
94a5728c
DB
2517{
2518 int i;
2519 for (i = 0; i < istate->cache_nr; i++) {
2520 if (ce_stage(istate->cache[i]))
2521 return 1;
2522 }
2523 return 0;
2524}
2525
150fe065
NTND
2526int repo_index_has_changes(struct repository *repo,
2527 struct tree *tree,
2528 struct strbuf *sb)
cffbfad5 2529{
150fe065 2530 struct index_state *istate = repo->index;
e1f8694f 2531 struct object_id cmp;
cffbfad5
EN
2532 int i;
2533
e1f8694f
EN
2534 if (tree)
2535 cmp = tree->object.oid;
4a93b899 2536 if (tree || !repo_get_oid_tree(repo, "HEAD", &cmp)) {
cffbfad5
EN
2537 struct diff_options opt;
2538
150fe065 2539 repo_diff_setup(repo, &opt);
cffbfad5
EN
2540 opt.flags.exit_with_status = 1;
2541 if (!sb)
2542 opt.flags.quick = 1;
8d833e93 2543 diff_setup_done(&opt);
e1f8694f 2544 do_diff_cache(&cmp, &opt);
cffbfad5
EN
2545 diffcore_std(&opt);
2546 for (i = 0; sb && i < diff_queued_diff.nr; i++) {
2547 if (i)
2548 strbuf_addch(sb, ' ');
2549 strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
2550 }
2551 diff_flush(&opt);
2552 return opt.flags.has_changes != 0;
2553 } else {
0c18c059
DS
2554 /* TODO: audit for interaction with sparse-index. */
2555 ensure_full_index(istate);
1b9fbefb 2556 for (i = 0; sb && i < istate->cache_nr; i++) {
cffbfad5
EN
2557 if (i)
2558 strbuf_addch(sb, ' ');
1b9fbefb 2559 strbuf_addstr(sb, istate->cache[i]->name);
cffbfad5 2560 }
1b9fbefb 2561 return !!istate->cache_nr;
cffbfad5
EN
2562 }
2563}
2564
410334ed
DS
2565static int write_index_ext_header(struct hashfile *f,
2566 git_hash_ctx *eoie_f,
2567 unsigned int ext,
2568 unsigned int sz)
bad68ec9 2569{
410334ed
DS
2570 hashwrite_be32(f, ext);
2571 hashwrite_be32(f, sz);
2572
2573 if (eoie_f) {
2574 ext = htonl(ext);
2575 sz = htonl(sz);
2576 the_hash_algo->update_fn(eoie_f, &ext, sizeof(ext));
2577 the_hash_algo->update_fn(eoie_f, &sz, sizeof(sz));
3b1d9e04 2578 }
410334ed 2579 return 0;
bad68ec9
JH
2580}
2581
58bf2a4c
NTND
2582static void ce_smudge_racily_clean_entry(struct index_state *istate,
2583 struct cache_entry *ce)
407c8eb0
JH
2584{
2585 /*
2586 * The only thing we care about in this function is to smudge the
2587 * falsely clean entry due to touch-update-touch race, so we leave
2588 * everything else as they are. We are called for entries whose
c21d39d7 2589 * ce_stat_data.sd_mtime match the index file mtime.
c70115b4
JH
2590 *
2591 * Note that this actually does not do much for gitlinks, for
2592 * which ce_match_stat_basic() always goes to the actual
2593 * contents. The caller checks with is_racy_timestamp() which
2594 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
2595 */
2596 struct stat st;
2597
2598 if (lstat(ce->name, &st) < 0)
2599 return;
2600 if (ce_match_stat_basic(ce, &st))
2601 return;
58bf2a4c 2602 if (ce_modified_check_fs(istate, ce, &st)) {
4b3511b0
JH
2603 /* This is "racily clean"; smudge it. Note that this
2604 * is a tricky code. At first glance, it may appear
2605 * that it can break with this sequence:
2606 *
2607 * $ echo xyzzy >frotz
2608 * $ git-update-index --add frotz
2609 * $ : >frotz
2610 * $ sleep 3
2611 * $ echo filfre >nitfol
2612 * $ git-update-index --add nitfol
2613 *
b7e58b17 2614 * but it does not. When the second update-index runs,
4b3511b0
JH
2615 * it notices that the entry "frotz" has the same timestamp
2616 * as index, and if we were to smudge it by resetting its
2617 * size to zero here, then the object name recorded
2618 * in index is the 6-byte file but the cached stat information
2619 * becomes zero --- which would then match what we would
a6080a0a 2620 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
2621 *
2622 * However, the second update-index, before calling
2623 * this function, notices that the cached size is 6
2624 * bytes and what is on the filesystem is an empty
2625 * file, and never calls us, so the cached size information
2626 * for "frotz" stays 6 which does not match the filesystem.
2627 */
c21d39d7 2628 ce->ce_stat_data.sd_size = 0;
407c8eb0
JH
2629 }
2630}
2631
f136f7bf 2632/* Copy miscellaneous fields but not the name */
ce012deb 2633static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
f136f7bf 2634 struct cache_entry *ce)
7a51ed66 2635{
b60e188c 2636 short flags;
575fa8a3 2637 const unsigned hashsz = the_hash_algo->rawsz;
2638 uint16_t *flagsp = (uint16_t *)(ondisk->data + hashsz);
b60e188c 2639
c21d39d7
MH
2640 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
2641 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
2642 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
2643 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
2644 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
2645 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
7a51ed66 2646 ondisk->mode = htonl(ce->ce_mode);
c21d39d7
MH
2647 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
2648 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
2649 ondisk->size = htonl(ce->ce_stat_data.sd_size);
575fa8a3 2650 hashcpy(ondisk->data, ce->oid.hash);
b60e188c 2651
ce51bf09 2652 flags = ce->ce_flags & ~CE_NAMEMASK;
b60e188c 2653 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
575fa8a3 2654 flagsp[0] = htons(flags);
06aaaa0b 2655 if (ce->ce_flags & CE_EXTENDED) {
575fa8a3 2656 flagsp[1] = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
f136f7bf
JH
2657 }
2658}
2659
410334ed 2660static int ce_write_entry(struct hashfile *f, struct cache_entry *ce,
ce012deb 2661 struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
f136f7bf 2662{
9d227781 2663 int size;
00a4b035
RJ
2664 unsigned int saved_namelen;
2665 int stripped_name = 0;
ce012deb 2666 static unsigned char padding[8] = { 0x00 };
f136f7bf 2667
b3c96fb1
NTND
2668 if (ce->ce_flags & CE_STRIP_NAME) {
2669 saved_namelen = ce_namelen(ce);
2670 ce->ce_namelen = 0;
00a4b035 2671 stripped_name = 1;
b3c96fb1
NTND
2672 }
2673
575fa8a3 2674 size = offsetof(struct ondisk_cache_entry,data) + ondisk_data_size(ce->ce_flags, 0);
ce012deb 2675
9d227781 2676 if (!previous_name) {
ce012deb
KW
2677 int len = ce_namelen(ce);
2678 copy_cache_entry_to_ondisk(ondisk, ce);
410334ed
DS
2679 hashwrite(f, ondisk, size);
2680 hashwrite(f, ce->name, len);
2681 hashwrite(f, padding, align_padding_size(size, len));
9d227781
JH
2682 } else {
2683 int common, to_remove, prefix_size;
2684 unsigned char to_remove_vi[16];
2685 for (common = 0;
2686 (ce->name[common] &&
2687 common < previous_name->len &&
2688 ce->name[common] == previous_name->buf[common]);
2689 common++)
2690 ; /* still matching */
2691 to_remove = previous_name->len - common;
2692 prefix_size = encode_varint(to_remove, to_remove_vi);
2693
ce012deb 2694 copy_cache_entry_to_ondisk(ondisk, ce);
410334ed
DS
2695 hashwrite(f, ondisk, size);
2696 hashwrite(f, to_remove_vi, prefix_size);
2697 hashwrite(f, ce->name + common, ce_namelen(ce) - common);
2698 hashwrite(f, padding, 1);
9d227781
JH
2699
2700 strbuf_splice(previous_name, common, to_remove,
2701 ce->name + common, ce_namelen(ce) - common);
06aaaa0b 2702 }
00a4b035 2703 if (stripped_name) {
b3c96fb1
NTND
2704 ce->ce_namelen = saved_namelen;
2705 ce->ce_flags &= ~CE_STRIP_NAME;
2706 }
7a51ed66 2707
410334ed 2708 return 0;
7a51ed66
LT
2709}
2710
426ddeea
YM
2711/*
2712 * This function verifies if index_state has the correct sha1 of the
2713 * index file. Don't die if we have any other failure, just return 0.
2714 */
2715static int verify_index_from(const struct index_state *istate, const char *path)
2716{
2717 int fd;
2718 ssize_t n;
2719 struct stat st;
aab61359 2720 unsigned char hash[GIT_MAX_RAWSZ];
426ddeea
YM
2721
2722 if (!istate->initialized)
2723 return 0;
2724
2725 fd = open(path, O_RDONLY);
2726 if (fd < 0)
2727 return 0;
2728
2729 if (fstat(fd, &st))
2730 goto out;
2731
aab61359 2732 if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
426ddeea
YM
2733 goto out;
2734
aab61359 2735 n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz);
2736 if (n != the_hash_algo->rawsz)
426ddeea
YM
2737 goto out;
2738
67947c34 2739 if (!hasheq(istate->oid.hash, hash))
426ddeea
YM
2740 goto out;
2741
2742 close(fd);
2743 return 1;
2744
2745out:
2746 close(fd);
2747 return 0;
2748}
2749
1b0d968b 2750static int repo_verify_index(struct repository *repo)
426ddeea 2751{
1b0d968b 2752 return verify_index_from(repo->index, repo->index_file);
426ddeea
YM
2753}
2754
2ede073f 2755int has_racy_timestamp(struct index_state *istate)
483fbe2b
JH
2756{
2757 int entries = istate->cache_nr;
2758 int i;
2759
2760 for (i = 0; i < entries; i++) {
2761 struct cache_entry *ce = istate->cache[i];
2762 if (is_racy_timestamp(istate, ce))
2763 return 1;
2764 }
2765 return 0;
2766}
2767
1b0d968b
NTND
2768void repo_update_index_if_able(struct repository *repo,
2769 struct lock_file *lockfile)
ccdc4ec3 2770{
1b0d968b
NTND
2771 if ((repo->index->cache_changed ||
2772 has_racy_timestamp(repo->index)) &&
2773 repo_verify_index(repo))
2774 write_locked_index(repo->index, lockfile, COMMIT_LOCK);
b74c90fb
2775 else
2776 rollback_lock_file(lockfile);
ccdc4ec3
JH
2777}
2778
d8465500
JN
2779static int record_eoie(void)
2780{
2781 int val;
2782
2783 if (!git_config_get_bool("index.recordendofindexentries", &val))
2784 return val;
2a9dedef
JN
2785
2786 /*
2787 * As a convenience, the end of index entries extension
2788 * used for threading is written by default if the user
2789 * explicitly requested threaded index reads.
2790 */
2791 return !git_config_get_index_threads(&val) && val != 1;
d8465500
JN
2792}
2793
42916054
JN
2794static int record_ieot(void)
2795{
2796 int val;
2797
2798 if (!git_config_get_bool("index.recordoffsettable", &val))
2799 return val;
2a9dedef
JN
2800
2801 /*
2802 * As a convenience, the offset table used for threading is
2803 * written by default if the user explicitly requested
2804 * threaded index reads.
2805 */
2806 return !git_config_get_index_threads(&val) && val != 1;
42916054
JN
2807}
2808
3b7a4475
JS
2809enum write_extensions {
2810 WRITE_NO_EXTENSION = 0,
2811 WRITE_SPLIT_INDEX_EXTENSION = 1<<0,
2812 WRITE_CACHE_TREE_EXTENSION = 1<<1,
2813 WRITE_RESOLVE_UNDO_EXTENSION = 1<<2,
2814 WRITE_UNTRACKED_CACHE_EXTENSION = 1<<3,
2815 WRITE_FSMONITOR_EXTENSION = 1<<4,
2816};
2817#define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2818
812d6b00
2819/*
2820 * On success, `tempfile` is closed. If it is the temporary file
2821 * of a `struct lock_file`, we will therefore effectively perform
2822 * a 'close_lock_file_gently()`. Since that is an implementation
2823 * detail of lockfiles, callers of `do_write_index()` should not
2824 * rely on it.
2825 */
9f41c7a6 2826static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
3b7a4475 2827 enum write_extensions write_extensions, unsigned flags)
197ee8c9 2828{
ca54d9ba 2829 uint64_t start = getnanotime();
410334ed
DS
2830 struct hashfile *f;
2831 git_hash_ctx *eoie_c = NULL;
197ee8c9 2832 struct cache_header hdr;
b50386c7 2833 int i, err = 0, removed, extended, hdr_version;
4aab5b46
JH
2834 struct cache_entry **cache = istate->cache;
2835 int entries = istate->cache_nr;
e1afca4f 2836 struct stat st;
575fa8a3 2837 struct ondisk_cache_entry ondisk;
9d227781 2838 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
4bddd983 2839 int drop_cache_tree = istate->drop_cache_tree;
3b1d9e04 2840 off_t offset;
ba95e96d 2841 int csum_fsync_flag;
77ff1127 2842 int ieot_entries = 1;
3255089a
BP
2843 struct index_entry_offset_table *ieot = NULL;
2844 int nr, nr_threads;
6269f8ea 2845 struct repository *r = istate->repo;
025a0709 2846
410334ed
DS
2847 f = hashfd(tempfile->fd, tempfile->filename.buf);
2848
17194b19
DS
2849 prepare_repo_settings(r);
2850 f->skip_hash = r->settings.index_skip_hash;
ee1f0c24 2851
06aaaa0b 2852 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 2853 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 2854 removed++;
197ee8c9 2855
06aaaa0b
NTND
2856 /* reduce extended entries if possible */
2857 cache[i]->ce_flags &= ~CE_EXTENDED;
2858 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2859 extended++;
2860 cache[i]->ce_flags |= CE_EXTENDED;
2861 }
2862 }
2863
e8ffd034 2864 if (!istate->version)
4a93b899 2865 istate->version = get_index_format_default(r);
9d227781
JH
2866
2867 /* demote version 3 to version 2 when the latter suffices */
2868 if (istate->version == 3 || istate->version == 2)
2869 istate->version = extended ? 3 : 2;
2870
2871 hdr_version = istate->version;
2872
ccc4feb5 2873 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
9d227781 2874 hdr.hdr_version = htonl(hdr_version);
025a0709 2875 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 2876
410334ed 2877 hashwrite(f, &hdr, sizeof(hdr));
197ee8c9 2878
2a9dedef 2879 if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads))
88168b9b 2880 nr_threads = 1;
62e5ee81 2881
42916054 2882 if (nr_threads != 1 && record_ieot()) {
3255089a
BP
2883 int ieot_blocks, cpus;
2884
2885 /*
2886 * ensure default number of ieot blocks maps evenly to the
2887 * default number of threads that will process them leaving
2888 * room for the thread to load the index extensions.
2889 */
2890 if (!nr_threads) {
2891 ieot_blocks = istate->cache_nr / THREAD_COST;
2892 cpus = online_cpus();
2893 if (ieot_blocks > cpus - 1)
2894 ieot_blocks = cpus - 1;
2895 } else {
2896 ieot_blocks = nr_threads;
77ff1127
BP
2897 if (ieot_blocks > istate->cache_nr)
2898 ieot_blocks = istate->cache_nr;
3255089a
BP
2899 }
2900
2901 /*
2902 * no reason to write out the IEOT extension if we don't
2903 * have enough blocks to utilize multi-threading
2904 */
2905 if (ieot_blocks > 1) {
2906 ieot = xcalloc(1, sizeof(struct index_entry_offset_table)
2907 + (ieot_blocks * sizeof(struct index_entry_offset)));
77ff1127 2908 ieot_entries = DIV_ROUND_UP(entries, ieot_blocks);
3255089a
BP
2909 }
2910 }
3255089a 2911
410334ed
DS
2912 offset = hashfile_total(f);
2913
3255089a 2914 nr = 0;
9d227781 2915 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
ce012deb 2916
197ee8c9
LT
2917 for (i = 0; i < entries; i++) {
2918 struct cache_entry *ce = cache[i];
7a51ed66 2919 if (ce->ce_flags & CE_REMOVE)
aa16021e 2920 continue;
e06c43c7 2921 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
58bf2a4c 2922 ce_smudge_racily_clean_entry(istate, ce);
99d1a986 2923 if (is_null_oid(&ce->oid)) {
83bd7437
JK
2924 static const char msg[] = "cache entry has null sha1: %s";
2925 static int allow = -1;
2926
2927 if (allow < 0)
2928 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2929 if (allow)
2930 warning(msg, ce->name);
2931 else
b50386c7 2932 err = error(msg, ce->name);
a96d3cc3
JK
2933
2934 drop_cache_tree = 1;
83bd7437 2935 }
77ff1127 2936 if (ieot && i && (i % ieot_entries == 0)) {
3255089a
BP
2937 ieot->entries[ieot->nr].nr = nr;
2938 ieot->entries[ieot->nr].offset = offset;
2939 ieot->nr++;
2940 /*
2941 * If we have a V4 index, set the first byte to an invalid
2942 * character to ensure there is nothing common with the previous
2943 * entry
2944 */
2945 if (previous_name)
2946 previous_name->buf[0] = 0;
2947 nr = 0;
410334ed
DS
2948
2949 offset = hashfile_total(f);
3255089a 2950 }
410334ed 2951 if (ce_write_entry(f, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
b50386c7
KW
2952 err = -1;
2953
2954 if (err)
2955 break;
3255089a
BP
2956 nr++;
2957 }
2958 if (ieot && nr) {
2959 ieot->entries[ieot->nr].nr = nr;
2960 ieot->entries[ieot->nr].offset = offset;
2961 ieot->nr++;
197ee8c9 2962 }
9d227781 2963 strbuf_release(&previous_name_buf);
1af1c2b6 2964
3255089a
BP
2965 if (err) {
2966 free(ieot);
b50386c7 2967 return err;
3255089a 2968 }
b50386c7 2969
410334ed
DS
2970 offset = hashfile_total(f);
2971
2972 /*
2973 * The extension headers must be hashed on their own for the
2974 * EOIE extension. Create a hashfile here to compute that hash.
2975 */
2976 if (offset && record_eoie()) {
2977 CALLOC_ARRAY(eoie_c, 1);
2978 the_hash_algo->init_fn(eoie_c);
3255089a 2979 }
3b1d9e04 2980
3255089a
BP
2981 /*
2982 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2983 * can minimize the number of extensions we have to scan through to
2984 * find it during load. Write it out regardless of the
2985 * strip_extensions parameter as we need it when loading the shared
2986 * index.
2987 */
3255089a
BP
2988 if (ieot) {
2989 struct strbuf sb = STRBUF_INIT;
2990
2991 write_ieot_extension(&sb, ieot);
410334ed
DS
2992 err = write_index_ext_header(f, eoie_c, CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0;
2993 hashwrite(f, sb.buf, sb.len);
3255089a
BP
2994 strbuf_release(&sb);
2995 free(ieot);
2996 if (err)
2997 return -1;
2998 }
3255089a 2999
3b7a4475
JS
3000 if (write_extensions & WRITE_SPLIT_INDEX_EXTENSION &&
3001 istate->split_index) {
5fc2fc8f
NTND
3002 struct strbuf sb = STRBUF_INIT;
3003
451b66c5
JS
3004 if (istate->sparse_index)
3005 die(_("cannot write split index for a sparse index"));
3006
5fc2fc8f 3007 err = write_link_extension(&sb, istate) < 0 ||
410334ed
DS
3008 write_index_ext_header(f, eoie_c, CACHE_EXT_LINK,
3009 sb.len) < 0;
3010 hashwrite(f, sb.buf, sb.len);
5fc2fc8f
NTND
3011 strbuf_release(&sb);
3012 if (err)
3013 return -1;
3014 }
3b7a4475
JS
3015 if (write_extensions & WRITE_CACHE_TREE_EXTENSION &&
3016 !drop_cache_tree && istate->cache_tree) {
f285a2d7 3017 struct strbuf sb = STRBUF_INIT;
1dffb8fa 3018
1dffb8fa 3019 cache_tree_write(&sb, istate->cache_tree);
410334ed
DS
3020 err = write_index_ext_header(f, eoie_c, CACHE_EXT_TREE, sb.len) < 0;
3021 hashwrite(f, sb.buf, sb.len);
1dffb8fa
PH
3022 strbuf_release(&sb);
3023 if (err)
bad68ec9 3024 return -1;
bad68ec9 3025 }
3b7a4475
JS
3026 if (write_extensions & WRITE_RESOLVE_UNDO_EXTENSION &&
3027 istate->resolve_undo) {
cfc5789a
JH
3028 struct strbuf sb = STRBUF_INIT;
3029
3030 resolve_undo_write(&sb, istate->resolve_undo);
410334ed
DS
3031 err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO,
3032 sb.len) < 0;
3033 hashwrite(f, sb.buf, sb.len);
cfc5789a
JH
3034 strbuf_release(&sb);
3035 if (err)
3036 return -1;
3037 }
3b7a4475
JS
3038 if (write_extensions & WRITE_UNTRACKED_CACHE_EXTENSION &&
3039 istate->untracked) {
83c094ad
NTND
3040 struct strbuf sb = STRBUF_INIT;
3041
3042 write_untracked_extension(&sb, istate->untracked);
410334ed
DS
3043 err = write_index_ext_header(f, eoie_c, CACHE_EXT_UNTRACKED,
3044 sb.len) < 0;
3045 hashwrite(f, sb.buf, sb.len);
83c094ad
NTND
3046 strbuf_release(&sb);
3047 if (err)
3048 return -1;
3049 }
3b7a4475
JS
3050 if (write_extensions & WRITE_FSMONITOR_EXTENSION &&
3051 istate->fsmonitor_last_update) {
883e248b
BP
3052 struct strbuf sb = STRBUF_INIT;
3053
3054 write_fsmonitor_extension(&sb, istate);
410334ed
DS
3055 err = write_index_ext_header(f, eoie_c, CACHE_EXT_FSMONITOR, sb.len) < 0;
3056 hashwrite(f, sb.buf, sb.len);
3b1d9e04
BP
3057 strbuf_release(&sb);
3058 if (err)
3059 return -1;
3060 }
cd42415f 3061 if (istate->sparse_index) {
410334ed 3062 if (write_index_ext_header(f, eoie_c, CACHE_EXT_SPARSE_DIRECTORIES, 0) < 0)
cd42415f
DS
3063 return -1;
3064 }
3b1d9e04
BP
3065
3066 /*
3067 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3068 * so that it can be found and processed before all the index entries are
3069 * read. Write it out regardless of the strip_extensions parameter as we need it
3070 * when loading the shared index.
3071 */
410334ed 3072 if (eoie_c) {
3b1d9e04
BP
3073 struct strbuf sb = STRBUF_INIT;
3074
410334ed
DS
3075 write_eoie_extension(&sb, eoie_c, offset);
3076 err = write_index_ext_header(f, NULL, CACHE_EXT_ENDOFINDEXENTRIES, sb.len) < 0;
3077 hashwrite(f, sb.buf, sb.len);
883e248b
BP
3078 strbuf_release(&sb);
3079 if (err)
3080 return -1;
3081 }
e1afca4f 3082
ba95e96d
NS
3083 csum_fsync_flag = 0;
3084 if (!alternate_index_output && (flags & COMMIT_LOCK))
3085 csum_fsync_flag = CSUM_FSYNC;
3086
3087 finalize_hashfile(f, istate->oid.hash, FSYNC_COMPONENT_INDEX,
3088 CSUM_HASH_IN_STREAM | csum_fsync_flag);
3089
49bd0fc2 3090 if (close_tempfile_gently(tempfile)) {
6a8c89d0 3091 error(_("could not close '%s'"), get_tempfile_path(tempfile));
49bd0fc2
JK
3092 return -1;
3093 }
6a8c89d0 3094 if (stat(get_tempfile_path(tempfile), &st))
e1afca4f 3095 return -1;
5bcf109c
KB
3096 istate->timestamp.sec = (unsigned int)st.st_mtime;
3097 istate->timestamp.nsec = ST_MTIME_NSEC(st);
ca54d9ba 3098 trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
42fee7a3
JH
3099
3100 /*
3101 * TODO trace2: replace "the_repository" with the actual repo instance
3102 * that is associated with the given "istate".
3103 */
3104 trace2_data_intmax("index", the_repository, "write/version",
3105 istate->version);
3106 trace2_data_intmax("index", the_repository, "write/cache_nr",
3107 istate->cache_nr);
3108
e1afca4f 3109 return 0;
197ee8c9 3110}
e46bbcf6 3111
626f35c8
NTND
3112void set_alternate_index_output(const char *name)
3113{
3114 alternate_index_output = name;
3115}
3116
3117static int commit_locked_index(struct lock_file *lk)
3118{
751baced
MH
3119 if (alternate_index_output)
3120 return commit_lock_file_to(lk, alternate_index_output);
3121 else
626f35c8 3122 return commit_lock_file(lk);
626f35c8
NTND
3123}
3124
3b7a4475
JS
3125static int do_write_locked_index(struct index_state *istate,
3126 struct lock_file *lock,
3127 unsigned flags,
3128 enum write_extensions write_extensions)
03b86647 3129{
42fee7a3 3130 int ret;
9fadb373 3131 int was_full = istate->sparse_index == INDEX_EXPANDED;
6e773527 3132
ce7a9f01 3133 ret = convert_to_sparse(istate, 0);
6e773527
DS
3134
3135 if (ret) {
3136 warning(_("failed to convert to a sparse-index"));
3137 return ret;
3138 }
42fee7a3
JH
3139
3140 /*
3141 * TODO trace2: replace "the_repository" with the actual repo instance
3142 * that is associated with the given "istate".
3143 */
3144 trace2_region_enter_printf("index", "do_write_index", the_repository,
6a8c89d0 3145 "%s", get_lock_file_path(lock));
3b7a4475 3146 ret = do_write_index(istate, lock->tempfile, write_extensions, flags);
42fee7a3 3147 trace2_region_leave_printf("index", "do_write_index", the_repository,
6a8c89d0 3148 "%s", get_lock_file_path(lock));
42fee7a3 3149
6e773527
DS
3150 if (was_full)
3151 ensure_full_index(istate);
3152
03b86647
NTND
3153 if (ret)
3154 return ret;
03b86647 3155 if (flags & COMMIT_LOCK)
1956ecd0
BP
3156 ret = commit_locked_index(lock);
3157 else
3158 ret = close_lock_file_gently(lock);
3159
dbb1c613 3160 run_hooks_l("post-index-change",
1956ecd0
BP
3161 istate->updated_workdir ? "1" : "0",
3162 istate->updated_skipworktree ? "1" : "0", NULL);
3163 istate->updated_workdir = 0;
3164 istate->updated_skipworktree = 0;
3165
3166 return ret;
03b86647
NTND
3167}
3168
5fc2fc8f
NTND
3169static int write_split_index(struct index_state *istate,
3170 struct lock_file *lock,
3171 unsigned flags)
3172{
3173 int ret;
3174 prepare_to_write_split_index(istate);
3b7a4475 3175 ret = do_write_locked_index(istate, lock, flags, WRITE_ALL_EXTENSIONS);
5fc2fc8f
NTND
3176 finish_writing_split_index(istate);
3177 return ret;
3178}
3179
b9683722
CC
3180static const char *shared_index_expire = "2.weeks.ago";
3181
3182static unsigned long get_shared_index_expire_date(void)
3183{
3184 static unsigned long shared_index_expire_date;
3185 static int shared_index_expire_date_prepared;
3186
3187 if (!shared_index_expire_date_prepared) {
3188 git_config_get_expiry("splitindex.sharedindexexpire",
3189 &shared_index_expire);
3190 shared_index_expire_date = approxidate(shared_index_expire);
3191 shared_index_expire_date_prepared = 1;
3192 }
3193
3194 return shared_index_expire_date;
3195}
3196
3197static int should_delete_shared_index(const char *shared_index_path)
3198{
3199 struct stat st;
3200 unsigned long expiration;
3201
3202 /* Check timestamp */
3203 expiration = get_shared_index_expire_date();
3204 if (!expiration)
3205 return 0;
3206 if (stat(shared_index_path, &st))
78bde923 3207 return error_errno(_("could not stat '%s'"), shared_index_path);
b9683722
CC
3208 if (st.st_mtime > expiration)
3209 return 0;
3210
3211 return 1;
3212}
3213
3214static int clean_shared_index_files(const char *current_hex)
3215{
3216 struct dirent *de;
3217 DIR *dir = opendir(get_git_dir());
3218
3219 if (!dir)
3220 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3221
3222 while ((de = readdir(dir)) != NULL) {
3223 const char *sha1_hex;
3224 const char *shared_index_path;
3225 if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
3226 continue;
3227 if (!strcmp(sha1_hex, current_hex))
3228 continue;
3229 shared_index_path = git_path("%s", de->d_name);
3230 if (should_delete_shared_index(shared_index_path) > 0 &&
3231 unlink(shared_index_path))
3232 warning_errno(_("unable to unlink: %s"), shared_index_path);
3233 }
3234 closedir(dir);
3235
3236 return 0;
3237}
3238
a0a96756 3239static int write_shared_index(struct index_state *istate,
ba95e96d 3240 struct tempfile **temp, unsigned flags)
c18b80a0
NTND
3241{
3242 struct split_index *si = istate->split_index;
6e773527 3243 int ret, was_full = !istate->sparse_index;
c18b80a0 3244
c18b80a0 3245 move_cache_to_base_index(istate);
ce7a9f01 3246 convert_to_sparse(istate, 0);
42fee7a3
JH
3247
3248 trace2_region_enter_printf("index", "shared/do_write_index",
6a8c89d0 3249 the_repository, "%s", get_tempfile_path(*temp));
3b7a4475 3250 ret = do_write_index(si->base, *temp, WRITE_NO_EXTENSION, flags);
c173542c 3251 trace2_region_leave_printf("index", "shared/do_write_index",
6a8c89d0 3252 the_repository, "%s", get_tempfile_path(*temp));
42fee7a3 3253
6e773527
DS
3254 if (was_full)
3255 ensure_full_index(istate);
3256
59f9d2dd 3257 if (ret)
c18b80a0 3258 return ret;
7db2d08c 3259 ret = adjust_shared_perm(get_tempfile_path(*temp));
df801f3f 3260 if (ret) {
9d0a9e90 3261 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp));
df801f3f
CC
3262 return ret;
3263 }
7db2d08c 3264 ret = rename_tempfile(temp,
75691ea3 3265 git_path("sharedindex.%s", oid_to_hex(&si->base->oid)));
b9683722 3266 if (!ret) {
75691ea3 3267 oidcpy(&si->base_oid, &si->base->oid);
3268 clean_shared_index_files(oid_to_hex(&si->base->oid));
b9683722
CC
3269 }
3270
c18b80a0
NTND
3271 return ret;
3272}
3273
e6a1dd77
CC
3274static const int default_max_percent_split_change = 20;
3275
3276static int too_many_not_shared_entries(struct index_state *istate)
3277{
3278 int i, not_shared = 0;
3279 int max_split = git_config_get_max_percent_split_change();
3280
3281 switch (max_split) {
3282 case -1:
3283 /* not or badly configured: use the default value */
3284 max_split = default_max_percent_split_change;
3285 break;
3286 case 0:
3287 return 1; /* 0% means always write a new shared index */
3288 case 100:
3289 return 0; /* 100% means never write a new shared index */
3290 default:
3291 break; /* just use the configured value */
3292 }
3293
3294 /* Count not shared entries */
3295 for (i = 0; i < istate->cache_nr; i++) {
3296 struct cache_entry *ce = istate->cache[i];
3297 if (!ce->index)
3298 not_shared++;
3299 }
3300
3301 return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100;
3302}
3303
03b86647
NTND
3304int write_locked_index(struct index_state *istate, struct lock_file *lock,
3305 unsigned flags)
3306{
e8ffd034 3307 int new_shared_index, ret, test_split_index_env;
5fc2fc8f
NTND
3308 struct split_index *si = istate->split_index;
3309
4592e608 3310 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
c207e9e1 3311 cache_tree_verify(the_repository, istate);
4592e608 3312
61000814
3313 if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
3314 if (flags & COMMIT_LOCK)
3315 rollback_lock_file(lock);
3316 return 0;
3317 }
3318
3bd28eb2
AV
3319 if (istate->fsmonitor_last_update)
3320 fill_fsmonitor_bitmap(istate);
3321
e8ffd034
SG
3322 test_split_index_env = git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3323
3324 if ((!si && !test_split_index_env) ||
3325 alternate_index_output ||
5165dd59 3326 (istate->cache_changed & ~EXTMASK)) {
3b7a4475
JS
3327 ret = do_write_locked_index(istate, lock, flags,
3328 ~WRITE_SPLIT_INDEX_EXTENSION);
df60cf57 3329 goto out;
5fc2fc8f
NTND
3330 }
3331
e8ffd034
SG
3332 if (test_split_index_env) {
3333 if (!si) {
3334 si = init_split_index(istate);
d6e3c181 3335 istate->cache_changed |= SPLIT_INDEX_ORDERED;
e8ffd034
SG
3336 } else {
3337 int v = si->base_oid.hash[0];
3338 if ((v & 15) < 6)
3339 istate->cache_changed |= SPLIT_INDEX_ORDERED;
3340 }
d6e3c181 3341 }
e6a1dd77
CC
3342 if (too_many_not_shared_entries(istate))
3343 istate->cache_changed |= SPLIT_INDEX_ORDERED;
0d59ffb4
CC
3344
3345 new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
3346
3347 if (new_shared_index) {
59f9d2dd
NTND
3348 struct tempfile *temp;
3349 int saved_errno;
3350
c9d6c788
ÆAB
3351 /* Same initial permissions as the main .git/index file */
3352 temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
59f9d2dd 3353 if (!temp) {
3b7a4475
JS
3354 ret = do_write_locked_index(istate, lock, flags,
3355 ~WRITE_SPLIT_INDEX_EXTENSION);
ef5b3a6c
NTND
3356 goto out;
3357 }
ba95e96d 3358 ret = write_shared_index(istate, &temp, flags);
59f9d2dd
NTND
3359
3360 saved_errno = errno;
3361 if (is_tempfile_active(temp))
3362 delete_tempfile(&temp);
3363 errno = saved_errno;
3364
c18b80a0 3365 if (ret)
df60cf57 3366 goto out;
c18b80a0
NTND
3367 }
3368
0d59ffb4
CC
3369 ret = write_split_index(istate, lock, flags);
3370
3371 /* Freshen the shared index only if the split-index was written */
6e37c8ed 3372 if (!ret && !new_shared_index && !is_null_oid(&si->base_oid)) {
a125a223 3373 const char *shared_index = git_path("sharedindex.%s",
2182abd9 3374 oid_to_hex(&si->base_oid));
a125a223
TG
3375 freshen_shared_index(shared_index, 1);
3376 }
0d59ffb4 3377
df60cf57
3378out:
3379 if (flags & COMMIT_LOCK)
3380 rollback_lock_file(lock);
0d59ffb4 3381 return ret;
03b86647
NTND
3382}
3383
e46bbcf6
MV
3384/*
3385 * Read the index file that is potentially unmerged into given
ad376204
EN
3386 * index_state, dropping any unmerged entries to stage #0 (potentially
3387 * resulting in a path appearing as both a file and a directory in the
3388 * index; the caller is responsible to clear out the extra entries
3389 * before writing the index to a tree). Returns true if the index is
3390 * unmerged. Callers who want to refuse to work from an unmerged
3391 * state can call this and check its return value, instead of calling
3392 * read_cache().
e46bbcf6 3393 */
e1ff0a32 3394int repo_read_index_unmerged(struct repository *repo)
e46bbcf6 3395{
e1ff0a32 3396 struct index_state *istate;
e46bbcf6 3397 int i;
d1a43f2a 3398 int unmerged = 0;
e46bbcf6 3399
e1ff0a32
NTND
3400 repo_read_index(repo);
3401 istate = repo->index;
e46bbcf6
MV
3402 for (i = 0; i < istate->cache_nr; i++) {
3403 struct cache_entry *ce = istate->cache[i];
d1a43f2a 3404 struct cache_entry *new_ce;
a849735b 3405 int len;
d1a43f2a
JH
3406
3407 if (!ce_stage(ce))
e46bbcf6 3408 continue;
d1a43f2a 3409 unmerged = 1;
68c4f6a5 3410 len = ce_namelen(ce);
a849735b 3411 new_ce = make_empty_cache_entry(istate, len);
d1a43f2a 3412 memcpy(new_ce->name, ce->name, len);
b60e188c
TG
3413 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
3414 new_ce->ce_namelen = len;
d1a43f2a 3415 new_ce->ce_mode = ce->ce_mode;
ad376204 3416 if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK))
9d0a9e90 3417 return error(_("%s: cannot drop to stage #0"),
5699d17e 3418 new_ce->name);
e46bbcf6 3419 }
d1a43f2a 3420 return unmerged;
e46bbcf6 3421}
041aee31 3422
98fa4738
JK
3423/*
3424 * Returns 1 if the path is an "other" path with respect to
3425 * the index; that is, the path is not mentioned in the index at all,
3426 * either as a file, a directory with some files in the index,
3427 * or as an unmerged entry.
3428 *
3429 * We helpfully remove a trailing "/" from directories so that
3430 * the output of read_directory can be used as-is.
3431 */
847a9e5d
DS
3432int index_name_is_other(struct index_state *istate, const char *name,
3433 int namelen)
98fa4738
JK
3434{
3435 int pos;
3436 if (namelen && name[namelen - 1] == '/')
3437 namelen--;
3438 pos = index_name_pos(istate, name, namelen);
3439 if (0 <= pos)
3440 return 0; /* exact match */
3441 pos = -pos - 1;
3442 if (pos < istate->cache_nr) {
3443 struct cache_entry *ce = istate->cache[pos];
3444 if (ce_namelen(ce) == namelen &&
3445 !memcmp(ce->name, name, namelen))
3446 return 0; /* Yup, this one exists unmerged */
3447 }
3448 return 1;
3449}
29fb37b2 3450
847a9e5d 3451void *read_blob_data_from_index(struct index_state *istate,
87542508 3452 const char *path, unsigned long *size)
29fb37b2
LF
3453{
3454 int pos, len;
3455 unsigned long sz;
3456 enum object_type type;
3457 void *data;
3458
3459 len = strlen(path);
3460 pos = index_name_pos(istate, path, len);
3461 if (pos < 0) {
3462 /*
3463 * We might be in the middle of a merge, in which
3464 * case we would read stage #2 (ours).
3465 */
3466 int i;
3467 for (i = -pos - 1;
3468 (pos < 0 && i < istate->cache_nr &&
3469 !strcmp(istate->cache[i]->name, path));
3470 i++)
3471 if (ce_stage(istate->cache[i]) == 2)
3472 pos = i;
3473 }
3474 if (pos < 0)
3475 return NULL;
bc726bd0
ÆAB
3476 data = repo_read_object_file(the_repository, &istate->cache[pos]->oid,
3477 &type, &sz);
29fb37b2
LF
3478 if (!data || type != OBJ_BLOB) {
3479 free(data);
3480 return NULL;
3481 }
ff366825
LF
3482 if (size)
3483 *size = sz;
29fb37b2
LF
3484 return data;
3485}
38612532 3486
edf3b905
DT
3487void move_index_extensions(struct index_state *dst, struct index_state *src)
3488{
3489 dst->untracked = src->untracked;
3490 src->untracked = NULL;
836ef2b6
NTND
3491 dst->cache_tree = src->cache_tree;
3492 src->cache_tree = NULL;
edf3b905 3493}
a849735b 3494
8e72d675
JM
3495struct cache_entry *dup_cache_entry(const struct cache_entry *ce,
3496 struct index_state *istate)
3497{
3498 unsigned int size = ce_size(ce);
3499 int mem_pool_allocated;
3500 struct cache_entry *new_entry = make_empty_cache_entry(istate, ce_namelen(ce));
3501 mem_pool_allocated = new_entry->mem_pool_allocated;
3502
3503 memcpy(new_entry, ce, size);
3504 new_entry->mem_pool_allocated = mem_pool_allocated;
3505 return new_entry;
3506}
3507
a849735b
JM
3508void discard_cache_entry(struct cache_entry *ce)
3509{
8616a2d0
JM
3510 if (ce && should_validate_cache_entries())
3511 memset(ce, 0xCD, cache_entry_size(ce->ce_namelen));
3512
8e72d675
JM
3513 if (ce && ce->mem_pool_allocated)
3514 return;
3515
a849735b
JM
3516 free(ce);
3517}
8616a2d0
JM
3518
3519int should_validate_cache_entries(void)
3520{
3521 static int validate_index_cache_entries = -1;
3522
3523 if (validate_index_cache_entries < 0) {
3524 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3525 validate_index_cache_entries = 1;
3526 else
3527 validate_index_cache_entries = 0;
3528 }
3529
3530 return validate_index_cache_entries;
3531}
3b1d9e04
BP
3532
3533#define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3534#define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3535
3536static size_t read_eoie_extension(const char *mmap, size_t mmap_size)
3537{
3538 /*
3539 * The end of index entries (EOIE) extension is guaranteed to be last
3540 * so that it can be found by scanning backwards from the EOF.
3541 *
3542 * "EOIE"
3543 * <4-byte length>
3544 * <4-byte offset>
3545 * <20-byte hash>
3546 */
3547 const char *index, *eoie;
3548 uint32_t extsize;
3549 size_t offset, src_offset;
3550 unsigned char hash[GIT_MAX_RAWSZ];
3551 git_hash_ctx c;
3552
3553 /* ensure we have an index big enough to contain an EOIE extension */
3554 if (mmap_size < sizeof(struct cache_header) + EOIE_SIZE_WITH_HEADER + the_hash_algo->rawsz)
3555 return 0;
3556
3557 /* validate the extension signature */
3558 index = eoie = mmap + mmap_size - EOIE_SIZE_WITH_HEADER - the_hash_algo->rawsz;
3559 if (CACHE_EXT(index) != CACHE_EXT_ENDOFINDEXENTRIES)
3560 return 0;
3561 index += sizeof(uint32_t);
3562
3563 /* validate the extension size */
3564 extsize = get_be32(index);
3565 if (extsize != EOIE_SIZE)
3566 return 0;
3567 index += sizeof(uint32_t);
3568
3569 /*
3570 * Validate the offset we're going to look for the first extension
3571 * signature is after the index header and before the eoie extension.
3572 */
3573 offset = get_be32(index);
3574 if (mmap + offset < mmap + sizeof(struct cache_header))
3575 return 0;
3576 if (mmap + offset >= eoie)
3577 return 0;
3578 index += sizeof(uint32_t);
3579
3580 /*
3581 * The hash is computed over extension types and their sizes (but not
3582 * their contents). E.g. if we have "TREE" extension that is N-bytes
3583 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3584 * then the hash would be:
3585 *
3586 * SHA-1("TREE" + <binary representation of N> +
3587 * "REUC" + <binary representation of M>)
3588 */
3589 src_offset = offset;
3590 the_hash_algo->init_fn(&c);
3591 while (src_offset < mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER) {
3592 /* After an array of active_nr index entries,
3593 * there can be arbitrary number of extended
3594 * sections, each of which is prefixed with
3595 * extension name (4-byte) and section length
3596 * in 4-byte network byte order.
3597 */
3598 uint32_t extsize;
3599 memcpy(&extsize, mmap + src_offset + 4, 4);
3600 extsize = ntohl(extsize);
3601
3602 /* verify the extension size isn't so large it will wrap around */
3603 if (src_offset + 8 + extsize < src_offset)
3604 return 0;
3605
3606 the_hash_algo->update_fn(&c, mmap + src_offset, 8);
3607
3608 src_offset += 8;
3609 src_offset += extsize;
3610 }
3611 the_hash_algo->final_fn(hash, &c);
3612 if (!hasheq(hash, (const unsigned char *)index))
3613 return 0;
3614
3615 /* Validate that the extension offsets returned us back to the eoie extension. */
3616 if (src_offset != mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER)
3617 return 0;
3618
3619 return offset;
3620}
3621
3622static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset)
3623{
3624 uint32_t buffer;
3625 unsigned char hash[GIT_MAX_RAWSZ];
3626
3627 /* offset */
3628 put_be32(&buffer, offset);
3629 strbuf_add(sb, &buffer, sizeof(uint32_t));
3630
3631 /* hash */
3632 the_hash_algo->final_fn(hash, eoie_context);
3633 strbuf_add(sb, hash, the_hash_algo->rawsz);
3634}
3255089a 3635
3255089a
BP
3636#define IEOT_VERSION (1)
3637
3638static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset)
3639{
ec36c42a
NTND
3640 const char *index = NULL;
3641 uint32_t extsize, ext_version;
3642 struct index_entry_offset_table *ieot;
3643 int i, nr;
3644
3645 /* find the IEOT extension */
3646 if (!offset)
3647 return NULL;
3648 while (offset <= mmap_size - the_hash_algo->rawsz - 8) {
3649 extsize = get_be32(mmap + offset + 4);
3650 if (CACHE_EXT((mmap + offset)) == CACHE_EXT_INDEXENTRYOFFSETTABLE) {
3651 index = mmap + offset + 4 + 4;
3652 break;
3653 }
3654 offset += 8;
3655 offset += extsize;
3656 }
3657 if (!index)
3658 return NULL;
3659
3660 /* validate the version is IEOT_VERSION */
3661 ext_version = get_be32(index);
3662 if (ext_version != IEOT_VERSION) {
3663 error("invalid IEOT version %d", ext_version);
3664 return NULL;
3665 }
3666 index += sizeof(uint32_t);
3667
3668 /* extension size - version bytes / bytes per entry */
3669 nr = (extsize - sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3670 if (!nr) {
3671 error("invalid number of IEOT entries %d", nr);
3672 return NULL;
3673 }
3674 ieot = xmalloc(sizeof(struct index_entry_offset_table)
3675 + (nr * sizeof(struct index_entry_offset)));
3676 ieot->nr = nr;
3677 for (i = 0; i < nr; i++) {
3678 ieot->entries[i].offset = get_be32(index);
3679 index += sizeof(uint32_t);
3680 ieot->entries[i].nr = get_be32(index);
3681 index += sizeof(uint32_t);
3682 }
3683
3684 return ieot;
3255089a
BP
3685}
3686
3687static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot)
3688{
ec36c42a
NTND
3689 uint32_t buffer;
3690 int i;
3255089a 3691
ec36c42a
NTND
3692 /* version */
3693 put_be32(&buffer, IEOT_VERSION);
3694 strbuf_add(sb, &buffer, sizeof(uint32_t));
3255089a 3695
ec36c42a
NTND
3696 /* ieot */
3697 for (i = 0; i < ieot->nr; i++) {
3255089a 3698
ec36c42a
NTND
3699 /* offset */
3700 put_be32(&buffer, ieot->entries[i].offset);
3701 strbuf_add(sb, &buffer, sizeof(uint32_t));
3255089a 3702
ec36c42a
NTND
3703 /* count */
3704 put_be32(&buffer, ieot->entries[i].nr);
3705 strbuf_add(sb, &buffer, sizeof(uint32_t));
3706 }
3255089a 3707}
b2896d27
JT
3708
3709void prefetch_cache_entries(const struct index_state *istate,
3710 must_prefetch_predicate must_prefetch)
3711{
3712 int i;
3713 struct oid_array to_fetch = OID_ARRAY_INIT;
3714
3715 for (i = 0; i < istate->cache_nr; i++) {
3716 struct cache_entry *ce = istate->cache[i];
3717
3718 if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce))
3719 continue;
3720 if (!oid_object_info_extended(the_repository, &ce->oid,
3721 NULL,
3722 OBJECT_INFO_FOR_PREFETCH))
3723 continue;
3724 oid_array_append(&to_fetch, &ce->oid);
3725 }
3726 promisor_remote_get_direct(the_repository,
3727 to_fetch.oid, to_fetch.nr);
3728 oid_array_clear(&to_fetch);
3729}
1a40e7be
EN
3730
3731static int read_one_entry_opt(struct index_state *istate,
3732 const struct object_id *oid,
3733 struct strbuf *base,
3734 const char *pathname,
3735 unsigned mode, int opt)
3736{
3737 int len;
3738 struct cache_entry *ce;
3739
3740 if (S_ISDIR(mode))
3741 return READ_TREE_RECURSIVE;
3742
3743 len = strlen(pathname);
3744 ce = make_empty_cache_entry(istate, base->len + len);
3745
3746 ce->ce_mode = create_ce_mode(mode);
3747 ce->ce_flags = create_ce_flags(1);
3748 ce->ce_namelen = base->len + len;
3749 memcpy(ce->name, base->buf, base->len);
3750 memcpy(ce->name + base->len, pathname, len+1);
3751 oidcpy(&ce->oid, oid);
3752 return add_index_entry(istate, ce, opt);
3753}
3754
3755static int read_one_entry(const struct object_id *oid, struct strbuf *base,
3756 const char *pathname, unsigned mode,
3757 void *context)
3758{
3759 struct index_state *istate = context;
3760 return read_one_entry_opt(istate, oid, base, pathname,
3761 mode,
3762 ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
3763}
3764
3765/*
3766 * This is used when the caller knows there is no existing entries at
3767 * the stage that will conflict with the entry being added.
3768 */
3769static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
3770 const char *pathname, unsigned mode,
3771 void *context)
3772{
3773 struct index_state *istate = context;
3774 return read_one_entry_opt(istate, oid, base, pathname,
3775 mode, ADD_CACHE_JUST_APPEND);
3776}
3777
3778/*
3779 * Read the tree specified with --with-tree option
3780 * (typically, HEAD) into stage #1 and then
3781 * squash them down to stage #0. This is used for
3782 * --error-unmatch to list and check the path patterns
3783 * that were given from the command line. We are not
3784 * going to write this index out.
3785 */
3786void overlay_tree_on_index(struct index_state *istate,
3787 const char *tree_name, const char *prefix)
3788{
3789 struct tree *tree;
3790 struct object_id oid;
3791 struct pathspec pathspec;
3792 struct cache_entry *last_stage0 = NULL;
3793 int i;
3794 read_tree_fn_t fn = NULL;
3795 int err;
3796
3797 if (repo_get_oid(the_repository, tree_name, &oid))
3798 die("tree-ish %s not found.", tree_name);
3799 tree = parse_tree_indirect(&oid);
3800 if (!tree)
3801 die("bad tree-ish %s", tree_name);
3802
3803 /* Hoist the unmerged entries up to stage #3 to make room */
3804 /* TODO: audit for interaction with sparse-index. */
3805 ensure_full_index(istate);
3806 for (i = 0; i < istate->cache_nr; i++) {
3807 struct cache_entry *ce = istate->cache[i];
3808 if (!ce_stage(ce))
3809 continue;
3810 ce->ce_flags |= CE_STAGEMASK;
3811 }
3812
3813 if (prefix) {
3814 static const char *(matchbuf[1]);
3815 matchbuf[0] = NULL;
3816 parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
3817 PATHSPEC_PREFER_CWD, prefix, matchbuf);
3818 } else
3819 memset(&pathspec, 0, sizeof(pathspec));
3820
3821 /*
3822 * See if we have cache entry at the stage. If so,
3823 * do it the original slow way, otherwise, append and then
3824 * sort at the end.
3825 */
3826 for (i = 0; !fn && i < istate->cache_nr; i++) {
3827 const struct cache_entry *ce = istate->cache[i];
3828 if (ce_stage(ce) == 1)
3829 fn = read_one_entry;
3830 }
3831
3832 if (!fn)
3833 fn = read_one_entry_quick;
3834 err = read_tree(the_repository, tree, &pathspec, fn, istate);
3835 clear_pathspec(&pathspec);
3836 if (err)
3837 die("unable to read tree entries %s", tree_name);
3838
3839 /*
3840 * Sort the cache entry -- we need to nuke the cache tree, though.
3841 */
3842 if (fn == read_one_entry_quick) {
3843 cache_tree_free(&istate->cache_tree);
3844 QSORT(istate->cache, istate->cache_nr, cmp_cache_name_compare);
3845 }
3846
3847 for (i = 0; i < istate->cache_nr; i++) {
3848 struct cache_entry *ce = istate->cache[i];
3849 switch (ce_stage(ce)) {
3850 case 0:
3851 last_stage0 = ce;
3852 /* fallthru */
3853 default:
3854 continue;
3855 case 1:
3856 /*
3857 * If there is stage #0 entry for this, we do not
3858 * need to show it. We use CE_UPDATE bit to mark
3859 * such an entry.
3860 */
3861 if (last_stage0 &&
3862 !strcmp(last_stage0->name, ce->name))
3863 ce->ce_flags |= CE_UPDATE;
3864 }
3865 }
3866}
6cee5ebc
EN
3867
3868struct update_callback_data {
3869 struct index_state *index;
3870 int include_sparse;
3871 int flags;
3872 int add_errors;
3873};
3874
3875static int fix_unmerged_status(struct diff_filepair *p,
3876 struct update_callback_data *data)
3877{
3878 if (p->status != DIFF_STATUS_UNMERGED)
3879 return p->status;
3880 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
3881 /*
3882 * This is not an explicit add request, and the
3883 * path is missing from the working tree (deleted)
3884 */
3885 return DIFF_STATUS_DELETED;
3886 else
3887 /*
3888 * Either an explicit add request, or path exists
3889 * in the working tree. An attempt to explicitly
3890 * add a path that does not exist in the working tree
3891 * will be caught as an error by the caller immediately.
3892 */
3893 return DIFF_STATUS_MODIFIED;
3894}
3895
3896static void update_callback(struct diff_queue_struct *q,
3897 struct diff_options *opt UNUSED, void *cbdata)
3898{
3899 int i;
3900 struct update_callback_data *data = cbdata;
3901
3902 for (i = 0; i < q->nr; i++) {
3903 struct diff_filepair *p = q->queue[i];
3904 const char *path = p->one->path;
3905
3906 if (!data->include_sparse &&
3907 !path_in_sparse_checkout(path, data->index))
3908 continue;
3909
3910 switch (fix_unmerged_status(p, data)) {
3911 default:
3912 die(_("unexpected diff status %c"), p->status);
3913 case DIFF_STATUS_MODIFIED:
3914 case DIFF_STATUS_TYPE_CHANGED:
3915 if (add_file_to_index(data->index, path, data->flags)) {
3916 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
3917 die(_("updating files failed"));
3918 data->add_errors++;
3919 }
3920 break;
3921 case DIFF_STATUS_DELETED:
3922 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
3923 break;
3924 if (!(data->flags & ADD_CACHE_PRETEND))
3925 remove_file_from_index(data->index, path);
3926 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
3927 printf(_("remove '%s'\n"), path);
3928 break;
3929 }
3930 }
3931}
3932
3933int add_files_to_cache(struct repository *repo, const char *prefix,
3934 const struct pathspec *pathspec, int include_sparse,
3935 int flags)
3936{
3937 struct update_callback_data data;
3938 struct rev_info rev;
3939
3940 memset(&data, 0, sizeof(data));
3941 data.index = repo->index;
3942 data.include_sparse = include_sparse;
3943 data.flags = flags;
3944
3945 repo_init_revisions(repo, &rev, prefix);
3946 setup_revisions(0, NULL, &rev, NULL);
3947 if (pathspec)
3948 copy_pathspec(&rev.prune_data, pathspec);
3949 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
3950 rev.diffopt.format_callback = update_callback;
3951 rev.diffopt.format_callback_data = &data;
3952 rev.diffopt.flags.override_submodule_config = 1;
3953 rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
3954
3955 /*
3956 * Use an ODB transaction to optimize adding multiple objects.
3957 * This function is invoked from commands other than 'add', which
3958 * may not have their own transaction active.
3959 */
3960 begin_odb_transaction();
3961 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
3962 end_odb_transaction();
3963
3964 release_revisions(&rev);
3965 return !!data.add_errors;
3966}