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