2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
7 #define USE_THE_REPOSITORY_VARIABLE
9 #include "git-compat-util.h"
10 #include "bulk-checkin.h"
18 #include "cache-tree.h"
21 #include "object-file.h"
22 #include "object-store-ll.h"
23 #include "oid-array.h"
26 #include "environment.h"
29 #include "name-hash.h"
30 #include "object-name.h"
32 #include "preload-index.h"
33 #include "read-cache.h"
34 #include "repository.h"
35 #include "resolve-undo.h"
40 #include "split-index.h"
43 #include "fsmonitor.h"
44 #include "thread-utils.h"
46 #include "sparse-index.h"
47 #include "csum-file.h"
48 #include "promisor-remote.h"
51 /* Mask for the name length in ce_flags in the on-disk index */
53 #define CE_NAMEMASK (0x0fff)
57 * The first letter should be 'A'..'Z' for extensions that are not
58 * necessary for a correct operation (i.e. optimization data).
59 * When new extensions are added that _needs_ to be understood in
60 * order to correctly interpret the index file, pick character that
61 * is outside the range, to cause the reader to abort.
64 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
65 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
66 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
67 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
68 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
69 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
70 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
71 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
72 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
74 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
75 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
76 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
77 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
81 * This is an estimate of the pathname length in the index. We use
82 * this for V4 index files to guess the un-deltafied size of the index
83 * in memory because of pathname deltafication. This is not required
84 * for V2/V3 index formats because their pathnames are not compressed.
85 * If the initial amount of memory set aside is not sufficient, the
86 * mem pool will allocate extra memory.
88 #define CACHE_ENTRY_PATH_LENGTH 80
90 enum index_search_mode
{
95 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
97 struct cache_entry
*ce
;
98 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
99 ce
->mem_pool_allocated
= 1;
103 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
105 struct cache_entry
* ce
;
106 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
107 ce
->mem_pool_allocated
= 1;
111 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
113 struct mem_pool
**pool_ptr
;
115 if (istate
->split_index
&& istate
->split_index
->base
)
116 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
118 pool_ptr
= &istate
->ce_mem_pool
;
121 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
122 mem_pool_init(*pool_ptr
, 0);
128 static const char *alternate_index_output
;
130 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
132 if (S_ISSPARSEDIR(ce
->ce_mode
))
133 istate
->sparse_index
= INDEX_COLLAPSED
;
135 istate
->cache
[nr
] = ce
;
136 add_name_hash(istate
, ce
);
139 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
141 struct cache_entry
*old
= istate
->cache
[nr
];
143 replace_index_entry_in_base(istate
, old
, ce
);
144 remove_name_hash(istate
, old
);
145 discard_cache_entry(old
);
146 ce
->ce_flags
&= ~CE_HASHED
;
147 set_index_entry(istate
, nr
, ce
);
148 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
149 mark_fsmonitor_invalid(istate
, ce
);
150 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
153 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
155 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
156 int namelen
= strlen(new_name
);
158 new_entry
= make_empty_cache_entry(istate
, namelen
);
159 copy_cache_entry(new_entry
, old_entry
);
160 new_entry
->ce_flags
&= ~CE_HASHED
;
161 new_entry
->ce_namelen
= namelen
;
162 new_entry
->index
= 0;
163 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
165 cache_tree_invalidate_path(istate
, old_entry
->name
);
166 untracked_cache_remove_from_index(istate
, old_entry
->name
);
167 remove_index_entry_at(istate
, nr
);
170 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
171 * we only update stat info if the entry is otherwise up-to-date (i.e.,
172 * the contents/mode haven't changed). This ensures that we reflect the
173 * 'ctime' of the rename in the index without (incorrectly) updating
174 * the cached stat info to reflect unstaged changes on disk.
176 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
177 if (refreshed
&& refreshed
!= new_entry
) {
178 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
179 discard_cache_entry(new_entry
);
181 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
185 * This only updates the "non-critical" parts of the directory
186 * cache, ie the parts that aren't tracked by GIT, and only used
187 * to validate the cache.
189 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
191 fill_stat_data(&ce
->ce_stat_data
, st
);
193 if (assume_unchanged
)
194 ce
->ce_flags
|= CE_VALID
;
196 if (S_ISREG(st
->st_mode
)) {
197 ce_mark_uptodate(ce
);
198 mark_fsmonitor_valid(istate
, ce
);
202 static unsigned int st_mode_from_ce(const struct cache_entry
*ce
)
204 extern int trust_executable_bit
, has_symlinks
;
206 switch (ce
->ce_mode
& S_IFMT
) {
208 return has_symlinks
? S_IFLNK
: (S_IFREG
| 0644);
210 return (ce
->ce_mode
& (trust_executable_bit
? 0755 : 0644)) | S_IFREG
;
212 return S_IFDIR
| 0755;
216 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
220 int fake_lstat(const struct cache_entry
*ce
, struct stat
*st
)
222 fake_lstat_data(&ce
->ce_stat_data
, st
);
223 st
->st_mode
= st_mode_from_ce(ce
);
225 /* always succeed as lstat() replacement */
229 static int ce_compare_data(struct index_state
*istate
,
230 const struct cache_entry
*ce
,
234 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
237 struct object_id oid
;
238 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
239 match
= !oideq(&oid
, &ce
->oid
);
240 /* index_fd() closed the file descriptor already */
245 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
250 enum object_type type
;
251 struct strbuf sb
= STRBUF_INIT
;
253 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
256 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
259 match
= memcmp(buffer
, sb
.buf
, size
);
266 static int ce_compare_gitlink(const struct cache_entry
*ce
)
268 struct object_id oid
;
271 * We don't actually require that the .git directory
272 * under GITLINK directory be a valid git directory. It
273 * might even be missing (in case nobody populated that
276 * If so, we consider it always to match.
278 if (repo_resolve_gitlink_ref(the_repository
, ce
->name
,
281 return !oideq(&oid
, &ce
->oid
);
284 static int ce_modified_check_fs(struct index_state
*istate
,
285 const struct cache_entry
*ce
,
288 switch (st
->st_mode
& S_IFMT
) {
290 if (ce_compare_data(istate
, ce
, st
))
294 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
298 if (S_ISGITLINK(ce
->ce_mode
))
299 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
300 /* else fallthrough */
307 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
309 unsigned int changed
= 0;
311 if (ce
->ce_flags
& CE_REMOVE
)
312 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
314 switch (ce
->ce_mode
& S_IFMT
) {
316 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
317 /* We consider only the owner x bit to be relevant for
320 if (trust_executable_bit
&&
321 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
322 changed
|= MODE_CHANGED
;
325 if (!S_ISLNK(st
->st_mode
) &&
326 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
327 changed
|= TYPE_CHANGED
;
330 /* We ignore most of the st_xxx fields for gitlinks */
331 if (!S_ISDIR(st
->st_mode
))
332 changed
|= TYPE_CHANGED
;
333 else if (ce_compare_gitlink(ce
))
334 changed
|= DATA_CHANGED
;
337 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
340 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
342 /* Racily smudged entry? */
343 if (!ce
->ce_stat_data
.sd_size
) {
344 if (!is_empty_blob_oid(&ce
->oid
, the_repository
->hash_algo
))
345 changed
|= DATA_CHANGED
;
351 static int is_racy_stat(const struct index_state
*istate
,
352 const struct stat_data
*sd
)
354 return (istate
->timestamp
.sec
&&
356 /* nanosecond timestamped files can also be racy! */
357 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
358 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
359 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
361 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
366 int is_racy_timestamp(const struct index_state
*istate
,
367 const struct cache_entry
*ce
)
369 return (!S_ISGITLINK(ce
->ce_mode
) &&
370 is_racy_stat(istate
, &ce
->ce_stat_data
));
373 int match_stat_data_racy(const struct index_state
*istate
,
374 const struct stat_data
*sd
, struct stat
*st
)
376 if (is_racy_stat(istate
, sd
))
377 return MTIME_CHANGED
;
378 return match_stat_data(sd
, st
);
381 int ie_match_stat(struct index_state
*istate
,
382 const struct cache_entry
*ce
, struct stat
*st
,
383 unsigned int options
)
385 unsigned int changed
;
386 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
387 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
388 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
389 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
391 if (!ignore_fsmonitor
)
392 refresh_fsmonitor(istate
);
394 * If it's marked as always valid in the index, it's
395 * valid whatever the checked-out copy says.
397 * skip-worktree has the same effect with higher precedence
399 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
401 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
403 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
407 * Intent-to-add entries have not been added, so the index entry
408 * by definition never matches what is in the work tree until it
409 * actually gets added.
411 if (ce_intent_to_add(ce
))
412 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
414 changed
= ce_match_stat_basic(ce
, st
);
417 * Within 1 second of this sequence:
418 * echo xyzzy >file && git-update-index --add file
419 * running this command:
421 * would give a falsely clean cache entry. The mtime and
422 * length match the cache, and other stat fields do not change.
424 * We could detect this at update-index time (the cache entry
425 * being registered/updated records the same time as "now")
426 * and delay the return from git-update-index, but that would
427 * effectively mean we can make at most one commit per second,
428 * which is not acceptable. Instead, we check cache entries
429 * whose mtime are the same as the index file timestamp more
430 * carefully than others.
432 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
433 if (assume_racy_is_modified
)
434 changed
|= DATA_CHANGED
;
436 changed
|= ce_modified_check_fs(istate
, ce
, st
);
442 int ie_modified(struct index_state
*istate
,
443 const struct cache_entry
*ce
,
444 struct stat
*st
, unsigned int options
)
446 int changed
, changed_fs
;
448 changed
= ie_match_stat(istate
, ce
, st
, options
);
452 * If the mode or type has changed, there's no point in trying
453 * to refresh the entry - it's not going to match
455 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
459 * Immediately after read-tree or update-index --cacheinfo,
460 * the length field is zero, as we have never even read the
461 * lstat(2) information once, and we cannot trust DATA_CHANGED
462 * returned by ie_match_stat() which in turn was returned by
463 * ce_match_stat_basic() to signal that the filesize of the
464 * blob changed. We have to actually go to the filesystem to
465 * see if the contents match, and if so, should answer "unchanged".
467 * The logic does not apply to gitlinks, as ce_match_stat_basic()
468 * already has checked the actual HEAD from the filesystem in the
469 * subproject. If ie_match_stat() already said it is different,
470 * then we know it is.
472 if ((changed
& DATA_CHANGED
) &&
473 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
476 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
478 return changed
| changed_fs
;
482 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
483 const char *name2
, int len2
, int stage2
)
487 cmp
= name_compare(name1
, len1
, name2
, len2
);
498 int cmp_cache_name_compare(const void *a_
, const void *b_
)
500 const struct cache_entry
*ce1
, *ce2
;
502 ce1
= *((const struct cache_entry
**)a_
);
503 ce2
= *((const struct cache_entry
**)b_
);
504 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
505 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
508 static int index_name_stage_pos(struct index_state
*istate
,
509 const char *name
, int namelen
,
511 enum index_search_mode search_mode
)
516 last
= istate
->cache_nr
;
517 while (last
> first
) {
518 int next
= first
+ ((last
- first
) >> 1);
519 struct cache_entry
*ce
= istate
->cache
[next
];
520 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
530 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
532 /* Note: first <= istate->cache_nr */
533 struct cache_entry
*ce
= istate
->cache
[first
- 1];
536 * If we are in a sparse-index _and_ the entry before the
537 * insertion position is a sparse-directory entry that is
538 * an ancestor of 'name', then we need to expand the index
539 * and search again. This will only trigger once, because
540 * thereafter the index is fully expanded.
542 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
543 ce_namelen(ce
) < namelen
&&
544 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
545 ensure_full_index(istate
);
546 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
553 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
555 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
558 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
560 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
563 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
565 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
568 int remove_index_entry_at(struct index_state
*istate
, int pos
)
570 struct cache_entry
*ce
= istate
->cache
[pos
];
572 record_resolve_undo(istate
, ce
);
573 remove_name_hash(istate
, ce
);
574 save_or_free_index_entry(istate
, ce
);
575 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
577 if (pos
>= istate
->cache_nr
)
579 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
580 istate
->cache_nr
- pos
);
585 * Remove all cache entries marked for removal, that is where
586 * CE_REMOVE is set in ce_flags. This is much more effective than
587 * calling remove_index_entry_at() for each entry to be removed.
589 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
591 struct cache_entry
**ce_array
= istate
->cache
;
594 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
595 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
597 cache_tree_invalidate_path(istate
,
599 untracked_cache_remove_from_index(istate
,
602 remove_name_hash(istate
, ce_array
[i
]);
603 save_or_free_index_entry(istate
, ce_array
[i
]);
606 ce_array
[j
++] = ce_array
[i
];
608 if (j
== istate
->cache_nr
)
610 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
611 istate
->cache_nr
= j
;
614 int remove_file_from_index(struct index_state
*istate
, const char *path
)
616 int pos
= index_name_pos(istate
, path
, strlen(path
));
619 cache_tree_invalidate_path(istate
, path
);
620 untracked_cache_remove_from_index(istate
, path
);
621 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
622 remove_index_entry_at(istate
, pos
);
626 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
628 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
631 static int index_name_pos_also_unmerged(struct index_state
*istate
,
632 const char *path
, int namelen
)
634 int pos
= index_name_pos(istate
, path
, namelen
);
635 struct cache_entry
*ce
;
640 /* maybe unmerged? */
642 if (pos
>= istate
->cache_nr
||
643 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
646 /* order of preference: stage 2, 1, 3 */
647 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
648 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
649 !compare_name(ce
, path
, namelen
))
654 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
656 int len
= ce_namelen(ce
);
657 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
661 * If we add a filename that aliases in the cache, we will use the
662 * name that we already have - but we don't want to update the same
663 * alias twice, because that implies that there were actually two
664 * different files with aliasing names!
666 * So we use the CE_ADDED flag to verify that the alias was an old
667 * one before we accept it as
669 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
670 struct cache_entry
*ce
,
671 struct cache_entry
*alias
)
674 struct cache_entry
*new_entry
;
676 if (alias
->ce_flags
& CE_ADDED
)
677 die(_("will not add file alias '%s' ('%s' already exists in index)"),
678 ce
->name
, alias
->name
);
680 /* Ok, create the new entry using the name of the existing alias */
681 len
= ce_namelen(alias
);
682 new_entry
= make_empty_cache_entry(istate
, len
);
683 memcpy(new_entry
->name
, alias
->name
, len
);
684 copy_cache_entry(new_entry
, ce
);
685 save_or_free_index_entry(istate
, ce
);
689 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
691 struct object_id oid
;
692 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
693 die(_("cannot create an empty blob in the object database"));
694 oidcpy(&ce
->oid
, &oid
);
697 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
699 int namelen
, was_same
;
700 mode_t st_mode
= st
->st_mode
;
701 struct cache_entry
*ce
, *alias
= NULL
;
702 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
703 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
704 int pretend
= flags
& ADD_CACHE_PRETEND
;
705 int intent_only
= flags
& ADD_CACHE_INTENT
;
706 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
707 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
708 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
709 struct object_id oid
;
711 if (flags
& ADD_CACHE_RENORMALIZE
)
712 hash_flags
|= HASH_RENORMALIZE
;
714 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
715 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
717 namelen
= strlen(path
);
718 if (S_ISDIR(st_mode
)) {
719 if (repo_resolve_gitlink_ref(the_repository
, path
, "HEAD", &oid
) < 0)
720 return error(_("'%s' does not have a commit checked out"), path
);
721 while (namelen
&& path
[namelen
-1] == '/')
724 ce
= make_empty_cache_entry(istate
, namelen
);
725 memcpy(ce
->name
, path
, namelen
);
726 ce
->ce_namelen
= namelen
;
728 fill_stat_cache_info(istate
, ce
, st
);
730 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
733 if (trust_executable_bit
&& has_symlinks
) {
734 ce
->ce_mode
= create_ce_mode(st_mode
);
736 /* If there is an existing entry, pick the mode bits and type
737 * from it, otherwise assume unexecutable regular file.
739 struct cache_entry
*ent
;
740 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
742 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
743 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
746 /* When core.ignorecase=true, determine if a directory of the same name but differing
747 * case already exists within the Git repository. If it does, ensure the directory
748 * case of the file being added to the repository matches (is folded into) the existing
749 * entry's directory case.
752 adjust_dirname_case(istate
, ce
->name
);
754 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
755 alias
= index_file_exists(istate
, ce
->name
,
756 ce_namelen(ce
), ignore_case
);
759 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
760 /* Nothing changed, really */
761 if (!S_ISGITLINK(alias
->ce_mode
))
762 ce_mark_uptodate(alias
);
763 alias
->ce_flags
|= CE_ADDED
;
765 discard_cache_entry(ce
);
770 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
771 discard_cache_entry(ce
);
772 return error(_("unable to index file '%s'"), path
);
775 set_object_name_for_intent_to_add_entry(ce
);
777 if (ignore_case
&& alias
&& different_name(ce
, alias
))
778 ce
= create_alias_ce(istate
, ce
, alias
);
779 ce
->ce_flags
|= CE_ADDED
;
781 /* It was suspected to be racily clean, but it turns out to be Ok */
784 oideq(&alias
->oid
, &ce
->oid
) &&
785 ce
->ce_mode
== alias
->ce_mode
);
788 discard_cache_entry(ce
);
789 else if (add_index_entry(istate
, ce
, add_option
)) {
790 discard_cache_entry(ce
);
791 return error(_("unable to add '%s' to index"), path
);
793 if (verbose
&& !was_same
)
794 printf("add '%s'\n", path
);
798 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
801 if (lstat(path
, &st
))
802 die_errno(_("unable to stat '%s'"), path
);
803 return add_to_index(istate
, path
, &st
, flags
);
806 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
808 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
811 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
812 struct mem_pool
*ce_mem_pool
)
815 return mem_pool__ce_calloc(ce_mem_pool
, len
);
816 return xcalloc(1, cache_entry_size(len
));
819 enum verify_path_result
{
825 static enum verify_path_result
verify_path_internal(const char *, unsigned);
827 int verify_path(const char *path
, unsigned mode
)
829 return verify_path_internal(path
, mode
) == PATH_OK
;
832 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
834 const struct object_id
*oid
,
837 unsigned int refresh_options
)
839 struct cache_entry
*ce
, *ret
;
842 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
843 error(_("invalid path '%s'"), path
);
848 ce
= make_empty_cache_entry(istate
, len
);
850 oidcpy(&ce
->oid
, oid
);
851 memcpy(ce
->name
, path
, len
);
852 ce
->ce_flags
= create_ce_flags(stage
);
853 ce
->ce_namelen
= len
;
854 ce
->ce_mode
= create_ce_mode(mode
);
856 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
858 discard_cache_entry(ce
);
862 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
863 const struct object_id
*oid
,
866 struct mem_pool
*ce_mem_pool
)
868 struct cache_entry
*ce
;
871 if (!verify_path(path
, mode
)) {
872 error(_("invalid path '%s'"), path
);
877 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
879 oidcpy(&ce
->oid
, oid
);
880 memcpy(ce
->name
, path
, len
);
881 ce
->ce_flags
= create_ce_flags(stage
);
882 ce
->ce_namelen
= len
;
883 ce
->ce_mode
= create_ce_mode(mode
);
889 * Chmod an index entry with either +x or -x.
891 * Returns -1 if the chmod for the particular cache entry failed (if it's
892 * not a regular file), -2 if an invalid flip argument is passed in, 0
895 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
898 if (!S_ISREG(ce
->ce_mode
))
905 ce
->ce_mode
&= ~0111;
910 cache_tree_invalidate_path(istate
, ce
->name
);
911 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
912 mark_fsmonitor_invalid(istate
, ce
);
913 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
918 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
920 int len
= ce_namelen(a
);
921 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
925 * We fundamentally don't like some paths: we don't want
926 * dot or dot-dot anywhere, and for obvious reasons don't
927 * want to recurse into ".git" either.
929 * Also, we don't want double slashes or slashes at the
930 * end that can make pathnames ambiguous.
932 static int verify_dotfile(const char *rest
, unsigned mode
)
935 * The first character was '.', but that
936 * has already been discarded, we now test
940 /* "." is not allowed */
941 if (*rest
== '\0' || is_dir_sep(*rest
))
946 * ".git" followed by NUL or slash is bad. Note that we match
947 * case-insensitively here, even if ignore_case is not set.
948 * This outlaws ".GIT" everywhere out of an abundance of caution,
949 * since there's really no good reason to allow it.
951 * Once we've seen ".git", we can also find ".gitmodules", etc (also
952 * case-insensitively).
956 if (rest
[1] != 'i' && rest
[1] != 'I')
958 if (rest
[2] != 't' && rest
[2] != 'T')
960 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
964 if (skip_iprefix(rest
, "modules", &rest
) &&
965 (*rest
== '\0' || is_dir_sep(*rest
)))
970 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
976 static enum verify_path_result
verify_path_internal(const char *path
,
981 if (has_dos_drive_prefix(path
))
984 if (!is_valid_path(path
))
995 if (is_hfs_dotgit(path
))
998 if (is_hfs_dotgitmodules(path
))
1003 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1005 return PATH_INVALID
;
1007 if (is_ntfs_dotgit(path
))
1008 return PATH_INVALID
;
1009 if (S_ISLNK(mode
)) {
1010 if (is_ntfs_dotgitmodules(path
))
1011 return PATH_INVALID
;
1016 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1018 return PATH_INVALID
;
1020 * allow terminating directory separators for
1021 * sparse directory entries.
1024 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1026 } else if (c
== '\\' && protect_ntfs
) {
1027 if (is_ntfs_dotgit(path
))
1028 return PATH_INVALID
;
1029 if (S_ISLNK(mode
)) {
1030 if (is_ntfs_dotgitmodules(path
))
1031 return PATH_INVALID
;
1040 * Do we have another file that has the beginning components being a
1041 * proper superset of the name we're trying to add?
1043 static int has_file_name(struct index_state
*istate
,
1044 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1047 int len
= ce_namelen(ce
);
1048 int stage
= ce_stage(ce
);
1049 const char *name
= ce
->name
;
1051 while (pos
< istate
->cache_nr
) {
1052 struct cache_entry
*p
= istate
->cache
[pos
++];
1054 if (len
>= ce_namelen(p
))
1056 if (memcmp(name
, p
->name
, len
))
1058 if (ce_stage(p
) != stage
)
1060 if (p
->name
[len
] != '/')
1062 if (p
->ce_flags
& CE_REMOVE
)
1067 remove_index_entry_at(istate
, --pos
);
1074 * Like strcmp(), but also return the offset of the first change.
1075 * If strings are equal, return the length.
1077 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1082 return strcmp(s1
, s2
);
1084 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1089 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1093 * Do we have another file with a pathname that is a proper
1094 * subset of the name we're trying to add?
1096 * That is, is there another file in the index with a path
1097 * that matches a sub-directory in the given entry?
1099 static int has_dir_name(struct index_state
*istate
,
1100 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1103 int stage
= ce_stage(ce
);
1104 const char *name
= ce
->name
;
1105 const char *slash
= name
+ ce_namelen(ce
);
1110 * We are frequently called during an iteration on a sorted
1111 * list of pathnames and while building a new index. Therefore,
1112 * there is a high probability that this entry will eventually
1113 * be appended to the index, rather than inserted in the middle.
1114 * If we can confirm that, we can avoid binary searches on the
1115 * components of the pathname.
1117 * Compare the entry's full path with the last path in the index.
1119 if (istate
->cache_nr
> 0) {
1120 cmp_last
= strcmp_offset(name
,
1121 istate
->cache
[istate
->cache_nr
- 1]->name
,
1124 if (name
[len_eq_last
] != '/') {
1126 * The entry sorts AFTER the last one in the
1129 * If there were a conflict with "file", then our
1130 * name would start with "file/" and the last index
1131 * entry would start with "file" but not "file/".
1133 * The next character after common prefix is
1134 * not '/', so there can be no conflict.
1139 * The entry sorts AFTER the last one in the
1140 * index, and the next character after common
1143 * Either the last index entry is a file in
1144 * conflict with this entry, or it has a name
1145 * which sorts between this entry and the
1146 * potential conflicting file.
1148 * In both cases, we fall through to the loop
1149 * below and let the regular search code handle it.
1152 } else if (cmp_last
== 0) {
1154 * The entry exactly matches the last one in the
1155 * index, but because of multiple stage and CE_REMOVE
1156 * items, we fall through and let the regular search
1166 if (*--slash
== '/')
1168 if (slash
<= ce
->name
)
1173 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1176 * Found one, but not so fast. This could
1177 * be a marker that says "I was here, but
1178 * I am being removed". Such an entry is
1179 * not a part of the resulting tree, and
1180 * it is Ok to have a directory at the same
1183 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1187 remove_index_entry_at(istate
, pos
);
1195 * Trivial optimization: if we find an entry that
1196 * already matches the sub-directory, then we know
1197 * we're ok, and we can exit.
1199 while (pos
< istate
->cache_nr
) {
1200 struct cache_entry
*p
= istate
->cache
[pos
];
1201 if ((ce_namelen(p
) <= len
) ||
1202 (p
->name
[len
] != '/') ||
1203 memcmp(p
->name
, name
, len
))
1204 break; /* not our subdirectory */
1205 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1207 * p is at the same stage as our entry, and
1208 * is a subdirectory of what we are looking
1209 * at, so we cannot have conflicts at our
1210 * level or anything shorter.
1219 /* We may be in a situation where we already have path/file and path
1220 * is being added, or we already have path and path/file is being
1221 * added. Either one would result in a nonsense tree that has path
1222 * twice when git-write-tree tries to write it out. Prevent it.
1224 * If ok-to-replace is specified, we remove the conflicting entries
1225 * from the cache so the caller should recompute the insert position.
1226 * When this happens, we return non-zero.
1228 static int check_file_directory_conflict(struct index_state
*istate
,
1229 const struct cache_entry
*ce
,
1230 int pos
, int ok_to_replace
)
1235 * When ce is an "I am going away" entry, we allow it to be added
1237 if (ce
->ce_flags
& CE_REMOVE
)
1241 * We check if the path is a sub-path of a subsequent pathname
1242 * first, since removing those will not change the position
1245 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1248 * Then check if the path might have a clashing sub-directory
1251 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1254 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1257 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1258 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1259 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1260 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1263 * If this entry's path sorts after the last entry in the index,
1264 * we can avoid searching for it.
1266 if (istate
->cache_nr
> 0 &&
1267 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1268 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1270 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1273 * Cache tree path should be invalidated only after index_name_stage_pos,
1274 * in case it expands a sparse index.
1276 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1277 cache_tree_invalidate_path(istate
, ce
->name
);
1279 /* existing match? Just replace it. */
1282 replace_index_entry(istate
, pos
, ce
);
1287 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1288 untracked_cache_add_to_index(istate
, ce
->name
);
1291 * Inserting a merged entry ("stage 0") into the index
1292 * will always replace all non-merged entries..
1294 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1295 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1297 if (!remove_index_entry_at(istate
, pos
))
1304 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1305 return error(_("invalid path '%s'"), ce
->name
);
1307 if (!skip_df_check
&&
1308 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1310 return error(_("'%s' appears as both a file and as a directory"),
1312 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1318 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1322 if (option
& ADD_CACHE_JUST_APPEND
)
1323 pos
= istate
->cache_nr
;
1326 ret
= add_index_entry_with_check(istate
, ce
, option
);
1332 /* Make sure the array is big enough .. */
1333 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1337 if (istate
->cache_nr
> pos
+ 1)
1338 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1339 istate
->cache_nr
- pos
- 1);
1340 set_index_entry(istate
, pos
, ce
);
1341 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1346 * "refresh" does not calculate a new sha1 file or bring the
1347 * cache up-to-date for mode/content changes. But what it
1348 * _does_ do is to "re-match" the stat information of a file
1349 * with the cache, so that you can refresh the cache for a
1350 * file that hasn't been changed but where the stat entry is
1353 * For example, you'd want to do this after doing a "git-read-tree",
1354 * to link up the stat cache details with the proper files.
1356 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1357 struct cache_entry
*ce
,
1358 unsigned int options
, int *err
,
1364 struct cache_entry
*updated
;
1366 int refresh
= options
& CE_MATCH_REFRESH
;
1367 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1368 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1369 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1370 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1372 if (!refresh
|| ce_uptodate(ce
))
1375 if (!ignore_fsmonitor
)
1376 refresh_fsmonitor(istate
);
1378 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1379 * that the change to the work tree does not matter and told
1382 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1383 ce_mark_uptodate(ce
);
1386 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1387 ce_mark_uptodate(ce
);
1390 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1391 ce_mark_uptodate(ce
);
1395 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1405 if (lstat(ce
->name
, &st
) < 0) {
1406 if (ignore_missing
&& errno
== ENOENT
)
1413 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1415 *changed_ret
= changed
;
1418 * The path is unchanged. If we were told to ignore
1419 * valid bit, then we did the actual stat check and
1420 * found that the entry is unmodified. If the entry
1421 * is not marked VALID, this is the place to mark it
1422 * valid again, under "assume unchanged" mode.
1424 if (ignore_valid
&& assume_unchanged
&&
1425 !(ce
->ce_flags
& CE_VALID
))
1426 ; /* mark this one VALID again */
1429 * We do not mark the index itself "modified"
1430 * because CE_UPTODATE flag is in-core only;
1431 * we are not going to write this change out.
1433 if (!S_ISGITLINK(ce
->ce_mode
)) {
1434 ce_mark_uptodate(ce
);
1435 mark_fsmonitor_valid(istate
, ce
);
1443 if (ie_modified(istate
, ce
, &st
, options
)) {
1449 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1450 copy_cache_entry(updated
, ce
);
1451 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1452 fill_stat_cache_info(istate
, updated
, &st
);
1454 * If ignore_valid is not set, we should leave CE_VALID bit
1455 * alone. Otherwise, paths marked with --no-assume-unchanged
1456 * (i.e. things to be edited) will reacquire CE_VALID bit
1457 * automatically, which is not really what we want.
1459 if (!ignore_valid
&& assume_unchanged
&&
1460 !(ce
->ce_flags
& CE_VALID
))
1461 updated
->ce_flags
&= ~CE_VALID
;
1463 /* istate->cache_changed is updated in the caller */
1467 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1468 int * first
, const char *header_msg
)
1470 if (in_porcelain
&& *first
&& header_msg
) {
1471 printf("%s\n", header_msg
);
1477 int repo_refresh_and_write_index(struct repository
*repo
,
1478 unsigned int refresh_flags
,
1479 unsigned int write_flags
,
1481 const struct pathspec
*pathspec
,
1482 char *seen
, const char *header_msg
)
1484 struct lock_file lock_file
= LOCK_INIT
;
1487 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1488 if (!gentle
&& fd
< 0)
1490 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1492 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1498 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1499 const struct pathspec
*pathspec
,
1500 char *seen
, const char *header_msg
)
1504 int really
= (flags
& REFRESH_REALLY
) != 0;
1505 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1506 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1507 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1508 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1509 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1511 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1512 unsigned int options
= (CE_MATCH_REFRESH
|
1513 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1514 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1515 const char *modified_fmt
;
1516 const char *deleted_fmt
;
1517 const char *typechange_fmt
;
1518 const char *added_fmt
;
1519 const char *unmerged_fmt
;
1520 struct progress
*progress
= NULL
;
1521 int t2_sum_lstat
= 0;
1522 int t2_sum_scan
= 0;
1524 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1525 progress
= start_delayed_progress(_("Refresh index"),
1528 trace_performance_enter();
1529 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1530 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1531 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1532 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1533 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1535 * Use the multi-threaded preload_index() to refresh most of the
1536 * cache entries quickly then in the single threaded loop below,
1537 * we only have to do the special cases that are left.
1539 preload_index(istate
, pathspec
, 0);
1540 trace2_region_enter("index", "refresh", NULL
);
1542 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1543 struct cache_entry
*ce
, *new_entry
;
1544 int cache_errno
= 0;
1547 int t2_did_lstat
= 0;
1548 int t2_did_scan
= 0;
1550 ce
= istate
->cache
[i
];
1551 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1553 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1557 * If this entry is a sparse directory, then there isn't
1558 * any stat() information to update. Ignore the entry.
1560 if (S_ISSPARSEDIR(ce
->ce_mode
))
1563 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1567 while ((i
< istate
->cache_nr
) &&
1568 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1574 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1575 &first
, header_msg
);
1583 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1584 &cache_errno
, &changed
,
1585 &t2_did_lstat
, &t2_did_scan
);
1586 t2_sum_lstat
+= t2_did_lstat
;
1587 t2_sum_scan
+= t2_did_scan
;
1588 if (new_entry
== ce
)
1590 display_progress(progress
, i
);
1594 if (really
&& cache_errno
== EINVAL
) {
1595 /* If we are doing --really-refresh that
1596 * means the index is not valid anymore.
1598 ce
->ce_flags
&= ~CE_VALID
;
1599 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1600 mark_fsmonitor_invalid(istate
, ce
);
1601 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1606 if (cache_errno
== ENOENT
)
1608 else if (ce_intent_to_add(ce
))
1609 fmt
= added_fmt
; /* must be before other checks */
1610 else if (changed
& TYPE_CHANGED
)
1611 fmt
= typechange_fmt
;
1615 ce
->name
, in_porcelain
, &first
, header_msg
);
1620 replace_index_entry(istate
, i
, new_entry
);
1622 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1623 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1624 trace2_region_leave("index", "refresh", NULL
);
1625 display_progress(progress
, istate
->cache_nr
);
1626 stop_progress(&progress
);
1627 trace_performance_leave("refresh index");
1631 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1632 struct cache_entry
*ce
,
1633 unsigned int options
)
1635 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1639 /*****************************************************************
1641 *****************************************************************/
1643 #define INDEX_FORMAT_DEFAULT 3
1645 static unsigned int get_index_format_default(struct repository
*r
)
1647 char *envversion
= getenv("GIT_INDEX_VERSION");
1649 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1652 prepare_repo_settings(r
);
1654 if (r
->settings
.index_version
>= 0)
1655 version
= r
->settings
.index_version
;
1656 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1657 warning(_("index.version set, but the value is invalid.\n"
1658 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1659 return INDEX_FORMAT_DEFAULT
;
1664 version
= strtoul(envversion
, &endp
, 10);
1666 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1667 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1668 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1669 version
= INDEX_FORMAT_DEFAULT
;
1675 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1676 * Again - this is just a (very strong in practice) heuristic that
1677 * the inode hasn't changed.
1679 * We save the fields in big-endian order to allow using the
1680 * index file over NFS transparently.
1682 struct ondisk_cache_entry
{
1683 struct cache_time ctime
;
1684 struct cache_time mtime
;
1692 * unsigned char hash[hashsz];
1694 * if (flags & CE_EXTENDED)
1697 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1698 char name
[FLEX_ARRAY
];
1701 /* These are only used for v3 or lower */
1702 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1703 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1704 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1705 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1706 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1707 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1708 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1710 /* Allow fsck to force verification of the index checksum. */
1711 int verify_index_checksum
;
1713 /* Allow fsck to force verification of the cache entry order. */
1714 int verify_ce_order
;
1716 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1719 unsigned char hash
[GIT_MAX_RAWSZ
];
1721 unsigned char *start
, *end
;
1722 struct object_id oid
;
1724 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1725 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1726 hdr_version
= ntohl(hdr
->hdr_version
);
1727 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1728 return error(_("bad index version %d"), hdr_version
);
1730 if (!verify_index_checksum
)
1733 end
= (unsigned char *)hdr
+ size
;
1734 start
= end
- the_hash_algo
->rawsz
;
1735 oidread(&oid
, start
, the_repository
->hash_algo
);
1736 if (oideq(&oid
, null_oid()))
1739 the_hash_algo
->init_fn(&c
);
1740 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1741 the_hash_algo
->final_fn(hash
, &c
);
1742 if (!hasheq(hash
, start
, the_repository
->hash_algo
))
1743 return error(_("bad index file sha1 signature"));
1747 static int read_index_extension(struct index_state
*istate
,
1748 const char *ext
, const char *data
, unsigned long sz
)
1750 switch (CACHE_EXT(ext
)) {
1751 case CACHE_EXT_TREE
:
1752 istate
->cache_tree
= cache_tree_read(data
, sz
);
1754 case CACHE_EXT_RESOLVE_UNDO
:
1755 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1757 case CACHE_EXT_LINK
:
1758 if (read_link_extension(istate
, data
, sz
))
1761 case CACHE_EXT_UNTRACKED
:
1762 istate
->untracked
= read_untracked_extension(data
, sz
);
1764 case CACHE_EXT_FSMONITOR
:
1765 read_fsmonitor_extension(istate
, data
, sz
);
1767 case CACHE_EXT_ENDOFINDEXENTRIES
:
1768 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1769 /* already handled in do_read_index() */
1771 case CACHE_EXT_SPARSE_DIRECTORIES
:
1772 /* no content, only an indicator */
1773 istate
->sparse_index
= INDEX_COLLAPSED
;
1776 if (*ext
< 'A' || 'Z' < *ext
)
1777 return error(_("index uses %.4s extension, which we do not understand"),
1779 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1786 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1787 * into a new incore 'cache_entry'.
1789 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1790 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1791 * its members. Instead, we use the byte offsets of members within the struct to
1792 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1793 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1794 * into the corresponding incore 'cache_entry' members.
1796 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1797 unsigned int version
,
1799 unsigned long *ent_size
,
1800 const struct cache_entry
*previous_ce
)
1802 struct cache_entry
*ce
;
1805 const unsigned hashsz
= the_hash_algo
->rawsz
;
1806 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1808 size_t copy_len
= 0;
1810 * Adjacent cache entries tend to share the leading paths, so it makes
1811 * sense to only store the differences in later entries. In the v4
1812 * on-disk format of the index, each on-disk cache entry stores the
1813 * number of bytes to be stripped from the end of the previous name,
1814 * and the bytes to append to the result, to come up with its name.
1816 int expand_name_field
= version
== 4;
1818 /* On-disk flags are just 16 bits */
1819 flags
= get_be16(flagsp
);
1820 len
= flags
& CE_NAMEMASK
;
1822 if (flags
& CE_EXTENDED
) {
1824 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1825 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1826 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1827 die(_("unknown index entry format 0x%08x"), extended_flags
);
1828 flags
|= extended_flags
;
1829 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1832 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1834 if (expand_name_field
) {
1835 const unsigned char *cp
= (const unsigned char *)name
;
1836 size_t strip_len
, previous_len
;
1838 /* If we're at the beginning of a block, ignore the previous name */
1839 strip_len
= decode_varint(&cp
);
1841 previous_len
= previous_ce
->ce_namelen
;
1842 if (previous_len
< strip_len
)
1843 die(_("malformed name field in the index, near path '%s'"),
1845 copy_len
= previous_len
- strip_len
;
1847 name
= (const char *)cp
;
1850 if (len
== CE_NAMEMASK
) {
1852 if (expand_name_field
)
1856 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1859 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1860 * with something more akin to 'load_bitmap_entries_v1()'s use of
1861 * 'read_be16'/'read_be32'. For consistency with the corresponding
1862 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1863 * should be done at the same time as removing references to
1864 * 'ondisk_cache_entry' there.
1866 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1867 + offsetof(struct cache_time
, sec
));
1868 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1869 + offsetof(struct cache_time
, sec
));
1870 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1871 + offsetof(struct cache_time
, nsec
));
1872 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1873 + offsetof(struct cache_time
, nsec
));
1874 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1875 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1876 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1877 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1878 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1879 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1880 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1881 ce
->ce_namelen
= len
;
1883 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
),
1884 the_repository
->hash_algo
);
1886 if (expand_name_field
) {
1888 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1889 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1890 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1892 memcpy(ce
->name
, name
, len
+ 1);
1893 *ent_size
= ondisk_ce_size(ce
);
1898 static void check_ce_order(struct index_state
*istate
)
1902 if (!verify_ce_order
)
1905 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1906 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1907 struct cache_entry
*next_ce
= istate
->cache
[i
];
1908 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1910 if (0 < name_compare
)
1911 die(_("unordered stage entries in index"));
1912 if (!name_compare
) {
1914 die(_("multiple stage entries for merged file '%s'"),
1916 if (ce_stage(ce
) > ce_stage(next_ce
))
1917 die(_("unordered stage entries for '%s'"),
1923 static void tweak_untracked_cache(struct index_state
*istate
)
1925 struct repository
*r
= the_repository
;
1927 prepare_repo_settings(r
);
1929 switch (r
->settings
.core_untracked_cache
) {
1930 case UNTRACKED_CACHE_REMOVE
:
1931 remove_untracked_cache(istate
);
1933 case UNTRACKED_CACHE_WRITE
:
1934 add_untracked_cache(istate
);
1936 case UNTRACKED_CACHE_KEEP
:
1938 * Either an explicit "core.untrackedCache=keep", the
1939 * default if "core.untrackedCache" isn't configured,
1940 * or a fallback on an unknown "core.untrackedCache"
1947 static void tweak_split_index(struct index_state
*istate
)
1949 switch (repo_config_get_split_index(the_repository
)) {
1950 case -1: /* unset: do nothing */
1953 remove_split_index(istate
);
1956 add_split_index(istate
);
1958 default: /* unknown value: do nothing */
1963 static void post_read_index_from(struct index_state
*istate
)
1965 check_ce_order(istate
);
1966 tweak_untracked_cache(istate
);
1967 tweak_split_index(istate
);
1968 tweak_fsmonitor(istate
);
1971 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1973 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1976 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1978 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1981 * Account for potential alignment differences.
1983 per_entry
+= align_padding_size(per_entry
, 0);
1984 return ondisk_size
+ entries
* per_entry
;
1987 struct index_entry_offset
1989 /* starting byte offset into index file, count of index entries in this block */
1993 struct index_entry_offset_table
1996 struct index_entry_offset entries
[FLEX_ARRAY
];
1999 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2000 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2002 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2003 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2005 struct load_index_extensions
2008 struct index_state
*istate
;
2011 unsigned long src_offset
;
2014 static void *load_index_extensions(void *_data
)
2016 struct load_index_extensions
*p
= _data
;
2017 unsigned long src_offset
= p
->src_offset
;
2019 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2020 /* After an array of active_nr index entries,
2021 * there can be arbitrary number of extended
2022 * sections, each of which is prefixed with
2023 * extension name (4-byte) and section length
2024 * in 4-byte network byte order.
2026 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2027 if (read_index_extension(p
->istate
,
2028 p
->mmap
+ src_offset
,
2029 p
->mmap
+ src_offset
+ 8,
2031 munmap((void *)p
->mmap
, p
->mmap_size
);
2032 die(_("index file corrupt"));
2035 src_offset
+= extsize
;
2042 * A helper function that will load the specified range of cache entries
2043 * from the memory mapped file and add them to the given index.
2045 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2046 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2047 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2050 unsigned long src_offset
= start_offset
;
2052 for (i
= offset
; i
< offset
+ nr
; i
++) {
2053 struct cache_entry
*ce
;
2054 unsigned long consumed
;
2056 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2058 &consumed
, previous_ce
);
2059 set_index_entry(istate
, i
, ce
);
2061 src_offset
+= consumed
;
2064 return src_offset
- start_offset
;
2067 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2068 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2070 unsigned long consumed
;
2072 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2073 if (istate
->version
== 4) {
2074 mem_pool_init(istate
->ce_mem_pool
,
2075 estimate_cache_size_from_compressed(istate
->cache_nr
));
2077 mem_pool_init(istate
->ce_mem_pool
,
2078 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2081 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2082 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2087 * Mostly randomly chosen maximum thread counts: we
2088 * cap the parallelism to online_cpus() threads, and we want
2089 * to have at least 10000 cache entries per thread for it to
2090 * be worth starting a thread.
2093 #define THREAD_COST (10000)
2095 struct load_cache_entries_thread_data
2098 struct index_state
*istate
;
2099 struct mem_pool
*ce_mem_pool
;
2102 struct index_entry_offset_table
*ieot
;
2103 int ieot_start
; /* starting index into the ieot array */
2104 int ieot_blocks
; /* count of ieot entries to process */
2105 unsigned long consumed
; /* return # of bytes in index file processed */
2109 * A thread proc to run the load_cache_entries() computation
2110 * across multiple background threads.
2112 static void *load_cache_entries_thread(void *_data
)
2114 struct load_cache_entries_thread_data
*p
= _data
;
2117 /* iterate across all ieot blocks assigned to this thread */
2118 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2119 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2120 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2121 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2126 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2127 int nr_threads
, struct index_entry_offset_table
*ieot
)
2129 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2130 struct load_cache_entries_thread_data
*data
;
2131 unsigned long consumed
= 0;
2133 /* a little sanity checking */
2134 if (istate
->name_hash_initialized
)
2135 BUG("the name hash isn't thread safe");
2137 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2138 mem_pool_init(istate
->ce_mem_pool
, 0);
2140 /* ensure we have no more threads than we have blocks to process */
2141 if (nr_threads
> ieot
->nr
)
2142 nr_threads
= ieot
->nr
;
2143 CALLOC_ARRAY(data
, nr_threads
);
2145 offset
= ieot_start
= 0;
2146 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2147 for (i
= 0; i
< nr_threads
; i
++) {
2148 struct load_cache_entries_thread_data
*p
= &data
[i
];
2151 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2152 ieot_blocks
= ieot
->nr
- ieot_start
;
2158 p
->ieot_start
= ieot_start
;
2159 p
->ieot_blocks
= ieot_blocks
;
2161 /* create a mem_pool for each thread */
2163 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2164 nr
+= p
->ieot
->entries
[j
].nr
;
2165 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2166 if (istate
->version
== 4) {
2167 mem_pool_init(p
->ce_mem_pool
,
2168 estimate_cache_size_from_compressed(nr
));
2170 mem_pool_init(p
->ce_mem_pool
,
2171 estimate_cache_size(mmap_size
, nr
));
2174 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2176 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2178 /* increment by the number of cache entries in the ieot block being processed */
2179 for (j
= 0; j
< ieot_blocks
; j
++)
2180 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2181 ieot_start
+= ieot_blocks
;
2184 for (i
= 0; i
< nr_threads
; i
++) {
2185 struct load_cache_entries_thread_data
*p
= &data
[i
];
2187 err
= pthread_join(p
->pthread
, NULL
);
2189 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2190 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2191 consumed
+= p
->consumed
;
2199 static void set_new_index_sparsity(struct index_state
*istate
)
2202 * If the index's repo exists, mark it sparse according to
2205 prepare_repo_settings(istate
->repo
);
2206 if (!istate
->repo
->settings
.command_requires_full_index
&&
2207 is_sparse_index_allowed(istate
, 0))
2208 istate
->sparse_index
= 1;
2211 /* remember to discard_cache() before reading a different cache! */
2212 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2216 unsigned long src_offset
;
2217 const struct cache_header
*hdr
;
2220 struct load_index_extensions p
;
2221 size_t extension_offset
= 0;
2222 int nr_threads
, cpus
;
2223 struct index_entry_offset_table
*ieot
= NULL
;
2225 if (istate
->initialized
)
2226 return istate
->cache_nr
;
2228 istate
->timestamp
.sec
= 0;
2229 istate
->timestamp
.nsec
= 0;
2230 fd
= open(path
, O_RDONLY
);
2232 if (!must_exist
&& errno
== ENOENT
) {
2233 set_new_index_sparsity(istate
);
2234 istate
->initialized
= 1;
2237 die_errno(_("%s: index file open failed"), path
);
2241 die_errno(_("%s: cannot stat the open index"), path
);
2243 mmap_size
= xsize_t(st
.st_size
);
2244 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2245 die(_("%s: index file smaller than expected"), path
);
2247 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2248 if (mmap
== MAP_FAILED
)
2249 die_errno(_("%s: unable to map index file%s"), path
,
2253 hdr
= (const struct cache_header
*)mmap
;
2254 if (verify_hdr(hdr
, mmap_size
) < 0)
2257 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
,
2258 the_repository
->hash_algo
);
2259 istate
->version
= ntohl(hdr
->hdr_version
);
2260 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2261 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2262 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2263 istate
->initialized
= 1;
2267 p
.mmap_size
= mmap_size
;
2269 src_offset
= sizeof(*hdr
);
2271 if (repo_config_get_index_threads(the_repository
, &nr_threads
))
2274 /* TODO: does creating more threads than cores help? */
2276 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2277 cpus
= online_cpus();
2278 if (nr_threads
> cpus
)
2285 if (nr_threads
> 1) {
2286 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2287 if (extension_offset
) {
2290 p
.src_offset
= extension_offset
;
2291 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2293 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2300 * Locate and read the index entry offset table so that we can use it
2301 * to multi-thread the reading of the cache entries.
2303 if (extension_offset
&& nr_threads
> 1)
2304 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2307 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2310 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2313 istate
->timestamp
.sec
= st
.st_mtime
;
2314 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2316 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2317 if (extension_offset
) {
2318 int ret
= pthread_join(p
.pthread
, NULL
);
2320 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2322 p
.src_offset
= src_offset
;
2323 load_index_extensions(&p
);
2325 munmap((void *)mmap
, mmap_size
);
2328 * TODO trace2: replace "the_repository" with the actual repo instance
2329 * that is associated with the given "istate".
2331 trace2_data_intmax("index", the_repository
, "read/version",
2333 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2337 * If the command explicitly requires a full index, force it
2338 * to be full. Otherwise, correct the sparsity based on repository
2339 * settings and other properties of the index (if necessary).
2341 prepare_repo_settings(istate
->repo
);
2342 if (istate
->repo
->settings
.command_requires_full_index
)
2343 ensure_full_index(istate
);
2345 ensure_correct_sparsity(istate
);
2347 return istate
->cache_nr
;
2350 munmap((void *)mmap
, mmap_size
);
2351 die(_("index file corrupt"));
2355 * Signal that the shared index is used by updating its mtime.
2357 * This way, shared index can be removed if they have not been used
2360 static void freshen_shared_index(const char *shared_index
, int warn
)
2362 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2363 warning(_("could not freshen shared index '%s'"), shared_index
);
2366 int read_index_from(struct index_state
*istate
, const char *path
,
2369 struct split_index
*split_index
;
2374 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2375 if (istate
->initialized
)
2376 return istate
->cache_nr
;
2379 * TODO trace2: replace "the_repository" with the actual repo instance
2380 * that is associated with the given "istate".
2382 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2384 trace_performance_enter();
2385 ret
= do_read_index(istate
, path
, 0);
2386 trace_performance_leave("read cache %s", path
);
2387 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2390 split_index
= istate
->split_index
;
2391 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2392 post_read_index_from(istate
);
2396 trace_performance_enter();
2397 if (split_index
->base
)
2398 release_index(split_index
->base
);
2400 ALLOC_ARRAY(split_index
->base
, 1);
2401 index_state_init(split_index
->base
, istate
->repo
);
2403 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2404 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2405 if (file_exists(base_path
)) {
2406 trace2_region_enter_printf("index", "shared/do_read_index",
2407 the_repository
, "%s", base_path
);
2409 ret
= do_read_index(split_index
->base
, base_path
, 0);
2410 trace2_region_leave_printf("index", "shared/do_read_index",
2411 the_repository
, "%s", base_path
);
2413 char *path_copy
= xstrdup(path
);
2414 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2415 dirname(path_copy
), base_oid_hex
);
2417 trace2_region_enter_printf("index", "shared/do_read_index",
2418 the_repository
, "%s", base_path2
);
2419 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2420 trace2_region_leave_printf("index", "shared/do_read_index",
2421 the_repository
, "%s", base_path2
);
2424 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2425 die(_("broken index, expect %s in %s, got %s"),
2426 base_oid_hex
, base_path
,
2427 oid_to_hex(&split_index
->base
->oid
));
2429 freshen_shared_index(base_path
, 0);
2430 merge_base_index(istate
);
2431 post_read_index_from(istate
);
2432 trace_performance_leave("read cache %s", base_path
);
2437 int is_index_unborn(struct index_state
*istate
)
2439 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2442 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2444 struct index_state blank
= INDEX_STATE_INIT(r
);
2445 memcpy(istate
, &blank
, sizeof(*istate
));
2448 void release_index(struct index_state
*istate
)
2451 * Cache entries in istate->cache[] should have been allocated
2452 * from the memory pool associated with this index, or from an
2453 * associated split_index. There is no need to free individual
2454 * cache entries. validate_cache_entries can detect when this
2455 * assertion does not hold.
2457 validate_cache_entries(istate
);
2459 resolve_undo_clear_index(istate
);
2460 free_name_hash(istate
);
2461 cache_tree_free(&(istate
->cache_tree
));
2462 free(istate
->fsmonitor_last_update
);
2463 free(istate
->cache
);
2464 discard_split_index(istate
);
2465 free_untracked_cache(istate
->untracked
);
2467 if (istate
->sparse_checkout_patterns
) {
2468 clear_pattern_list(istate
->sparse_checkout_patterns
);
2469 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2472 if (istate
->ce_mem_pool
) {
2473 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2474 FREE_AND_NULL(istate
->ce_mem_pool
);
2478 void discard_index(struct index_state
*istate
)
2480 release_index(istate
);
2481 index_state_init(istate
, istate
->repo
);
2485 * Validate the cache entries of this index.
2486 * All cache entries associated with this index
2487 * should have been allocated by the memory pool
2488 * associated with this index, or by a referenced
2491 void validate_cache_entries(const struct index_state
*istate
)
2495 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2498 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2500 BUG("cache entry is not allocated from expected memory pool");
2501 } else if (!istate
->ce_mem_pool
||
2502 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2503 if (!istate
->split_index
||
2504 !istate
->split_index
->base
||
2505 !istate
->split_index
->base
->ce_mem_pool
||
2506 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2507 BUG("cache entry is not allocated from expected memory pool");
2512 if (istate
->split_index
)
2513 validate_cache_entries(istate
->split_index
->base
);
2516 int unmerged_index(const struct index_state
*istate
)
2519 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2520 if (ce_stage(istate
->cache
[i
]))
2526 int repo_index_has_changes(struct repository
*repo
,
2530 struct index_state
*istate
= repo
->index
;
2531 struct object_id cmp
;
2535 cmp
= tree
->object
.oid
;
2536 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2537 struct diff_options opt
;
2539 repo_diff_setup(repo
, &opt
);
2540 opt
.flags
.exit_with_status
= 1;
2542 opt
.flags
.quick
= 1;
2543 diff_setup_done(&opt
);
2544 do_diff_cache(&cmp
, &opt
);
2546 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2548 strbuf_addch(sb
, ' ');
2549 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2552 return opt
.flags
.has_changes
!= 0;
2554 /* TODO: audit for interaction with sparse-index. */
2555 ensure_full_index(istate
);
2556 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2558 strbuf_addch(sb
, ' ');
2559 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2561 return !!istate
->cache_nr
;
2565 static int write_index_ext_header(struct hashfile
*f
,
2566 git_hash_ctx
*eoie_f
,
2570 hashwrite_be32(f
, ext
);
2571 hashwrite_be32(f
, sz
);
2576 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2577 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2582 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2583 struct cache_entry
*ce
)
2586 * The only thing we care about in this function is to smudge the
2587 * falsely clean entry due to touch-update-touch race, so we leave
2588 * everything else as they are. We are called for entries whose
2589 * ce_stat_data.sd_mtime match the index file mtime.
2591 * Note that this actually does not do much for gitlinks, for
2592 * which ce_match_stat_basic() always goes to the actual
2593 * contents. The caller checks with is_racy_timestamp() which
2594 * always says "no" for gitlinks, so we are not called for them ;-)
2598 if (lstat(ce
->name
, &st
) < 0)
2600 if (ce_match_stat_basic(ce
, &st
))
2602 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2603 /* This is "racily clean"; smudge it. Note that this
2604 * is a tricky code. At first glance, it may appear
2605 * that it can break with this sequence:
2607 * $ echo xyzzy >frotz
2608 * $ git-update-index --add frotz
2611 * $ echo filfre >nitfol
2612 * $ git-update-index --add nitfol
2614 * but it does not. When the second update-index runs,
2615 * it notices that the entry "frotz" has the same timestamp
2616 * as index, and if we were to smudge it by resetting its
2617 * size to zero here, then the object name recorded
2618 * in index is the 6-byte file but the cached stat information
2619 * becomes zero --- which would then match what we would
2620 * obtain from the filesystem next time we stat("frotz").
2622 * However, the second update-index, before calling
2623 * this function, notices that the cached size is 6
2624 * bytes and what is on the filesystem is an empty
2625 * file, and never calls us, so the cached size information
2626 * for "frotz" stays 6 which does not match the filesystem.
2628 ce
->ce_stat_data
.sd_size
= 0;
2632 /* Copy miscellaneous fields but not the name */
2633 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2634 struct cache_entry
*ce
)
2637 const unsigned hashsz
= the_hash_algo
->rawsz
;
2638 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2640 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2641 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2642 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2643 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2644 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2645 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2646 ondisk
->mode
= htonl(ce
->ce_mode
);
2647 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2648 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2649 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2650 hashcpy(ondisk
->data
, ce
->oid
.hash
, the_repository
->hash_algo
);
2652 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2653 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2654 flagsp
[0] = htons(flags
);
2655 if (ce
->ce_flags
& CE_EXTENDED
) {
2656 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2660 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2661 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2664 unsigned int saved_namelen
;
2665 int stripped_name
= 0;
2666 static unsigned char padding
[8] = { 0x00 };
2668 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2669 saved_namelen
= ce_namelen(ce
);
2674 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2676 if (!previous_name
) {
2677 int len
= ce_namelen(ce
);
2678 copy_cache_entry_to_ondisk(ondisk
, ce
);
2679 hashwrite(f
, ondisk
, size
);
2680 hashwrite(f
, ce
->name
, len
);
2681 hashwrite(f
, padding
, align_padding_size(size
, len
));
2683 int common
, to_remove
, prefix_size
;
2684 unsigned char to_remove_vi
[16];
2686 (ce
->name
[common
] &&
2687 common
< previous_name
->len
&&
2688 ce
->name
[common
] == previous_name
->buf
[common
]);
2690 ; /* still matching */
2691 to_remove
= previous_name
->len
- common
;
2692 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2694 copy_cache_entry_to_ondisk(ondisk
, ce
);
2695 hashwrite(f
, ondisk
, size
);
2696 hashwrite(f
, to_remove_vi
, prefix_size
);
2697 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2698 hashwrite(f
, padding
, 1);
2700 strbuf_splice(previous_name
, common
, to_remove
,
2701 ce
->name
+ common
, ce_namelen(ce
) - common
);
2703 if (stripped_name
) {
2704 ce
->ce_namelen
= saved_namelen
;
2705 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2712 * This function verifies if index_state has the correct sha1 of the
2713 * index file. Don't die if we have any other failure, just return 0.
2715 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2720 unsigned char hash
[GIT_MAX_RAWSZ
];
2722 if (!istate
->initialized
)
2725 fd
= open(path
, O_RDONLY
);
2732 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2735 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2736 if (n
!= the_hash_algo
->rawsz
)
2739 if (!hasheq(istate
->oid
.hash
, hash
, the_repository
->hash_algo
))
2750 static int repo_verify_index(struct repository
*repo
)
2752 return verify_index_from(repo
->index
, repo
->index_file
);
2755 int has_racy_timestamp(struct index_state
*istate
)
2757 int entries
= istate
->cache_nr
;
2760 for (i
= 0; i
< entries
; i
++) {
2761 struct cache_entry
*ce
= istate
->cache
[i
];
2762 if (is_racy_timestamp(istate
, ce
))
2768 void repo_update_index_if_able(struct repository
*repo
,
2769 struct lock_file
*lockfile
)
2771 if ((repo
->index
->cache_changed
||
2772 has_racy_timestamp(repo
->index
)) &&
2773 repo_verify_index(repo
))
2774 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2776 rollback_lock_file(lockfile
);
2779 static int record_eoie(void)
2783 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2787 * As a convenience, the end of index entries extension
2788 * used for threading is written by default if the user
2789 * explicitly requested threaded index reads.
2791 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2794 static int record_ieot(void)
2798 if (!git_config_get_bool("index.recordoffsettable", &val
))
2802 * As a convenience, the offset table used for threading is
2803 * written by default if the user explicitly requested
2804 * threaded index reads.
2806 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2809 enum write_extensions
{
2810 WRITE_NO_EXTENSION
= 0,
2811 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2812 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2813 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2814 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2815 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2817 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2820 * On success, `tempfile` is closed. If it is the temporary file
2821 * of a `struct lock_file`, we will therefore effectively perform
2822 * a 'close_lock_file_gently()`. Since that is an implementation
2823 * detail of lockfiles, callers of `do_write_index()` should not
2826 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2827 enum write_extensions write_extensions
, unsigned flags
)
2829 uint64_t start
= getnanotime();
2831 git_hash_ctx
*eoie_c
= NULL
;
2832 struct cache_header hdr
;
2833 int i
, err
= 0, removed
, extended
, hdr_version
;
2834 struct cache_entry
**cache
= istate
->cache
;
2835 int entries
= istate
->cache_nr
;
2837 struct ondisk_cache_entry ondisk
;
2838 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2839 int drop_cache_tree
= istate
->drop_cache_tree
;
2841 int csum_fsync_flag
;
2842 int ieot_entries
= 1;
2843 struct index_entry_offset_table
*ieot
= NULL
;
2844 struct repository
*r
= istate
->repo
;
2845 struct strbuf sb
= STRBUF_INIT
;
2846 int nr
, nr_threads
, ret
;
2848 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2850 prepare_repo_settings(r
);
2851 f
->skip_hash
= r
->settings
.index_skip_hash
;
2853 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2854 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2857 /* reduce extended entries if possible */
2858 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2859 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2861 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2865 if (!istate
->version
)
2866 istate
->version
= get_index_format_default(r
);
2868 /* demote version 3 to version 2 when the latter suffices */
2869 if (istate
->version
== 3 || istate
->version
== 2)
2870 istate
->version
= extended
? 3 : 2;
2872 hdr_version
= istate
->version
;
2874 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2875 hdr
.hdr_version
= htonl(hdr_version
);
2876 hdr
.hdr_entries
= htonl(entries
- removed
);
2878 hashwrite(f
, &hdr
, sizeof(hdr
));
2880 if (!HAVE_THREADS
|| repo_config_get_index_threads(the_repository
, &nr_threads
))
2883 if (nr_threads
!= 1 && record_ieot()) {
2884 int ieot_blocks
, cpus
;
2887 * ensure default number of ieot blocks maps evenly to the
2888 * default number of threads that will process them leaving
2889 * room for the thread to load the index extensions.
2892 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2893 cpus
= online_cpus();
2894 if (ieot_blocks
> cpus
- 1)
2895 ieot_blocks
= cpus
- 1;
2897 ieot_blocks
= nr_threads
;
2898 if (ieot_blocks
> istate
->cache_nr
)
2899 ieot_blocks
= istate
->cache_nr
;
2903 * no reason to write out the IEOT extension if we don't
2904 * have enough blocks to utilize multi-threading
2906 if (ieot_blocks
> 1) {
2907 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2908 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2909 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2913 offset
= hashfile_total(f
);
2916 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2918 for (i
= 0; i
< entries
; i
++) {
2919 struct cache_entry
*ce
= cache
[i
];
2920 if (ce
->ce_flags
& CE_REMOVE
)
2922 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2923 ce_smudge_racily_clean_entry(istate
, ce
);
2924 if (is_null_oid(&ce
->oid
)) {
2925 static const char msg
[] = "cache entry has null sha1: %s";
2926 static int allow
= -1;
2929 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2931 warning(msg
, ce
->name
);
2933 err
= error(msg
, ce
->name
);
2935 drop_cache_tree
= 1;
2937 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2938 ieot
->entries
[ieot
->nr
].nr
= nr
;
2939 ieot
->entries
[ieot
->nr
].offset
= offset
;
2942 * If we have a V4 index, set the first byte to an invalid
2943 * character to ensure there is nothing common with the previous
2947 previous_name
->buf
[0] = 0;
2950 offset
= hashfile_total(f
);
2952 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2960 ieot
->entries
[ieot
->nr
].nr
= nr
;
2961 ieot
->entries
[ieot
->nr
].offset
= offset
;
2964 strbuf_release(&previous_name_buf
);
2971 offset
= hashfile_total(f
);
2974 * The extension headers must be hashed on their own for the
2975 * EOIE extension. Create a hashfile here to compute that hash.
2977 if (offset
&& record_eoie()) {
2978 CALLOC_ARRAY(eoie_c
, 1);
2979 the_hash_algo
->init_fn(eoie_c
);
2983 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2984 * can minimize the number of extensions we have to scan through to
2985 * find it during load. Write it out regardless of the
2986 * strip_extensions parameter as we need it when loading the shared
2992 write_ieot_extension(&sb
, ieot
);
2993 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2994 hashwrite(f
, sb
.buf
, sb
.len
);
3001 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3002 istate
->split_index
) {
3005 if (istate
->sparse_index
)
3006 die(_("cannot write split index for a sparse index"));
3008 err
= write_link_extension(&sb
, istate
) < 0 ||
3009 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3011 hashwrite(f
, sb
.buf
, sb
.len
);
3017 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3018 !drop_cache_tree
&& istate
->cache_tree
) {
3021 cache_tree_write(&sb
, istate
->cache_tree
);
3022 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3023 hashwrite(f
, sb
.buf
, sb
.len
);
3029 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3030 istate
->resolve_undo
) {
3033 resolve_undo_write(&sb
, istate
->resolve_undo
);
3034 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3036 hashwrite(f
, sb
.buf
, sb
.len
);
3042 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3043 istate
->untracked
) {
3046 write_untracked_extension(&sb
, istate
->untracked
);
3047 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3049 hashwrite(f
, sb
.buf
, sb
.len
);
3055 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3056 istate
->fsmonitor_last_update
) {
3059 write_fsmonitor_extension(&sb
, istate
);
3060 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3061 hashwrite(f
, sb
.buf
, sb
.len
);
3067 if (istate
->sparse_index
) {
3068 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0) {
3075 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3076 * so that it can be found and processed before all the index entries are
3077 * read. Write it out regardless of the strip_extensions parameter as we need it
3078 * when loading the shared index.
3083 write_eoie_extension(&sb
, eoie_c
, offset
);
3084 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3085 hashwrite(f
, sb
.buf
, sb
.len
);
3092 csum_fsync_flag
= 0;
3093 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3094 csum_fsync_flag
= CSUM_FSYNC
;
3096 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3097 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3100 if (close_tempfile_gently(tempfile
)) {
3101 ret
= error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3104 if (stat(get_tempfile_path(tempfile
), &st
)) {
3108 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3109 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3110 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3113 * TODO trace2: replace "the_repository" with the actual repo instance
3114 * that is associated with the given "istate".
3116 trace2_data_intmax("index", the_repository
, "write/version",
3118 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3126 strbuf_release(&sb
);
3131 void set_alternate_index_output(const char *name
)
3133 alternate_index_output
= name
;
3136 static int commit_locked_index(struct lock_file
*lk
)
3138 if (alternate_index_output
)
3139 return commit_lock_file_to(lk
, alternate_index_output
);
3141 return commit_lock_file(lk
);
3144 static int do_write_locked_index(struct index_state
*istate
,
3145 struct lock_file
*lock
,
3147 enum write_extensions write_extensions
)
3150 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3152 ret
= convert_to_sparse(istate
, 0);
3155 warning(_("failed to convert to a sparse-index"));
3160 * TODO trace2: replace "the_repository" with the actual repo instance
3161 * that is associated with the given "istate".
3163 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3164 "%s", get_lock_file_path(lock
));
3165 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3166 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3167 "%s", get_lock_file_path(lock
));
3170 ensure_full_index(istate
);
3174 if (flags
& COMMIT_LOCK
)
3175 ret
= commit_locked_index(lock
);
3177 ret
= close_lock_file_gently(lock
);
3179 run_hooks_l(the_repository
, "post-index-change",
3180 istate
->updated_workdir
? "1" : "0",
3181 istate
->updated_skipworktree
? "1" : "0", NULL
);
3182 istate
->updated_workdir
= 0;
3183 istate
->updated_skipworktree
= 0;
3188 static int write_split_index(struct index_state
*istate
,
3189 struct lock_file
*lock
,
3193 prepare_to_write_split_index(istate
);
3194 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3195 finish_writing_split_index(istate
);
3199 static unsigned long get_shared_index_expire_date(void)
3201 static unsigned long shared_index_expire_date
;
3202 static int shared_index_expire_date_prepared
;
3204 if (!shared_index_expire_date_prepared
) {
3205 const char *shared_index_expire
= "2.weeks.ago";
3208 repo_config_get_expiry(the_repository
, "splitindex.sharedindexexpire",
3211 shared_index_expire
= value
;
3213 shared_index_expire_date
= approxidate(shared_index_expire
);
3214 shared_index_expire_date_prepared
= 1;
3219 return shared_index_expire_date
;
3222 static int should_delete_shared_index(const char *shared_index_path
)
3225 unsigned long expiration
;
3227 /* Check timestamp */
3228 expiration
= get_shared_index_expire_date();
3231 if (stat(shared_index_path
, &st
))
3232 return error_errno(_("could not stat '%s'"), shared_index_path
);
3233 if (st
.st_mtime
> expiration
)
3239 static int clean_shared_index_files(const char *current_hex
)
3242 DIR *dir
= opendir(repo_get_git_dir(the_repository
));
3245 return error_errno(_("unable to open git dir: %s"),
3246 repo_get_git_dir(the_repository
));
3248 while ((de
= readdir(dir
)) != NULL
) {
3249 const char *sha1_hex
;
3250 const char *shared_index_path
;
3251 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3253 if (!strcmp(sha1_hex
, current_hex
))
3255 shared_index_path
= git_path("%s", de
->d_name
);
3256 if (should_delete_shared_index(shared_index_path
) > 0 &&
3257 unlink(shared_index_path
))
3258 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3265 static int write_shared_index(struct index_state
*istate
,
3266 struct tempfile
**temp
, unsigned flags
)
3268 struct split_index
*si
= istate
->split_index
;
3269 int ret
, was_full
= !istate
->sparse_index
;
3271 move_cache_to_base_index(istate
);
3272 convert_to_sparse(istate
, 0);
3274 trace2_region_enter_printf("index", "shared/do_write_index",
3275 the_repository
, "%s", get_tempfile_path(*temp
));
3276 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3277 trace2_region_leave_printf("index", "shared/do_write_index",
3278 the_repository
, "%s", get_tempfile_path(*temp
));
3281 ensure_full_index(istate
);
3285 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3287 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3290 ret
= rename_tempfile(temp
,
3291 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3293 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3294 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3300 static const int default_max_percent_split_change
= 20;
3302 static int too_many_not_shared_entries(struct index_state
*istate
)
3304 int i
, not_shared
= 0;
3305 int max_split
= repo_config_get_max_percent_split_change(the_repository
);
3307 switch (max_split
) {
3309 /* not or badly configured: use the default value */
3310 max_split
= default_max_percent_split_change
;
3313 return 1; /* 0% means always write a new shared index */
3315 return 0; /* 100% means never write a new shared index */
3317 break; /* just use the configured value */
3320 /* Count not shared entries */
3321 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3322 struct cache_entry
*ce
= istate
->cache
[i
];
3327 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3330 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3333 int new_shared_index
, ret
, test_split_index_env
;
3334 struct split_index
*si
= istate
->split_index
;
3336 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3337 cache_tree_verify(the_repository
, istate
);
3339 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3340 if (flags
& COMMIT_LOCK
)
3341 rollback_lock_file(lock
);
3345 if (istate
->fsmonitor_last_update
)
3346 fill_fsmonitor_bitmap(istate
);
3348 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3350 if ((!si
&& !test_split_index_env
) ||
3351 alternate_index_output
||
3352 (istate
->cache_changed
& ~EXTMASK
)) {
3353 ret
= do_write_locked_index(istate
, lock
, flags
,
3354 ~WRITE_SPLIT_INDEX_EXTENSION
);
3358 if (test_split_index_env
) {
3360 si
= init_split_index(istate
);
3361 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3363 int v
= si
->base_oid
.hash
[0];
3365 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3368 if (too_many_not_shared_entries(istate
))
3369 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3371 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3373 if (new_shared_index
) {
3374 struct tempfile
*temp
;
3377 /* Same initial permissions as the main .git/index file */
3378 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3380 ret
= do_write_locked_index(istate
, lock
, flags
,
3381 ~WRITE_SPLIT_INDEX_EXTENSION
);
3384 ret
= write_shared_index(istate
, &temp
, flags
);
3386 saved_errno
= errno
;
3387 if (is_tempfile_active(temp
))
3388 delete_tempfile(&temp
);
3389 errno
= saved_errno
;
3395 ret
= write_split_index(istate
, lock
, flags
);
3397 /* Freshen the shared index only if the split-index was written */
3398 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3399 const char *shared_index
= git_path("sharedindex.%s",
3400 oid_to_hex(&si
->base_oid
));
3401 freshen_shared_index(shared_index
, 1);
3405 if (flags
& COMMIT_LOCK
)
3406 rollback_lock_file(lock
);
3411 * Read the index file that is potentially unmerged into given
3412 * index_state, dropping any unmerged entries to stage #0 (potentially
3413 * resulting in a path appearing as both a file and a directory in the
3414 * index; the caller is responsible to clear out the extra entries
3415 * before writing the index to a tree). Returns true if the index is
3416 * unmerged. Callers who want to refuse to work from an unmerged
3417 * state can call this and check its return value, instead of calling
3420 int repo_read_index_unmerged(struct repository
*repo
)
3422 struct index_state
*istate
;
3426 repo_read_index(repo
);
3427 istate
= repo
->index
;
3428 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3429 struct cache_entry
*ce
= istate
->cache
[i
];
3430 struct cache_entry
*new_ce
;
3436 len
= ce_namelen(ce
);
3437 new_ce
= make_empty_cache_entry(istate
, len
);
3438 memcpy(new_ce
->name
, ce
->name
, len
);
3439 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3440 new_ce
->ce_namelen
= len
;
3441 new_ce
->ce_mode
= ce
->ce_mode
;
3442 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3443 return error(_("%s: cannot drop to stage #0"),
3450 * Returns 1 if the path is an "other" path with respect to
3451 * the index; that is, the path is not mentioned in the index at all,
3452 * either as a file, a directory with some files in the index,
3453 * or as an unmerged entry.
3455 * We helpfully remove a trailing "/" from directories so that
3456 * the output of read_directory can be used as-is.
3458 int index_name_is_other(struct index_state
*istate
, const char *name
,
3462 if (namelen
&& name
[namelen
- 1] == '/')
3464 pos
= index_name_pos(istate
, name
, namelen
);
3466 return 0; /* exact match */
3468 if (pos
< istate
->cache_nr
) {
3469 struct cache_entry
*ce
= istate
->cache
[pos
];
3470 if (ce_namelen(ce
) == namelen
&&
3471 !memcmp(ce
->name
, name
, namelen
))
3472 return 0; /* Yup, this one exists unmerged */
3477 void *read_blob_data_from_index(struct index_state
*istate
,
3478 const char *path
, unsigned long *size
)
3482 enum object_type type
;
3486 pos
= index_name_pos(istate
, path
, len
);
3489 * We might be in the middle of a merge, in which
3490 * case we would read stage #2 (ours).
3494 (pos
< 0 && i
< istate
->cache_nr
&&
3495 !strcmp(istate
->cache
[i
]->name
, path
));
3497 if (ce_stage(istate
->cache
[i
]) == 2)
3502 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3504 if (!data
|| type
!= OBJ_BLOB
) {
3513 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3515 dst
->untracked
= src
->untracked
;
3516 src
->untracked
= NULL
;
3517 dst
->cache_tree
= src
->cache_tree
;
3518 src
->cache_tree
= NULL
;
3521 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3522 struct index_state
*istate
)
3524 unsigned int size
= ce_size(ce
);
3525 int mem_pool_allocated
;
3526 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3527 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3529 memcpy(new_entry
, ce
, size
);
3530 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3534 void discard_cache_entry(struct cache_entry
*ce
)
3536 if (ce
&& should_validate_cache_entries())
3537 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3539 if (ce
&& ce
->mem_pool_allocated
)
3545 int should_validate_cache_entries(void)
3547 static int validate_index_cache_entries
= -1;
3549 if (validate_index_cache_entries
< 0) {
3550 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3551 validate_index_cache_entries
= 1;
3553 validate_index_cache_entries
= 0;
3556 return validate_index_cache_entries
;
3559 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3560 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3562 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3565 * The end of index entries (EOIE) extension is guaranteed to be last
3566 * so that it can be found by scanning backwards from the EOF.
3573 const char *index
, *eoie
;
3575 size_t offset
, src_offset
;
3576 unsigned char hash
[GIT_MAX_RAWSZ
];
3579 /* ensure we have an index big enough to contain an EOIE extension */
3580 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3583 /* validate the extension signature */
3584 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3585 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3587 index
+= sizeof(uint32_t);
3589 /* validate the extension size */
3590 extsize
= get_be32(index
);
3591 if (extsize
!= EOIE_SIZE
)
3593 index
+= sizeof(uint32_t);
3596 * Validate the offset we're going to look for the first extension
3597 * signature is after the index header and before the eoie extension.
3599 offset
= get_be32(index
);
3600 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3602 if (mmap
+ offset
>= eoie
)
3604 index
+= sizeof(uint32_t);
3607 * The hash is computed over extension types and their sizes (but not
3608 * their contents). E.g. if we have "TREE" extension that is N-bytes
3609 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3610 * then the hash would be:
3612 * SHA-1("TREE" + <binary representation of N> +
3613 * "REUC" + <binary representation of M>)
3615 src_offset
= offset
;
3616 the_hash_algo
->init_fn(&c
);
3617 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3618 /* After an array of active_nr index entries,
3619 * there can be arbitrary number of extended
3620 * sections, each of which is prefixed with
3621 * extension name (4-byte) and section length
3622 * in 4-byte network byte order.
3625 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3626 extsize
= ntohl(extsize
);
3628 /* verify the extension size isn't so large it will wrap around */
3629 if (src_offset
+ 8 + extsize
< src_offset
)
3632 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3635 src_offset
+= extsize
;
3637 the_hash_algo
->final_fn(hash
, &c
);
3638 if (!hasheq(hash
, (const unsigned char *)index
, the_repository
->hash_algo
))
3641 /* Validate that the extension offsets returned us back to the eoie extension. */
3642 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3648 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3651 unsigned char hash
[GIT_MAX_RAWSZ
];
3654 put_be32(&buffer
, offset
);
3655 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3658 the_hash_algo
->final_fn(hash
, eoie_context
);
3659 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3662 #define IEOT_VERSION (1)
3664 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3666 const char *index
= NULL
;
3667 uint32_t extsize
, ext_version
;
3668 struct index_entry_offset_table
*ieot
;
3671 /* find the IEOT extension */
3674 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3675 extsize
= get_be32(mmap
+ offset
+ 4);
3676 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3677 index
= mmap
+ offset
+ 4 + 4;
3686 /* validate the version is IEOT_VERSION */
3687 ext_version
= get_be32(index
);
3688 if (ext_version
!= IEOT_VERSION
) {
3689 error("invalid IEOT version %d", ext_version
);
3692 index
+= sizeof(uint32_t);
3694 /* extension size - version bytes / bytes per entry */
3695 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3697 error("invalid number of IEOT entries %d", nr
);
3700 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3701 + (nr
* sizeof(struct index_entry_offset
)));
3703 for (i
= 0; i
< nr
; i
++) {
3704 ieot
->entries
[i
].offset
= get_be32(index
);
3705 index
+= sizeof(uint32_t);
3706 ieot
->entries
[i
].nr
= get_be32(index
);
3707 index
+= sizeof(uint32_t);
3713 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3719 put_be32(&buffer
, IEOT_VERSION
);
3720 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3723 for (i
= 0; i
< ieot
->nr
; i
++) {
3726 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3727 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3730 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3731 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3735 void prefetch_cache_entries(const struct index_state
*istate
,
3736 must_prefetch_predicate must_prefetch
)
3739 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3741 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3742 struct cache_entry
*ce
= istate
->cache
[i
];
3744 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3746 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3748 OBJECT_INFO_FOR_PREFETCH
))
3750 oid_array_append(&to_fetch
, &ce
->oid
);
3752 promisor_remote_get_direct(the_repository
,
3753 to_fetch
.oid
, to_fetch
.nr
);
3754 oid_array_clear(&to_fetch
);
3757 static int read_one_entry_opt(struct index_state
*istate
,
3758 const struct object_id
*oid
,
3759 struct strbuf
*base
,
3760 const char *pathname
,
3761 unsigned mode
, int opt
)
3764 struct cache_entry
*ce
;
3767 return READ_TREE_RECURSIVE
;
3769 len
= strlen(pathname
);
3770 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3772 ce
->ce_mode
= create_ce_mode(mode
);
3773 ce
->ce_flags
= create_ce_flags(1);
3774 ce
->ce_namelen
= base
->len
+ len
;
3775 memcpy(ce
->name
, base
->buf
, base
->len
);
3776 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3777 oidcpy(&ce
->oid
, oid
);
3778 return add_index_entry(istate
, ce
, opt
);
3781 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3782 const char *pathname
, unsigned mode
,
3785 struct index_state
*istate
= context
;
3786 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3788 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3792 * This is used when the caller knows there is no existing entries at
3793 * the stage that will conflict with the entry being added.
3795 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3796 const char *pathname
, unsigned mode
,
3799 struct index_state
*istate
= context
;
3800 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3801 mode
, ADD_CACHE_JUST_APPEND
);
3805 * Read the tree specified with --with-tree option
3806 * (typically, HEAD) into stage #1 and then
3807 * squash them down to stage #0. This is used for
3808 * --error-unmatch to list and check the path patterns
3809 * that were given from the command line. We are not
3810 * going to write this index out.
3812 void overlay_tree_on_index(struct index_state
*istate
,
3813 const char *tree_name
, const char *prefix
)
3816 struct object_id oid
;
3817 struct pathspec pathspec
;
3818 struct cache_entry
*last_stage0
= NULL
;
3820 read_tree_fn_t fn
= NULL
;
3823 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3824 die("tree-ish %s not found.", tree_name
);
3825 tree
= parse_tree_indirect(&oid
);
3827 die("bad tree-ish %s", tree_name
);
3829 /* Hoist the unmerged entries up to stage #3 to make room */
3830 /* TODO: audit for interaction with sparse-index. */
3831 ensure_full_index(istate
);
3832 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3833 struct cache_entry
*ce
= istate
->cache
[i
];
3836 ce
->ce_flags
|= CE_STAGEMASK
;
3840 static const char *(matchbuf
[1]);
3842 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3843 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3845 memset(&pathspec
, 0, sizeof(pathspec
));
3848 * See if we have cache entry at the stage. If so,
3849 * do it the original slow way, otherwise, append and then
3852 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3853 const struct cache_entry
*ce
= istate
->cache
[i
];
3854 if (ce_stage(ce
) == 1)
3855 fn
= read_one_entry
;
3859 fn
= read_one_entry_quick
;
3860 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3861 clear_pathspec(&pathspec
);
3863 die("unable to read tree entries %s", tree_name
);
3866 * Sort the cache entry -- we need to nuke the cache tree, though.
3868 if (fn
== read_one_entry_quick
) {
3869 cache_tree_free(&istate
->cache_tree
);
3870 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3873 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3874 struct cache_entry
*ce
= istate
->cache
[i
];
3875 switch (ce_stage(ce
)) {
3883 * If there is stage #0 entry for this, we do not
3884 * need to show it. We use CE_UPDATE bit to mark
3888 !strcmp(last_stage0
->name
, ce
->name
))
3889 ce
->ce_flags
|= CE_UPDATE
;
3894 struct update_callback_data
{
3895 struct index_state
*index
;
3901 static int fix_unmerged_status(struct diff_filepair
*p
,
3902 struct update_callback_data
*data
)
3904 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3906 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3908 * This is not an explicit add request, and the
3909 * path is missing from the working tree (deleted)
3911 return DIFF_STATUS_DELETED
;
3914 * Either an explicit add request, or path exists
3915 * in the working tree. An attempt to explicitly
3916 * add a path that does not exist in the working tree
3917 * will be caught as an error by the caller immediately.
3919 return DIFF_STATUS_MODIFIED
;
3922 static void update_callback(struct diff_queue_struct
*q
,
3923 struct diff_options
*opt UNUSED
, void *cbdata
)
3926 struct update_callback_data
*data
= cbdata
;
3928 for (i
= 0; i
< q
->nr
; i
++) {
3929 struct diff_filepair
*p
= q
->queue
[i
];
3930 const char *path
= p
->one
->path
;
3932 if (!data
->include_sparse
&&
3933 !path_in_sparse_checkout(path
, data
->index
))
3936 switch (fix_unmerged_status(p
, data
)) {
3938 die(_("unexpected diff status %c"), p
->status
);
3939 case DIFF_STATUS_MODIFIED
:
3940 case DIFF_STATUS_TYPE_CHANGED
:
3941 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3942 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3943 die(_("updating files failed"));
3947 case DIFF_STATUS_DELETED
:
3948 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3950 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3951 remove_file_from_index(data
->index
, path
);
3952 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3953 printf(_("remove '%s'\n"), path
);
3959 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3960 const struct pathspec
*pathspec
, char *ps_matched
,
3961 int include_sparse
, int flags
)
3963 struct update_callback_data data
;
3964 struct rev_info rev
;
3966 memset(&data
, 0, sizeof(data
));
3967 data
.index
= repo
->index
;
3968 data
.include_sparse
= include_sparse
;
3971 repo_init_revisions(repo
, &rev
, prefix
);
3972 setup_revisions(0, NULL
, &rev
, NULL
);
3974 copy_pathspec(&rev
.prune_data
, pathspec
);
3975 rev
.ps_matched
= ps_matched
;
3977 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3978 rev
.diffopt
.format_callback
= update_callback
;
3979 rev
.diffopt
.format_callback_data
= &data
;
3980 rev
.diffopt
.flags
.override_submodule_config
= 1;
3981 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3984 * Use an ODB transaction to optimize adding multiple objects.
3985 * This function is invoked from commands other than 'add', which
3986 * may not have their own transaction active.
3988 begin_odb_transaction();
3989 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3990 end_odb_transaction();
3992 release_revisions(&rev
);
3993 return !!data
.add_errors
;