2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #include "git-compat-util.h"
7 #include "bulk-checkin.h"
15 #include "cache-tree.h"
18 #include "object-file.h"
19 #include "object-store-ll.h"
20 #include "oid-array.h"
23 #include "environment.h"
26 #include "name-hash.h"
27 #include "object-name.h"
29 #include "preload-index.h"
30 #include "read-cache.h"
31 #include "resolve-undo.h"
36 #include "split-index.h"
39 #include "fsmonitor.h"
40 #include "thread-utils.h"
42 #include "sparse-index.h"
43 #include "csum-file.h"
44 #include "promisor-remote.h"
47 /* Mask for the name length in ce_flags in the on-disk index */
49 #define CE_NAMEMASK (0x0fff)
53 * The first letter should be 'A'..'Z' for extensions that are not
54 * necessary for a correct operation (i.e. optimization data).
55 * When new extensions are added that _needs_ to be understood in
56 * order to correctly interpret the index file, pick character that
57 * is outside the range, to cause the reader to abort.
60 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
61 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
62 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
63 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
64 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
65 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
66 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
67 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
68 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
70 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
71 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
72 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
73 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
77 * This is an estimate of the pathname length in the index. We use
78 * this for V4 index files to guess the un-deltafied size of the index
79 * in memory because of pathname deltafication. This is not required
80 * for V2/V3 index formats because their pathnames are not compressed.
81 * If the initial amount of memory set aside is not sufficient, the
82 * mem pool will allocate extra memory.
84 #define CACHE_ENTRY_PATH_LENGTH 80
86 enum index_search_mode
{
91 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
93 struct cache_entry
*ce
;
94 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
95 ce
->mem_pool_allocated
= 1;
99 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
101 struct cache_entry
* ce
;
102 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
103 ce
->mem_pool_allocated
= 1;
107 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
109 struct mem_pool
**pool_ptr
;
111 if (istate
->split_index
&& istate
->split_index
->base
)
112 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
114 pool_ptr
= &istate
->ce_mem_pool
;
117 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
118 mem_pool_init(*pool_ptr
, 0);
124 static const char *alternate_index_output
;
126 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
128 if (S_ISSPARSEDIR(ce
->ce_mode
))
129 istate
->sparse_index
= INDEX_COLLAPSED
;
131 istate
->cache
[nr
] = ce
;
132 add_name_hash(istate
, ce
);
135 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
137 struct cache_entry
*old
= istate
->cache
[nr
];
139 replace_index_entry_in_base(istate
, old
, ce
);
140 remove_name_hash(istate
, old
);
141 discard_cache_entry(old
);
142 ce
->ce_flags
&= ~CE_HASHED
;
143 set_index_entry(istate
, nr
, ce
);
144 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
145 mark_fsmonitor_invalid(istate
, ce
);
146 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
149 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
151 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
152 int namelen
= strlen(new_name
);
154 new_entry
= make_empty_cache_entry(istate
, namelen
);
155 copy_cache_entry(new_entry
, old_entry
);
156 new_entry
->ce_flags
&= ~CE_HASHED
;
157 new_entry
->ce_namelen
= namelen
;
158 new_entry
->index
= 0;
159 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
161 cache_tree_invalidate_path(istate
, old_entry
->name
);
162 untracked_cache_remove_from_index(istate
, old_entry
->name
);
163 remove_index_entry_at(istate
, nr
);
166 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
167 * we only update stat info if the entry is otherwise up-to-date (i.e.,
168 * the contents/mode haven't changed). This ensures that we reflect the
169 * 'ctime' of the rename in the index without (incorrectly) updating
170 * the cached stat info to reflect unstaged changes on disk.
172 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
173 if (refreshed
&& refreshed
!= new_entry
) {
174 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
175 discard_cache_entry(new_entry
);
177 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
181 * This only updates the "non-critical" parts of the directory
182 * cache, ie the parts that aren't tracked by GIT, and only used
183 * to validate the cache.
185 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
187 fill_stat_data(&ce
->ce_stat_data
, st
);
189 if (assume_unchanged
)
190 ce
->ce_flags
|= CE_VALID
;
192 if (S_ISREG(st
->st_mode
)) {
193 ce_mark_uptodate(ce
);
194 mark_fsmonitor_valid(istate
, ce
);
198 static unsigned int st_mode_from_ce(const struct cache_entry
*ce
)
200 extern int trust_executable_bit
, has_symlinks
;
202 switch (ce
->ce_mode
& S_IFMT
) {
204 return has_symlinks
? S_IFLNK
: (S_IFREG
| 0644);
206 return (ce
->ce_mode
& (trust_executable_bit
? 0755 : 0644)) | S_IFREG
;
208 return S_IFDIR
| 0755;
212 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
216 int fake_lstat(const struct cache_entry
*ce
, struct stat
*st
)
218 fake_lstat_data(&ce
->ce_stat_data
, st
);
219 st
->st_mode
= st_mode_from_ce(ce
);
221 /* always succeed as lstat() replacement */
225 static int ce_compare_data(struct index_state
*istate
,
226 const struct cache_entry
*ce
,
230 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
233 struct object_id oid
;
234 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
235 match
= !oideq(&oid
, &ce
->oid
);
236 /* index_fd() closed the file descriptor already */
241 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
246 enum object_type type
;
247 struct strbuf sb
= STRBUF_INIT
;
249 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
252 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
255 match
= memcmp(buffer
, sb
.buf
, size
);
262 static int ce_compare_gitlink(const struct cache_entry
*ce
)
264 struct object_id oid
;
267 * We don't actually require that the .git directory
268 * under GITLINK directory be a valid git directory. It
269 * might even be missing (in case nobody populated that
272 * If so, we consider it always to match.
274 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
276 return !oideq(&oid
, &ce
->oid
);
279 static int ce_modified_check_fs(struct index_state
*istate
,
280 const struct cache_entry
*ce
,
283 switch (st
->st_mode
& S_IFMT
) {
285 if (ce_compare_data(istate
, ce
, st
))
289 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
293 if (S_ISGITLINK(ce
->ce_mode
))
294 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
295 /* else fallthrough */
302 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
304 unsigned int changed
= 0;
306 if (ce
->ce_flags
& CE_REMOVE
)
307 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
309 switch (ce
->ce_mode
& S_IFMT
) {
311 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
312 /* We consider only the owner x bit to be relevant for
315 if (trust_executable_bit
&&
316 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
317 changed
|= MODE_CHANGED
;
320 if (!S_ISLNK(st
->st_mode
) &&
321 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
322 changed
|= TYPE_CHANGED
;
325 /* We ignore most of the st_xxx fields for gitlinks */
326 if (!S_ISDIR(st
->st_mode
))
327 changed
|= TYPE_CHANGED
;
328 else if (ce_compare_gitlink(ce
))
329 changed
|= DATA_CHANGED
;
332 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
335 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
337 /* Racily smudged entry? */
338 if (!ce
->ce_stat_data
.sd_size
) {
339 if (!is_empty_blob_sha1(ce
->oid
.hash
))
340 changed
|= DATA_CHANGED
;
346 static int is_racy_stat(const struct index_state
*istate
,
347 const struct stat_data
*sd
)
349 return (istate
->timestamp
.sec
&&
351 /* nanosecond timestamped files can also be racy! */
352 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
353 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
354 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
356 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
361 int is_racy_timestamp(const struct index_state
*istate
,
362 const struct cache_entry
*ce
)
364 return (!S_ISGITLINK(ce
->ce_mode
) &&
365 is_racy_stat(istate
, &ce
->ce_stat_data
));
368 int match_stat_data_racy(const struct index_state
*istate
,
369 const struct stat_data
*sd
, struct stat
*st
)
371 if (is_racy_stat(istate
, sd
))
372 return MTIME_CHANGED
;
373 return match_stat_data(sd
, st
);
376 int ie_match_stat(struct index_state
*istate
,
377 const struct cache_entry
*ce
, struct stat
*st
,
378 unsigned int options
)
380 unsigned int changed
;
381 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
382 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
383 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
384 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
386 if (!ignore_fsmonitor
)
387 refresh_fsmonitor(istate
);
389 * If it's marked as always valid in the index, it's
390 * valid whatever the checked-out copy says.
392 * skip-worktree has the same effect with higher precedence
394 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
396 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
398 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
402 * Intent-to-add entries have not been added, so the index entry
403 * by definition never matches what is in the work tree until it
404 * actually gets added.
406 if (ce_intent_to_add(ce
))
407 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
409 changed
= ce_match_stat_basic(ce
, st
);
412 * Within 1 second of this sequence:
413 * echo xyzzy >file && git-update-index --add file
414 * running this command:
416 * would give a falsely clean cache entry. The mtime and
417 * length match the cache, and other stat fields do not change.
419 * We could detect this at update-index time (the cache entry
420 * being registered/updated records the same time as "now")
421 * and delay the return from git-update-index, but that would
422 * effectively mean we can make at most one commit per second,
423 * which is not acceptable. Instead, we check cache entries
424 * whose mtime are the same as the index file timestamp more
425 * carefully than others.
427 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
428 if (assume_racy_is_modified
)
429 changed
|= DATA_CHANGED
;
431 changed
|= ce_modified_check_fs(istate
, ce
, st
);
437 int ie_modified(struct index_state
*istate
,
438 const struct cache_entry
*ce
,
439 struct stat
*st
, unsigned int options
)
441 int changed
, changed_fs
;
443 changed
= ie_match_stat(istate
, ce
, st
, options
);
447 * If the mode or type has changed, there's no point in trying
448 * to refresh the entry - it's not going to match
450 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
454 * Immediately after read-tree or update-index --cacheinfo,
455 * the length field is zero, as we have never even read the
456 * lstat(2) information once, and we cannot trust DATA_CHANGED
457 * returned by ie_match_stat() which in turn was returned by
458 * ce_match_stat_basic() to signal that the filesize of the
459 * blob changed. We have to actually go to the filesystem to
460 * see if the contents match, and if so, should answer "unchanged".
462 * The logic does not apply to gitlinks, as ce_match_stat_basic()
463 * already has checked the actual HEAD from the filesystem in the
464 * subproject. If ie_match_stat() already said it is different,
465 * then we know it is.
467 if ((changed
& DATA_CHANGED
) &&
468 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
471 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
473 return changed
| changed_fs
;
477 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
478 const char *name2
, int len2
, int stage2
)
482 cmp
= name_compare(name1
, len1
, name2
, len2
);
493 int cmp_cache_name_compare(const void *a_
, const void *b_
)
495 const struct cache_entry
*ce1
, *ce2
;
497 ce1
= *((const struct cache_entry
**)a_
);
498 ce2
= *((const struct cache_entry
**)b_
);
499 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
500 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
503 static int index_name_stage_pos(struct index_state
*istate
,
504 const char *name
, int namelen
,
506 enum index_search_mode search_mode
)
511 last
= istate
->cache_nr
;
512 while (last
> first
) {
513 int next
= first
+ ((last
- first
) >> 1);
514 struct cache_entry
*ce
= istate
->cache
[next
];
515 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
525 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
527 /* Note: first <= istate->cache_nr */
528 struct cache_entry
*ce
= istate
->cache
[first
- 1];
531 * If we are in a sparse-index _and_ the entry before the
532 * insertion position is a sparse-directory entry that is
533 * an ancestor of 'name', then we need to expand the index
534 * and search again. This will only trigger once, because
535 * thereafter the index is fully expanded.
537 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
538 ce_namelen(ce
) < namelen
&&
539 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
540 ensure_full_index(istate
);
541 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
548 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
550 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
553 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
555 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
558 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
560 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
563 int remove_index_entry_at(struct index_state
*istate
, int pos
)
565 struct cache_entry
*ce
= istate
->cache
[pos
];
567 record_resolve_undo(istate
, ce
);
568 remove_name_hash(istate
, ce
);
569 save_or_free_index_entry(istate
, ce
);
570 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
572 if (pos
>= istate
->cache_nr
)
574 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
575 istate
->cache_nr
- pos
);
580 * Remove all cache entries marked for removal, that is where
581 * CE_REMOVE is set in ce_flags. This is much more effective than
582 * calling remove_index_entry_at() for each entry to be removed.
584 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
586 struct cache_entry
**ce_array
= istate
->cache
;
589 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
590 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
592 cache_tree_invalidate_path(istate
,
594 untracked_cache_remove_from_index(istate
,
597 remove_name_hash(istate
, ce_array
[i
]);
598 save_or_free_index_entry(istate
, ce_array
[i
]);
601 ce_array
[j
++] = ce_array
[i
];
603 if (j
== istate
->cache_nr
)
605 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
606 istate
->cache_nr
= j
;
609 int remove_file_from_index(struct index_state
*istate
, const char *path
)
611 int pos
= index_name_pos(istate
, path
, strlen(path
));
614 cache_tree_invalidate_path(istate
, path
);
615 untracked_cache_remove_from_index(istate
, path
);
616 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
617 remove_index_entry_at(istate
, pos
);
621 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
623 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
626 static int index_name_pos_also_unmerged(struct index_state
*istate
,
627 const char *path
, int namelen
)
629 int pos
= index_name_pos(istate
, path
, namelen
);
630 struct cache_entry
*ce
;
635 /* maybe unmerged? */
637 if (pos
>= istate
->cache_nr
||
638 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
641 /* order of preference: stage 2, 1, 3 */
642 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
643 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
644 !compare_name(ce
, path
, namelen
))
649 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
651 int len
= ce_namelen(ce
);
652 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
656 * If we add a filename that aliases in the cache, we will use the
657 * name that we already have - but we don't want to update the same
658 * alias twice, because that implies that there were actually two
659 * different files with aliasing names!
661 * So we use the CE_ADDED flag to verify that the alias was an old
662 * one before we accept it as
664 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
665 struct cache_entry
*ce
,
666 struct cache_entry
*alias
)
669 struct cache_entry
*new_entry
;
671 if (alias
->ce_flags
& CE_ADDED
)
672 die(_("will not add file alias '%s' ('%s' already exists in index)"),
673 ce
->name
, alias
->name
);
675 /* Ok, create the new entry using the name of the existing alias */
676 len
= ce_namelen(alias
);
677 new_entry
= make_empty_cache_entry(istate
, len
);
678 memcpy(new_entry
->name
, alias
->name
, len
);
679 copy_cache_entry(new_entry
, ce
);
680 save_or_free_index_entry(istate
, ce
);
684 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
686 struct object_id oid
;
687 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
688 die(_("cannot create an empty blob in the object database"));
689 oidcpy(&ce
->oid
, &oid
);
692 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
694 int namelen
, was_same
;
695 mode_t st_mode
= st
->st_mode
;
696 struct cache_entry
*ce
, *alias
= NULL
;
697 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
698 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
699 int pretend
= flags
& ADD_CACHE_PRETEND
;
700 int intent_only
= flags
& ADD_CACHE_INTENT
;
701 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
702 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
703 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
704 struct object_id oid
;
706 if (flags
& ADD_CACHE_RENORMALIZE
)
707 hash_flags
|= HASH_RENORMALIZE
;
709 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
710 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
712 namelen
= strlen(path
);
713 if (S_ISDIR(st_mode
)) {
714 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
715 return error(_("'%s' does not have a commit checked out"), path
);
716 while (namelen
&& path
[namelen
-1] == '/')
719 ce
= make_empty_cache_entry(istate
, namelen
);
720 memcpy(ce
->name
, path
, namelen
);
721 ce
->ce_namelen
= namelen
;
723 fill_stat_cache_info(istate
, ce
, st
);
725 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
728 if (trust_executable_bit
&& has_symlinks
) {
729 ce
->ce_mode
= create_ce_mode(st_mode
);
731 /* If there is an existing entry, pick the mode bits and type
732 * from it, otherwise assume unexecutable regular file.
734 struct cache_entry
*ent
;
735 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
737 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
738 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
741 /* When core.ignorecase=true, determine if a directory of the same name but differing
742 * case already exists within the Git repository. If it does, ensure the directory
743 * case of the file being added to the repository matches (is folded into) the existing
744 * entry's directory case.
747 adjust_dirname_case(istate
, ce
->name
);
749 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
750 alias
= index_file_exists(istate
, ce
->name
,
751 ce_namelen(ce
), ignore_case
);
754 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
755 /* Nothing changed, really */
756 if (!S_ISGITLINK(alias
->ce_mode
))
757 ce_mark_uptodate(alias
);
758 alias
->ce_flags
|= CE_ADDED
;
760 discard_cache_entry(ce
);
765 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
766 discard_cache_entry(ce
);
767 return error(_("unable to index file '%s'"), path
);
770 set_object_name_for_intent_to_add_entry(ce
);
772 if (ignore_case
&& alias
&& different_name(ce
, alias
))
773 ce
= create_alias_ce(istate
, ce
, alias
);
774 ce
->ce_flags
|= CE_ADDED
;
776 /* It was suspected to be racily clean, but it turns out to be Ok */
779 oideq(&alias
->oid
, &ce
->oid
) &&
780 ce
->ce_mode
== alias
->ce_mode
);
783 discard_cache_entry(ce
);
784 else if (add_index_entry(istate
, ce
, add_option
)) {
785 discard_cache_entry(ce
);
786 return error(_("unable to add '%s' to index"), path
);
788 if (verbose
&& !was_same
)
789 printf("add '%s'\n", path
);
793 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
796 if (lstat(path
, &st
))
797 die_errno(_("unable to stat '%s'"), path
);
798 return add_to_index(istate
, path
, &st
, flags
);
801 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
803 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
806 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
807 struct mem_pool
*ce_mem_pool
)
810 return mem_pool__ce_calloc(ce_mem_pool
, len
);
811 return xcalloc(1, cache_entry_size(len
));
814 enum verify_path_result
{
820 static enum verify_path_result
verify_path_internal(const char *, unsigned);
822 int verify_path(const char *path
, unsigned mode
)
824 return verify_path_internal(path
, mode
) == PATH_OK
;
827 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
829 const struct object_id
*oid
,
832 unsigned int refresh_options
)
834 struct cache_entry
*ce
, *ret
;
837 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
838 error(_("invalid path '%s'"), path
);
843 ce
= make_empty_cache_entry(istate
, len
);
845 oidcpy(&ce
->oid
, oid
);
846 memcpy(ce
->name
, path
, len
);
847 ce
->ce_flags
= create_ce_flags(stage
);
848 ce
->ce_namelen
= len
;
849 ce
->ce_mode
= create_ce_mode(mode
);
851 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
853 discard_cache_entry(ce
);
857 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
858 const struct object_id
*oid
,
861 struct mem_pool
*ce_mem_pool
)
863 struct cache_entry
*ce
;
866 if (!verify_path(path
, mode
)) {
867 error(_("invalid path '%s'"), path
);
872 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
874 oidcpy(&ce
->oid
, oid
);
875 memcpy(ce
->name
, path
, len
);
876 ce
->ce_flags
= create_ce_flags(stage
);
877 ce
->ce_namelen
= len
;
878 ce
->ce_mode
= create_ce_mode(mode
);
884 * Chmod an index entry with either +x or -x.
886 * Returns -1 if the chmod for the particular cache entry failed (if it's
887 * not a regular file), -2 if an invalid flip argument is passed in, 0
890 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
893 if (!S_ISREG(ce
->ce_mode
))
900 ce
->ce_mode
&= ~0111;
905 cache_tree_invalidate_path(istate
, ce
->name
);
906 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
907 mark_fsmonitor_invalid(istate
, ce
);
908 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
913 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
915 int len
= ce_namelen(a
);
916 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
920 * We fundamentally don't like some paths: we don't want
921 * dot or dot-dot anywhere, and for obvious reasons don't
922 * want to recurse into ".git" either.
924 * Also, we don't want double slashes or slashes at the
925 * end that can make pathnames ambiguous.
927 static int verify_dotfile(const char *rest
, unsigned mode
)
930 * The first character was '.', but that
931 * has already been discarded, we now test
935 /* "." is not allowed */
936 if (*rest
== '\0' || is_dir_sep(*rest
))
941 * ".git" followed by NUL or slash is bad. Note that we match
942 * case-insensitively here, even if ignore_case is not set.
943 * This outlaws ".GIT" everywhere out of an abundance of caution,
944 * since there's really no good reason to allow it.
946 * Once we've seen ".git", we can also find ".gitmodules", etc (also
947 * case-insensitively).
951 if (rest
[1] != 'i' && rest
[1] != 'I')
953 if (rest
[2] != 't' && rest
[2] != 'T')
955 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
959 if (skip_iprefix(rest
, "modules", &rest
) &&
960 (*rest
== '\0' || is_dir_sep(*rest
)))
965 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
971 static enum verify_path_result
verify_path_internal(const char *path
,
976 if (has_dos_drive_prefix(path
))
979 if (!is_valid_path(path
))
990 if (is_hfs_dotgit(path
))
993 if (is_hfs_dotgitmodules(path
))
998 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1000 return PATH_INVALID
;
1002 if (is_ntfs_dotgit(path
))
1003 return PATH_INVALID
;
1004 if (S_ISLNK(mode
)) {
1005 if (is_ntfs_dotgitmodules(path
))
1006 return PATH_INVALID
;
1011 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1013 return PATH_INVALID
;
1015 * allow terminating directory separators for
1016 * sparse directory entries.
1019 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1021 } else if (c
== '\\' && protect_ntfs
) {
1022 if (is_ntfs_dotgit(path
))
1023 return PATH_INVALID
;
1024 if (S_ISLNK(mode
)) {
1025 if (is_ntfs_dotgitmodules(path
))
1026 return PATH_INVALID
;
1035 * Do we have another file that has the beginning components being a
1036 * proper superset of the name we're trying to add?
1038 static int has_file_name(struct index_state
*istate
,
1039 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1042 int len
= ce_namelen(ce
);
1043 int stage
= ce_stage(ce
);
1044 const char *name
= ce
->name
;
1046 while (pos
< istate
->cache_nr
) {
1047 struct cache_entry
*p
= istate
->cache
[pos
++];
1049 if (len
>= ce_namelen(p
))
1051 if (memcmp(name
, p
->name
, len
))
1053 if (ce_stage(p
) != stage
)
1055 if (p
->name
[len
] != '/')
1057 if (p
->ce_flags
& CE_REMOVE
)
1062 remove_index_entry_at(istate
, --pos
);
1069 * Like strcmp(), but also return the offset of the first change.
1070 * If strings are equal, return the length.
1072 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1077 return strcmp(s1
, s2
);
1079 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1084 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1088 * Do we have another file with a pathname that is a proper
1089 * subset of the name we're trying to add?
1091 * That is, is there another file in the index with a path
1092 * that matches a sub-directory in the given entry?
1094 static int has_dir_name(struct index_state
*istate
,
1095 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1098 int stage
= ce_stage(ce
);
1099 const char *name
= ce
->name
;
1100 const char *slash
= name
+ ce_namelen(ce
);
1105 * We are frequently called during an iteration on a sorted
1106 * list of pathnames and while building a new index. Therefore,
1107 * there is a high probability that this entry will eventually
1108 * be appended to the index, rather than inserted in the middle.
1109 * If we can confirm that, we can avoid binary searches on the
1110 * components of the pathname.
1112 * Compare the entry's full path with the last path in the index.
1114 if (istate
->cache_nr
> 0) {
1115 cmp_last
= strcmp_offset(name
,
1116 istate
->cache
[istate
->cache_nr
- 1]->name
,
1119 if (len_eq_last
== 0) {
1121 * The entry sorts AFTER the last one in the
1122 * index and their paths have no common prefix,
1123 * so there cannot be a F/D conflict.
1128 * The entry sorts AFTER the last one in the
1129 * index, but has a common prefix. Fall through
1130 * to the loop below to disect the entry's path
1131 * and see where the difference is.
1134 } else if (cmp_last
== 0) {
1136 * The entry exactly matches the last one in the
1137 * index, but because of multiple stage and CE_REMOVE
1138 * items, we fall through and let the regular search
1148 if (*--slash
== '/')
1150 if (slash
<= ce
->name
)
1157 * (len + 1) is a directory boundary (including
1158 * the trailing slash). And since the loop is
1159 * decrementing "slash", the first iteration is
1160 * the longest directory prefix; subsequent
1161 * iterations consider parent directories.
1164 if (len
+ 1 <= len_eq_last
) {
1166 * The directory prefix (including the trailing
1167 * slash) also appears as a prefix in the last
1168 * entry, so the remainder cannot collide (because
1169 * strcmp said the whole path was greater).
1174 * LT: last: xxx/file_A
1180 if (len
> len_eq_last
) {
1182 * This part of the directory prefix (excluding
1183 * the trailing slash) is longer than the known
1184 * equal portions, so this sub-directory cannot
1185 * collide with a file.
1194 * This is a possible collision. Fall through and
1195 * let the regular search code handle it.
1202 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1205 * Found one, but not so fast. This could
1206 * be a marker that says "I was here, but
1207 * I am being removed". Such an entry is
1208 * not a part of the resulting tree, and
1209 * it is Ok to have a directory at the same
1212 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1216 remove_index_entry_at(istate
, pos
);
1224 * Trivial optimization: if we find an entry that
1225 * already matches the sub-directory, then we know
1226 * we're ok, and we can exit.
1228 while (pos
< istate
->cache_nr
) {
1229 struct cache_entry
*p
= istate
->cache
[pos
];
1230 if ((ce_namelen(p
) <= len
) ||
1231 (p
->name
[len
] != '/') ||
1232 memcmp(p
->name
, name
, len
))
1233 break; /* not our subdirectory */
1234 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1236 * p is at the same stage as our entry, and
1237 * is a subdirectory of what we are looking
1238 * at, so we cannot have conflicts at our
1239 * level or anything shorter.
1248 /* We may be in a situation where we already have path/file and path
1249 * is being added, or we already have path and path/file is being
1250 * added. Either one would result in a nonsense tree that has path
1251 * twice when git-write-tree tries to write it out. Prevent it.
1253 * If ok-to-replace is specified, we remove the conflicting entries
1254 * from the cache so the caller should recompute the insert position.
1255 * When this happens, we return non-zero.
1257 static int check_file_directory_conflict(struct index_state
*istate
,
1258 const struct cache_entry
*ce
,
1259 int pos
, int ok_to_replace
)
1264 * When ce is an "I am going away" entry, we allow it to be added
1266 if (ce
->ce_flags
& CE_REMOVE
)
1270 * We check if the path is a sub-path of a subsequent pathname
1271 * first, since removing those will not change the position
1274 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1277 * Then check if the path might have a clashing sub-directory
1280 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1283 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1286 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1287 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1288 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1289 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1292 * If this entry's path sorts after the last entry in the index,
1293 * we can avoid searching for it.
1295 if (istate
->cache_nr
> 0 &&
1296 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1297 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1299 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1302 * Cache tree path should be invalidated only after index_name_stage_pos,
1303 * in case it expands a sparse index.
1305 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1306 cache_tree_invalidate_path(istate
, ce
->name
);
1308 /* existing match? Just replace it. */
1311 replace_index_entry(istate
, pos
, ce
);
1316 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1317 untracked_cache_add_to_index(istate
, ce
->name
);
1320 * Inserting a merged entry ("stage 0") into the index
1321 * will always replace all non-merged entries..
1323 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1324 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1326 if (!remove_index_entry_at(istate
, pos
))
1333 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1334 return error(_("invalid path '%s'"), ce
->name
);
1336 if (!skip_df_check
&&
1337 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1339 return error(_("'%s' appears as both a file and as a directory"),
1341 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1347 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1351 if (option
& ADD_CACHE_JUST_APPEND
)
1352 pos
= istate
->cache_nr
;
1355 ret
= add_index_entry_with_check(istate
, ce
, option
);
1361 /* Make sure the array is big enough .. */
1362 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1366 if (istate
->cache_nr
> pos
+ 1)
1367 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1368 istate
->cache_nr
- pos
- 1);
1369 set_index_entry(istate
, pos
, ce
);
1370 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1375 * "refresh" does not calculate a new sha1 file or bring the
1376 * cache up-to-date for mode/content changes. But what it
1377 * _does_ do is to "re-match" the stat information of a file
1378 * with the cache, so that you can refresh the cache for a
1379 * file that hasn't been changed but where the stat entry is
1382 * For example, you'd want to do this after doing a "git-read-tree",
1383 * to link up the stat cache details with the proper files.
1385 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1386 struct cache_entry
*ce
,
1387 unsigned int options
, int *err
,
1393 struct cache_entry
*updated
;
1395 int refresh
= options
& CE_MATCH_REFRESH
;
1396 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1397 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1398 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1399 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1401 if (!refresh
|| ce_uptodate(ce
))
1404 if (!ignore_fsmonitor
)
1405 refresh_fsmonitor(istate
);
1407 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1408 * that the change to the work tree does not matter and told
1411 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1412 ce_mark_uptodate(ce
);
1415 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1416 ce_mark_uptodate(ce
);
1419 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1420 ce_mark_uptodate(ce
);
1424 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1434 if (lstat(ce
->name
, &st
) < 0) {
1435 if (ignore_missing
&& errno
== ENOENT
)
1442 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1444 *changed_ret
= changed
;
1447 * The path is unchanged. If we were told to ignore
1448 * valid bit, then we did the actual stat check and
1449 * found that the entry is unmodified. If the entry
1450 * is not marked VALID, this is the place to mark it
1451 * valid again, under "assume unchanged" mode.
1453 if (ignore_valid
&& assume_unchanged
&&
1454 !(ce
->ce_flags
& CE_VALID
))
1455 ; /* mark this one VALID again */
1458 * We do not mark the index itself "modified"
1459 * because CE_UPTODATE flag is in-core only;
1460 * we are not going to write this change out.
1462 if (!S_ISGITLINK(ce
->ce_mode
)) {
1463 ce_mark_uptodate(ce
);
1464 mark_fsmonitor_valid(istate
, ce
);
1472 if (ie_modified(istate
, ce
, &st
, options
)) {
1478 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1479 copy_cache_entry(updated
, ce
);
1480 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1481 fill_stat_cache_info(istate
, updated
, &st
);
1483 * If ignore_valid is not set, we should leave CE_VALID bit
1484 * alone. Otherwise, paths marked with --no-assume-unchanged
1485 * (i.e. things to be edited) will reacquire CE_VALID bit
1486 * automatically, which is not really what we want.
1488 if (!ignore_valid
&& assume_unchanged
&&
1489 !(ce
->ce_flags
& CE_VALID
))
1490 updated
->ce_flags
&= ~CE_VALID
;
1492 /* istate->cache_changed is updated in the caller */
1496 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1497 int * first
, const char *header_msg
)
1499 if (in_porcelain
&& *first
&& header_msg
) {
1500 printf("%s\n", header_msg
);
1506 int repo_refresh_and_write_index(struct repository
*repo
,
1507 unsigned int refresh_flags
,
1508 unsigned int write_flags
,
1510 const struct pathspec
*pathspec
,
1511 char *seen
, const char *header_msg
)
1513 struct lock_file lock_file
= LOCK_INIT
;
1516 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1517 if (!gentle
&& fd
< 0)
1519 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1521 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1527 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1528 const struct pathspec
*pathspec
,
1529 char *seen
, const char *header_msg
)
1533 int really
= (flags
& REFRESH_REALLY
) != 0;
1534 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1535 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1536 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1537 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1538 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1540 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1541 unsigned int options
= (CE_MATCH_REFRESH
|
1542 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1543 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1544 const char *modified_fmt
;
1545 const char *deleted_fmt
;
1546 const char *typechange_fmt
;
1547 const char *added_fmt
;
1548 const char *unmerged_fmt
;
1549 struct progress
*progress
= NULL
;
1550 int t2_sum_lstat
= 0;
1551 int t2_sum_scan
= 0;
1553 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1554 progress
= start_delayed_progress(_("Refresh index"),
1557 trace_performance_enter();
1558 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1559 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1560 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1561 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1562 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1564 * Use the multi-threaded preload_index() to refresh most of the
1565 * cache entries quickly then in the single threaded loop below,
1566 * we only have to do the special cases that are left.
1568 preload_index(istate
, pathspec
, 0);
1569 trace2_region_enter("index", "refresh", NULL
);
1571 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1572 struct cache_entry
*ce
, *new_entry
;
1573 int cache_errno
= 0;
1576 int t2_did_lstat
= 0;
1577 int t2_did_scan
= 0;
1579 ce
= istate
->cache
[i
];
1580 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1582 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1586 * If this entry is a sparse directory, then there isn't
1587 * any stat() information to update. Ignore the entry.
1589 if (S_ISSPARSEDIR(ce
->ce_mode
))
1592 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1596 while ((i
< istate
->cache_nr
) &&
1597 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1603 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1604 &first
, header_msg
);
1612 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1613 &cache_errno
, &changed
,
1614 &t2_did_lstat
, &t2_did_scan
);
1615 t2_sum_lstat
+= t2_did_lstat
;
1616 t2_sum_scan
+= t2_did_scan
;
1617 if (new_entry
== ce
)
1619 display_progress(progress
, i
);
1623 if (really
&& cache_errno
== EINVAL
) {
1624 /* If we are doing --really-refresh that
1625 * means the index is not valid anymore.
1627 ce
->ce_flags
&= ~CE_VALID
;
1628 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1629 mark_fsmonitor_invalid(istate
, ce
);
1630 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1635 if (cache_errno
== ENOENT
)
1637 else if (ce_intent_to_add(ce
))
1638 fmt
= added_fmt
; /* must be before other checks */
1639 else if (changed
& TYPE_CHANGED
)
1640 fmt
= typechange_fmt
;
1644 ce
->name
, in_porcelain
, &first
, header_msg
);
1649 replace_index_entry(istate
, i
, new_entry
);
1651 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1652 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1653 trace2_region_leave("index", "refresh", NULL
);
1654 display_progress(progress
, istate
->cache_nr
);
1655 stop_progress(&progress
);
1656 trace_performance_leave("refresh index");
1660 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1661 struct cache_entry
*ce
,
1662 unsigned int options
)
1664 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1668 /*****************************************************************
1670 *****************************************************************/
1672 #define INDEX_FORMAT_DEFAULT 3
1674 static unsigned int get_index_format_default(struct repository
*r
)
1676 char *envversion
= getenv("GIT_INDEX_VERSION");
1678 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1681 prepare_repo_settings(r
);
1683 if (r
->settings
.index_version
>= 0)
1684 version
= r
->settings
.index_version
;
1685 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1686 warning(_("index.version set, but the value is invalid.\n"
1687 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1688 return INDEX_FORMAT_DEFAULT
;
1693 version
= strtoul(envversion
, &endp
, 10);
1695 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1696 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1697 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1698 version
= INDEX_FORMAT_DEFAULT
;
1704 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1705 * Again - this is just a (very strong in practice) heuristic that
1706 * the inode hasn't changed.
1708 * We save the fields in big-endian order to allow using the
1709 * index file over NFS transparently.
1711 struct ondisk_cache_entry
{
1712 struct cache_time ctime
;
1713 struct cache_time mtime
;
1721 * unsigned char hash[hashsz];
1723 * if (flags & CE_EXTENDED)
1726 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1727 char name
[FLEX_ARRAY
];
1730 /* These are only used for v3 or lower */
1731 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1732 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1733 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1734 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1735 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1736 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1737 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1739 /* Allow fsck to force verification of the index checksum. */
1740 int verify_index_checksum
;
1742 /* Allow fsck to force verification of the cache entry order. */
1743 int verify_ce_order
;
1745 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1748 unsigned char hash
[GIT_MAX_RAWSZ
];
1750 unsigned char *start
, *end
;
1751 struct object_id oid
;
1753 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1754 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1755 hdr_version
= ntohl(hdr
->hdr_version
);
1756 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1757 return error(_("bad index version %d"), hdr_version
);
1759 if (!verify_index_checksum
)
1762 end
= (unsigned char *)hdr
+ size
;
1763 start
= end
- the_hash_algo
->rawsz
;
1764 oidread(&oid
, start
);
1765 if (oideq(&oid
, null_oid()))
1768 the_hash_algo
->init_fn(&c
);
1769 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1770 the_hash_algo
->final_fn(hash
, &c
);
1771 if (!hasheq(hash
, start
))
1772 return error(_("bad index file sha1 signature"));
1776 static int read_index_extension(struct index_state
*istate
,
1777 const char *ext
, const char *data
, unsigned long sz
)
1779 switch (CACHE_EXT(ext
)) {
1780 case CACHE_EXT_TREE
:
1781 istate
->cache_tree
= cache_tree_read(data
, sz
);
1783 case CACHE_EXT_RESOLVE_UNDO
:
1784 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1786 case CACHE_EXT_LINK
:
1787 if (read_link_extension(istate
, data
, sz
))
1790 case CACHE_EXT_UNTRACKED
:
1791 istate
->untracked
= read_untracked_extension(data
, sz
);
1793 case CACHE_EXT_FSMONITOR
:
1794 read_fsmonitor_extension(istate
, data
, sz
);
1796 case CACHE_EXT_ENDOFINDEXENTRIES
:
1797 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1798 /* already handled in do_read_index() */
1800 case CACHE_EXT_SPARSE_DIRECTORIES
:
1801 /* no content, only an indicator */
1802 istate
->sparse_index
= INDEX_COLLAPSED
;
1805 if (*ext
< 'A' || 'Z' < *ext
)
1806 return error(_("index uses %.4s extension, which we do not understand"),
1808 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1815 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1816 * into a new incore 'cache_entry'.
1818 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1819 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1820 * its members. Instead, we use the byte offsets of members within the struct to
1821 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1822 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1823 * into the corresponding incore 'cache_entry' members.
1825 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1826 unsigned int version
,
1828 unsigned long *ent_size
,
1829 const struct cache_entry
*previous_ce
)
1831 struct cache_entry
*ce
;
1834 const unsigned hashsz
= the_hash_algo
->rawsz
;
1835 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1837 size_t copy_len
= 0;
1839 * Adjacent cache entries tend to share the leading paths, so it makes
1840 * sense to only store the differences in later entries. In the v4
1841 * on-disk format of the index, each on-disk cache entry stores the
1842 * number of bytes to be stripped from the end of the previous name,
1843 * and the bytes to append to the result, to come up with its name.
1845 int expand_name_field
= version
== 4;
1847 /* On-disk flags are just 16 bits */
1848 flags
= get_be16(flagsp
);
1849 len
= flags
& CE_NAMEMASK
;
1851 if (flags
& CE_EXTENDED
) {
1853 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1854 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1855 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1856 die(_("unknown index entry format 0x%08x"), extended_flags
);
1857 flags
|= extended_flags
;
1858 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1861 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1863 if (expand_name_field
) {
1864 const unsigned char *cp
= (const unsigned char *)name
;
1865 size_t strip_len
, previous_len
;
1867 /* If we're at the beginning of a block, ignore the previous name */
1868 strip_len
= decode_varint(&cp
);
1870 previous_len
= previous_ce
->ce_namelen
;
1871 if (previous_len
< strip_len
)
1872 die(_("malformed name field in the index, near path '%s'"),
1874 copy_len
= previous_len
- strip_len
;
1876 name
= (const char *)cp
;
1879 if (len
== CE_NAMEMASK
) {
1881 if (expand_name_field
)
1885 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1888 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1889 * with something more akin to 'load_bitmap_entries_v1()'s use of
1890 * 'read_be16'/'read_be32'. For consistency with the corresponding
1891 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1892 * should be done at the same time as removing references to
1893 * 'ondisk_cache_entry' there.
1895 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1896 + offsetof(struct cache_time
, sec
));
1897 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1898 + offsetof(struct cache_time
, sec
));
1899 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1900 + offsetof(struct cache_time
, nsec
));
1901 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1902 + offsetof(struct cache_time
, nsec
));
1903 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1904 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1905 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1906 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1907 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1908 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1909 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1910 ce
->ce_namelen
= len
;
1912 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
));
1914 if (expand_name_field
) {
1916 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1917 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1918 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1920 memcpy(ce
->name
, name
, len
+ 1);
1921 *ent_size
= ondisk_ce_size(ce
);
1926 static void check_ce_order(struct index_state
*istate
)
1930 if (!verify_ce_order
)
1933 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1934 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1935 struct cache_entry
*next_ce
= istate
->cache
[i
];
1936 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1938 if (0 < name_compare
)
1939 die(_("unordered stage entries in index"));
1940 if (!name_compare
) {
1942 die(_("multiple stage entries for merged file '%s'"),
1944 if (ce_stage(ce
) > ce_stage(next_ce
))
1945 die(_("unordered stage entries for '%s'"),
1951 static void tweak_untracked_cache(struct index_state
*istate
)
1953 struct repository
*r
= the_repository
;
1955 prepare_repo_settings(r
);
1957 switch (r
->settings
.core_untracked_cache
) {
1958 case UNTRACKED_CACHE_REMOVE
:
1959 remove_untracked_cache(istate
);
1961 case UNTRACKED_CACHE_WRITE
:
1962 add_untracked_cache(istate
);
1964 case UNTRACKED_CACHE_KEEP
:
1966 * Either an explicit "core.untrackedCache=keep", the
1967 * default if "core.untrackedCache" isn't configured,
1968 * or a fallback on an unknown "core.untrackedCache"
1975 static void tweak_split_index(struct index_state
*istate
)
1977 switch (git_config_get_split_index()) {
1978 case -1: /* unset: do nothing */
1981 remove_split_index(istate
);
1984 add_split_index(istate
);
1986 default: /* unknown value: do nothing */
1991 static void post_read_index_from(struct index_state
*istate
)
1993 check_ce_order(istate
);
1994 tweak_untracked_cache(istate
);
1995 tweak_split_index(istate
);
1996 tweak_fsmonitor(istate
);
1999 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
2001 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
2004 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
2006 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
2009 * Account for potential alignment differences.
2011 per_entry
+= align_padding_size(per_entry
, 0);
2012 return ondisk_size
+ entries
* per_entry
;
2015 struct index_entry_offset
2017 /* starting byte offset into index file, count of index entries in this block */
2021 struct index_entry_offset_table
2024 struct index_entry_offset entries
[FLEX_ARRAY
];
2027 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2028 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2030 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2031 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2033 struct load_index_extensions
2036 struct index_state
*istate
;
2039 unsigned long src_offset
;
2042 static void *load_index_extensions(void *_data
)
2044 struct load_index_extensions
*p
= _data
;
2045 unsigned long src_offset
= p
->src_offset
;
2047 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2048 /* After an array of active_nr index entries,
2049 * there can be arbitrary number of extended
2050 * sections, each of which is prefixed with
2051 * extension name (4-byte) and section length
2052 * in 4-byte network byte order.
2054 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2055 if (read_index_extension(p
->istate
,
2056 p
->mmap
+ src_offset
,
2057 p
->mmap
+ src_offset
+ 8,
2059 munmap((void *)p
->mmap
, p
->mmap_size
);
2060 die(_("index file corrupt"));
2063 src_offset
+= extsize
;
2070 * A helper function that will load the specified range of cache entries
2071 * from the memory mapped file and add them to the given index.
2073 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2074 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2075 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2078 unsigned long src_offset
= start_offset
;
2080 for (i
= offset
; i
< offset
+ nr
; i
++) {
2081 struct cache_entry
*ce
;
2082 unsigned long consumed
;
2084 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2086 &consumed
, previous_ce
);
2087 set_index_entry(istate
, i
, ce
);
2089 src_offset
+= consumed
;
2092 return src_offset
- start_offset
;
2095 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2096 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2098 unsigned long consumed
;
2100 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2101 if (istate
->version
== 4) {
2102 mem_pool_init(istate
->ce_mem_pool
,
2103 estimate_cache_size_from_compressed(istate
->cache_nr
));
2105 mem_pool_init(istate
->ce_mem_pool
,
2106 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2109 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2110 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2115 * Mostly randomly chosen maximum thread counts: we
2116 * cap the parallelism to online_cpus() threads, and we want
2117 * to have at least 10000 cache entries per thread for it to
2118 * be worth starting a thread.
2121 #define THREAD_COST (10000)
2123 struct load_cache_entries_thread_data
2126 struct index_state
*istate
;
2127 struct mem_pool
*ce_mem_pool
;
2130 struct index_entry_offset_table
*ieot
;
2131 int ieot_start
; /* starting index into the ieot array */
2132 int ieot_blocks
; /* count of ieot entries to process */
2133 unsigned long consumed
; /* return # of bytes in index file processed */
2137 * A thread proc to run the load_cache_entries() computation
2138 * across multiple background threads.
2140 static void *load_cache_entries_thread(void *_data
)
2142 struct load_cache_entries_thread_data
*p
= _data
;
2145 /* iterate across all ieot blocks assigned to this thread */
2146 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2147 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2148 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2149 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2154 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2155 int nr_threads
, struct index_entry_offset_table
*ieot
)
2157 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2158 struct load_cache_entries_thread_data
*data
;
2159 unsigned long consumed
= 0;
2161 /* a little sanity checking */
2162 if (istate
->name_hash_initialized
)
2163 BUG("the name hash isn't thread safe");
2165 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2166 mem_pool_init(istate
->ce_mem_pool
, 0);
2168 /* ensure we have no more threads than we have blocks to process */
2169 if (nr_threads
> ieot
->nr
)
2170 nr_threads
= ieot
->nr
;
2171 CALLOC_ARRAY(data
, nr_threads
);
2173 offset
= ieot_start
= 0;
2174 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2175 for (i
= 0; i
< nr_threads
; i
++) {
2176 struct load_cache_entries_thread_data
*p
= &data
[i
];
2179 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2180 ieot_blocks
= ieot
->nr
- ieot_start
;
2186 p
->ieot_start
= ieot_start
;
2187 p
->ieot_blocks
= ieot_blocks
;
2189 /* create a mem_pool for each thread */
2191 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2192 nr
+= p
->ieot
->entries
[j
].nr
;
2193 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2194 if (istate
->version
== 4) {
2195 mem_pool_init(p
->ce_mem_pool
,
2196 estimate_cache_size_from_compressed(nr
));
2198 mem_pool_init(p
->ce_mem_pool
,
2199 estimate_cache_size(mmap_size
, nr
));
2202 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2204 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2206 /* increment by the number of cache entries in the ieot block being processed */
2207 for (j
= 0; j
< ieot_blocks
; j
++)
2208 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2209 ieot_start
+= ieot_blocks
;
2212 for (i
= 0; i
< nr_threads
; i
++) {
2213 struct load_cache_entries_thread_data
*p
= &data
[i
];
2215 err
= pthread_join(p
->pthread
, NULL
);
2217 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2218 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2219 consumed
+= p
->consumed
;
2227 static void set_new_index_sparsity(struct index_state
*istate
)
2230 * If the index's repo exists, mark it sparse according to
2233 prepare_repo_settings(istate
->repo
);
2234 if (!istate
->repo
->settings
.command_requires_full_index
&&
2235 is_sparse_index_allowed(istate
, 0))
2236 istate
->sparse_index
= 1;
2239 /* remember to discard_cache() before reading a different cache! */
2240 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2244 unsigned long src_offset
;
2245 const struct cache_header
*hdr
;
2248 struct load_index_extensions p
;
2249 size_t extension_offset
= 0;
2250 int nr_threads
, cpus
;
2251 struct index_entry_offset_table
*ieot
= NULL
;
2253 if (istate
->initialized
)
2254 return istate
->cache_nr
;
2256 istate
->timestamp
.sec
= 0;
2257 istate
->timestamp
.nsec
= 0;
2258 fd
= open(path
, O_RDONLY
);
2260 if (!must_exist
&& errno
== ENOENT
) {
2261 set_new_index_sparsity(istate
);
2262 istate
->initialized
= 1;
2265 die_errno(_("%s: index file open failed"), path
);
2269 die_errno(_("%s: cannot stat the open index"), path
);
2271 mmap_size
= xsize_t(st
.st_size
);
2272 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2273 die(_("%s: index file smaller than expected"), path
);
2275 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2276 if (mmap
== MAP_FAILED
)
2277 die_errno(_("%s: unable to map index file%s"), path
,
2281 hdr
= (const struct cache_header
*)mmap
;
2282 if (verify_hdr(hdr
, mmap_size
) < 0)
2285 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2286 istate
->version
= ntohl(hdr
->hdr_version
);
2287 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2288 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2289 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2290 istate
->initialized
= 1;
2294 p
.mmap_size
= mmap_size
;
2296 src_offset
= sizeof(*hdr
);
2298 if (git_config_get_index_threads(&nr_threads
))
2301 /* TODO: does creating more threads than cores help? */
2303 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2304 cpus
= online_cpus();
2305 if (nr_threads
> cpus
)
2312 if (nr_threads
> 1) {
2313 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2314 if (extension_offset
) {
2317 p
.src_offset
= extension_offset
;
2318 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2320 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2327 * Locate and read the index entry offset table so that we can use it
2328 * to multi-thread the reading of the cache entries.
2330 if (extension_offset
&& nr_threads
> 1)
2331 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2334 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2337 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2340 istate
->timestamp
.sec
= st
.st_mtime
;
2341 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2343 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2344 if (extension_offset
) {
2345 int ret
= pthread_join(p
.pthread
, NULL
);
2347 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2349 p
.src_offset
= src_offset
;
2350 load_index_extensions(&p
);
2352 munmap((void *)mmap
, mmap_size
);
2355 * TODO trace2: replace "the_repository" with the actual repo instance
2356 * that is associated with the given "istate".
2358 trace2_data_intmax("index", the_repository
, "read/version",
2360 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2364 * If the command explicitly requires a full index, force it
2365 * to be full. Otherwise, correct the sparsity based on repository
2366 * settings and other properties of the index (if necessary).
2368 prepare_repo_settings(istate
->repo
);
2369 if (istate
->repo
->settings
.command_requires_full_index
)
2370 ensure_full_index(istate
);
2372 ensure_correct_sparsity(istate
);
2374 return istate
->cache_nr
;
2377 munmap((void *)mmap
, mmap_size
);
2378 die(_("index file corrupt"));
2382 * Signal that the shared index is used by updating its mtime.
2384 * This way, shared index can be removed if they have not been used
2387 static void freshen_shared_index(const char *shared_index
, int warn
)
2389 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2390 warning(_("could not freshen shared index '%s'"), shared_index
);
2393 int read_index_from(struct index_state
*istate
, const char *path
,
2396 struct split_index
*split_index
;
2401 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2402 if (istate
->initialized
)
2403 return istate
->cache_nr
;
2406 * TODO trace2: replace "the_repository" with the actual repo instance
2407 * that is associated with the given "istate".
2409 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2411 trace_performance_enter();
2412 ret
= do_read_index(istate
, path
, 0);
2413 trace_performance_leave("read cache %s", path
);
2414 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2417 split_index
= istate
->split_index
;
2418 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2419 post_read_index_from(istate
);
2423 trace_performance_enter();
2424 if (split_index
->base
)
2425 release_index(split_index
->base
);
2427 ALLOC_ARRAY(split_index
->base
, 1);
2428 index_state_init(split_index
->base
, istate
->repo
);
2430 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2431 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2432 if (file_exists(base_path
)) {
2433 trace2_region_enter_printf("index", "shared/do_read_index",
2434 the_repository
, "%s", base_path
);
2436 ret
= do_read_index(split_index
->base
, base_path
, 0);
2437 trace2_region_leave_printf("index", "shared/do_read_index",
2438 the_repository
, "%s", base_path
);
2440 char *path_copy
= xstrdup(path
);
2441 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2442 dirname(path_copy
), base_oid_hex
);
2444 trace2_region_enter_printf("index", "shared/do_read_index",
2445 the_repository
, "%s", base_path2
);
2446 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2447 trace2_region_leave_printf("index", "shared/do_read_index",
2448 the_repository
, "%s", base_path2
);
2451 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2452 die(_("broken index, expect %s in %s, got %s"),
2453 base_oid_hex
, base_path
,
2454 oid_to_hex(&split_index
->base
->oid
));
2456 freshen_shared_index(base_path
, 0);
2457 merge_base_index(istate
);
2458 post_read_index_from(istate
);
2459 trace_performance_leave("read cache %s", base_path
);
2464 int is_index_unborn(struct index_state
*istate
)
2466 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2469 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2471 struct index_state blank
= INDEX_STATE_INIT(r
);
2472 memcpy(istate
, &blank
, sizeof(*istate
));
2475 void release_index(struct index_state
*istate
)
2478 * Cache entries in istate->cache[] should have been allocated
2479 * from the memory pool associated with this index, or from an
2480 * associated split_index. There is no need to free individual
2481 * cache entries. validate_cache_entries can detect when this
2482 * assertion does not hold.
2484 validate_cache_entries(istate
);
2486 resolve_undo_clear_index(istate
);
2487 free_name_hash(istate
);
2488 cache_tree_free(&(istate
->cache_tree
));
2489 free(istate
->fsmonitor_last_update
);
2490 free(istate
->cache
);
2491 discard_split_index(istate
);
2492 free_untracked_cache(istate
->untracked
);
2494 if (istate
->sparse_checkout_patterns
) {
2495 clear_pattern_list(istate
->sparse_checkout_patterns
);
2496 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2499 if (istate
->ce_mem_pool
) {
2500 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2501 FREE_AND_NULL(istate
->ce_mem_pool
);
2505 void discard_index(struct index_state
*istate
)
2507 release_index(istate
);
2508 index_state_init(istate
, istate
->repo
);
2512 * Validate the cache entries of this index.
2513 * All cache entries associated with this index
2514 * should have been allocated by the memory pool
2515 * associated with this index, or by a referenced
2518 void validate_cache_entries(const struct index_state
*istate
)
2522 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2525 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2527 BUG("cache entry is not allocated from expected memory pool");
2528 } else if (!istate
->ce_mem_pool
||
2529 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2530 if (!istate
->split_index
||
2531 !istate
->split_index
->base
||
2532 !istate
->split_index
->base
->ce_mem_pool
||
2533 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2534 BUG("cache entry is not allocated from expected memory pool");
2539 if (istate
->split_index
)
2540 validate_cache_entries(istate
->split_index
->base
);
2543 int unmerged_index(const struct index_state
*istate
)
2546 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2547 if (ce_stage(istate
->cache
[i
]))
2553 int repo_index_has_changes(struct repository
*repo
,
2557 struct index_state
*istate
= repo
->index
;
2558 struct object_id cmp
;
2562 cmp
= tree
->object
.oid
;
2563 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2564 struct diff_options opt
;
2566 repo_diff_setup(repo
, &opt
);
2567 opt
.flags
.exit_with_status
= 1;
2569 opt
.flags
.quick
= 1;
2570 diff_setup_done(&opt
);
2571 do_diff_cache(&cmp
, &opt
);
2573 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2575 strbuf_addch(sb
, ' ');
2576 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2579 return opt
.flags
.has_changes
!= 0;
2581 /* TODO: audit for interaction with sparse-index. */
2582 ensure_full_index(istate
);
2583 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2585 strbuf_addch(sb
, ' ');
2586 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2588 return !!istate
->cache_nr
;
2592 static int write_index_ext_header(struct hashfile
*f
,
2593 git_hash_ctx
*eoie_f
,
2597 hashwrite_be32(f
, ext
);
2598 hashwrite_be32(f
, sz
);
2603 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2604 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2609 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2610 struct cache_entry
*ce
)
2613 * The only thing we care about in this function is to smudge the
2614 * falsely clean entry due to touch-update-touch race, so we leave
2615 * everything else as they are. We are called for entries whose
2616 * ce_stat_data.sd_mtime match the index file mtime.
2618 * Note that this actually does not do much for gitlinks, for
2619 * which ce_match_stat_basic() always goes to the actual
2620 * contents. The caller checks with is_racy_timestamp() which
2621 * always says "no" for gitlinks, so we are not called for them ;-)
2625 if (lstat(ce
->name
, &st
) < 0)
2627 if (ce_match_stat_basic(ce
, &st
))
2629 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2630 /* This is "racily clean"; smudge it. Note that this
2631 * is a tricky code. At first glance, it may appear
2632 * that it can break with this sequence:
2634 * $ echo xyzzy >frotz
2635 * $ git-update-index --add frotz
2638 * $ echo filfre >nitfol
2639 * $ git-update-index --add nitfol
2641 * but it does not. When the second update-index runs,
2642 * it notices that the entry "frotz" has the same timestamp
2643 * as index, and if we were to smudge it by resetting its
2644 * size to zero here, then the object name recorded
2645 * in index is the 6-byte file but the cached stat information
2646 * becomes zero --- which would then match what we would
2647 * obtain from the filesystem next time we stat("frotz").
2649 * However, the second update-index, before calling
2650 * this function, notices that the cached size is 6
2651 * bytes and what is on the filesystem is an empty
2652 * file, and never calls us, so the cached size information
2653 * for "frotz" stays 6 which does not match the filesystem.
2655 ce
->ce_stat_data
.sd_size
= 0;
2659 /* Copy miscellaneous fields but not the name */
2660 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2661 struct cache_entry
*ce
)
2664 const unsigned hashsz
= the_hash_algo
->rawsz
;
2665 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2667 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2668 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2669 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2670 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2671 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2672 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2673 ondisk
->mode
= htonl(ce
->ce_mode
);
2674 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2675 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2676 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2677 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2679 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2680 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2681 flagsp
[0] = htons(flags
);
2682 if (ce
->ce_flags
& CE_EXTENDED
) {
2683 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2687 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2688 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2691 unsigned int saved_namelen
;
2692 int stripped_name
= 0;
2693 static unsigned char padding
[8] = { 0x00 };
2695 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2696 saved_namelen
= ce_namelen(ce
);
2701 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2703 if (!previous_name
) {
2704 int len
= ce_namelen(ce
);
2705 copy_cache_entry_to_ondisk(ondisk
, ce
);
2706 hashwrite(f
, ondisk
, size
);
2707 hashwrite(f
, ce
->name
, len
);
2708 hashwrite(f
, padding
, align_padding_size(size
, len
));
2710 int common
, to_remove
, prefix_size
;
2711 unsigned char to_remove_vi
[16];
2713 (ce
->name
[common
] &&
2714 common
< previous_name
->len
&&
2715 ce
->name
[common
] == previous_name
->buf
[common
]);
2717 ; /* still matching */
2718 to_remove
= previous_name
->len
- common
;
2719 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2721 copy_cache_entry_to_ondisk(ondisk
, ce
);
2722 hashwrite(f
, ondisk
, size
);
2723 hashwrite(f
, to_remove_vi
, prefix_size
);
2724 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2725 hashwrite(f
, padding
, 1);
2727 strbuf_splice(previous_name
, common
, to_remove
,
2728 ce
->name
+ common
, ce_namelen(ce
) - common
);
2730 if (stripped_name
) {
2731 ce
->ce_namelen
= saved_namelen
;
2732 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2739 * This function verifies if index_state has the correct sha1 of the
2740 * index file. Don't die if we have any other failure, just return 0.
2742 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2747 unsigned char hash
[GIT_MAX_RAWSZ
];
2749 if (!istate
->initialized
)
2752 fd
= open(path
, O_RDONLY
);
2759 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2762 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2763 if (n
!= the_hash_algo
->rawsz
)
2766 if (!hasheq(istate
->oid
.hash
, hash
))
2777 static int repo_verify_index(struct repository
*repo
)
2779 return verify_index_from(repo
->index
, repo
->index_file
);
2782 int has_racy_timestamp(struct index_state
*istate
)
2784 int entries
= istate
->cache_nr
;
2787 for (i
= 0; i
< entries
; i
++) {
2788 struct cache_entry
*ce
= istate
->cache
[i
];
2789 if (is_racy_timestamp(istate
, ce
))
2795 void repo_update_index_if_able(struct repository
*repo
,
2796 struct lock_file
*lockfile
)
2798 if ((repo
->index
->cache_changed
||
2799 has_racy_timestamp(repo
->index
)) &&
2800 repo_verify_index(repo
))
2801 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2803 rollback_lock_file(lockfile
);
2806 static int record_eoie(void)
2810 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2814 * As a convenience, the end of index entries extension
2815 * used for threading is written by default if the user
2816 * explicitly requested threaded index reads.
2818 return !git_config_get_index_threads(&val
) && val
!= 1;
2821 static int record_ieot(void)
2825 if (!git_config_get_bool("index.recordoffsettable", &val
))
2829 * As a convenience, the offset table used for threading is
2830 * written by default if the user explicitly requested
2831 * threaded index reads.
2833 return !git_config_get_index_threads(&val
) && val
!= 1;
2836 enum write_extensions
{
2837 WRITE_NO_EXTENSION
= 0,
2838 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2839 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2840 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2841 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2842 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2844 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2847 * On success, `tempfile` is closed. If it is the temporary file
2848 * of a `struct lock_file`, we will therefore effectively perform
2849 * a 'close_lock_file_gently()`. Since that is an implementation
2850 * detail of lockfiles, callers of `do_write_index()` should not
2853 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2854 enum write_extensions write_extensions
, unsigned flags
)
2856 uint64_t start
= getnanotime();
2858 git_hash_ctx
*eoie_c
= NULL
;
2859 struct cache_header hdr
;
2860 int i
, err
= 0, removed
, extended
, hdr_version
;
2861 struct cache_entry
**cache
= istate
->cache
;
2862 int entries
= istate
->cache_nr
;
2864 struct ondisk_cache_entry ondisk
;
2865 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2866 int drop_cache_tree
= istate
->drop_cache_tree
;
2868 int csum_fsync_flag
;
2869 int ieot_entries
= 1;
2870 struct index_entry_offset_table
*ieot
= NULL
;
2872 struct repository
*r
= istate
->repo
;
2874 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2876 prepare_repo_settings(r
);
2877 f
->skip_hash
= r
->settings
.index_skip_hash
;
2879 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2880 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2883 /* reduce extended entries if possible */
2884 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2885 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2887 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2891 if (!istate
->version
)
2892 istate
->version
= get_index_format_default(r
);
2894 /* demote version 3 to version 2 when the latter suffices */
2895 if (istate
->version
== 3 || istate
->version
== 2)
2896 istate
->version
= extended
? 3 : 2;
2898 hdr_version
= istate
->version
;
2900 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2901 hdr
.hdr_version
= htonl(hdr_version
);
2902 hdr
.hdr_entries
= htonl(entries
- removed
);
2904 hashwrite(f
, &hdr
, sizeof(hdr
));
2906 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2909 if (nr_threads
!= 1 && record_ieot()) {
2910 int ieot_blocks
, cpus
;
2913 * ensure default number of ieot blocks maps evenly to the
2914 * default number of threads that will process them leaving
2915 * room for the thread to load the index extensions.
2918 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2919 cpus
= online_cpus();
2920 if (ieot_blocks
> cpus
- 1)
2921 ieot_blocks
= cpus
- 1;
2923 ieot_blocks
= nr_threads
;
2924 if (ieot_blocks
> istate
->cache_nr
)
2925 ieot_blocks
= istate
->cache_nr
;
2929 * no reason to write out the IEOT extension if we don't
2930 * have enough blocks to utilize multi-threading
2932 if (ieot_blocks
> 1) {
2933 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2934 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2935 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2939 offset
= hashfile_total(f
);
2942 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2944 for (i
= 0; i
< entries
; i
++) {
2945 struct cache_entry
*ce
= cache
[i
];
2946 if (ce
->ce_flags
& CE_REMOVE
)
2948 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2949 ce_smudge_racily_clean_entry(istate
, ce
);
2950 if (is_null_oid(&ce
->oid
)) {
2951 static const char msg
[] = "cache entry has null sha1: %s";
2952 static int allow
= -1;
2955 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2957 warning(msg
, ce
->name
);
2959 err
= error(msg
, ce
->name
);
2961 drop_cache_tree
= 1;
2963 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2964 ieot
->entries
[ieot
->nr
].nr
= nr
;
2965 ieot
->entries
[ieot
->nr
].offset
= offset
;
2968 * If we have a V4 index, set the first byte to an invalid
2969 * character to ensure there is nothing common with the previous
2973 previous_name
->buf
[0] = 0;
2976 offset
= hashfile_total(f
);
2978 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2986 ieot
->entries
[ieot
->nr
].nr
= nr
;
2987 ieot
->entries
[ieot
->nr
].offset
= offset
;
2990 strbuf_release(&previous_name_buf
);
2997 offset
= hashfile_total(f
);
3000 * The extension headers must be hashed on their own for the
3001 * EOIE extension. Create a hashfile here to compute that hash.
3003 if (offset
&& record_eoie()) {
3004 CALLOC_ARRAY(eoie_c
, 1);
3005 the_hash_algo
->init_fn(eoie_c
);
3009 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
3010 * can minimize the number of extensions we have to scan through to
3011 * find it during load. Write it out regardless of the
3012 * strip_extensions parameter as we need it when loading the shared
3016 struct strbuf sb
= STRBUF_INIT
;
3018 write_ieot_extension(&sb
, ieot
);
3019 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
3020 hashwrite(f
, sb
.buf
, sb
.len
);
3021 strbuf_release(&sb
);
3027 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3028 istate
->split_index
) {
3029 struct strbuf sb
= STRBUF_INIT
;
3031 if (istate
->sparse_index
)
3032 die(_("cannot write split index for a sparse index"));
3034 err
= write_link_extension(&sb
, istate
) < 0 ||
3035 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3037 hashwrite(f
, sb
.buf
, sb
.len
);
3038 strbuf_release(&sb
);
3042 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3043 !drop_cache_tree
&& istate
->cache_tree
) {
3044 struct strbuf sb
= STRBUF_INIT
;
3046 cache_tree_write(&sb
, istate
->cache_tree
);
3047 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3048 hashwrite(f
, sb
.buf
, sb
.len
);
3049 strbuf_release(&sb
);
3053 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3054 istate
->resolve_undo
) {
3055 struct strbuf sb
= STRBUF_INIT
;
3057 resolve_undo_write(&sb
, istate
->resolve_undo
);
3058 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3060 hashwrite(f
, sb
.buf
, sb
.len
);
3061 strbuf_release(&sb
);
3065 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3066 istate
->untracked
) {
3067 struct strbuf sb
= STRBUF_INIT
;
3069 write_untracked_extension(&sb
, istate
->untracked
);
3070 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3072 hashwrite(f
, sb
.buf
, sb
.len
);
3073 strbuf_release(&sb
);
3077 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3078 istate
->fsmonitor_last_update
) {
3079 struct strbuf sb
= STRBUF_INIT
;
3081 write_fsmonitor_extension(&sb
, istate
);
3082 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3083 hashwrite(f
, sb
.buf
, sb
.len
);
3084 strbuf_release(&sb
);
3088 if (istate
->sparse_index
) {
3089 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3094 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3095 * so that it can be found and processed before all the index entries are
3096 * read. Write it out regardless of the strip_extensions parameter as we need it
3097 * when loading the shared index.
3100 struct strbuf sb
= STRBUF_INIT
;
3102 write_eoie_extension(&sb
, eoie_c
, offset
);
3103 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3104 hashwrite(f
, sb
.buf
, sb
.len
);
3105 strbuf_release(&sb
);
3110 csum_fsync_flag
= 0;
3111 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3112 csum_fsync_flag
= CSUM_FSYNC
;
3114 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3115 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3117 if (close_tempfile_gently(tempfile
)) {
3118 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3121 if (stat(get_tempfile_path(tempfile
), &st
))
3123 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3124 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3125 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3128 * TODO trace2: replace "the_repository" with the actual repo instance
3129 * that is associated with the given "istate".
3131 trace2_data_intmax("index", the_repository
, "write/version",
3133 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3139 void set_alternate_index_output(const char *name
)
3141 alternate_index_output
= name
;
3144 static int commit_locked_index(struct lock_file
*lk
)
3146 if (alternate_index_output
)
3147 return commit_lock_file_to(lk
, alternate_index_output
);
3149 return commit_lock_file(lk
);
3152 static int do_write_locked_index(struct index_state
*istate
,
3153 struct lock_file
*lock
,
3155 enum write_extensions write_extensions
)
3158 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3160 ret
= convert_to_sparse(istate
, 0);
3163 warning(_("failed to convert to a sparse-index"));
3168 * TODO trace2: replace "the_repository" with the actual repo instance
3169 * that is associated with the given "istate".
3171 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3172 "%s", get_lock_file_path(lock
));
3173 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3174 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3175 "%s", get_lock_file_path(lock
));
3178 ensure_full_index(istate
);
3182 if (flags
& COMMIT_LOCK
)
3183 ret
= commit_locked_index(lock
);
3185 ret
= close_lock_file_gently(lock
);
3187 run_hooks_l("post-index-change",
3188 istate
->updated_workdir
? "1" : "0",
3189 istate
->updated_skipworktree
? "1" : "0", NULL
);
3190 istate
->updated_workdir
= 0;
3191 istate
->updated_skipworktree
= 0;
3196 static int write_split_index(struct index_state
*istate
,
3197 struct lock_file
*lock
,
3201 prepare_to_write_split_index(istate
);
3202 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3203 finish_writing_split_index(istate
);
3207 static const char *shared_index_expire
= "2.weeks.ago";
3209 static unsigned long get_shared_index_expire_date(void)
3211 static unsigned long shared_index_expire_date
;
3212 static int shared_index_expire_date_prepared
;
3214 if (!shared_index_expire_date_prepared
) {
3215 git_config_get_expiry("splitindex.sharedindexexpire",
3216 &shared_index_expire
);
3217 shared_index_expire_date
= approxidate(shared_index_expire
);
3218 shared_index_expire_date_prepared
= 1;
3221 return shared_index_expire_date
;
3224 static int should_delete_shared_index(const char *shared_index_path
)
3227 unsigned long expiration
;
3229 /* Check timestamp */
3230 expiration
= get_shared_index_expire_date();
3233 if (stat(shared_index_path
, &st
))
3234 return error_errno(_("could not stat '%s'"), shared_index_path
);
3235 if (st
.st_mtime
> expiration
)
3241 static int clean_shared_index_files(const char *current_hex
)
3244 DIR *dir
= opendir(get_git_dir());
3247 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3249 while ((de
= readdir(dir
)) != NULL
) {
3250 const char *sha1_hex
;
3251 const char *shared_index_path
;
3252 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3254 if (!strcmp(sha1_hex
, current_hex
))
3256 shared_index_path
= git_path("%s", de
->d_name
);
3257 if (should_delete_shared_index(shared_index_path
) > 0 &&
3258 unlink(shared_index_path
))
3259 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3266 static int write_shared_index(struct index_state
*istate
,
3267 struct tempfile
**temp
, unsigned flags
)
3269 struct split_index
*si
= istate
->split_index
;
3270 int ret
, was_full
= !istate
->sparse_index
;
3272 move_cache_to_base_index(istate
);
3273 convert_to_sparse(istate
, 0);
3275 trace2_region_enter_printf("index", "shared/do_write_index",
3276 the_repository
, "%s", get_tempfile_path(*temp
));
3277 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3278 trace2_region_leave_printf("index", "shared/do_write_index",
3279 the_repository
, "%s", get_tempfile_path(*temp
));
3282 ensure_full_index(istate
);
3286 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3288 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3291 ret
= rename_tempfile(temp
,
3292 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3294 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3295 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3301 static const int default_max_percent_split_change
= 20;
3303 static int too_many_not_shared_entries(struct index_state
*istate
)
3305 int i
, not_shared
= 0;
3306 int max_split
= git_config_get_max_percent_split_change();
3308 switch (max_split
) {
3310 /* not or badly configured: use the default value */
3311 max_split
= default_max_percent_split_change
;
3314 return 1; /* 0% means always write a new shared index */
3316 return 0; /* 100% means never write a new shared index */
3318 break; /* just use the configured value */
3321 /* Count not shared entries */
3322 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3323 struct cache_entry
*ce
= istate
->cache
[i
];
3328 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3331 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3334 int new_shared_index
, ret
, test_split_index_env
;
3335 struct split_index
*si
= istate
->split_index
;
3337 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3338 cache_tree_verify(the_repository
, istate
);
3340 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3341 if (flags
& COMMIT_LOCK
)
3342 rollback_lock_file(lock
);
3346 if (istate
->fsmonitor_last_update
)
3347 fill_fsmonitor_bitmap(istate
);
3349 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3351 if ((!si
&& !test_split_index_env
) ||
3352 alternate_index_output
||
3353 (istate
->cache_changed
& ~EXTMASK
)) {
3354 ret
= do_write_locked_index(istate
, lock
, flags
,
3355 ~WRITE_SPLIT_INDEX_EXTENSION
);
3359 if (test_split_index_env
) {
3361 si
= init_split_index(istate
);
3362 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3364 int v
= si
->base_oid
.hash
[0];
3366 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3369 if (too_many_not_shared_entries(istate
))
3370 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3372 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3374 if (new_shared_index
) {
3375 struct tempfile
*temp
;
3378 /* Same initial permissions as the main .git/index file */
3379 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3381 ret
= do_write_locked_index(istate
, lock
, flags
,
3382 ~WRITE_SPLIT_INDEX_EXTENSION
);
3385 ret
= write_shared_index(istate
, &temp
, flags
);
3387 saved_errno
= errno
;
3388 if (is_tempfile_active(temp
))
3389 delete_tempfile(&temp
);
3390 errno
= saved_errno
;
3396 ret
= write_split_index(istate
, lock
, flags
);
3398 /* Freshen the shared index only if the split-index was written */
3399 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3400 const char *shared_index
= git_path("sharedindex.%s",
3401 oid_to_hex(&si
->base_oid
));
3402 freshen_shared_index(shared_index
, 1);
3406 if (flags
& COMMIT_LOCK
)
3407 rollback_lock_file(lock
);
3412 * Read the index file that is potentially unmerged into given
3413 * index_state, dropping any unmerged entries to stage #0 (potentially
3414 * resulting in a path appearing as both a file and a directory in the
3415 * index; the caller is responsible to clear out the extra entries
3416 * before writing the index to a tree). Returns true if the index is
3417 * unmerged. Callers who want to refuse to work from an unmerged
3418 * state can call this and check its return value, instead of calling
3421 int repo_read_index_unmerged(struct repository
*repo
)
3423 struct index_state
*istate
;
3427 repo_read_index(repo
);
3428 istate
= repo
->index
;
3429 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3430 struct cache_entry
*ce
= istate
->cache
[i
];
3431 struct cache_entry
*new_ce
;
3437 len
= ce_namelen(ce
);
3438 new_ce
= make_empty_cache_entry(istate
, len
);
3439 memcpy(new_ce
->name
, ce
->name
, len
);
3440 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3441 new_ce
->ce_namelen
= len
;
3442 new_ce
->ce_mode
= ce
->ce_mode
;
3443 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3444 return error(_("%s: cannot drop to stage #0"),
3451 * Returns 1 if the path is an "other" path with respect to
3452 * the index; that is, the path is not mentioned in the index at all,
3453 * either as a file, a directory with some files in the index,
3454 * or as an unmerged entry.
3456 * We helpfully remove a trailing "/" from directories so that
3457 * the output of read_directory can be used as-is.
3459 int index_name_is_other(struct index_state
*istate
, const char *name
,
3463 if (namelen
&& name
[namelen
- 1] == '/')
3465 pos
= index_name_pos(istate
, name
, namelen
);
3467 return 0; /* exact match */
3469 if (pos
< istate
->cache_nr
) {
3470 struct cache_entry
*ce
= istate
->cache
[pos
];
3471 if (ce_namelen(ce
) == namelen
&&
3472 !memcmp(ce
->name
, name
, namelen
))
3473 return 0; /* Yup, this one exists unmerged */
3478 void *read_blob_data_from_index(struct index_state
*istate
,
3479 const char *path
, unsigned long *size
)
3483 enum object_type type
;
3487 pos
= index_name_pos(istate
, path
, len
);
3490 * We might be in the middle of a merge, in which
3491 * case we would read stage #2 (ours).
3495 (pos
< 0 && i
< istate
->cache_nr
&&
3496 !strcmp(istate
->cache
[i
]->name
, path
));
3498 if (ce_stage(istate
->cache
[i
]) == 2)
3503 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3505 if (!data
|| type
!= OBJ_BLOB
) {
3514 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3516 dst
->untracked
= src
->untracked
;
3517 src
->untracked
= NULL
;
3518 dst
->cache_tree
= src
->cache_tree
;
3519 src
->cache_tree
= NULL
;
3522 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3523 struct index_state
*istate
)
3525 unsigned int size
= ce_size(ce
);
3526 int mem_pool_allocated
;
3527 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3528 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3530 memcpy(new_entry
, ce
, size
);
3531 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3535 void discard_cache_entry(struct cache_entry
*ce
)
3537 if (ce
&& should_validate_cache_entries())
3538 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3540 if (ce
&& ce
->mem_pool_allocated
)
3546 int should_validate_cache_entries(void)
3548 static int validate_index_cache_entries
= -1;
3550 if (validate_index_cache_entries
< 0) {
3551 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3552 validate_index_cache_entries
= 1;
3554 validate_index_cache_entries
= 0;
3557 return validate_index_cache_entries
;
3560 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3561 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3563 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3566 * The end of index entries (EOIE) extension is guaranteed to be last
3567 * so that it can be found by scanning backwards from the EOF.
3574 const char *index
, *eoie
;
3576 size_t offset
, src_offset
;
3577 unsigned char hash
[GIT_MAX_RAWSZ
];
3580 /* ensure we have an index big enough to contain an EOIE extension */
3581 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3584 /* validate the extension signature */
3585 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3586 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3588 index
+= sizeof(uint32_t);
3590 /* validate the extension size */
3591 extsize
= get_be32(index
);
3592 if (extsize
!= EOIE_SIZE
)
3594 index
+= sizeof(uint32_t);
3597 * Validate the offset we're going to look for the first extension
3598 * signature is after the index header and before the eoie extension.
3600 offset
= get_be32(index
);
3601 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3603 if (mmap
+ offset
>= eoie
)
3605 index
+= sizeof(uint32_t);
3608 * The hash is computed over extension types and their sizes (but not
3609 * their contents). E.g. if we have "TREE" extension that is N-bytes
3610 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3611 * then the hash would be:
3613 * SHA-1("TREE" + <binary representation of N> +
3614 * "REUC" + <binary representation of M>)
3616 src_offset
= offset
;
3617 the_hash_algo
->init_fn(&c
);
3618 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3619 /* After an array of active_nr index entries,
3620 * there can be arbitrary number of extended
3621 * sections, each of which is prefixed with
3622 * extension name (4-byte) and section length
3623 * in 4-byte network byte order.
3626 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3627 extsize
= ntohl(extsize
);
3629 /* verify the extension size isn't so large it will wrap around */
3630 if (src_offset
+ 8 + extsize
< src_offset
)
3633 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3636 src_offset
+= extsize
;
3638 the_hash_algo
->final_fn(hash
, &c
);
3639 if (!hasheq(hash
, (const unsigned char *)index
))
3642 /* Validate that the extension offsets returned us back to the eoie extension. */
3643 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3649 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3652 unsigned char hash
[GIT_MAX_RAWSZ
];
3655 put_be32(&buffer
, offset
);
3656 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3659 the_hash_algo
->final_fn(hash
, eoie_context
);
3660 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3663 #define IEOT_VERSION (1)
3665 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3667 const char *index
= NULL
;
3668 uint32_t extsize
, ext_version
;
3669 struct index_entry_offset_table
*ieot
;
3672 /* find the IEOT extension */
3675 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3676 extsize
= get_be32(mmap
+ offset
+ 4);
3677 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3678 index
= mmap
+ offset
+ 4 + 4;
3687 /* validate the version is IEOT_VERSION */
3688 ext_version
= get_be32(index
);
3689 if (ext_version
!= IEOT_VERSION
) {
3690 error("invalid IEOT version %d", ext_version
);
3693 index
+= sizeof(uint32_t);
3695 /* extension size - version bytes / bytes per entry */
3696 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3698 error("invalid number of IEOT entries %d", nr
);
3701 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3702 + (nr
* sizeof(struct index_entry_offset
)));
3704 for (i
= 0; i
< nr
; i
++) {
3705 ieot
->entries
[i
].offset
= get_be32(index
);
3706 index
+= sizeof(uint32_t);
3707 ieot
->entries
[i
].nr
= get_be32(index
);
3708 index
+= sizeof(uint32_t);
3714 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3720 put_be32(&buffer
, IEOT_VERSION
);
3721 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3724 for (i
= 0; i
< ieot
->nr
; i
++) {
3727 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3728 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3731 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3732 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3736 void prefetch_cache_entries(const struct index_state
*istate
,
3737 must_prefetch_predicate must_prefetch
)
3740 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3742 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3743 struct cache_entry
*ce
= istate
->cache
[i
];
3745 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3747 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3749 OBJECT_INFO_FOR_PREFETCH
))
3751 oid_array_append(&to_fetch
, &ce
->oid
);
3753 promisor_remote_get_direct(the_repository
,
3754 to_fetch
.oid
, to_fetch
.nr
);
3755 oid_array_clear(&to_fetch
);
3758 static int read_one_entry_opt(struct index_state
*istate
,
3759 const struct object_id
*oid
,
3760 struct strbuf
*base
,
3761 const char *pathname
,
3762 unsigned mode
, int opt
)
3765 struct cache_entry
*ce
;
3768 return READ_TREE_RECURSIVE
;
3770 len
= strlen(pathname
);
3771 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3773 ce
->ce_mode
= create_ce_mode(mode
);
3774 ce
->ce_flags
= create_ce_flags(1);
3775 ce
->ce_namelen
= base
->len
+ len
;
3776 memcpy(ce
->name
, base
->buf
, base
->len
);
3777 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3778 oidcpy(&ce
->oid
, oid
);
3779 return add_index_entry(istate
, ce
, opt
);
3782 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3783 const char *pathname
, unsigned mode
,
3786 struct index_state
*istate
= context
;
3787 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3789 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3793 * This is used when the caller knows there is no existing entries at
3794 * the stage that will conflict with the entry being added.
3796 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3797 const char *pathname
, unsigned mode
,
3800 struct index_state
*istate
= context
;
3801 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3802 mode
, ADD_CACHE_JUST_APPEND
);
3806 * Read the tree specified with --with-tree option
3807 * (typically, HEAD) into stage #1 and then
3808 * squash them down to stage #0. This is used for
3809 * --error-unmatch to list and check the path patterns
3810 * that were given from the command line. We are not
3811 * going to write this index out.
3813 void overlay_tree_on_index(struct index_state
*istate
,
3814 const char *tree_name
, const char *prefix
)
3817 struct object_id oid
;
3818 struct pathspec pathspec
;
3819 struct cache_entry
*last_stage0
= NULL
;
3821 read_tree_fn_t fn
= NULL
;
3824 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3825 die("tree-ish %s not found.", tree_name
);
3826 tree
= parse_tree_indirect(&oid
);
3828 die("bad tree-ish %s", tree_name
);
3830 /* Hoist the unmerged entries up to stage #3 to make room */
3831 /* TODO: audit for interaction with sparse-index. */
3832 ensure_full_index(istate
);
3833 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3834 struct cache_entry
*ce
= istate
->cache
[i
];
3837 ce
->ce_flags
|= CE_STAGEMASK
;
3841 static const char *(matchbuf
[1]);
3843 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3844 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3846 memset(&pathspec
, 0, sizeof(pathspec
));
3849 * See if we have cache entry at the stage. If so,
3850 * do it the original slow way, otherwise, append and then
3853 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3854 const struct cache_entry
*ce
= istate
->cache
[i
];
3855 if (ce_stage(ce
) == 1)
3856 fn
= read_one_entry
;
3860 fn
= read_one_entry_quick
;
3861 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3862 clear_pathspec(&pathspec
);
3864 die("unable to read tree entries %s", tree_name
);
3867 * Sort the cache entry -- we need to nuke the cache tree, though.
3869 if (fn
== read_one_entry_quick
) {
3870 cache_tree_free(&istate
->cache_tree
);
3871 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3874 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3875 struct cache_entry
*ce
= istate
->cache
[i
];
3876 switch (ce_stage(ce
)) {
3884 * If there is stage #0 entry for this, we do not
3885 * need to show it. We use CE_UPDATE bit to mark
3889 !strcmp(last_stage0
->name
, ce
->name
))
3890 ce
->ce_flags
|= CE_UPDATE
;
3895 struct update_callback_data
{
3896 struct index_state
*index
;
3902 static int fix_unmerged_status(struct diff_filepair
*p
,
3903 struct update_callback_data
*data
)
3905 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3907 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3909 * This is not an explicit add request, and the
3910 * path is missing from the working tree (deleted)
3912 return DIFF_STATUS_DELETED
;
3915 * Either an explicit add request, or path exists
3916 * in the working tree. An attempt to explicitly
3917 * add a path that does not exist in the working tree
3918 * will be caught as an error by the caller immediately.
3920 return DIFF_STATUS_MODIFIED
;
3923 static void update_callback(struct diff_queue_struct
*q
,
3924 struct diff_options
*opt UNUSED
, void *cbdata
)
3927 struct update_callback_data
*data
= cbdata
;
3929 for (i
= 0; i
< q
->nr
; i
++) {
3930 struct diff_filepair
*p
= q
->queue
[i
];
3931 const char *path
= p
->one
->path
;
3933 if (!data
->include_sparse
&&
3934 !path_in_sparse_checkout(path
, data
->index
))
3937 switch (fix_unmerged_status(p
, data
)) {
3939 die(_("unexpected diff status %c"), p
->status
);
3940 case DIFF_STATUS_MODIFIED
:
3941 case DIFF_STATUS_TYPE_CHANGED
:
3942 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3943 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3944 die(_("updating files failed"));
3948 case DIFF_STATUS_DELETED
:
3949 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3951 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3952 remove_file_from_index(data
->index
, path
);
3953 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3954 printf(_("remove '%s'\n"), path
);
3960 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3961 const struct pathspec
*pathspec
, char *ps_matched
,
3962 int include_sparse
, int flags
)
3964 struct update_callback_data data
;
3965 struct rev_info rev
;
3967 memset(&data
, 0, sizeof(data
));
3968 data
.index
= repo
->index
;
3969 data
.include_sparse
= include_sparse
;
3972 repo_init_revisions(repo
, &rev
, prefix
);
3973 setup_revisions(0, NULL
, &rev
, NULL
);
3975 copy_pathspec(&rev
.prune_data
, pathspec
);
3976 rev
.ps_matched
= ps_matched
;
3978 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3979 rev
.diffopt
.format_callback
= update_callback
;
3980 rev
.diffopt
.format_callback_data
= &data
;
3981 rev
.diffopt
.flags
.override_submodule_config
= 1;
3982 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3985 * Use an ODB transaction to optimize adding multiple objects.
3986 * This function is invoked from commands other than 'add', which
3987 * may not have their own transaction active.
3989 begin_odb_transaction();
3990 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3991 end_odb_transaction();
3993 release_revisions(&rev
);
3994 return !!data
.add_errors
;