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