merge-recursive: honor diff.algorithm
[git/gitster.git] / read-cache.c
blob48bf24f87c00c15e5a4b249b26eabc624546f901
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
7 #define USE_THE_REPOSITORY_VARIABLE
9 #include "git-compat-util.h"
10 #include "bulk-checkin.h"
11 #include "config.h"
12 #include "date.h"
13 #include "diff.h"
14 #include "diffcore.h"
15 #include "hex.h"
16 #include "tempfile.h"
17 #include "lockfile.h"
18 #include "cache-tree.h"
19 #include "refs.h"
20 #include "dir.h"
21 #include "object-file.h"
22 #include "object-store-ll.h"
23 #include "oid-array.h"
24 #include "tree.h"
25 #include "commit.h"
26 #include "environment.h"
27 #include "gettext.h"
28 #include "mem-pool.h"
29 #include "name-hash.h"
30 #include "object-name.h"
31 #include "path.h"
32 #include "preload-index.h"
33 #include "read-cache.h"
34 #include "resolve-undo.h"
35 #include "revision.h"
36 #include "strbuf.h"
37 #include "trace2.h"
38 #include "varint.h"
39 #include "split-index.h"
40 #include "symlinks.h"
41 #include "utf8.h"
42 #include "fsmonitor.h"
43 #include "thread-utils.h"
44 #include "progress.h"
45 #include "sparse-index.h"
46 #include "csum-file.h"
47 #include "promisor-remote.h"
48 #include "hook.h"
50 /* Mask for the name length in ce_flags in the on-disk index */
52 #define CE_NAMEMASK (0x0fff)
54 /* Index extensions.
56 * The first letter should be 'A'..'Z' for extensions that are not
57 * necessary for a correct operation (i.e. optimization data).
58 * When new extensions are added that _needs_ to be understood in
59 * order to correctly interpret the index file, pick character that
60 * is outside the range, to cause the reader to abort.
63 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
64 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
65 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
66 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
67 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
68 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
69 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
70 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
71 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
73 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
74 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
75 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
76 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
80 * This is an estimate of the pathname length in the index. We use
81 * this for V4 index files to guess the un-deltafied size of the index
82 * in memory because of pathname deltafication. This is not required
83 * for V2/V3 index formats because their pathnames are not compressed.
84 * If the initial amount of memory set aside is not sufficient, the
85 * mem pool will allocate extra memory.
87 #define CACHE_ENTRY_PATH_LENGTH 80
89 enum index_search_mode {
90 NO_EXPAND_SPARSE = 0,
91 EXPAND_SPARSE = 1
94 static inline struct cache_entry *mem_pool__ce_alloc(struct mem_pool *mem_pool, size_t len)
96 struct cache_entry *ce;
97 ce = mem_pool_alloc(mem_pool, cache_entry_size(len));
98 ce->mem_pool_allocated = 1;
99 return ce;
102 static inline struct cache_entry *mem_pool__ce_calloc(struct mem_pool *mem_pool, size_t len)
104 struct cache_entry * ce;
105 ce = mem_pool_calloc(mem_pool, 1, cache_entry_size(len));
106 ce->mem_pool_allocated = 1;
107 return ce;
110 static struct mem_pool *find_mem_pool(struct index_state *istate)
112 struct mem_pool **pool_ptr;
114 if (istate->split_index && istate->split_index->base)
115 pool_ptr = &istate->split_index->base->ce_mem_pool;
116 else
117 pool_ptr = &istate->ce_mem_pool;
119 if (!*pool_ptr) {
120 *pool_ptr = xmalloc(sizeof(**pool_ptr));
121 mem_pool_init(*pool_ptr, 0);
124 return *pool_ptr;
127 static const char *alternate_index_output;
129 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
131 if (S_ISSPARSEDIR(ce->ce_mode))
132 istate->sparse_index = INDEX_COLLAPSED;
134 istate->cache[nr] = ce;
135 add_name_hash(istate, ce);
138 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
140 struct cache_entry *old = istate->cache[nr];
142 replace_index_entry_in_base(istate, old, ce);
143 remove_name_hash(istate, old);
144 discard_cache_entry(old);
145 ce->ce_flags &= ~CE_HASHED;
146 set_index_entry(istate, nr, ce);
147 ce->ce_flags |= CE_UPDATE_IN_BASE;
148 mark_fsmonitor_invalid(istate, ce);
149 istate->cache_changed |= CE_ENTRY_CHANGED;
152 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
154 struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
155 int namelen = strlen(new_name);
157 new_entry = make_empty_cache_entry(istate, namelen);
158 copy_cache_entry(new_entry, old_entry);
159 new_entry->ce_flags &= ~CE_HASHED;
160 new_entry->ce_namelen = namelen;
161 new_entry->index = 0;
162 memcpy(new_entry->name, new_name, namelen + 1);
164 cache_tree_invalidate_path(istate, old_entry->name);
165 untracked_cache_remove_from_index(istate, old_entry->name);
166 remove_index_entry_at(istate, nr);
169 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
170 * we only update stat info if the entry is otherwise up-to-date (i.e.,
171 * the contents/mode haven't changed). This ensures that we reflect the
172 * 'ctime' of the rename in the index without (incorrectly) updating
173 * the cached stat info to reflect unstaged changes on disk.
175 refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
176 if (refreshed && refreshed != new_entry) {
177 add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
178 discard_cache_entry(new_entry);
179 } else
180 add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
184 * This only updates the "non-critical" parts of the directory
185 * cache, ie the parts that aren't tracked by GIT, and only used
186 * to validate the cache.
188 void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
190 fill_stat_data(&ce->ce_stat_data, st);
192 if (assume_unchanged)
193 ce->ce_flags |= CE_VALID;
195 if (S_ISREG(st->st_mode)) {
196 ce_mark_uptodate(ce);
197 mark_fsmonitor_valid(istate, ce);
201 static unsigned int st_mode_from_ce(const struct cache_entry *ce)
203 extern int trust_executable_bit, has_symlinks;
205 switch (ce->ce_mode & S_IFMT) {
206 case S_IFLNK:
207 return has_symlinks ? S_IFLNK : (S_IFREG | 0644);
208 case S_IFREG:
209 return (ce->ce_mode & (trust_executable_bit ? 0755 : 0644)) | S_IFREG;
210 case S_IFGITLINK:
211 return S_IFDIR | 0755;
212 case S_IFDIR:
213 return ce->ce_mode;
214 default:
215 BUG("unsupported ce_mode: %o", ce->ce_mode);
219 int fake_lstat(const struct cache_entry *ce, struct stat *st)
221 fake_lstat_data(&ce->ce_stat_data, st);
222 st->st_mode = st_mode_from_ce(ce);
224 /* always succeed as lstat() replacement */
225 return 0;
228 static int ce_compare_data(struct index_state *istate,
229 const struct cache_entry *ce,
230 struct stat *st)
232 int match = -1;
233 int fd = git_open_cloexec(ce->name, O_RDONLY);
235 if (fd >= 0) {
236 struct object_id oid;
237 if (!index_fd(istate, &oid, fd, st, OBJ_BLOB, ce->name, 0))
238 match = !oideq(&oid, &ce->oid);
239 /* index_fd() closed the file descriptor already */
241 return match;
244 static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
246 int match = -1;
247 void *buffer;
248 unsigned long size;
249 enum object_type type;
250 struct strbuf sb = STRBUF_INIT;
252 if (strbuf_readlink(&sb, ce->name, expected_size))
253 return -1;
255 buffer = repo_read_object_file(the_repository, &ce->oid, &type, &size);
256 if (buffer) {
257 if (size == sb.len)
258 match = memcmp(buffer, sb.buf, size);
259 free(buffer);
261 strbuf_release(&sb);
262 return match;
265 static int ce_compare_gitlink(const struct cache_entry *ce)
267 struct object_id oid;
270 * We don't actually require that the .git directory
271 * under GITLINK directory be a valid git directory. It
272 * might even be missing (in case nobody populated that
273 * sub-project).
275 * If so, we consider it always to match.
277 if (repo_resolve_gitlink_ref(the_repository, ce->name,
278 "HEAD", &oid) < 0)
279 return 0;
280 return !oideq(&oid, &ce->oid);
283 static int ce_modified_check_fs(struct index_state *istate,
284 const struct cache_entry *ce,
285 struct stat *st)
287 switch (st->st_mode & S_IFMT) {
288 case S_IFREG:
289 if (ce_compare_data(istate, ce, st))
290 return DATA_CHANGED;
291 break;
292 case S_IFLNK:
293 if (ce_compare_link(ce, xsize_t(st->st_size)))
294 return DATA_CHANGED;
295 break;
296 case S_IFDIR:
297 if (S_ISGITLINK(ce->ce_mode))
298 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
299 /* else fallthrough */
300 default:
301 return TYPE_CHANGED;
303 return 0;
306 static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
308 unsigned int changed = 0;
310 if (ce->ce_flags & CE_REMOVE)
311 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
313 switch (ce->ce_mode & S_IFMT) {
314 case S_IFREG:
315 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
316 /* We consider only the owner x bit to be relevant for
317 * "mode changes"
319 if (trust_executable_bit &&
320 (0100 & (ce->ce_mode ^ st->st_mode)))
321 changed |= MODE_CHANGED;
322 break;
323 case S_IFLNK:
324 if (!S_ISLNK(st->st_mode) &&
325 (has_symlinks || !S_ISREG(st->st_mode)))
326 changed |= TYPE_CHANGED;
327 break;
328 case S_IFGITLINK:
329 /* We ignore most of the st_xxx fields for gitlinks */
330 if (!S_ISDIR(st->st_mode))
331 changed |= TYPE_CHANGED;
332 else if (ce_compare_gitlink(ce))
333 changed |= DATA_CHANGED;
334 return changed;
335 default:
336 BUG("unsupported ce_mode: %o", ce->ce_mode);
339 changed |= match_stat_data(&ce->ce_stat_data, st);
341 /* Racily smudged entry? */
342 if (!ce->ce_stat_data.sd_size) {
343 if (!is_empty_blob_oid(&ce->oid, the_repository->hash_algo))
344 changed |= DATA_CHANGED;
347 return changed;
350 static int is_racy_stat(const struct index_state *istate,
351 const struct stat_data *sd)
353 return (istate->timestamp.sec &&
354 #ifdef USE_NSEC
355 /* nanosecond timestamped files can also be racy! */
356 (istate->timestamp.sec < sd->sd_mtime.sec ||
357 (istate->timestamp.sec == sd->sd_mtime.sec &&
358 istate->timestamp.nsec <= sd->sd_mtime.nsec))
359 #else
360 istate->timestamp.sec <= sd->sd_mtime.sec
361 #endif
365 int is_racy_timestamp(const struct index_state *istate,
366 const struct cache_entry *ce)
368 return (!S_ISGITLINK(ce->ce_mode) &&
369 is_racy_stat(istate, &ce->ce_stat_data));
372 int match_stat_data_racy(const struct index_state *istate,
373 const struct stat_data *sd, struct stat *st)
375 if (is_racy_stat(istate, sd))
376 return MTIME_CHANGED;
377 return match_stat_data(sd, st);
380 int ie_match_stat(struct index_state *istate,
381 const struct cache_entry *ce, struct stat *st,
382 unsigned int options)
384 unsigned int changed;
385 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
386 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
387 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
388 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
390 if (!ignore_fsmonitor)
391 refresh_fsmonitor(istate);
393 * If it's marked as always valid in the index, it's
394 * valid whatever the checked-out copy says.
396 * skip-worktree has the same effect with higher precedence
398 if (!ignore_skip_worktree && ce_skip_worktree(ce))
399 return 0;
400 if (!ignore_valid && (ce->ce_flags & CE_VALID))
401 return 0;
402 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID))
403 return 0;
406 * Intent-to-add entries have not been added, so the index entry
407 * by definition never matches what is in the work tree until it
408 * actually gets added.
410 if (ce_intent_to_add(ce))
411 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
413 changed = ce_match_stat_basic(ce, st);
416 * Within 1 second of this sequence:
417 * echo xyzzy >file && git-update-index --add file
418 * running this command:
419 * echo frotz >file
420 * would give a falsely clean cache entry. The mtime and
421 * length match the cache, and other stat fields do not change.
423 * We could detect this at update-index time (the cache entry
424 * being registered/updated records the same time as "now")
425 * and delay the return from git-update-index, but that would
426 * effectively mean we can make at most one commit per second,
427 * which is not acceptable. Instead, we check cache entries
428 * whose mtime are the same as the index file timestamp more
429 * carefully than others.
431 if (!changed && is_racy_timestamp(istate, ce)) {
432 if (assume_racy_is_modified)
433 changed |= DATA_CHANGED;
434 else
435 changed |= ce_modified_check_fs(istate, ce, st);
438 return changed;
441 int ie_modified(struct index_state *istate,
442 const struct cache_entry *ce,
443 struct stat *st, unsigned int options)
445 int changed, changed_fs;
447 changed = ie_match_stat(istate, ce, st, options);
448 if (!changed)
449 return 0;
451 * If the mode or type has changed, there's no point in trying
452 * to refresh the entry - it's not going to match
454 if (changed & (MODE_CHANGED | TYPE_CHANGED))
455 return changed;
458 * Immediately after read-tree or update-index --cacheinfo,
459 * the length field is zero, as we have never even read the
460 * lstat(2) information once, and we cannot trust DATA_CHANGED
461 * returned by ie_match_stat() which in turn was returned by
462 * ce_match_stat_basic() to signal that the filesize of the
463 * blob changed. We have to actually go to the filesystem to
464 * see if the contents match, and if so, should answer "unchanged".
466 * The logic does not apply to gitlinks, as ce_match_stat_basic()
467 * already has checked the actual HEAD from the filesystem in the
468 * subproject. If ie_match_stat() already said it is different,
469 * then we know it is.
471 if ((changed & DATA_CHANGED) &&
472 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
473 return changed;
475 changed_fs = ce_modified_check_fs(istate, ce, st);
476 if (changed_fs)
477 return changed | changed_fs;
478 return 0;
481 static int cache_name_stage_compare(const char *name1, int len1, int stage1,
482 const char *name2, int len2, int stage2)
484 int cmp;
486 cmp = name_compare(name1, len1, name2, len2);
487 if (cmp)
488 return cmp;
490 if (stage1 < stage2)
491 return -1;
492 if (stage1 > stage2)
493 return 1;
494 return 0;
497 int cmp_cache_name_compare(const void *a_, const void *b_)
499 const struct cache_entry *ce1, *ce2;
501 ce1 = *((const struct cache_entry **)a_);
502 ce2 = *((const struct cache_entry **)b_);
503 return cache_name_stage_compare(ce1->name, ce1->ce_namelen, ce_stage(ce1),
504 ce2->name, ce2->ce_namelen, ce_stage(ce2));
507 static int index_name_stage_pos(struct index_state *istate,
508 const char *name, int namelen,
509 int stage,
510 enum index_search_mode search_mode)
512 int first, last;
514 first = 0;
515 last = istate->cache_nr;
516 while (last > first) {
517 int next = first + ((last - first) >> 1);
518 struct cache_entry *ce = istate->cache[next];
519 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
520 if (!cmp)
521 return next;
522 if (cmp < 0) {
523 last = next;
524 continue;
526 first = next+1;
529 if (search_mode == EXPAND_SPARSE && istate->sparse_index &&
530 first > 0) {
531 /* Note: first <= istate->cache_nr */
532 struct cache_entry *ce = istate->cache[first - 1];
535 * If we are in a sparse-index _and_ the entry before the
536 * insertion position is a sparse-directory entry that is
537 * an ancestor of 'name', then we need to expand the index
538 * and search again. This will only trigger once, because
539 * thereafter the index is fully expanded.
541 if (S_ISSPARSEDIR(ce->ce_mode) &&
542 ce_namelen(ce) < namelen &&
543 !strncmp(name, ce->name, ce_namelen(ce))) {
544 ensure_full_index(istate);
545 return index_name_stage_pos(istate, name, namelen, stage, search_mode);
549 return -first-1;
552 int index_name_pos(struct index_state *istate, const char *name, int namelen)
554 return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE);
557 int index_name_pos_sparse(struct index_state *istate, const char *name, int namelen)
559 return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE);
562 int index_entry_exists(struct index_state *istate, const char *name, int namelen)
564 return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0;
567 int remove_index_entry_at(struct index_state *istate, int pos)
569 struct cache_entry *ce = istate->cache[pos];
571 record_resolve_undo(istate, ce);
572 remove_name_hash(istate, ce);
573 save_or_free_index_entry(istate, ce);
574 istate->cache_changed |= CE_ENTRY_REMOVED;
575 istate->cache_nr--;
576 if (pos >= istate->cache_nr)
577 return 0;
578 MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1,
579 istate->cache_nr - pos);
580 return 1;
584 * Remove all cache entries marked for removal, that is where
585 * CE_REMOVE is set in ce_flags. This is much more effective than
586 * calling remove_index_entry_at() for each entry to be removed.
588 void remove_marked_cache_entries(struct index_state *istate, int invalidate)
590 struct cache_entry **ce_array = istate->cache;
591 unsigned int i, j;
593 for (i = j = 0; i < istate->cache_nr; i++) {
594 if (ce_array[i]->ce_flags & CE_REMOVE) {
595 if (invalidate) {
596 cache_tree_invalidate_path(istate,
597 ce_array[i]->name);
598 untracked_cache_remove_from_index(istate,
599 ce_array[i]->name);
601 remove_name_hash(istate, ce_array[i]);
602 save_or_free_index_entry(istate, ce_array[i]);
604 else
605 ce_array[j++] = ce_array[i];
607 if (j == istate->cache_nr)
608 return;
609 istate->cache_changed |= CE_ENTRY_REMOVED;
610 istate->cache_nr = j;
613 int remove_file_from_index(struct index_state *istate, const char *path)
615 int pos = index_name_pos(istate, path, strlen(path));
616 if (pos < 0)
617 pos = -pos-1;
618 cache_tree_invalidate_path(istate, path);
619 untracked_cache_remove_from_index(istate, path);
620 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
621 remove_index_entry_at(istate, pos);
622 return 0;
625 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
627 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
630 static int index_name_pos_also_unmerged(struct index_state *istate,
631 const char *path, int namelen)
633 int pos = index_name_pos(istate, path, namelen);
634 struct cache_entry *ce;
636 if (pos >= 0)
637 return pos;
639 /* maybe unmerged? */
640 pos = -1 - pos;
641 if (pos >= istate->cache_nr ||
642 compare_name((ce = istate->cache[pos]), path, namelen))
643 return -1;
645 /* order of preference: stage 2, 1, 3 */
646 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
647 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
648 !compare_name(ce, path, namelen))
649 pos++;
650 return pos;
653 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
655 int len = ce_namelen(ce);
656 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
660 * If we add a filename that aliases in the cache, we will use the
661 * name that we already have - but we don't want to update the same
662 * alias twice, because that implies that there were actually two
663 * different files with aliasing names!
665 * So we use the CE_ADDED flag to verify that the alias was an old
666 * one before we accept it as
668 static struct cache_entry *create_alias_ce(struct index_state *istate,
669 struct cache_entry *ce,
670 struct cache_entry *alias)
672 int len;
673 struct cache_entry *new_entry;
675 if (alias->ce_flags & CE_ADDED)
676 die(_("will not add file alias '%s' ('%s' already exists in index)"),
677 ce->name, alias->name);
679 /* Ok, create the new entry using the name of the existing alias */
680 len = ce_namelen(alias);
681 new_entry = make_empty_cache_entry(istate, len);
682 memcpy(new_entry->name, alias->name, len);
683 copy_cache_entry(new_entry, ce);
684 save_or_free_index_entry(istate, ce);
685 return new_entry;
688 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
690 struct object_id oid;
691 if (write_object_file("", 0, OBJ_BLOB, &oid))
692 die(_("cannot create an empty blob in the object database"));
693 oidcpy(&ce->oid, &oid);
696 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
698 int namelen, was_same;
699 mode_t st_mode = st->st_mode;
700 struct cache_entry *ce, *alias = NULL;
701 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
702 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
703 int pretend = flags & ADD_CACHE_PRETEND;
704 int intent_only = flags & ADD_CACHE_INTENT;
705 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
706 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
707 unsigned hash_flags = pretend ? 0 : HASH_WRITE_OBJECT;
708 struct object_id oid;
710 if (flags & ADD_CACHE_RENORMALIZE)
711 hash_flags |= HASH_RENORMALIZE;
713 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
714 return error(_("%s: can only add regular files, symbolic links or git-directories"), path);
716 namelen = strlen(path);
717 if (S_ISDIR(st_mode)) {
718 if (repo_resolve_gitlink_ref(the_repository, path, "HEAD", &oid) < 0)
719 return error(_("'%s' does not have a commit checked out"), path);
720 while (namelen && path[namelen-1] == '/')
721 namelen--;
723 ce = make_empty_cache_entry(istate, namelen);
724 memcpy(ce->name, path, namelen);
725 ce->ce_namelen = namelen;
726 if (!intent_only)
727 fill_stat_cache_info(istate, ce, st);
728 else
729 ce->ce_flags |= CE_INTENT_TO_ADD;
732 if (trust_executable_bit && has_symlinks) {
733 ce->ce_mode = create_ce_mode(st_mode);
734 } else {
735 /* If there is an existing entry, pick the mode bits and type
736 * from it, otherwise assume unexecutable regular file.
738 struct cache_entry *ent;
739 int pos = index_name_pos_also_unmerged(istate, path, namelen);
741 ent = (0 <= pos) ? istate->cache[pos] : NULL;
742 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
745 /* When core.ignorecase=true, determine if a directory of the same name but differing
746 * case already exists within the Git repository. If it does, ensure the directory
747 * case of the file being added to the repository matches (is folded into) the existing
748 * entry's directory case.
750 if (ignore_case) {
751 adjust_dirname_case(istate, ce->name);
753 if (!(flags & ADD_CACHE_RENORMALIZE)) {
754 alias = index_file_exists(istate, ce->name,
755 ce_namelen(ce), ignore_case);
756 if (alias &&
757 !ce_stage(alias) &&
758 !ie_match_stat(istate, alias, st, ce_option)) {
759 /* Nothing changed, really */
760 if (!S_ISGITLINK(alias->ce_mode))
761 ce_mark_uptodate(alias);
762 alias->ce_flags |= CE_ADDED;
764 discard_cache_entry(ce);
765 return 0;
768 if (!intent_only) {
769 if (index_path(istate, &ce->oid, path, st, hash_flags)) {
770 discard_cache_entry(ce);
771 return error(_("unable to index file '%s'"), path);
773 } else
774 set_object_name_for_intent_to_add_entry(ce);
776 if (ignore_case && alias && different_name(ce, alias))
777 ce = create_alias_ce(istate, ce, alias);
778 ce->ce_flags |= CE_ADDED;
780 /* It was suspected to be racily clean, but it turns out to be Ok */
781 was_same = (alias &&
782 !ce_stage(alias) &&
783 oideq(&alias->oid, &ce->oid) &&
784 ce->ce_mode == alias->ce_mode);
786 if (pretend)
787 discard_cache_entry(ce);
788 else if (add_index_entry(istate, ce, add_option)) {
789 discard_cache_entry(ce);
790 return error(_("unable to add '%s' to index"), path);
792 if (verbose && !was_same)
793 printf("add '%s'\n", path);
794 return 0;
797 int add_file_to_index(struct index_state *istate, const char *path, int flags)
799 struct stat st;
800 if (lstat(path, &st))
801 die_errno(_("unable to stat '%s'"), path);
802 return add_to_index(istate, path, &st, flags);
805 struct cache_entry *make_empty_cache_entry(struct index_state *istate, size_t len)
807 return mem_pool__ce_calloc(find_mem_pool(istate), len);
810 struct cache_entry *make_empty_transient_cache_entry(size_t len,
811 struct mem_pool *ce_mem_pool)
813 if (ce_mem_pool)
814 return mem_pool__ce_calloc(ce_mem_pool, len);
815 return xcalloc(1, cache_entry_size(len));
818 enum verify_path_result {
819 PATH_OK,
820 PATH_INVALID,
821 PATH_DIR_WITH_SEP,
824 static enum verify_path_result verify_path_internal(const char *, unsigned);
826 int verify_path(const char *path, unsigned mode)
828 return verify_path_internal(path, mode) == PATH_OK;
831 struct cache_entry *make_cache_entry(struct index_state *istate,
832 unsigned int mode,
833 const struct object_id *oid,
834 const char *path,
835 int stage,
836 unsigned int refresh_options)
838 struct cache_entry *ce, *ret;
839 int len;
841 if (verify_path_internal(path, mode) == PATH_INVALID) {
842 error(_("invalid path '%s'"), path);
843 return NULL;
846 len = strlen(path);
847 ce = make_empty_cache_entry(istate, len);
849 oidcpy(&ce->oid, oid);
850 memcpy(ce->name, path, len);
851 ce->ce_flags = create_ce_flags(stage);
852 ce->ce_namelen = len;
853 ce->ce_mode = create_ce_mode(mode);
855 ret = refresh_cache_entry(istate, ce, refresh_options);
856 if (ret != ce)
857 discard_cache_entry(ce);
858 return ret;
861 struct cache_entry *make_transient_cache_entry(unsigned int mode,
862 const struct object_id *oid,
863 const char *path,
864 int stage,
865 struct mem_pool *ce_mem_pool)
867 struct cache_entry *ce;
868 int len;
870 if (!verify_path(path, mode)) {
871 error(_("invalid path '%s'"), path);
872 return NULL;
875 len = strlen(path);
876 ce = make_empty_transient_cache_entry(len, ce_mem_pool);
878 oidcpy(&ce->oid, oid);
879 memcpy(ce->name, path, len);
880 ce->ce_flags = create_ce_flags(stage);
881 ce->ce_namelen = len;
882 ce->ce_mode = create_ce_mode(mode);
884 return ce;
888 * Chmod an index entry with either +x or -x.
890 * Returns -1 if the chmod for the particular cache entry failed (if it's
891 * not a regular file), -2 if an invalid flip argument is passed in, 0
892 * otherwise.
894 int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
895 char flip)
897 if (!S_ISREG(ce->ce_mode))
898 return -1;
899 switch (flip) {
900 case '+':
901 ce->ce_mode |= 0111;
902 break;
903 case '-':
904 ce->ce_mode &= ~0111;
905 break;
906 default:
907 return -2;
909 cache_tree_invalidate_path(istate, ce->name);
910 ce->ce_flags |= CE_UPDATE_IN_BASE;
911 mark_fsmonitor_invalid(istate, ce);
912 istate->cache_changed |= CE_ENTRY_CHANGED;
914 return 0;
917 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
919 int len = ce_namelen(a);
920 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
924 * We fundamentally don't like some paths: we don't want
925 * dot or dot-dot anywhere, and for obvious reasons don't
926 * want to recurse into ".git" either.
928 * Also, we don't want double slashes or slashes at the
929 * end that can make pathnames ambiguous.
931 static int verify_dotfile(const char *rest, unsigned mode)
934 * The first character was '.', but that
935 * has already been discarded, we now test
936 * the rest.
939 /* "." is not allowed */
940 if (*rest == '\0' || is_dir_sep(*rest))
941 return 0;
943 switch (*rest) {
945 * ".git" followed by NUL or slash is bad. Note that we match
946 * case-insensitively here, even if ignore_case is not set.
947 * This outlaws ".GIT" everywhere out of an abundance of caution,
948 * since there's really no good reason to allow it.
950 * Once we've seen ".git", we can also find ".gitmodules", etc (also
951 * case-insensitively).
953 case 'g':
954 case 'G':
955 if (rest[1] != 'i' && rest[1] != 'I')
956 break;
957 if (rest[2] != 't' && rest[2] != 'T')
958 break;
959 if (rest[3] == '\0' || is_dir_sep(rest[3]))
960 return 0;
961 if (S_ISLNK(mode)) {
962 rest += 3;
963 if (skip_iprefix(rest, "modules", &rest) &&
964 (*rest == '\0' || is_dir_sep(*rest)))
965 return 0;
967 break;
968 case '.':
969 if (rest[1] == '\0' || is_dir_sep(rest[1]))
970 return 0;
972 return 1;
975 static enum verify_path_result verify_path_internal(const char *path,
976 unsigned mode)
978 char c = 0;
980 if (has_dos_drive_prefix(path))
981 return PATH_INVALID;
983 if (!is_valid_path(path))
984 return PATH_INVALID;
986 goto inside;
987 for (;;) {
988 if (!c)
989 return PATH_OK;
990 if (is_dir_sep(c)) {
991 inside:
992 if (protect_hfs) {
994 if (is_hfs_dotgit(path))
995 return PATH_INVALID;
996 if (S_ISLNK(mode)) {
997 if (is_hfs_dotgitmodules(path))
998 return PATH_INVALID;
1001 if (protect_ntfs) {
1002 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1003 if (c == '\\')
1004 return PATH_INVALID;
1005 #endif
1006 if (is_ntfs_dotgit(path))
1007 return PATH_INVALID;
1008 if (S_ISLNK(mode)) {
1009 if (is_ntfs_dotgitmodules(path))
1010 return PATH_INVALID;
1014 c = *path++;
1015 if ((c == '.' && !verify_dotfile(path, mode)) ||
1016 is_dir_sep(c))
1017 return PATH_INVALID;
1019 * allow terminating directory separators for
1020 * sparse directory entries.
1022 if (c == '\0')
1023 return S_ISDIR(mode) ? PATH_DIR_WITH_SEP :
1024 PATH_INVALID;
1025 } else if (c == '\\' && protect_ntfs) {
1026 if (is_ntfs_dotgit(path))
1027 return PATH_INVALID;
1028 if (S_ISLNK(mode)) {
1029 if (is_ntfs_dotgitmodules(path))
1030 return PATH_INVALID;
1034 c = *path++;
1039 * Do we have another file that has the beginning components being a
1040 * proper superset of the name we're trying to add?
1042 static int has_file_name(struct index_state *istate,
1043 const struct cache_entry *ce, int pos, int ok_to_replace)
1045 int retval = 0;
1046 int len = ce_namelen(ce);
1047 int stage = ce_stage(ce);
1048 const char *name = ce->name;
1050 while (pos < istate->cache_nr) {
1051 struct cache_entry *p = istate->cache[pos++];
1053 if (len >= ce_namelen(p))
1054 break;
1055 if (memcmp(name, p->name, len))
1056 break;
1057 if (ce_stage(p) != stage)
1058 continue;
1059 if (p->name[len] != '/')
1060 continue;
1061 if (p->ce_flags & CE_REMOVE)
1062 continue;
1063 retval = -1;
1064 if (!ok_to_replace)
1065 break;
1066 remove_index_entry_at(istate, --pos);
1068 return retval;
1073 * Like strcmp(), but also return the offset of the first change.
1074 * If strings are equal, return the length.
1076 int strcmp_offset(const char *s1, const char *s2, size_t *first_change)
1078 size_t k;
1080 if (!first_change)
1081 return strcmp(s1, s2);
1083 for (k = 0; s1[k] == s2[k]; k++)
1084 if (s1[k] == '\0')
1085 break;
1087 *first_change = k;
1088 return (unsigned char)s1[k] - (unsigned char)s2[k];
1092 * Do we have another file with a pathname that is a proper
1093 * subset of the name we're trying to add?
1095 * That is, is there another file in the index with a path
1096 * that matches a sub-directory in the given entry?
1098 static int has_dir_name(struct index_state *istate,
1099 const struct cache_entry *ce, int pos, int ok_to_replace)
1101 int retval = 0;
1102 int stage = ce_stage(ce);
1103 const char *name = ce->name;
1104 const char *slash = name + ce_namelen(ce);
1105 size_t len_eq_last;
1106 int cmp_last = 0;
1109 * We are frequently called during an iteration on a sorted
1110 * list of pathnames and while building a new index. Therefore,
1111 * there is a high probability that this entry will eventually
1112 * be appended to the index, rather than inserted in the middle.
1113 * If we can confirm that, we can avoid binary searches on the
1114 * components of the pathname.
1116 * Compare the entry's full path with the last path in the index.
1118 if (istate->cache_nr > 0) {
1119 cmp_last = strcmp_offset(name,
1120 istate->cache[istate->cache_nr - 1]->name,
1121 &len_eq_last);
1122 if (cmp_last > 0) {
1123 if (name[len_eq_last] != '/') {
1125 * The entry sorts AFTER the last one in the
1126 * index.
1128 * If there were a conflict with "file", then our
1129 * name would start with "file/" and the last index
1130 * entry would start with "file" but not "file/".
1132 * The next character after common prefix is
1133 * not '/', so there can be no conflict.
1135 return retval;
1136 } else {
1138 * The entry sorts AFTER the last one in the
1139 * index, and the next character after common
1140 * prefix is '/'.
1142 * Either the last index entry is a file in
1143 * conflict with this entry, or it has a name
1144 * which sorts between this entry and the
1145 * potential conflicting file.
1147 * In both cases, we fall through to the loop
1148 * below and let the regular search code handle it.
1151 } else if (cmp_last == 0) {
1153 * The entry exactly matches the last one in the
1154 * index, but because of multiple stage and CE_REMOVE
1155 * items, we fall through and let the regular search
1156 * code handle it.
1161 for (;;) {
1162 size_t len;
1164 for (;;) {
1165 if (*--slash == '/')
1166 break;
1167 if (slash <= ce->name)
1168 return retval;
1170 len = slash - name;
1172 pos = index_name_stage_pos(istate, name, len, stage, EXPAND_SPARSE);
1173 if (pos >= 0) {
1175 * Found one, but not so fast. This could
1176 * be a marker that says "I was here, but
1177 * I am being removed". Such an entry is
1178 * not a part of the resulting tree, and
1179 * it is Ok to have a directory at the same
1180 * path.
1182 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
1183 retval = -1;
1184 if (!ok_to_replace)
1185 break;
1186 remove_index_entry_at(istate, pos);
1187 continue;
1190 else
1191 pos = -pos-1;
1194 * Trivial optimization: if we find an entry that
1195 * already matches the sub-directory, then we know
1196 * we're ok, and we can exit.
1198 while (pos < istate->cache_nr) {
1199 struct cache_entry *p = istate->cache[pos];
1200 if ((ce_namelen(p) <= len) ||
1201 (p->name[len] != '/') ||
1202 memcmp(p->name, name, len))
1203 break; /* not our subdirectory */
1204 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
1206 * p is at the same stage as our entry, and
1207 * is a subdirectory of what we are looking
1208 * at, so we cannot have conflicts at our
1209 * level or anything shorter.
1211 return retval;
1212 pos++;
1215 return retval;
1218 /* We may be in a situation where we already have path/file and path
1219 * is being added, or we already have path and path/file is being
1220 * added. Either one would result in a nonsense tree that has path
1221 * twice when git-write-tree tries to write it out. Prevent it.
1223 * If ok-to-replace is specified, we remove the conflicting entries
1224 * from the cache so the caller should recompute the insert position.
1225 * When this happens, we return non-zero.
1227 static int check_file_directory_conflict(struct index_state *istate,
1228 const struct cache_entry *ce,
1229 int pos, int ok_to_replace)
1231 int retval;
1234 * When ce is an "I am going away" entry, we allow it to be added
1236 if (ce->ce_flags & CE_REMOVE)
1237 return 0;
1240 * We check if the path is a sub-path of a subsequent pathname
1241 * first, since removing those will not change the position
1242 * in the array.
1244 retval = has_file_name(istate, ce, pos, ok_to_replace);
1247 * Then check if the path might have a clashing sub-directory
1248 * before it.
1250 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
1253 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
1255 int pos;
1256 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1257 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
1258 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
1259 int new_only = option & ADD_CACHE_NEW_ONLY;
1262 * If this entry's path sorts after the last entry in the index,
1263 * we can avoid searching for it.
1265 if (istate->cache_nr > 0 &&
1266 strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
1267 pos = index_pos_to_insert_pos(istate->cache_nr);
1268 else
1269 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
1272 * Cache tree path should be invalidated only after index_name_stage_pos,
1273 * in case it expands a sparse index.
1275 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1276 cache_tree_invalidate_path(istate, ce->name);
1278 /* existing match? Just replace it. */
1279 if (pos >= 0) {
1280 if (!new_only)
1281 replace_index_entry(istate, pos, ce);
1282 return 0;
1284 pos = -pos-1;
1286 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1287 untracked_cache_add_to_index(istate, ce->name);
1290 * Inserting a merged entry ("stage 0") into the index
1291 * will always replace all non-merged entries..
1293 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1294 while (ce_same_name(istate->cache[pos], ce)) {
1295 ok_to_add = 1;
1296 if (!remove_index_entry_at(istate, pos))
1297 break;
1301 if (!ok_to_add)
1302 return -1;
1303 if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
1304 return error(_("invalid path '%s'"), ce->name);
1306 if (!skip_df_check &&
1307 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1308 if (!ok_to_replace)
1309 return error(_("'%s' appears as both a file and as a directory"),
1310 ce->name);
1311 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
1312 pos = -pos-1;
1314 return pos + 1;
1317 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1319 int pos;
1321 if (option & ADD_CACHE_JUST_APPEND)
1322 pos = istate->cache_nr;
1323 else {
1324 int ret;
1325 ret = add_index_entry_with_check(istate, ce, option);
1326 if (ret <= 0)
1327 return ret;
1328 pos = ret - 1;
1331 /* Make sure the array is big enough .. */
1332 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1334 /* Add it in.. */
1335 istate->cache_nr++;
1336 if (istate->cache_nr > pos + 1)
1337 MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos,
1338 istate->cache_nr - pos - 1);
1339 set_index_entry(istate, pos, ce);
1340 istate->cache_changed |= CE_ENTRY_ADDED;
1341 return 0;
1345 * "refresh" does not calculate a new sha1 file or bring the
1346 * cache up-to-date for mode/content changes. But what it
1347 * _does_ do is to "re-match" the stat information of a file
1348 * with the cache, so that you can refresh the cache for a
1349 * file that hasn't been changed but where the stat entry is
1350 * out of date.
1352 * For example, you'd want to do this after doing a "git-read-tree",
1353 * to link up the stat cache details with the proper files.
1355 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1356 struct cache_entry *ce,
1357 unsigned int options, int *err,
1358 int *changed_ret,
1359 int *t2_did_lstat,
1360 int *t2_did_scan)
1362 struct stat st;
1363 struct cache_entry *updated;
1364 int changed;
1365 int refresh = options & CE_MATCH_REFRESH;
1366 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1367 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1368 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1369 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
1371 if (!refresh || ce_uptodate(ce))
1372 return ce;
1374 if (!ignore_fsmonitor)
1375 refresh_fsmonitor(istate);
1377 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1378 * that the change to the work tree does not matter and told
1379 * us not to worry.
1381 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1382 ce_mark_uptodate(ce);
1383 return ce;
1385 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1386 ce_mark_uptodate(ce);
1387 return ce;
1389 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) {
1390 ce_mark_uptodate(ce);
1391 return ce;
1394 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1395 if (ignore_missing)
1396 return ce;
1397 if (err)
1398 *err = ENOENT;
1399 return NULL;
1402 if (t2_did_lstat)
1403 *t2_did_lstat = 1;
1404 if (lstat(ce->name, &st) < 0) {
1405 if (ignore_missing && errno == ENOENT)
1406 return ce;
1407 if (err)
1408 *err = errno;
1409 return NULL;
1412 changed = ie_match_stat(istate, ce, &st, options);
1413 if (changed_ret)
1414 *changed_ret = changed;
1415 if (!changed) {
1417 * The path is unchanged. If we were told to ignore
1418 * valid bit, then we did the actual stat check and
1419 * found that the entry is unmodified. If the entry
1420 * is not marked VALID, this is the place to mark it
1421 * valid again, under "assume unchanged" mode.
1423 if (ignore_valid && assume_unchanged &&
1424 !(ce->ce_flags & CE_VALID))
1425 ; /* mark this one VALID again */
1426 else {
1428 * We do not mark the index itself "modified"
1429 * because CE_UPTODATE flag is in-core only;
1430 * we are not going to write this change out.
1432 if (!S_ISGITLINK(ce->ce_mode)) {
1433 ce_mark_uptodate(ce);
1434 mark_fsmonitor_valid(istate, ce);
1436 return ce;
1440 if (t2_did_scan)
1441 *t2_did_scan = 1;
1442 if (ie_modified(istate, ce, &st, options)) {
1443 if (err)
1444 *err = EINVAL;
1445 return NULL;
1448 updated = make_empty_cache_entry(istate, ce_namelen(ce));
1449 copy_cache_entry(updated, ce);
1450 memcpy(updated->name, ce->name, ce->ce_namelen + 1);
1451 fill_stat_cache_info(istate, updated, &st);
1453 * If ignore_valid is not set, we should leave CE_VALID bit
1454 * alone. Otherwise, paths marked with --no-assume-unchanged
1455 * (i.e. things to be edited) will reacquire CE_VALID bit
1456 * automatically, which is not really what we want.
1458 if (!ignore_valid && assume_unchanged &&
1459 !(ce->ce_flags & CE_VALID))
1460 updated->ce_flags &= ~CE_VALID;
1462 /* istate->cache_changed is updated in the caller */
1463 return updated;
1466 static void show_file(const char * fmt, const char * name, int in_porcelain,
1467 int * first, const char *header_msg)
1469 if (in_porcelain && *first && header_msg) {
1470 printf("%s\n", header_msg);
1471 *first = 0;
1473 printf(fmt, name);
1476 int repo_refresh_and_write_index(struct repository *repo,
1477 unsigned int refresh_flags,
1478 unsigned int write_flags,
1479 int gentle,
1480 const struct pathspec *pathspec,
1481 char *seen, const char *header_msg)
1483 struct lock_file lock_file = LOCK_INIT;
1484 int fd, ret = 0;
1486 fd = repo_hold_locked_index(repo, &lock_file, 0);
1487 if (!gentle && fd < 0)
1488 return -1;
1489 if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg))
1490 ret = 1;
1491 if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags))
1492 ret = -1;
1493 return ret;
1497 int refresh_index(struct index_state *istate, unsigned int flags,
1498 const struct pathspec *pathspec,
1499 char *seen, const char *header_msg)
1501 int i;
1502 int has_errors = 0;
1503 int really = (flags & REFRESH_REALLY) != 0;
1504 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1505 int quiet = (flags & REFRESH_QUIET) != 0;
1506 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1507 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1508 int ignore_skip_worktree = (flags & REFRESH_IGNORE_SKIP_WORKTREE) != 0;
1509 int first = 1;
1510 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1511 unsigned int options = (CE_MATCH_REFRESH |
1512 (really ? CE_MATCH_IGNORE_VALID : 0) |
1513 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1514 const char *modified_fmt;
1515 const char *deleted_fmt;
1516 const char *typechange_fmt;
1517 const char *added_fmt;
1518 const char *unmerged_fmt;
1519 struct progress *progress = NULL;
1520 int t2_sum_lstat = 0;
1521 int t2_sum_scan = 0;
1523 if (flags & REFRESH_PROGRESS && isatty(2))
1524 progress = start_delayed_progress(_("Refresh index"),
1525 istate->cache_nr);
1527 trace_performance_enter();
1528 modified_fmt = in_porcelain ? "M\t%s\n" : "%s: needs update\n";
1529 deleted_fmt = in_porcelain ? "D\t%s\n" : "%s: needs update\n";
1530 typechange_fmt = in_porcelain ? "T\t%s\n" : "%s: needs update\n";
1531 added_fmt = in_porcelain ? "A\t%s\n" : "%s: needs update\n";
1532 unmerged_fmt = in_porcelain ? "U\t%s\n" : "%s: needs merge\n";
1534 * Use the multi-threaded preload_index() to refresh most of the
1535 * cache entries quickly then in the single threaded loop below,
1536 * we only have to do the special cases that are left.
1538 preload_index(istate, pathspec, 0);
1539 trace2_region_enter("index", "refresh", NULL);
1541 for (i = 0; i < istate->cache_nr; i++) {
1542 struct cache_entry *ce, *new_entry;
1543 int cache_errno = 0;
1544 int changed = 0;
1545 int filtered = 0;
1546 int t2_did_lstat = 0;
1547 int t2_did_scan = 0;
1549 ce = istate->cache[i];
1550 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1551 continue;
1552 if (ignore_skip_worktree && ce_skip_worktree(ce))
1553 continue;
1556 * If this entry is a sparse directory, then there isn't
1557 * any stat() information to update. Ignore the entry.
1559 if (S_ISSPARSEDIR(ce->ce_mode))
1560 continue;
1562 if (pathspec && !ce_path_match(istate, ce, pathspec, seen))
1563 filtered = 1;
1565 if (ce_stage(ce)) {
1566 while ((i < istate->cache_nr) &&
1567 ! strcmp(istate->cache[i]->name, ce->name))
1568 i++;
1569 i--;
1570 if (allow_unmerged)
1571 continue;
1572 if (!filtered)
1573 show_file(unmerged_fmt, ce->name, in_porcelain,
1574 &first, header_msg);
1575 has_errors = 1;
1576 continue;
1579 if (filtered)
1580 continue;
1582 new_entry = refresh_cache_ent(istate, ce, options,
1583 &cache_errno, &changed,
1584 &t2_did_lstat, &t2_did_scan);
1585 t2_sum_lstat += t2_did_lstat;
1586 t2_sum_scan += t2_did_scan;
1587 if (new_entry == ce)
1588 continue;
1589 display_progress(progress, i);
1590 if (!new_entry) {
1591 const char *fmt;
1593 if (really && cache_errno == EINVAL) {
1594 /* If we are doing --really-refresh that
1595 * means the index is not valid anymore.
1597 ce->ce_flags &= ~CE_VALID;
1598 ce->ce_flags |= CE_UPDATE_IN_BASE;
1599 mark_fsmonitor_invalid(istate, ce);
1600 istate->cache_changed |= CE_ENTRY_CHANGED;
1602 if (quiet)
1603 continue;
1605 if (cache_errno == ENOENT)
1606 fmt = deleted_fmt;
1607 else if (ce_intent_to_add(ce))
1608 fmt = added_fmt; /* must be before other checks */
1609 else if (changed & TYPE_CHANGED)
1610 fmt = typechange_fmt;
1611 else
1612 fmt = modified_fmt;
1613 show_file(fmt,
1614 ce->name, in_porcelain, &first, header_msg);
1615 has_errors = 1;
1616 continue;
1619 replace_index_entry(istate, i, new_entry);
1621 trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat);
1622 trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
1623 trace2_region_leave("index", "refresh", NULL);
1624 display_progress(progress, istate->cache_nr);
1625 stop_progress(&progress);
1626 trace_performance_leave("refresh index");
1627 return has_errors;
1630 struct cache_entry *refresh_cache_entry(struct index_state *istate,
1631 struct cache_entry *ce,
1632 unsigned int options)
1634 return refresh_cache_ent(istate, ce, options, NULL, NULL, NULL, NULL);
1638 /*****************************************************************
1639 * Index File I/O
1640 *****************************************************************/
1642 #define INDEX_FORMAT_DEFAULT 3
1644 static unsigned int get_index_format_default(struct repository *r)
1646 char *envversion = getenv("GIT_INDEX_VERSION");
1647 char *endp;
1648 unsigned int version = INDEX_FORMAT_DEFAULT;
1650 if (!envversion) {
1651 prepare_repo_settings(r);
1653 if (r->settings.index_version >= 0)
1654 version = r->settings.index_version;
1655 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1656 warning(_("index.version set, but the value is invalid.\n"
1657 "Using version %i"), INDEX_FORMAT_DEFAULT);
1658 return INDEX_FORMAT_DEFAULT;
1660 return version;
1663 version = strtoul(envversion, &endp, 10);
1664 if (*endp ||
1665 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1666 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1667 "Using version %i"), INDEX_FORMAT_DEFAULT);
1668 version = INDEX_FORMAT_DEFAULT;
1670 return version;
1674 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1675 * Again - this is just a (very strong in practice) heuristic that
1676 * the inode hasn't changed.
1678 * We save the fields in big-endian order to allow using the
1679 * index file over NFS transparently.
1681 struct ondisk_cache_entry {
1682 struct cache_time ctime;
1683 struct cache_time mtime;
1684 uint32_t dev;
1685 uint32_t ino;
1686 uint32_t mode;
1687 uint32_t uid;
1688 uint32_t gid;
1689 uint32_t size;
1691 * unsigned char hash[hashsz];
1692 * uint16_t flags;
1693 * if (flags & CE_EXTENDED)
1694 * uint16_t flags2;
1696 unsigned char data[GIT_MAX_RAWSZ + 2 * sizeof(uint16_t)];
1697 char name[FLEX_ARRAY];
1700 /* These are only used for v3 or lower */
1701 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1702 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1703 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1704 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1705 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1706 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1707 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1709 /* Allow fsck to force verification of the index checksum. */
1710 int verify_index_checksum;
1712 /* Allow fsck to force verification of the cache entry order. */
1713 int verify_ce_order;
1715 static int verify_hdr(const struct cache_header *hdr, unsigned long size)
1717 git_hash_ctx c;
1718 unsigned char hash[GIT_MAX_RAWSZ];
1719 int hdr_version;
1720 unsigned char *start, *end;
1721 struct object_id oid;
1723 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1724 return error(_("bad signature 0x%08x"), hdr->hdr_signature);
1725 hdr_version = ntohl(hdr->hdr_version);
1726 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1727 return error(_("bad index version %d"), hdr_version);
1729 if (!verify_index_checksum)
1730 return 0;
1732 end = (unsigned char *)hdr + size;
1733 start = end - the_hash_algo->rawsz;
1734 oidread(&oid, start, the_repository->hash_algo);
1735 if (oideq(&oid, null_oid()))
1736 return 0;
1738 the_hash_algo->init_fn(&c);
1739 the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
1740 the_hash_algo->final_fn(hash, &c);
1741 if (!hasheq(hash, start, the_repository->hash_algo))
1742 return error(_("bad index file sha1 signature"));
1743 return 0;
1746 static int read_index_extension(struct index_state *istate,
1747 const char *ext, const char *data, unsigned long sz)
1749 switch (CACHE_EXT(ext)) {
1750 case CACHE_EXT_TREE:
1751 istate->cache_tree = cache_tree_read(data, sz);
1752 break;
1753 case CACHE_EXT_RESOLVE_UNDO:
1754 istate->resolve_undo = resolve_undo_read(data, sz);
1755 break;
1756 case CACHE_EXT_LINK:
1757 if (read_link_extension(istate, data, sz))
1758 return -1;
1759 break;
1760 case CACHE_EXT_UNTRACKED:
1761 istate->untracked = read_untracked_extension(data, sz);
1762 break;
1763 case CACHE_EXT_FSMONITOR:
1764 read_fsmonitor_extension(istate, data, sz);
1765 break;
1766 case CACHE_EXT_ENDOFINDEXENTRIES:
1767 case CACHE_EXT_INDEXENTRYOFFSETTABLE:
1768 /* already handled in do_read_index() */
1769 break;
1770 case CACHE_EXT_SPARSE_DIRECTORIES:
1771 /* no content, only an indicator */
1772 istate->sparse_index = INDEX_COLLAPSED;
1773 break;
1774 default:
1775 if (*ext < 'A' || 'Z' < *ext)
1776 return error(_("index uses %.4s extension, which we do not understand"),
1777 ext);
1778 fprintf_ln(stderr, _("ignoring %.4s extension"), ext);
1779 break;
1781 return 0;
1785 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1786 * into a new incore 'cache_entry'.
1788 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1789 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1790 * its members. Instead, we use the byte offsets of members within the struct to
1791 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1792 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1793 * into the corresponding incore 'cache_entry' members.
1795 static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
1796 unsigned int version,
1797 const char *ondisk,
1798 unsigned long *ent_size,
1799 const struct cache_entry *previous_ce)
1801 struct cache_entry *ce;
1802 size_t len;
1803 const char *name;
1804 const unsigned hashsz = the_hash_algo->rawsz;
1805 const char *flagsp = ondisk + offsetof(struct ondisk_cache_entry, data) + hashsz;
1806 unsigned int flags;
1807 size_t copy_len = 0;
1809 * Adjacent cache entries tend to share the leading paths, so it makes
1810 * sense to only store the differences in later entries. In the v4
1811 * on-disk format of the index, each on-disk cache entry stores the
1812 * number of bytes to be stripped from the end of the previous name,
1813 * and the bytes to append to the result, to come up with its name.
1815 int expand_name_field = version == 4;
1817 /* On-disk flags are just 16 bits */
1818 flags = get_be16(flagsp);
1819 len = flags & CE_NAMEMASK;
1821 if (flags & CE_EXTENDED) {
1822 int extended_flags;
1823 extended_flags = get_be16(flagsp + sizeof(uint16_t)) << 16;
1824 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1825 if (extended_flags & ~CE_EXTENDED_FLAGS)
1826 die(_("unknown index entry format 0x%08x"), extended_flags);
1827 flags |= extended_flags;
1828 name = (const char *)(flagsp + 2 * sizeof(uint16_t));
1830 else
1831 name = (const char *)(flagsp + sizeof(uint16_t));
1833 if (expand_name_field) {
1834 const unsigned char *cp = (const unsigned char *)name;
1835 size_t strip_len, previous_len;
1837 /* If we're at the beginning of a block, ignore the previous name */
1838 strip_len = decode_varint(&cp);
1839 if (previous_ce) {
1840 previous_len = previous_ce->ce_namelen;
1841 if (previous_len < strip_len)
1842 die(_("malformed name field in the index, near path '%s'"),
1843 previous_ce->name);
1844 copy_len = previous_len - strip_len;
1846 name = (const char *)cp;
1849 if (len == CE_NAMEMASK) {
1850 len = strlen(name);
1851 if (expand_name_field)
1852 len += copy_len;
1855 ce = mem_pool__ce_alloc(ce_mem_pool, len);
1858 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1859 * with something more akin to 'load_bitmap_entries_v1()'s use of
1860 * 'read_be16'/'read_be32'. For consistency with the corresponding
1861 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1862 * should be done at the same time as removing references to
1863 * 'ondisk_cache_entry' there.
1865 ce->ce_stat_data.sd_ctime.sec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ctime)
1866 + offsetof(struct cache_time, sec));
1867 ce->ce_stat_data.sd_mtime.sec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mtime)
1868 + offsetof(struct cache_time, sec));
1869 ce->ce_stat_data.sd_ctime.nsec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ctime)
1870 + offsetof(struct cache_time, nsec));
1871 ce->ce_stat_data.sd_mtime.nsec = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mtime)
1872 + offsetof(struct cache_time, nsec));
1873 ce->ce_stat_data.sd_dev = get_be32(ondisk + offsetof(struct ondisk_cache_entry, dev));
1874 ce->ce_stat_data.sd_ino = get_be32(ondisk + offsetof(struct ondisk_cache_entry, ino));
1875 ce->ce_mode = get_be32(ondisk + offsetof(struct ondisk_cache_entry, mode));
1876 ce->ce_stat_data.sd_uid = get_be32(ondisk + offsetof(struct ondisk_cache_entry, uid));
1877 ce->ce_stat_data.sd_gid = get_be32(ondisk + offsetof(struct ondisk_cache_entry, gid));
1878 ce->ce_stat_data.sd_size = get_be32(ondisk + offsetof(struct ondisk_cache_entry, size));
1879 ce->ce_flags = flags & ~CE_NAMEMASK;
1880 ce->ce_namelen = len;
1881 ce->index = 0;
1882 oidread(&ce->oid, (const unsigned char *)ondisk + offsetof(struct ondisk_cache_entry, data),
1883 the_repository->hash_algo);
1885 if (expand_name_field) {
1886 if (copy_len)
1887 memcpy(ce->name, previous_ce->name, copy_len);
1888 memcpy(ce->name + copy_len, name, len + 1 - copy_len);
1889 *ent_size = (name - ((char *)ondisk)) + len + 1 - copy_len;
1890 } else {
1891 memcpy(ce->name, name, len + 1);
1892 *ent_size = ondisk_ce_size(ce);
1894 return ce;
1897 static void check_ce_order(struct index_state *istate)
1899 unsigned int i;
1901 if (!verify_ce_order)
1902 return;
1904 for (i = 1; i < istate->cache_nr; i++) {
1905 struct cache_entry *ce = istate->cache[i - 1];
1906 struct cache_entry *next_ce = istate->cache[i];
1907 int name_compare = strcmp(ce->name, next_ce->name);
1909 if (0 < name_compare)
1910 die(_("unordered stage entries in index"));
1911 if (!name_compare) {
1912 if (!ce_stage(ce))
1913 die(_("multiple stage entries for merged file '%s'"),
1914 ce->name);
1915 if (ce_stage(ce) > ce_stage(next_ce))
1916 die(_("unordered stage entries for '%s'"),
1917 ce->name);
1922 static void tweak_untracked_cache(struct index_state *istate)
1924 struct repository *r = the_repository;
1926 prepare_repo_settings(r);
1928 switch (r->settings.core_untracked_cache) {
1929 case UNTRACKED_CACHE_REMOVE:
1930 remove_untracked_cache(istate);
1931 break;
1932 case UNTRACKED_CACHE_WRITE:
1933 add_untracked_cache(istate);
1934 break;
1935 case UNTRACKED_CACHE_KEEP:
1937 * Either an explicit "core.untrackedCache=keep", the
1938 * default if "core.untrackedCache" isn't configured,
1939 * or a fallback on an unknown "core.untrackedCache"
1940 * value.
1942 break;
1946 static void tweak_split_index(struct index_state *istate)
1948 switch (git_config_get_split_index()) {
1949 case -1: /* unset: do nothing */
1950 break;
1951 case 0: /* false */
1952 remove_split_index(istate);
1953 break;
1954 case 1: /* true */
1955 add_split_index(istate);
1956 break;
1957 default: /* unknown value: do nothing */
1958 break;
1962 static void post_read_index_from(struct index_state *istate)
1964 check_ce_order(istate);
1965 tweak_untracked_cache(istate);
1966 tweak_split_index(istate);
1967 tweak_fsmonitor(istate);
1970 static size_t estimate_cache_size_from_compressed(unsigned int entries)
1972 return entries * (sizeof(struct cache_entry) + CACHE_ENTRY_PATH_LENGTH);
1975 static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
1977 long per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);
1980 * Account for potential alignment differences.
1982 per_entry += align_padding_size(per_entry, 0);
1983 return ondisk_size + entries * per_entry;
1986 struct index_entry_offset
1988 /* starting byte offset into index file, count of index entries in this block */
1989 int offset, nr;
1992 struct index_entry_offset_table
1994 int nr;
1995 struct index_entry_offset entries[FLEX_ARRAY];
1998 static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset);
1999 static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot);
2001 static size_t read_eoie_extension(const char *mmap, size_t mmap_size);
2002 static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset);
2004 struct load_index_extensions
2006 pthread_t pthread;
2007 struct index_state *istate;
2008 const char *mmap;
2009 size_t mmap_size;
2010 unsigned long src_offset;
2013 static void *load_index_extensions(void *_data)
2015 struct load_index_extensions *p = _data;
2016 unsigned long src_offset = p->src_offset;
2018 while (src_offset <= p->mmap_size - the_hash_algo->rawsz - 8) {
2019 /* After an array of active_nr index entries,
2020 * there can be arbitrary number of extended
2021 * sections, each of which is prefixed with
2022 * extension name (4-byte) and section length
2023 * in 4-byte network byte order.
2025 uint32_t extsize = get_be32(p->mmap + src_offset + 4);
2026 if (read_index_extension(p->istate,
2027 p->mmap + src_offset,
2028 p->mmap + src_offset + 8,
2029 extsize) < 0) {
2030 munmap((void *)p->mmap, p->mmap_size);
2031 die(_("index file corrupt"));
2033 src_offset += 8;
2034 src_offset += extsize;
2037 return NULL;
2041 * A helper function that will load the specified range of cache entries
2042 * from the memory mapped file and add them to the given index.
2044 static unsigned long load_cache_entry_block(struct index_state *istate,
2045 struct mem_pool *ce_mem_pool, int offset, int nr, const char *mmap,
2046 unsigned long start_offset, const struct cache_entry *previous_ce)
2048 int i;
2049 unsigned long src_offset = start_offset;
2051 for (i = offset; i < offset + nr; i++) {
2052 struct cache_entry *ce;
2053 unsigned long consumed;
2055 ce = create_from_disk(ce_mem_pool, istate->version,
2056 mmap + src_offset,
2057 &consumed, previous_ce);
2058 set_index_entry(istate, i, ce);
2060 src_offset += consumed;
2061 previous_ce = ce;
2063 return src_offset - start_offset;
2066 static unsigned long load_all_cache_entries(struct index_state *istate,
2067 const char *mmap, size_t mmap_size, unsigned long src_offset)
2069 unsigned long consumed;
2071 istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
2072 if (istate->version == 4) {
2073 mem_pool_init(istate->ce_mem_pool,
2074 estimate_cache_size_from_compressed(istate->cache_nr));
2075 } else {
2076 mem_pool_init(istate->ce_mem_pool,
2077 estimate_cache_size(mmap_size, istate->cache_nr));
2080 consumed = load_cache_entry_block(istate, istate->ce_mem_pool,
2081 0, istate->cache_nr, mmap, src_offset, NULL);
2082 return consumed;
2086 * Mostly randomly chosen maximum thread counts: we
2087 * cap the parallelism to online_cpus() threads, and we want
2088 * to have at least 10000 cache entries per thread for it to
2089 * be worth starting a thread.
2092 #define THREAD_COST (10000)
2094 struct load_cache_entries_thread_data
2096 pthread_t pthread;
2097 struct index_state *istate;
2098 struct mem_pool *ce_mem_pool;
2099 int offset;
2100 const char *mmap;
2101 struct index_entry_offset_table *ieot;
2102 int ieot_start; /* starting index into the ieot array */
2103 int ieot_blocks; /* count of ieot entries to process */
2104 unsigned long consumed; /* return # of bytes in index file processed */
2108 * A thread proc to run the load_cache_entries() computation
2109 * across multiple background threads.
2111 static void *load_cache_entries_thread(void *_data)
2113 struct load_cache_entries_thread_data *p = _data;
2114 int i;
2116 /* iterate across all ieot blocks assigned to this thread */
2117 for (i = p->ieot_start; i < p->ieot_start + p->ieot_blocks; i++) {
2118 p->consumed += load_cache_entry_block(p->istate, p->ce_mem_pool,
2119 p->offset, p->ieot->entries[i].nr, p->mmap, p->ieot->entries[i].offset, NULL);
2120 p->offset += p->ieot->entries[i].nr;
2122 return NULL;
2125 static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size,
2126 int nr_threads, struct index_entry_offset_table *ieot)
2128 int i, offset, ieot_blocks, ieot_start, err;
2129 struct load_cache_entries_thread_data *data;
2130 unsigned long consumed = 0;
2132 /* a little sanity checking */
2133 if (istate->name_hash_initialized)
2134 BUG("the name hash isn't thread safe");
2136 istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
2137 mem_pool_init(istate->ce_mem_pool, 0);
2139 /* ensure we have no more threads than we have blocks to process */
2140 if (nr_threads > ieot->nr)
2141 nr_threads = ieot->nr;
2142 CALLOC_ARRAY(data, nr_threads);
2144 offset = ieot_start = 0;
2145 ieot_blocks = DIV_ROUND_UP(ieot->nr, nr_threads);
2146 for (i = 0; i < nr_threads; i++) {
2147 struct load_cache_entries_thread_data *p = &data[i];
2148 int nr, j;
2150 if (ieot_start + ieot_blocks > ieot->nr)
2151 ieot_blocks = ieot->nr - ieot_start;
2153 p->istate = istate;
2154 p->offset = offset;
2155 p->mmap = mmap;
2156 p->ieot = ieot;
2157 p->ieot_start = ieot_start;
2158 p->ieot_blocks = ieot_blocks;
2160 /* create a mem_pool for each thread */
2161 nr = 0;
2162 for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++)
2163 nr += p->ieot->entries[j].nr;
2164 p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
2165 if (istate->version == 4) {
2166 mem_pool_init(p->ce_mem_pool,
2167 estimate_cache_size_from_compressed(nr));
2168 } else {
2169 mem_pool_init(p->ce_mem_pool,
2170 estimate_cache_size(mmap_size, nr));
2173 err = pthread_create(&p->pthread, NULL, load_cache_entries_thread, p);
2174 if (err)
2175 die(_("unable to create load_cache_entries thread: %s"), strerror(err));
2177 /* increment by the number of cache entries in the ieot block being processed */
2178 for (j = 0; j < ieot_blocks; j++)
2179 offset += ieot->entries[ieot_start + j].nr;
2180 ieot_start += ieot_blocks;
2183 for (i = 0; i < nr_threads; i++) {
2184 struct load_cache_entries_thread_data *p = &data[i];
2186 err = pthread_join(p->pthread, NULL);
2187 if (err)
2188 die(_("unable to join load_cache_entries thread: %s"), strerror(err));
2189 mem_pool_combine(istate->ce_mem_pool, p->ce_mem_pool);
2190 consumed += p->consumed;
2193 free(data);
2195 return consumed;
2198 static void set_new_index_sparsity(struct index_state *istate)
2201 * If the index's repo exists, mark it sparse according to
2202 * repo settings.
2204 prepare_repo_settings(istate->repo);
2205 if (!istate->repo->settings.command_requires_full_index &&
2206 is_sparse_index_allowed(istate, 0))
2207 istate->sparse_index = 1;
2210 /* remember to discard_cache() before reading a different cache! */
2211 int do_read_index(struct index_state *istate, const char *path, int must_exist)
2213 int fd;
2214 struct stat st;
2215 unsigned long src_offset;
2216 const struct cache_header *hdr;
2217 const char *mmap;
2218 size_t mmap_size;
2219 struct load_index_extensions p;
2220 size_t extension_offset = 0;
2221 int nr_threads, cpus;
2222 struct index_entry_offset_table *ieot = NULL;
2224 if (istate->initialized)
2225 return istate->cache_nr;
2227 istate->timestamp.sec = 0;
2228 istate->timestamp.nsec = 0;
2229 fd = open(path, O_RDONLY);
2230 if (fd < 0) {
2231 if (!must_exist && errno == ENOENT) {
2232 set_new_index_sparsity(istate);
2233 istate->initialized = 1;
2234 return 0;
2236 die_errno(_("%s: index file open failed"), path);
2239 if (fstat(fd, &st))
2240 die_errno(_("%s: cannot stat the open index"), path);
2242 mmap_size = xsize_t(st.st_size);
2243 if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
2244 die(_("%s: index file smaller than expected"), path);
2246 mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
2247 if (mmap == MAP_FAILED)
2248 die_errno(_("%s: unable to map index file%s"), path,
2249 mmap_os_err());
2250 close(fd);
2252 hdr = (const struct cache_header *)mmap;
2253 if (verify_hdr(hdr, mmap_size) < 0)
2254 goto unmap;
2256 oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz,
2257 the_repository->hash_algo);
2258 istate->version = ntohl(hdr->hdr_version);
2259 istate->cache_nr = ntohl(hdr->hdr_entries);
2260 istate->cache_alloc = alloc_nr(istate->cache_nr);
2261 CALLOC_ARRAY(istate->cache, istate->cache_alloc);
2262 istate->initialized = 1;
2264 p.istate = istate;
2265 p.mmap = mmap;
2266 p.mmap_size = mmap_size;
2268 src_offset = sizeof(*hdr);
2270 if (git_config_get_index_threads(&nr_threads))
2271 nr_threads = 1;
2273 /* TODO: does creating more threads than cores help? */
2274 if (!nr_threads) {
2275 nr_threads = istate->cache_nr / THREAD_COST;
2276 cpus = online_cpus();
2277 if (nr_threads > cpus)
2278 nr_threads = cpus;
2281 if (!HAVE_THREADS)
2282 nr_threads = 1;
2284 if (nr_threads > 1) {
2285 extension_offset = read_eoie_extension(mmap, mmap_size);
2286 if (extension_offset) {
2287 int err;
2289 p.src_offset = extension_offset;
2290 err = pthread_create(&p.pthread, NULL, load_index_extensions, &p);
2291 if (err)
2292 die(_("unable to create load_index_extensions thread: %s"), strerror(err));
2294 nr_threads--;
2299 * Locate and read the index entry offset table so that we can use it
2300 * to multi-thread the reading of the cache entries.
2302 if (extension_offset && nr_threads > 1)
2303 ieot = read_ieot_extension(mmap, mmap_size, extension_offset);
2305 if (ieot) {
2306 src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot);
2307 free(ieot);
2308 } else {
2309 src_offset += load_all_cache_entries(istate, mmap, mmap_size, src_offset);
2312 istate->timestamp.sec = st.st_mtime;
2313 istate->timestamp.nsec = ST_MTIME_NSEC(st);
2315 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2316 if (extension_offset) {
2317 int ret = pthread_join(p.pthread, NULL);
2318 if (ret)
2319 die(_("unable to join load_index_extensions thread: %s"), strerror(ret));
2320 } else {
2321 p.src_offset = src_offset;
2322 load_index_extensions(&p);
2324 munmap((void *)mmap, mmap_size);
2327 * TODO trace2: replace "the_repository" with the actual repo instance
2328 * that is associated with the given "istate".
2330 trace2_data_intmax("index", the_repository, "read/version",
2331 istate->version);
2332 trace2_data_intmax("index", the_repository, "read/cache_nr",
2333 istate->cache_nr);
2336 * If the command explicitly requires a full index, force it
2337 * to be full. Otherwise, correct the sparsity based on repository
2338 * settings and other properties of the index (if necessary).
2340 prepare_repo_settings(istate->repo);
2341 if (istate->repo->settings.command_requires_full_index)
2342 ensure_full_index(istate);
2343 else
2344 ensure_correct_sparsity(istate);
2346 return istate->cache_nr;
2348 unmap:
2349 munmap((void *)mmap, mmap_size);
2350 die(_("index file corrupt"));
2354 * Signal that the shared index is used by updating its mtime.
2356 * This way, shared index can be removed if they have not been used
2357 * for some time.
2359 static void freshen_shared_index(const char *shared_index, int warn)
2361 if (!check_and_freshen_file(shared_index, 1) && warn)
2362 warning(_("could not freshen shared index '%s'"), shared_index);
2365 int read_index_from(struct index_state *istate, const char *path,
2366 const char *gitdir)
2368 struct split_index *split_index;
2369 int ret;
2370 char *base_oid_hex;
2371 char *base_path;
2373 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2374 if (istate->initialized)
2375 return istate->cache_nr;
2378 * TODO trace2: replace "the_repository" with the actual repo instance
2379 * that is associated with the given "istate".
2381 trace2_region_enter_printf("index", "do_read_index", the_repository,
2382 "%s", path);
2383 trace_performance_enter();
2384 ret = do_read_index(istate, path, 0);
2385 trace_performance_leave("read cache %s", path);
2386 trace2_region_leave_printf("index", "do_read_index", the_repository,
2387 "%s", path);
2389 split_index = istate->split_index;
2390 if (!split_index || is_null_oid(&split_index->base_oid)) {
2391 post_read_index_from(istate);
2392 return ret;
2395 trace_performance_enter();
2396 if (split_index->base)
2397 release_index(split_index->base);
2398 else
2399 ALLOC_ARRAY(split_index->base, 1);
2400 index_state_init(split_index->base, istate->repo);
2402 base_oid_hex = oid_to_hex(&split_index->base_oid);
2403 base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
2404 if (file_exists(base_path)) {
2405 trace2_region_enter_printf("index", "shared/do_read_index",
2406 the_repository, "%s", base_path);
2408 ret = do_read_index(split_index->base, base_path, 0);
2409 trace2_region_leave_printf("index", "shared/do_read_index",
2410 the_repository, "%s", base_path);
2411 } else {
2412 char *path_copy = xstrdup(path);
2413 char *base_path2 = xstrfmt("%s/sharedindex.%s",
2414 dirname(path_copy), base_oid_hex);
2415 free(path_copy);
2416 trace2_region_enter_printf("index", "shared/do_read_index",
2417 the_repository, "%s", base_path2);
2418 ret = do_read_index(split_index->base, base_path2, 1);
2419 trace2_region_leave_printf("index", "shared/do_read_index",
2420 the_repository, "%s", base_path2);
2421 free(base_path2);
2423 if (!oideq(&split_index->base_oid, &split_index->base->oid))
2424 die(_("broken index, expect %s in %s, got %s"),
2425 base_oid_hex, base_path,
2426 oid_to_hex(&split_index->base->oid));
2428 freshen_shared_index(base_path, 0);
2429 merge_base_index(istate);
2430 post_read_index_from(istate);
2431 trace_performance_leave("read cache %s", base_path);
2432 free(base_path);
2433 return ret;
2436 int is_index_unborn(struct index_state *istate)
2438 return (!istate->cache_nr && !istate->timestamp.sec);
2441 void index_state_init(struct index_state *istate, struct repository *r)
2443 struct index_state blank = INDEX_STATE_INIT(r);
2444 memcpy(istate, &blank, sizeof(*istate));
2447 void release_index(struct index_state *istate)
2450 * Cache entries in istate->cache[] should have been allocated
2451 * from the memory pool associated with this index, or from an
2452 * associated split_index. There is no need to free individual
2453 * cache entries. validate_cache_entries can detect when this
2454 * assertion does not hold.
2456 validate_cache_entries(istate);
2458 resolve_undo_clear_index(istate);
2459 free_name_hash(istate);
2460 cache_tree_free(&(istate->cache_tree));
2461 free(istate->fsmonitor_last_update);
2462 free(istate->cache);
2463 discard_split_index(istate);
2464 free_untracked_cache(istate->untracked);
2466 if (istate->sparse_checkout_patterns) {
2467 clear_pattern_list(istate->sparse_checkout_patterns);
2468 FREE_AND_NULL(istate->sparse_checkout_patterns);
2471 if (istate->ce_mem_pool) {
2472 mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries());
2473 FREE_AND_NULL(istate->ce_mem_pool);
2477 void discard_index(struct index_state *istate)
2479 release_index(istate);
2480 index_state_init(istate, istate->repo);
2484 * Validate the cache entries of this index.
2485 * All cache entries associated with this index
2486 * should have been allocated by the memory pool
2487 * associated with this index, or by a referenced
2488 * split index.
2490 void validate_cache_entries(const struct index_state *istate)
2492 int i;
2494 if (!should_validate_cache_entries() ||!istate || !istate->initialized)
2495 return;
2497 for (i = 0; i < istate->cache_nr; i++) {
2498 if (!istate) {
2499 BUG("cache entry is not allocated from expected memory pool");
2500 } else if (!istate->ce_mem_pool ||
2501 !mem_pool_contains(istate->ce_mem_pool, istate->cache[i])) {
2502 if (!istate->split_index ||
2503 !istate->split_index->base ||
2504 !istate->split_index->base->ce_mem_pool ||
2505 !mem_pool_contains(istate->split_index->base->ce_mem_pool, istate->cache[i])) {
2506 BUG("cache entry is not allocated from expected memory pool");
2511 if (istate->split_index)
2512 validate_cache_entries(istate->split_index->base);
2515 int unmerged_index(const struct index_state *istate)
2517 int i;
2518 for (i = 0; i < istate->cache_nr; i++) {
2519 if (ce_stage(istate->cache[i]))
2520 return 1;
2522 return 0;
2525 int repo_index_has_changes(struct repository *repo,
2526 struct tree *tree,
2527 struct strbuf *sb)
2529 struct index_state *istate = repo->index;
2530 struct object_id cmp;
2531 int i;
2533 if (tree)
2534 cmp = tree->object.oid;
2535 if (tree || !repo_get_oid_tree(repo, "HEAD", &cmp)) {
2536 struct diff_options opt;
2538 repo_diff_setup(repo, &opt);
2539 opt.flags.exit_with_status = 1;
2540 if (!sb)
2541 opt.flags.quick = 1;
2542 diff_setup_done(&opt);
2543 do_diff_cache(&cmp, &opt);
2544 diffcore_std(&opt);
2545 for (i = 0; sb && i < diff_queued_diff.nr; i++) {
2546 if (i)
2547 strbuf_addch(sb, ' ');
2548 strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
2550 diff_flush(&opt);
2551 return opt.flags.has_changes != 0;
2552 } else {
2553 /* TODO: audit for interaction with sparse-index. */
2554 ensure_full_index(istate);
2555 for (i = 0; sb && i < istate->cache_nr; i++) {
2556 if (i)
2557 strbuf_addch(sb, ' ');
2558 strbuf_addstr(sb, istate->cache[i]->name);
2560 return !!istate->cache_nr;
2564 static int write_index_ext_header(struct hashfile *f,
2565 git_hash_ctx *eoie_f,
2566 unsigned int ext,
2567 unsigned int sz)
2569 hashwrite_be32(f, ext);
2570 hashwrite_be32(f, sz);
2572 if (eoie_f) {
2573 ext = htonl(ext);
2574 sz = htonl(sz);
2575 the_hash_algo->update_fn(eoie_f, &ext, sizeof(ext));
2576 the_hash_algo->update_fn(eoie_f, &sz, sizeof(sz));
2578 return 0;
2581 static void ce_smudge_racily_clean_entry(struct index_state *istate,
2582 struct cache_entry *ce)
2585 * The only thing we care about in this function is to smudge the
2586 * falsely clean entry due to touch-update-touch race, so we leave
2587 * everything else as they are. We are called for entries whose
2588 * ce_stat_data.sd_mtime match the index file mtime.
2590 * Note that this actually does not do much for gitlinks, for
2591 * which ce_match_stat_basic() always goes to the actual
2592 * contents. The caller checks with is_racy_timestamp() which
2593 * always says "no" for gitlinks, so we are not called for them ;-)
2595 struct stat st;
2597 if (lstat(ce->name, &st) < 0)
2598 return;
2599 if (ce_match_stat_basic(ce, &st))
2600 return;
2601 if (ce_modified_check_fs(istate, ce, &st)) {
2602 /* This is "racily clean"; smudge it. Note that this
2603 * is a tricky code. At first glance, it may appear
2604 * that it can break with this sequence:
2606 * $ echo xyzzy >frotz
2607 * $ git-update-index --add frotz
2608 * $ : >frotz
2609 * $ sleep 3
2610 * $ echo filfre >nitfol
2611 * $ git-update-index --add nitfol
2613 * but it does not. When the second update-index runs,
2614 * it notices that the entry "frotz" has the same timestamp
2615 * as index, and if we were to smudge it by resetting its
2616 * size to zero here, then the object name recorded
2617 * in index is the 6-byte file but the cached stat information
2618 * becomes zero --- which would then match what we would
2619 * obtain from the filesystem next time we stat("frotz").
2621 * However, the second update-index, before calling
2622 * this function, notices that the cached size is 6
2623 * bytes and what is on the filesystem is an empty
2624 * file, and never calls us, so the cached size information
2625 * for "frotz" stays 6 which does not match the filesystem.
2627 ce->ce_stat_data.sd_size = 0;
2631 /* Copy miscellaneous fields but not the name */
2632 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
2633 struct cache_entry *ce)
2635 short flags;
2636 const unsigned hashsz = the_hash_algo->rawsz;
2637 uint16_t *flagsp = (uint16_t *)(ondisk->data + hashsz);
2639 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
2640 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
2641 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
2642 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
2643 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
2644 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
2645 ondisk->mode = htonl(ce->ce_mode);
2646 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
2647 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
2648 ondisk->size = htonl(ce->ce_stat_data.sd_size);
2649 hashcpy(ondisk->data, ce->oid.hash, the_repository->hash_algo);
2651 flags = ce->ce_flags & ~CE_NAMEMASK;
2652 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
2653 flagsp[0] = htons(flags);
2654 if (ce->ce_flags & CE_EXTENDED) {
2655 flagsp[1] = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
2659 static int ce_write_entry(struct hashfile *f, struct cache_entry *ce,
2660 struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
2662 int size;
2663 unsigned int saved_namelen;
2664 int stripped_name = 0;
2665 static unsigned char padding[8] = { 0x00 };
2667 if (ce->ce_flags & CE_STRIP_NAME) {
2668 saved_namelen = ce_namelen(ce);
2669 ce->ce_namelen = 0;
2670 stripped_name = 1;
2673 size = offsetof(struct ondisk_cache_entry,data) + ondisk_data_size(ce->ce_flags, 0);
2675 if (!previous_name) {
2676 int len = ce_namelen(ce);
2677 copy_cache_entry_to_ondisk(ondisk, ce);
2678 hashwrite(f, ondisk, size);
2679 hashwrite(f, ce->name, len);
2680 hashwrite(f, padding, align_padding_size(size, len));
2681 } else {
2682 int common, to_remove, prefix_size;
2683 unsigned char to_remove_vi[16];
2684 for (common = 0;
2685 (ce->name[common] &&
2686 common < previous_name->len &&
2687 ce->name[common] == previous_name->buf[common]);
2688 common++)
2689 ; /* still matching */
2690 to_remove = previous_name->len - common;
2691 prefix_size = encode_varint(to_remove, to_remove_vi);
2693 copy_cache_entry_to_ondisk(ondisk, ce);
2694 hashwrite(f, ondisk, size);
2695 hashwrite(f, to_remove_vi, prefix_size);
2696 hashwrite(f, ce->name + common, ce_namelen(ce) - common);
2697 hashwrite(f, padding, 1);
2699 strbuf_splice(previous_name, common, to_remove,
2700 ce->name + common, ce_namelen(ce) - common);
2702 if (stripped_name) {
2703 ce->ce_namelen = saved_namelen;
2704 ce->ce_flags &= ~CE_STRIP_NAME;
2707 return 0;
2711 * This function verifies if index_state has the correct sha1 of the
2712 * index file. Don't die if we have any other failure, just return 0.
2714 static int verify_index_from(const struct index_state *istate, const char *path)
2716 int fd;
2717 ssize_t n;
2718 struct stat st;
2719 unsigned char hash[GIT_MAX_RAWSZ];
2721 if (!istate->initialized)
2722 return 0;
2724 fd = open(path, O_RDONLY);
2725 if (fd < 0)
2726 return 0;
2728 if (fstat(fd, &st))
2729 goto out;
2731 if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
2732 goto out;
2734 n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz);
2735 if (n != the_hash_algo->rawsz)
2736 goto out;
2738 if (!hasheq(istate->oid.hash, hash, the_repository->hash_algo))
2739 goto out;
2741 close(fd);
2742 return 1;
2744 out:
2745 close(fd);
2746 return 0;
2749 static int repo_verify_index(struct repository *repo)
2751 return verify_index_from(repo->index, repo->index_file);
2754 int has_racy_timestamp(struct index_state *istate)
2756 int entries = istate->cache_nr;
2757 int i;
2759 for (i = 0; i < entries; i++) {
2760 struct cache_entry *ce = istate->cache[i];
2761 if (is_racy_timestamp(istate, ce))
2762 return 1;
2764 return 0;
2767 void repo_update_index_if_able(struct repository *repo,
2768 struct lock_file *lockfile)
2770 if ((repo->index->cache_changed ||
2771 has_racy_timestamp(repo->index)) &&
2772 repo_verify_index(repo))
2773 write_locked_index(repo->index, lockfile, COMMIT_LOCK);
2774 else
2775 rollback_lock_file(lockfile);
2778 static int record_eoie(void)
2780 int val;
2782 if (!git_config_get_bool("index.recordendofindexentries", &val))
2783 return val;
2786 * As a convenience, the end of index entries extension
2787 * used for threading is written by default if the user
2788 * explicitly requested threaded index reads.
2790 return !git_config_get_index_threads(&val) && val != 1;
2793 static int record_ieot(void)
2795 int val;
2797 if (!git_config_get_bool("index.recordoffsettable", &val))
2798 return val;
2801 * As a convenience, the offset table used for threading is
2802 * written by default if the user explicitly requested
2803 * threaded index reads.
2805 return !git_config_get_index_threads(&val) && val != 1;
2808 enum write_extensions {
2809 WRITE_NO_EXTENSION = 0,
2810 WRITE_SPLIT_INDEX_EXTENSION = 1<<0,
2811 WRITE_CACHE_TREE_EXTENSION = 1<<1,
2812 WRITE_RESOLVE_UNDO_EXTENSION = 1<<2,
2813 WRITE_UNTRACKED_CACHE_EXTENSION = 1<<3,
2814 WRITE_FSMONITOR_EXTENSION = 1<<4,
2816 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2819 * On success, `tempfile` is closed. If it is the temporary file
2820 * of a `struct lock_file`, we will therefore effectively perform
2821 * a 'close_lock_file_gently()`. Since that is an implementation
2822 * detail of lockfiles, callers of `do_write_index()` should not
2823 * rely on it.
2825 static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
2826 enum write_extensions write_extensions, unsigned flags)
2828 uint64_t start = getnanotime();
2829 struct hashfile *f;
2830 git_hash_ctx *eoie_c = NULL;
2831 struct cache_header hdr;
2832 int i, err = 0, removed, extended, hdr_version;
2833 struct cache_entry **cache = istate->cache;
2834 int entries = istate->cache_nr;
2835 struct stat st;
2836 struct ondisk_cache_entry ondisk;
2837 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
2838 int drop_cache_tree = istate->drop_cache_tree;
2839 off_t offset;
2840 int csum_fsync_flag;
2841 int ieot_entries = 1;
2842 struct index_entry_offset_table *ieot = NULL;
2843 int nr, nr_threads;
2844 struct repository *r = istate->repo;
2846 f = hashfd(tempfile->fd, tempfile->filename.buf);
2848 prepare_repo_settings(r);
2849 f->skip_hash = r->settings.index_skip_hash;
2851 for (i = removed = extended = 0; i < entries; i++) {
2852 if (cache[i]->ce_flags & CE_REMOVE)
2853 removed++;
2855 /* reduce extended entries if possible */
2856 cache[i]->ce_flags &= ~CE_EXTENDED;
2857 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2858 extended++;
2859 cache[i]->ce_flags |= CE_EXTENDED;
2863 if (!istate->version)
2864 istate->version = get_index_format_default(r);
2866 /* demote version 3 to version 2 when the latter suffices */
2867 if (istate->version == 3 || istate->version == 2)
2868 istate->version = extended ? 3 : 2;
2870 hdr_version = istate->version;
2872 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
2873 hdr.hdr_version = htonl(hdr_version);
2874 hdr.hdr_entries = htonl(entries - removed);
2876 hashwrite(f, &hdr, sizeof(hdr));
2878 if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads))
2879 nr_threads = 1;
2881 if (nr_threads != 1 && record_ieot()) {
2882 int ieot_blocks, cpus;
2885 * ensure default number of ieot blocks maps evenly to the
2886 * default number of threads that will process them leaving
2887 * room for the thread to load the index extensions.
2889 if (!nr_threads) {
2890 ieot_blocks = istate->cache_nr / THREAD_COST;
2891 cpus = online_cpus();
2892 if (ieot_blocks > cpus - 1)
2893 ieot_blocks = cpus - 1;
2894 } else {
2895 ieot_blocks = nr_threads;
2896 if (ieot_blocks > istate->cache_nr)
2897 ieot_blocks = istate->cache_nr;
2901 * no reason to write out the IEOT extension if we don't
2902 * have enough blocks to utilize multi-threading
2904 if (ieot_blocks > 1) {
2905 ieot = xcalloc(1, sizeof(struct index_entry_offset_table)
2906 + (ieot_blocks * sizeof(struct index_entry_offset)));
2907 ieot_entries = DIV_ROUND_UP(entries, ieot_blocks);
2911 offset = hashfile_total(f);
2913 nr = 0;
2914 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2916 for (i = 0; i < entries; i++) {
2917 struct cache_entry *ce = cache[i];
2918 if (ce->ce_flags & CE_REMOVE)
2919 continue;
2920 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
2921 ce_smudge_racily_clean_entry(istate, ce);
2922 if (is_null_oid(&ce->oid)) {
2923 static const char msg[] = "cache entry has null sha1: %s";
2924 static int allow = -1;
2926 if (allow < 0)
2927 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2928 if (allow)
2929 warning(msg, ce->name);
2930 else
2931 err = error(msg, ce->name);
2933 drop_cache_tree = 1;
2935 if (ieot && i && (i % ieot_entries == 0)) {
2936 ieot->entries[ieot->nr].nr = nr;
2937 ieot->entries[ieot->nr].offset = offset;
2938 ieot->nr++;
2940 * If we have a V4 index, set the first byte to an invalid
2941 * character to ensure there is nothing common with the previous
2942 * entry
2944 if (previous_name)
2945 previous_name->buf[0] = 0;
2946 nr = 0;
2948 offset = hashfile_total(f);
2950 if (ce_write_entry(f, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
2951 err = -1;
2953 if (err)
2954 break;
2955 nr++;
2957 if (ieot && nr) {
2958 ieot->entries[ieot->nr].nr = nr;
2959 ieot->entries[ieot->nr].offset = offset;
2960 ieot->nr++;
2962 strbuf_release(&previous_name_buf);
2964 if (err) {
2965 free(ieot);
2966 return err;
2969 offset = hashfile_total(f);
2972 * The extension headers must be hashed on their own for the
2973 * EOIE extension. Create a hashfile here to compute that hash.
2975 if (offset && record_eoie()) {
2976 CALLOC_ARRAY(eoie_c, 1);
2977 the_hash_algo->init_fn(eoie_c);
2981 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2982 * can minimize the number of extensions we have to scan through to
2983 * find it during load. Write it out regardless of the
2984 * strip_extensions parameter as we need it when loading the shared
2985 * index.
2987 if (ieot) {
2988 struct strbuf sb = STRBUF_INIT;
2990 write_ieot_extension(&sb, ieot);
2991 err = write_index_ext_header(f, eoie_c, CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0;
2992 hashwrite(f, sb.buf, sb.len);
2993 strbuf_release(&sb);
2994 free(ieot);
2995 if (err)
2996 return -1;
2999 if (write_extensions & WRITE_SPLIT_INDEX_EXTENSION &&
3000 istate->split_index) {
3001 struct strbuf sb = STRBUF_INIT;
3003 if (istate->sparse_index)
3004 die(_("cannot write split index for a sparse index"));
3006 err = write_link_extension(&sb, istate) < 0 ||
3007 write_index_ext_header(f, eoie_c, CACHE_EXT_LINK,
3008 sb.len) < 0;
3009 hashwrite(f, sb.buf, sb.len);
3010 strbuf_release(&sb);
3011 if (err)
3012 return -1;
3014 if (write_extensions & WRITE_CACHE_TREE_EXTENSION &&
3015 !drop_cache_tree && istate->cache_tree) {
3016 struct strbuf sb = STRBUF_INIT;
3018 cache_tree_write(&sb, istate->cache_tree);
3019 err = write_index_ext_header(f, eoie_c, CACHE_EXT_TREE, sb.len) < 0;
3020 hashwrite(f, sb.buf, sb.len);
3021 strbuf_release(&sb);
3022 if (err)
3023 return -1;
3025 if (write_extensions & WRITE_RESOLVE_UNDO_EXTENSION &&
3026 istate->resolve_undo) {
3027 struct strbuf sb = STRBUF_INIT;
3029 resolve_undo_write(&sb, istate->resolve_undo);
3030 err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO,
3031 sb.len) < 0;
3032 hashwrite(f, sb.buf, sb.len);
3033 strbuf_release(&sb);
3034 if (err)
3035 return -1;
3037 if (write_extensions & WRITE_UNTRACKED_CACHE_EXTENSION &&
3038 istate->untracked) {
3039 struct strbuf sb = STRBUF_INIT;
3041 write_untracked_extension(&sb, istate->untracked);
3042 err = write_index_ext_header(f, eoie_c, CACHE_EXT_UNTRACKED,
3043 sb.len) < 0;
3044 hashwrite(f, sb.buf, sb.len);
3045 strbuf_release(&sb);
3046 if (err)
3047 return -1;
3049 if (write_extensions & WRITE_FSMONITOR_EXTENSION &&
3050 istate->fsmonitor_last_update) {
3051 struct strbuf sb = STRBUF_INIT;
3053 write_fsmonitor_extension(&sb, istate);
3054 err = write_index_ext_header(f, eoie_c, CACHE_EXT_FSMONITOR, sb.len) < 0;
3055 hashwrite(f, sb.buf, sb.len);
3056 strbuf_release(&sb);
3057 if (err)
3058 return -1;
3060 if (istate->sparse_index) {
3061 if (write_index_ext_header(f, eoie_c, CACHE_EXT_SPARSE_DIRECTORIES, 0) < 0)
3062 return -1;
3066 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3067 * so that it can be found and processed before all the index entries are
3068 * read. Write it out regardless of the strip_extensions parameter as we need it
3069 * when loading the shared index.
3071 if (eoie_c) {
3072 struct strbuf sb = STRBUF_INIT;
3074 write_eoie_extension(&sb, eoie_c, offset);
3075 err = write_index_ext_header(f, NULL, CACHE_EXT_ENDOFINDEXENTRIES, sb.len) < 0;
3076 hashwrite(f, sb.buf, sb.len);
3077 strbuf_release(&sb);
3078 if (err)
3079 return -1;
3082 csum_fsync_flag = 0;
3083 if (!alternate_index_output && (flags & COMMIT_LOCK))
3084 csum_fsync_flag = CSUM_FSYNC;
3086 finalize_hashfile(f, istate->oid.hash, FSYNC_COMPONENT_INDEX,
3087 CSUM_HASH_IN_STREAM | csum_fsync_flag);
3089 if (close_tempfile_gently(tempfile)) {
3090 error(_("could not close '%s'"), get_tempfile_path(tempfile));
3091 return -1;
3093 if (stat(get_tempfile_path(tempfile), &st))
3094 return -1;
3095 istate->timestamp.sec = (unsigned int)st.st_mtime;
3096 istate->timestamp.nsec = ST_MTIME_NSEC(st);
3097 trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
3100 * TODO trace2: replace "the_repository" with the actual repo instance
3101 * that is associated with the given "istate".
3103 trace2_data_intmax("index", the_repository, "write/version",
3104 istate->version);
3105 trace2_data_intmax("index", the_repository, "write/cache_nr",
3106 istate->cache_nr);
3108 return 0;
3111 void set_alternate_index_output(const char *name)
3113 alternate_index_output = name;
3116 static int commit_locked_index(struct lock_file *lk)
3118 if (alternate_index_output)
3119 return commit_lock_file_to(lk, alternate_index_output);
3120 else
3121 return commit_lock_file(lk);
3124 static int do_write_locked_index(struct index_state *istate,
3125 struct lock_file *lock,
3126 unsigned flags,
3127 enum write_extensions write_extensions)
3129 int ret;
3130 int was_full = istate->sparse_index == INDEX_EXPANDED;
3132 ret = convert_to_sparse(istate, 0);
3134 if (ret) {
3135 warning(_("failed to convert to a sparse-index"));
3136 return ret;
3140 * TODO trace2: replace "the_repository" with the actual repo instance
3141 * that is associated with the given "istate".
3143 trace2_region_enter_printf("index", "do_write_index", the_repository,
3144 "%s", get_lock_file_path(lock));
3145 ret = do_write_index(istate, lock->tempfile, write_extensions, flags);
3146 trace2_region_leave_printf("index", "do_write_index", the_repository,
3147 "%s", get_lock_file_path(lock));
3149 if (was_full)
3150 ensure_full_index(istate);
3152 if (ret)
3153 return ret;
3154 if (flags & COMMIT_LOCK)
3155 ret = commit_locked_index(lock);
3156 else
3157 ret = close_lock_file_gently(lock);
3159 run_hooks_l("post-index-change",
3160 istate->updated_workdir ? "1" : "0",
3161 istate->updated_skipworktree ? "1" : "0", NULL);
3162 istate->updated_workdir = 0;
3163 istate->updated_skipworktree = 0;
3165 return ret;
3168 static int write_split_index(struct index_state *istate,
3169 struct lock_file *lock,
3170 unsigned flags)
3172 int ret;
3173 prepare_to_write_split_index(istate);
3174 ret = do_write_locked_index(istate, lock, flags, WRITE_ALL_EXTENSIONS);
3175 finish_writing_split_index(istate);
3176 return ret;
3179 static const char *shared_index_expire = "2.weeks.ago";
3181 static unsigned long get_shared_index_expire_date(void)
3183 static unsigned long shared_index_expire_date;
3184 static int shared_index_expire_date_prepared;
3186 if (!shared_index_expire_date_prepared) {
3187 git_config_get_expiry("splitindex.sharedindexexpire",
3188 &shared_index_expire);
3189 shared_index_expire_date = approxidate(shared_index_expire);
3190 shared_index_expire_date_prepared = 1;
3193 return shared_index_expire_date;
3196 static int should_delete_shared_index(const char *shared_index_path)
3198 struct stat st;
3199 unsigned long expiration;
3201 /* Check timestamp */
3202 expiration = get_shared_index_expire_date();
3203 if (!expiration)
3204 return 0;
3205 if (stat(shared_index_path, &st))
3206 return error_errno(_("could not stat '%s'"), shared_index_path);
3207 if (st.st_mtime > expiration)
3208 return 0;
3210 return 1;
3213 static int clean_shared_index_files(const char *current_hex)
3215 struct dirent *de;
3216 DIR *dir = opendir(get_git_dir());
3218 if (!dir)
3219 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3221 while ((de = readdir(dir)) != NULL) {
3222 const char *sha1_hex;
3223 const char *shared_index_path;
3224 if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
3225 continue;
3226 if (!strcmp(sha1_hex, current_hex))
3227 continue;
3228 shared_index_path = git_path("%s", de->d_name);
3229 if (should_delete_shared_index(shared_index_path) > 0 &&
3230 unlink(shared_index_path))
3231 warning_errno(_("unable to unlink: %s"), shared_index_path);
3233 closedir(dir);
3235 return 0;
3238 static int write_shared_index(struct index_state *istate,
3239 struct tempfile **temp, unsigned flags)
3241 struct split_index *si = istate->split_index;
3242 int ret, was_full = !istate->sparse_index;
3244 move_cache_to_base_index(istate);
3245 convert_to_sparse(istate, 0);
3247 trace2_region_enter_printf("index", "shared/do_write_index",
3248 the_repository, "%s", get_tempfile_path(*temp));
3249 ret = do_write_index(si->base, *temp, WRITE_NO_EXTENSION, flags);
3250 trace2_region_leave_printf("index", "shared/do_write_index",
3251 the_repository, "%s", get_tempfile_path(*temp));
3253 if (was_full)
3254 ensure_full_index(istate);
3256 if (ret)
3257 return ret;
3258 ret = adjust_shared_perm(get_tempfile_path(*temp));
3259 if (ret) {
3260 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp));
3261 return ret;
3263 ret = rename_tempfile(temp,
3264 git_path("sharedindex.%s", oid_to_hex(&si->base->oid)));
3265 if (!ret) {
3266 oidcpy(&si->base_oid, &si->base->oid);
3267 clean_shared_index_files(oid_to_hex(&si->base->oid));
3270 return ret;
3273 static const int default_max_percent_split_change = 20;
3275 static int too_many_not_shared_entries(struct index_state *istate)
3277 int i, not_shared = 0;
3278 int max_split = git_config_get_max_percent_split_change();
3280 switch (max_split) {
3281 case -1:
3282 /* not or badly configured: use the default value */
3283 max_split = default_max_percent_split_change;
3284 break;
3285 case 0:
3286 return 1; /* 0% means always write a new shared index */
3287 case 100:
3288 return 0; /* 100% means never write a new shared index */
3289 default:
3290 break; /* just use the configured value */
3293 /* Count not shared entries */
3294 for (i = 0; i < istate->cache_nr; i++) {
3295 struct cache_entry *ce = istate->cache[i];
3296 if (!ce->index)
3297 not_shared++;
3300 return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100;
3303 int write_locked_index(struct index_state *istate, struct lock_file *lock,
3304 unsigned flags)
3306 int new_shared_index, ret, test_split_index_env;
3307 struct split_index *si = istate->split_index;
3309 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3310 cache_tree_verify(the_repository, istate);
3312 if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
3313 if (flags & COMMIT_LOCK)
3314 rollback_lock_file(lock);
3315 return 0;
3318 if (istate->fsmonitor_last_update)
3319 fill_fsmonitor_bitmap(istate);
3321 test_split_index_env = git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3323 if ((!si && !test_split_index_env) ||
3324 alternate_index_output ||
3325 (istate->cache_changed & ~EXTMASK)) {
3326 ret = do_write_locked_index(istate, lock, flags,
3327 ~WRITE_SPLIT_INDEX_EXTENSION);
3328 goto out;
3331 if (test_split_index_env) {
3332 if (!si) {
3333 si = init_split_index(istate);
3334 istate->cache_changed |= SPLIT_INDEX_ORDERED;
3335 } else {
3336 int v = si->base_oid.hash[0];
3337 if ((v & 15) < 6)
3338 istate->cache_changed |= SPLIT_INDEX_ORDERED;
3341 if (too_many_not_shared_entries(istate))
3342 istate->cache_changed |= SPLIT_INDEX_ORDERED;
3344 new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
3346 if (new_shared_index) {
3347 struct tempfile *temp;
3348 int saved_errno;
3350 /* Same initial permissions as the main .git/index file */
3351 temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3352 if (!temp) {
3353 ret = do_write_locked_index(istate, lock, flags,
3354 ~WRITE_SPLIT_INDEX_EXTENSION);
3355 goto out;
3357 ret = write_shared_index(istate, &temp, flags);
3359 saved_errno = errno;
3360 if (is_tempfile_active(temp))
3361 delete_tempfile(&temp);
3362 errno = saved_errno;
3364 if (ret)
3365 goto out;
3368 ret = write_split_index(istate, lock, flags);
3370 /* Freshen the shared index only if the split-index was written */
3371 if (!ret && !new_shared_index && !is_null_oid(&si->base_oid)) {
3372 const char *shared_index = git_path("sharedindex.%s",
3373 oid_to_hex(&si->base_oid));
3374 freshen_shared_index(shared_index, 1);
3377 out:
3378 if (flags & COMMIT_LOCK)
3379 rollback_lock_file(lock);
3380 return ret;
3384 * Read the index file that is potentially unmerged into given
3385 * index_state, dropping any unmerged entries to stage #0 (potentially
3386 * resulting in a path appearing as both a file and a directory in the
3387 * index; the caller is responsible to clear out the extra entries
3388 * before writing the index to a tree). Returns true if the index is
3389 * unmerged. Callers who want to refuse to work from an unmerged
3390 * state can call this and check its return value, instead of calling
3391 * read_cache().
3393 int repo_read_index_unmerged(struct repository *repo)
3395 struct index_state *istate;
3396 int i;
3397 int unmerged = 0;
3399 repo_read_index(repo);
3400 istate = repo->index;
3401 for (i = 0; i < istate->cache_nr; i++) {
3402 struct cache_entry *ce = istate->cache[i];
3403 struct cache_entry *new_ce;
3404 int len;
3406 if (!ce_stage(ce))
3407 continue;
3408 unmerged = 1;
3409 len = ce_namelen(ce);
3410 new_ce = make_empty_cache_entry(istate, len);
3411 memcpy(new_ce->name, ce->name, len);
3412 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
3413 new_ce->ce_namelen = len;
3414 new_ce->ce_mode = ce->ce_mode;
3415 if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK))
3416 return error(_("%s: cannot drop to stage #0"),
3417 new_ce->name);
3419 return unmerged;
3423 * Returns 1 if the path is an "other" path with respect to
3424 * the index; that is, the path is not mentioned in the index at all,
3425 * either as a file, a directory with some files in the index,
3426 * or as an unmerged entry.
3428 * We helpfully remove a trailing "/" from directories so that
3429 * the output of read_directory can be used as-is.
3431 int index_name_is_other(struct index_state *istate, const char *name,
3432 int namelen)
3434 int pos;
3435 if (namelen && name[namelen - 1] == '/')
3436 namelen--;
3437 pos = index_name_pos(istate, name, namelen);
3438 if (0 <= pos)
3439 return 0; /* exact match */
3440 pos = -pos - 1;
3441 if (pos < istate->cache_nr) {
3442 struct cache_entry *ce = istate->cache[pos];
3443 if (ce_namelen(ce) == namelen &&
3444 !memcmp(ce->name, name, namelen))
3445 return 0; /* Yup, this one exists unmerged */
3447 return 1;
3450 void *read_blob_data_from_index(struct index_state *istate,
3451 const char *path, unsigned long *size)
3453 int pos, len;
3454 unsigned long sz;
3455 enum object_type type;
3456 void *data;
3458 len = strlen(path);
3459 pos = index_name_pos(istate, path, len);
3460 if (pos < 0) {
3462 * We might be in the middle of a merge, in which
3463 * case we would read stage #2 (ours).
3465 int i;
3466 for (i = -pos - 1;
3467 (pos < 0 && i < istate->cache_nr &&
3468 !strcmp(istate->cache[i]->name, path));
3469 i++)
3470 if (ce_stage(istate->cache[i]) == 2)
3471 pos = i;
3473 if (pos < 0)
3474 return NULL;
3475 data = repo_read_object_file(the_repository, &istate->cache[pos]->oid,
3476 &type, &sz);
3477 if (!data || type != OBJ_BLOB) {
3478 free(data);
3479 return NULL;
3481 if (size)
3482 *size = sz;
3483 return data;
3486 void move_index_extensions(struct index_state *dst, struct index_state *src)
3488 dst->untracked = src->untracked;
3489 src->untracked = NULL;
3490 dst->cache_tree = src->cache_tree;
3491 src->cache_tree = NULL;
3494 struct cache_entry *dup_cache_entry(const struct cache_entry *ce,
3495 struct index_state *istate)
3497 unsigned int size = ce_size(ce);
3498 int mem_pool_allocated;
3499 struct cache_entry *new_entry = make_empty_cache_entry(istate, ce_namelen(ce));
3500 mem_pool_allocated = new_entry->mem_pool_allocated;
3502 memcpy(new_entry, ce, size);
3503 new_entry->mem_pool_allocated = mem_pool_allocated;
3504 return new_entry;
3507 void discard_cache_entry(struct cache_entry *ce)
3509 if (ce && should_validate_cache_entries())
3510 memset(ce, 0xCD, cache_entry_size(ce->ce_namelen));
3512 if (ce && ce->mem_pool_allocated)
3513 return;
3515 free(ce);
3518 int should_validate_cache_entries(void)
3520 static int validate_index_cache_entries = -1;
3522 if (validate_index_cache_entries < 0) {
3523 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3524 validate_index_cache_entries = 1;
3525 else
3526 validate_index_cache_entries = 0;
3529 return validate_index_cache_entries;
3532 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3533 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3535 static size_t read_eoie_extension(const char *mmap, size_t mmap_size)
3538 * The end of index entries (EOIE) extension is guaranteed to be last
3539 * so that it can be found by scanning backwards from the EOF.
3541 * "EOIE"
3542 * <4-byte length>
3543 * <4-byte offset>
3544 * <20-byte hash>
3546 const char *index, *eoie;
3547 uint32_t extsize;
3548 size_t offset, src_offset;
3549 unsigned char hash[GIT_MAX_RAWSZ];
3550 git_hash_ctx c;
3552 /* ensure we have an index big enough to contain an EOIE extension */
3553 if (mmap_size < sizeof(struct cache_header) + EOIE_SIZE_WITH_HEADER + the_hash_algo->rawsz)
3554 return 0;
3556 /* validate the extension signature */
3557 index = eoie = mmap + mmap_size - EOIE_SIZE_WITH_HEADER - the_hash_algo->rawsz;
3558 if (CACHE_EXT(index) != CACHE_EXT_ENDOFINDEXENTRIES)
3559 return 0;
3560 index += sizeof(uint32_t);
3562 /* validate the extension size */
3563 extsize = get_be32(index);
3564 if (extsize != EOIE_SIZE)
3565 return 0;
3566 index += sizeof(uint32_t);
3569 * Validate the offset we're going to look for the first extension
3570 * signature is after the index header and before the eoie extension.
3572 offset = get_be32(index);
3573 if (mmap + offset < mmap + sizeof(struct cache_header))
3574 return 0;
3575 if (mmap + offset >= eoie)
3576 return 0;
3577 index += sizeof(uint32_t);
3580 * The hash is computed over extension types and their sizes (but not
3581 * their contents). E.g. if we have "TREE" extension that is N-bytes
3582 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3583 * then the hash would be:
3585 * SHA-1("TREE" + <binary representation of N> +
3586 * "REUC" + <binary representation of M>)
3588 src_offset = offset;
3589 the_hash_algo->init_fn(&c);
3590 while (src_offset < mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER) {
3591 /* After an array of active_nr index entries,
3592 * there can be arbitrary number of extended
3593 * sections, each of which is prefixed with
3594 * extension name (4-byte) and section length
3595 * in 4-byte network byte order.
3597 uint32_t extsize;
3598 memcpy(&extsize, mmap + src_offset + 4, 4);
3599 extsize = ntohl(extsize);
3601 /* verify the extension size isn't so large it will wrap around */
3602 if (src_offset + 8 + extsize < src_offset)
3603 return 0;
3605 the_hash_algo->update_fn(&c, mmap + src_offset, 8);
3607 src_offset += 8;
3608 src_offset += extsize;
3610 the_hash_algo->final_fn(hash, &c);
3611 if (!hasheq(hash, (const unsigned char *)index, the_repository->hash_algo))
3612 return 0;
3614 /* Validate that the extension offsets returned us back to the eoie extension. */
3615 if (src_offset != mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER)
3616 return 0;
3618 return offset;
3621 static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset)
3623 uint32_t buffer;
3624 unsigned char hash[GIT_MAX_RAWSZ];
3626 /* offset */
3627 put_be32(&buffer, offset);
3628 strbuf_add(sb, &buffer, sizeof(uint32_t));
3630 /* hash */
3631 the_hash_algo->final_fn(hash, eoie_context);
3632 strbuf_add(sb, hash, the_hash_algo->rawsz);
3635 #define IEOT_VERSION (1)
3637 static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset)
3639 const char *index = NULL;
3640 uint32_t extsize, ext_version;
3641 struct index_entry_offset_table *ieot;
3642 int i, nr;
3644 /* find the IEOT extension */
3645 if (!offset)
3646 return NULL;
3647 while (offset <= mmap_size - the_hash_algo->rawsz - 8) {
3648 extsize = get_be32(mmap + offset + 4);
3649 if (CACHE_EXT((mmap + offset)) == CACHE_EXT_INDEXENTRYOFFSETTABLE) {
3650 index = mmap + offset + 4 + 4;
3651 break;
3653 offset += 8;
3654 offset += extsize;
3656 if (!index)
3657 return NULL;
3659 /* validate the version is IEOT_VERSION */
3660 ext_version = get_be32(index);
3661 if (ext_version != IEOT_VERSION) {
3662 error("invalid IEOT version %d", ext_version);
3663 return NULL;
3665 index += sizeof(uint32_t);
3667 /* extension size - version bytes / bytes per entry */
3668 nr = (extsize - sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3669 if (!nr) {
3670 error("invalid number of IEOT entries %d", nr);
3671 return NULL;
3673 ieot = xmalloc(sizeof(struct index_entry_offset_table)
3674 + (nr * sizeof(struct index_entry_offset)));
3675 ieot->nr = nr;
3676 for (i = 0; i < nr; i++) {
3677 ieot->entries[i].offset = get_be32(index);
3678 index += sizeof(uint32_t);
3679 ieot->entries[i].nr = get_be32(index);
3680 index += sizeof(uint32_t);
3683 return ieot;
3686 static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot)
3688 uint32_t buffer;
3689 int i;
3691 /* version */
3692 put_be32(&buffer, IEOT_VERSION);
3693 strbuf_add(sb, &buffer, sizeof(uint32_t));
3695 /* ieot */
3696 for (i = 0; i < ieot->nr; i++) {
3698 /* offset */
3699 put_be32(&buffer, ieot->entries[i].offset);
3700 strbuf_add(sb, &buffer, sizeof(uint32_t));
3702 /* count */
3703 put_be32(&buffer, ieot->entries[i].nr);
3704 strbuf_add(sb, &buffer, sizeof(uint32_t));
3708 void prefetch_cache_entries(const struct index_state *istate,
3709 must_prefetch_predicate must_prefetch)
3711 int i;
3712 struct oid_array to_fetch = OID_ARRAY_INIT;
3714 for (i = 0; i < istate->cache_nr; i++) {
3715 struct cache_entry *ce = istate->cache[i];
3717 if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce))
3718 continue;
3719 if (!oid_object_info_extended(the_repository, &ce->oid,
3720 NULL,
3721 OBJECT_INFO_FOR_PREFETCH))
3722 continue;
3723 oid_array_append(&to_fetch, &ce->oid);
3725 promisor_remote_get_direct(the_repository,
3726 to_fetch.oid, to_fetch.nr);
3727 oid_array_clear(&to_fetch);
3730 static int read_one_entry_opt(struct index_state *istate,
3731 const struct object_id *oid,
3732 struct strbuf *base,
3733 const char *pathname,
3734 unsigned mode, int opt)
3736 int len;
3737 struct cache_entry *ce;
3739 if (S_ISDIR(mode))
3740 return READ_TREE_RECURSIVE;
3742 len = strlen(pathname);
3743 ce = make_empty_cache_entry(istate, base->len + len);
3745 ce->ce_mode = create_ce_mode(mode);
3746 ce->ce_flags = create_ce_flags(1);
3747 ce->ce_namelen = base->len + len;
3748 memcpy(ce->name, base->buf, base->len);
3749 memcpy(ce->name + base->len, pathname, len+1);
3750 oidcpy(&ce->oid, oid);
3751 return add_index_entry(istate, ce, opt);
3754 static int read_one_entry(const struct object_id *oid, struct strbuf *base,
3755 const char *pathname, unsigned mode,
3756 void *context)
3758 struct index_state *istate = context;
3759 return read_one_entry_opt(istate, oid, base, pathname,
3760 mode,
3761 ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
3765 * This is used when the caller knows there is no existing entries at
3766 * the stage that will conflict with the entry being added.
3768 static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
3769 const char *pathname, unsigned mode,
3770 void *context)
3772 struct index_state *istate = context;
3773 return read_one_entry_opt(istate, oid, base, pathname,
3774 mode, ADD_CACHE_JUST_APPEND);
3778 * Read the tree specified with --with-tree option
3779 * (typically, HEAD) into stage #1 and then
3780 * squash them down to stage #0. This is used for
3781 * --error-unmatch to list and check the path patterns
3782 * that were given from the command line. We are not
3783 * going to write this index out.
3785 void overlay_tree_on_index(struct index_state *istate,
3786 const char *tree_name, const char *prefix)
3788 struct tree *tree;
3789 struct object_id oid;
3790 struct pathspec pathspec;
3791 struct cache_entry *last_stage0 = NULL;
3792 int i;
3793 read_tree_fn_t fn = NULL;
3794 int err;
3796 if (repo_get_oid(the_repository, tree_name, &oid))
3797 die("tree-ish %s not found.", tree_name);
3798 tree = parse_tree_indirect(&oid);
3799 if (!tree)
3800 die("bad tree-ish %s", tree_name);
3802 /* Hoist the unmerged entries up to stage #3 to make room */
3803 /* TODO: audit for interaction with sparse-index. */
3804 ensure_full_index(istate);
3805 for (i = 0; i < istate->cache_nr; i++) {
3806 struct cache_entry *ce = istate->cache[i];
3807 if (!ce_stage(ce))
3808 continue;
3809 ce->ce_flags |= CE_STAGEMASK;
3812 if (prefix) {
3813 static const char *(matchbuf[1]);
3814 matchbuf[0] = NULL;
3815 parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
3816 PATHSPEC_PREFER_CWD, prefix, matchbuf);
3817 } else
3818 memset(&pathspec, 0, sizeof(pathspec));
3821 * See if we have cache entry at the stage. If so,
3822 * do it the original slow way, otherwise, append and then
3823 * sort at the end.
3825 for (i = 0; !fn && i < istate->cache_nr; i++) {
3826 const struct cache_entry *ce = istate->cache[i];
3827 if (ce_stage(ce) == 1)
3828 fn = read_one_entry;
3831 if (!fn)
3832 fn = read_one_entry_quick;
3833 err = read_tree(the_repository, tree, &pathspec, fn, istate);
3834 clear_pathspec(&pathspec);
3835 if (err)
3836 die("unable to read tree entries %s", tree_name);
3839 * Sort the cache entry -- we need to nuke the cache tree, though.
3841 if (fn == read_one_entry_quick) {
3842 cache_tree_free(&istate->cache_tree);
3843 QSORT(istate->cache, istate->cache_nr, cmp_cache_name_compare);
3846 for (i = 0; i < istate->cache_nr; i++) {
3847 struct cache_entry *ce = istate->cache[i];
3848 switch (ce_stage(ce)) {
3849 case 0:
3850 last_stage0 = ce;
3851 /* fallthru */
3852 default:
3853 continue;
3854 case 1:
3856 * If there is stage #0 entry for this, we do not
3857 * need to show it. We use CE_UPDATE bit to mark
3858 * such an entry.
3860 if (last_stage0 &&
3861 !strcmp(last_stage0->name, ce->name))
3862 ce->ce_flags |= CE_UPDATE;
3867 struct update_callback_data {
3868 struct index_state *index;
3869 int include_sparse;
3870 int flags;
3871 int add_errors;
3874 static int fix_unmerged_status(struct diff_filepair *p,
3875 struct update_callback_data *data)
3877 if (p->status != DIFF_STATUS_UNMERGED)
3878 return p->status;
3879 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
3881 * This is not an explicit add request, and the
3882 * path is missing from the working tree (deleted)
3884 return DIFF_STATUS_DELETED;
3885 else
3887 * Either an explicit add request, or path exists
3888 * in the working tree. An attempt to explicitly
3889 * add a path that does not exist in the working tree
3890 * will be caught as an error by the caller immediately.
3892 return DIFF_STATUS_MODIFIED;
3895 static void update_callback(struct diff_queue_struct *q,
3896 struct diff_options *opt UNUSED, void *cbdata)
3898 int i;
3899 struct update_callback_data *data = cbdata;
3901 for (i = 0; i < q->nr; i++) {
3902 struct diff_filepair *p = q->queue[i];
3903 const char *path = p->one->path;
3905 if (!data->include_sparse &&
3906 !path_in_sparse_checkout(path, data->index))
3907 continue;
3909 switch (fix_unmerged_status(p, data)) {
3910 default:
3911 die(_("unexpected diff status %c"), p->status);
3912 case DIFF_STATUS_MODIFIED:
3913 case DIFF_STATUS_TYPE_CHANGED:
3914 if (add_file_to_index(data->index, path, data->flags)) {
3915 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
3916 die(_("updating files failed"));
3917 data->add_errors++;
3919 break;
3920 case DIFF_STATUS_DELETED:
3921 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
3922 break;
3923 if (!(data->flags & ADD_CACHE_PRETEND))
3924 remove_file_from_index(data->index, path);
3925 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
3926 printf(_("remove '%s'\n"), path);
3927 break;
3932 int add_files_to_cache(struct repository *repo, const char *prefix,
3933 const struct pathspec *pathspec, char *ps_matched,
3934 int include_sparse, int flags)
3936 struct update_callback_data data;
3937 struct rev_info rev;
3939 memset(&data, 0, sizeof(data));
3940 data.index = repo->index;
3941 data.include_sparse = include_sparse;
3942 data.flags = flags;
3944 repo_init_revisions(repo, &rev, prefix);
3945 setup_revisions(0, NULL, &rev, NULL);
3946 if (pathspec) {
3947 copy_pathspec(&rev.prune_data, pathspec);
3948 rev.ps_matched = ps_matched;
3950 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
3951 rev.diffopt.format_callback = update_callback;
3952 rev.diffopt.format_callback_data = &data;
3953 rev.diffopt.flags.override_submodule_config = 1;
3954 rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
3957 * Use an ODB transaction to optimize adding multiple objects.
3958 * This function is invoked from commands other than 'add', which
3959 * may not have their own transaction active.
3961 begin_odb_transaction();
3962 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
3963 end_odb_transaction();
3965 release_revisions(&rev);
3966 return !!data.add_errors;