2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #include "git-compat-util.h"
7 #include "bulk-checkin.h"
15 #include "cache-tree.h"
18 #include "object-file.h"
19 #include "object-store-ll.h"
20 #include "oid-array.h"
24 #include "environment.h"
27 #include "name-hash.h"
28 #include "object-name.h"
30 #include "preload-index.h"
31 #include "read-cache.h"
32 #include "resolve-undo.h"
34 #include "run-command.h"
38 #include "split-index.h"
41 #include "fsmonitor.h"
42 #include "thread-utils.h"
44 #include "sparse-index.h"
45 #include "csum-file.h"
46 #include "promisor-remote.h"
49 /* Mask for the name length in ce_flags in the on-disk index */
51 #define CE_NAMEMASK (0x0fff)
55 * The first letter should be 'A'..'Z' for extensions that are not
56 * necessary for a correct operation (i.e. optimization data).
57 * When new extensions are added that _needs_ to be understood in
58 * order to correctly interpret the index file, pick character that
59 * is outside the range, to cause the reader to abort.
62 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
63 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
64 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
65 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
66 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
67 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
68 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
69 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
70 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
72 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
73 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
74 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
75 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
79 * This is an estimate of the pathname length in the index. We use
80 * this for V4 index files to guess the un-deltafied size of the index
81 * in memory because of pathname deltafication. This is not required
82 * for V2/V3 index formats because their pathnames are not compressed.
83 * If the initial amount of memory set aside is not sufficient, the
84 * mem pool will allocate extra memory.
86 #define CACHE_ENTRY_PATH_LENGTH 80
88 enum index_search_mode
{
93 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
95 struct cache_entry
*ce
;
96 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
97 ce
->mem_pool_allocated
= 1;
101 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
103 struct cache_entry
* ce
;
104 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
105 ce
->mem_pool_allocated
= 1;
109 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
111 struct mem_pool
**pool_ptr
;
113 if (istate
->split_index
&& istate
->split_index
->base
)
114 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
116 pool_ptr
= &istate
->ce_mem_pool
;
119 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
120 mem_pool_init(*pool_ptr
, 0);
126 static const char *alternate_index_output
;
128 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
130 if (S_ISSPARSEDIR(ce
->ce_mode
))
131 istate
->sparse_index
= INDEX_COLLAPSED
;
133 istate
->cache
[nr
] = ce
;
134 add_name_hash(istate
, ce
);
137 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
139 struct cache_entry
*old
= istate
->cache
[nr
];
141 replace_index_entry_in_base(istate
, old
, ce
);
142 remove_name_hash(istate
, old
);
143 discard_cache_entry(old
);
144 ce
->ce_flags
&= ~CE_HASHED
;
145 set_index_entry(istate
, nr
, ce
);
146 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
147 mark_fsmonitor_invalid(istate
, ce
);
148 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
151 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
153 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
154 int namelen
= strlen(new_name
);
156 new_entry
= make_empty_cache_entry(istate
, namelen
);
157 copy_cache_entry(new_entry
, old_entry
);
158 new_entry
->ce_flags
&= ~CE_HASHED
;
159 new_entry
->ce_namelen
= namelen
;
160 new_entry
->index
= 0;
161 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
163 cache_tree_invalidate_path(istate
, old_entry
->name
);
164 untracked_cache_remove_from_index(istate
, old_entry
->name
);
165 remove_index_entry_at(istate
, nr
);
168 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
169 * we only update stat info if the entry is otherwise up-to-date (i.e.,
170 * the contents/mode haven't changed). This ensures that we reflect the
171 * 'ctime' of the rename in the index without (incorrectly) updating
172 * the cached stat info to reflect unstaged changes on disk.
174 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
175 if (refreshed
&& refreshed
!= new_entry
) {
176 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
177 discard_cache_entry(new_entry
);
179 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
183 * This only updates the "non-critical" parts of the directory
184 * cache, ie the parts that aren't tracked by GIT, and only used
185 * to validate the cache.
187 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
189 fill_stat_data(&ce
->ce_stat_data
, st
);
191 if (assume_unchanged
)
192 ce
->ce_flags
|= CE_VALID
;
194 if (S_ISREG(st
->st_mode
)) {
195 ce_mark_uptodate(ce
);
196 mark_fsmonitor_valid(istate
, ce
);
200 static unsigned int st_mode_from_ce(const struct cache_entry
*ce
)
202 extern int trust_executable_bit
, has_symlinks
;
204 switch (ce
->ce_mode
& S_IFMT
) {
206 return has_symlinks
? S_IFLNK
: (S_IFREG
| 0644);
208 return (ce
->ce_mode
& (trust_executable_bit
? 0755 : 0644)) | S_IFREG
;
210 return S_IFDIR
| 0755;
214 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
218 int fake_lstat(const struct cache_entry
*ce
, struct stat
*st
)
220 fake_lstat_data(&ce
->ce_stat_data
, st
);
221 st
->st_mode
= st_mode_from_ce(ce
);
223 /* always succeed as lstat() replacement */
227 static int ce_compare_data(struct index_state
*istate
,
228 const struct cache_entry
*ce
,
232 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
235 struct object_id oid
;
236 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
237 match
= !oideq(&oid
, &ce
->oid
);
238 /* index_fd() closed the file descriptor already */
243 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
248 enum object_type type
;
249 struct strbuf sb
= STRBUF_INIT
;
251 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
254 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
257 match
= memcmp(buffer
, sb
.buf
, size
);
264 static int ce_compare_gitlink(const struct cache_entry
*ce
)
266 struct object_id oid
;
269 * We don't actually require that the .git directory
270 * under GITLINK directory be a valid git directory. It
271 * might even be missing (in case nobody populated that
274 * If so, we consider it always to match.
276 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
278 return !oideq(&oid
, &ce
->oid
);
281 static int ce_modified_check_fs(struct index_state
*istate
,
282 const struct cache_entry
*ce
,
285 switch (st
->st_mode
& S_IFMT
) {
287 if (ce_compare_data(istate
, ce
, st
))
291 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
295 if (S_ISGITLINK(ce
->ce_mode
))
296 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
297 /* else fallthrough */
304 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
306 unsigned int changed
= 0;
308 if (ce
->ce_flags
& CE_REMOVE
)
309 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
311 switch (ce
->ce_mode
& S_IFMT
) {
313 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
314 /* We consider only the owner x bit to be relevant for
317 if (trust_executable_bit
&&
318 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
319 changed
|= MODE_CHANGED
;
322 if (!S_ISLNK(st
->st_mode
) &&
323 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
324 changed
|= TYPE_CHANGED
;
327 /* We ignore most of the st_xxx fields for gitlinks */
328 if (!S_ISDIR(st
->st_mode
))
329 changed
|= TYPE_CHANGED
;
330 else if (ce_compare_gitlink(ce
))
331 changed
|= DATA_CHANGED
;
334 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
337 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
339 /* Racily smudged entry? */
340 if (!ce
->ce_stat_data
.sd_size
) {
341 if (!is_empty_blob_sha1(ce
->oid
.hash
))
342 changed
|= DATA_CHANGED
;
348 static int is_racy_stat(const struct index_state
*istate
,
349 const struct stat_data
*sd
)
351 return (istate
->timestamp
.sec
&&
353 /* nanosecond timestamped files can also be racy! */
354 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
355 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
356 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
358 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
363 int is_racy_timestamp(const struct index_state
*istate
,
364 const struct cache_entry
*ce
)
366 return (!S_ISGITLINK(ce
->ce_mode
) &&
367 is_racy_stat(istate
, &ce
->ce_stat_data
));
370 int match_stat_data_racy(const struct index_state
*istate
,
371 const struct stat_data
*sd
, struct stat
*st
)
373 if (is_racy_stat(istate
, sd
))
374 return MTIME_CHANGED
;
375 return match_stat_data(sd
, st
);
378 int ie_match_stat(struct index_state
*istate
,
379 const struct cache_entry
*ce
, struct stat
*st
,
380 unsigned int options
)
382 unsigned int changed
;
383 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
384 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
385 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
386 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
388 if (!ignore_fsmonitor
)
389 refresh_fsmonitor(istate
);
391 * If it's marked as always valid in the index, it's
392 * valid whatever the checked-out copy says.
394 * skip-worktree has the same effect with higher precedence
396 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
398 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
400 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
404 * Intent-to-add entries have not been added, so the index entry
405 * by definition never matches what is in the work tree until it
406 * actually gets added.
408 if (ce_intent_to_add(ce
))
409 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
411 changed
= ce_match_stat_basic(ce
, st
);
414 * Within 1 second of this sequence:
415 * echo xyzzy >file && git-update-index --add file
416 * running this command:
418 * would give a falsely clean cache entry. The mtime and
419 * length match the cache, and other stat fields do not change.
421 * We could detect this at update-index time (the cache entry
422 * being registered/updated records the same time as "now")
423 * and delay the return from git-update-index, but that would
424 * effectively mean we can make at most one commit per second,
425 * which is not acceptable. Instead, we check cache entries
426 * whose mtime are the same as the index file timestamp more
427 * carefully than others.
429 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
430 if (assume_racy_is_modified
)
431 changed
|= DATA_CHANGED
;
433 changed
|= ce_modified_check_fs(istate
, ce
, st
);
439 int ie_modified(struct index_state
*istate
,
440 const struct cache_entry
*ce
,
441 struct stat
*st
, unsigned int options
)
443 int changed
, changed_fs
;
445 changed
= ie_match_stat(istate
, ce
, st
, options
);
449 * If the mode or type has changed, there's no point in trying
450 * to refresh the entry - it's not going to match
452 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
456 * Immediately after read-tree or update-index --cacheinfo,
457 * the length field is zero, as we have never even read the
458 * lstat(2) information once, and we cannot trust DATA_CHANGED
459 * returned by ie_match_stat() which in turn was returned by
460 * ce_match_stat_basic() to signal that the filesize of the
461 * blob changed. We have to actually go to the filesystem to
462 * see if the contents match, and if so, should answer "unchanged".
464 * The logic does not apply to gitlinks, as ce_match_stat_basic()
465 * already has checked the actual HEAD from the filesystem in the
466 * subproject. If ie_match_stat() already said it is different,
467 * then we know it is.
469 if ((changed
& DATA_CHANGED
) &&
470 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
473 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
475 return changed
| changed_fs
;
479 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
480 const char *name2
, int len2
, int stage2
)
484 cmp
= name_compare(name1
, len1
, name2
, len2
);
495 int cmp_cache_name_compare(const void *a_
, const void *b_
)
497 const struct cache_entry
*ce1
, *ce2
;
499 ce1
= *((const struct cache_entry
**)a_
);
500 ce2
= *((const struct cache_entry
**)b_
);
501 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
502 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
505 static int index_name_stage_pos(struct index_state
*istate
,
506 const char *name
, int namelen
,
508 enum index_search_mode search_mode
)
513 last
= istate
->cache_nr
;
514 while (last
> first
) {
515 int next
= first
+ ((last
- first
) >> 1);
516 struct cache_entry
*ce
= istate
->cache
[next
];
517 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
527 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
529 /* Note: first <= istate->cache_nr */
530 struct cache_entry
*ce
= istate
->cache
[first
- 1];
533 * If we are in a sparse-index _and_ the entry before the
534 * insertion position is a sparse-directory entry that is
535 * an ancestor of 'name', then we need to expand the index
536 * and search again. This will only trigger once, because
537 * thereafter the index is fully expanded.
539 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
540 ce_namelen(ce
) < namelen
&&
541 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
542 ensure_full_index(istate
);
543 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
550 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
552 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
555 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
557 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
560 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
562 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
565 int remove_index_entry_at(struct index_state
*istate
, int pos
)
567 struct cache_entry
*ce
= istate
->cache
[pos
];
569 record_resolve_undo(istate
, ce
);
570 remove_name_hash(istate
, ce
);
571 save_or_free_index_entry(istate
, ce
);
572 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
574 if (pos
>= istate
->cache_nr
)
576 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
577 istate
->cache_nr
- pos
);
582 * Remove all cache entries marked for removal, that is where
583 * CE_REMOVE is set in ce_flags. This is much more effective than
584 * calling remove_index_entry_at() for each entry to be removed.
586 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
588 struct cache_entry
**ce_array
= istate
->cache
;
591 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
592 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
594 cache_tree_invalidate_path(istate
,
596 untracked_cache_remove_from_index(istate
,
599 remove_name_hash(istate
, ce_array
[i
]);
600 save_or_free_index_entry(istate
, ce_array
[i
]);
603 ce_array
[j
++] = ce_array
[i
];
605 if (j
== istate
->cache_nr
)
607 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
608 istate
->cache_nr
= j
;
611 int remove_file_from_index(struct index_state
*istate
, const char *path
)
613 int pos
= index_name_pos(istate
, path
, strlen(path
));
616 cache_tree_invalidate_path(istate
, path
);
617 untracked_cache_remove_from_index(istate
, path
);
618 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
619 remove_index_entry_at(istate
, pos
);
623 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
625 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
628 static int index_name_pos_also_unmerged(struct index_state
*istate
,
629 const char *path
, int namelen
)
631 int pos
= index_name_pos(istate
, path
, namelen
);
632 struct cache_entry
*ce
;
637 /* maybe unmerged? */
639 if (pos
>= istate
->cache_nr
||
640 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
643 /* order of preference: stage 2, 1, 3 */
644 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
645 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
646 !compare_name(ce
, path
, namelen
))
651 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
653 int len
= ce_namelen(ce
);
654 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
658 * If we add a filename that aliases in the cache, we will use the
659 * name that we already have - but we don't want to update the same
660 * alias twice, because that implies that there were actually two
661 * different files with aliasing names!
663 * So we use the CE_ADDED flag to verify that the alias was an old
664 * one before we accept it as
666 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
667 struct cache_entry
*ce
,
668 struct cache_entry
*alias
)
671 struct cache_entry
*new_entry
;
673 if (alias
->ce_flags
& CE_ADDED
)
674 die(_("will not add file alias '%s' ('%s' already exists in index)"),
675 ce
->name
, alias
->name
);
677 /* Ok, create the new entry using the name of the existing alias */
678 len
= ce_namelen(alias
);
679 new_entry
= make_empty_cache_entry(istate
, len
);
680 memcpy(new_entry
->name
, alias
->name
, len
);
681 copy_cache_entry(new_entry
, ce
);
682 save_or_free_index_entry(istate
, ce
);
686 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
688 struct object_id oid
;
689 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
690 die(_("cannot create an empty blob in the object database"));
691 oidcpy(&ce
->oid
, &oid
);
694 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
696 int namelen
, was_same
;
697 mode_t st_mode
= st
->st_mode
;
698 struct cache_entry
*ce
, *alias
= NULL
;
699 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
700 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
701 int pretend
= flags
& ADD_CACHE_PRETEND
;
702 int intent_only
= flags
& ADD_CACHE_INTENT
;
703 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
704 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
705 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
706 struct object_id oid
;
708 if (flags
& ADD_CACHE_RENORMALIZE
)
709 hash_flags
|= HASH_RENORMALIZE
;
711 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
712 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
714 namelen
= strlen(path
);
715 if (S_ISDIR(st_mode
)) {
716 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
717 return error(_("'%s' does not have a commit checked out"), path
);
718 while (namelen
&& path
[namelen
-1] == '/')
721 ce
= make_empty_cache_entry(istate
, namelen
);
722 memcpy(ce
->name
, path
, namelen
);
723 ce
->ce_namelen
= namelen
;
725 fill_stat_cache_info(istate
, ce
, st
);
727 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
730 if (trust_executable_bit
&& has_symlinks
) {
731 ce
->ce_mode
= create_ce_mode(st_mode
);
733 /* If there is an existing entry, pick the mode bits and type
734 * from it, otherwise assume unexecutable regular file.
736 struct cache_entry
*ent
;
737 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
739 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
740 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
743 /* When core.ignorecase=true, determine if a directory of the same name but differing
744 * case already exists within the Git repository. If it does, ensure the directory
745 * case of the file being added to the repository matches (is folded into) the existing
746 * entry's directory case.
749 adjust_dirname_case(istate
, ce
->name
);
751 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
752 alias
= index_file_exists(istate
, ce
->name
,
753 ce_namelen(ce
), ignore_case
);
756 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
757 /* Nothing changed, really */
758 if (!S_ISGITLINK(alias
->ce_mode
))
759 ce_mark_uptodate(alias
);
760 alias
->ce_flags
|= CE_ADDED
;
762 discard_cache_entry(ce
);
767 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
768 discard_cache_entry(ce
);
769 return error(_("unable to index file '%s'"), path
);
772 set_object_name_for_intent_to_add_entry(ce
);
774 if (ignore_case
&& alias
&& different_name(ce
, alias
))
775 ce
= create_alias_ce(istate
, ce
, alias
);
776 ce
->ce_flags
|= CE_ADDED
;
778 /* It was suspected to be racily clean, but it turns out to be Ok */
781 oideq(&alias
->oid
, &ce
->oid
) &&
782 ce
->ce_mode
== alias
->ce_mode
);
785 discard_cache_entry(ce
);
786 else if (add_index_entry(istate
, ce
, add_option
)) {
787 discard_cache_entry(ce
);
788 return error(_("unable to add '%s' to index"), path
);
790 if (verbose
&& !was_same
)
791 printf("add '%s'\n", path
);
795 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
798 if (lstat(path
, &st
))
799 die_errno(_("unable to stat '%s'"), path
);
800 return add_to_index(istate
, path
, &st
, flags
);
803 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
805 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
808 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
809 struct mem_pool
*ce_mem_pool
)
812 return mem_pool__ce_calloc(ce_mem_pool
, len
);
813 return xcalloc(1, cache_entry_size(len
));
816 enum verify_path_result
{
822 static enum verify_path_result
verify_path_internal(const char *, unsigned);
824 int verify_path(const char *path
, unsigned mode
)
826 return verify_path_internal(path
, mode
) == PATH_OK
;
829 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
831 const struct object_id
*oid
,
834 unsigned int refresh_options
)
836 struct cache_entry
*ce
, *ret
;
839 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
840 error(_("invalid path '%s'"), path
);
845 ce
= make_empty_cache_entry(istate
, len
);
847 oidcpy(&ce
->oid
, oid
);
848 memcpy(ce
->name
, path
, len
);
849 ce
->ce_flags
= create_ce_flags(stage
);
850 ce
->ce_namelen
= len
;
851 ce
->ce_mode
= create_ce_mode(mode
);
853 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
855 discard_cache_entry(ce
);
859 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
860 const struct object_id
*oid
,
863 struct mem_pool
*ce_mem_pool
)
865 struct cache_entry
*ce
;
868 if (!verify_path(path
, mode
)) {
869 error(_("invalid path '%s'"), path
);
874 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
876 oidcpy(&ce
->oid
, oid
);
877 memcpy(ce
->name
, path
, len
);
878 ce
->ce_flags
= create_ce_flags(stage
);
879 ce
->ce_namelen
= len
;
880 ce
->ce_mode
= create_ce_mode(mode
);
886 * Chmod an index entry with either +x or -x.
888 * Returns -1 if the chmod for the particular cache entry failed (if it's
889 * not a regular file), -2 if an invalid flip argument is passed in, 0
892 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
895 if (!S_ISREG(ce
->ce_mode
))
902 ce
->ce_mode
&= ~0111;
907 cache_tree_invalidate_path(istate
, ce
->name
);
908 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
909 mark_fsmonitor_invalid(istate
, ce
);
910 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
915 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
917 int len
= ce_namelen(a
);
918 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
922 * We fundamentally don't like some paths: we don't want
923 * dot or dot-dot anywhere, and for obvious reasons don't
924 * want to recurse into ".git" either.
926 * Also, we don't want double slashes or slashes at the
927 * end that can make pathnames ambiguous.
929 static int verify_dotfile(const char *rest
, unsigned mode
)
932 * The first character was '.', but that
933 * has already been discarded, we now test
937 /* "." is not allowed */
938 if (*rest
== '\0' || is_dir_sep(*rest
))
943 * ".git" followed by NUL or slash is bad. Note that we match
944 * case-insensitively here, even if ignore_case is not set.
945 * This outlaws ".GIT" everywhere out of an abundance of caution,
946 * since there's really no good reason to allow it.
948 * Once we've seen ".git", we can also find ".gitmodules", etc (also
949 * case-insensitively).
953 if (rest
[1] != 'i' && rest
[1] != 'I')
955 if (rest
[2] != 't' && rest
[2] != 'T')
957 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
961 if (skip_iprefix(rest
, "modules", &rest
) &&
962 (*rest
== '\0' || is_dir_sep(*rest
)))
967 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
973 static enum verify_path_result
verify_path_internal(const char *path
,
978 if (has_dos_drive_prefix(path
))
981 if (!is_valid_path(path
))
992 if (is_hfs_dotgit(path
))
995 if (is_hfs_dotgitmodules(path
))
1000 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1002 return PATH_INVALID
;
1004 if (is_ntfs_dotgit(path
))
1005 return PATH_INVALID
;
1006 if (S_ISLNK(mode
)) {
1007 if (is_ntfs_dotgitmodules(path
))
1008 return PATH_INVALID
;
1013 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1015 return PATH_INVALID
;
1017 * allow terminating directory separators for
1018 * sparse directory entries.
1021 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1023 } else if (c
== '\\' && protect_ntfs
) {
1024 if (is_ntfs_dotgit(path
))
1025 return PATH_INVALID
;
1026 if (S_ISLNK(mode
)) {
1027 if (is_ntfs_dotgitmodules(path
))
1028 return PATH_INVALID
;
1037 * Do we have another file that has the beginning components being a
1038 * proper superset of the name we're trying to add?
1040 static int has_file_name(struct index_state
*istate
,
1041 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1044 int len
= ce_namelen(ce
);
1045 int stage
= ce_stage(ce
);
1046 const char *name
= ce
->name
;
1048 while (pos
< istate
->cache_nr
) {
1049 struct cache_entry
*p
= istate
->cache
[pos
++];
1051 if (len
>= ce_namelen(p
))
1053 if (memcmp(name
, p
->name
, len
))
1055 if (ce_stage(p
) != stage
)
1057 if (p
->name
[len
] != '/')
1059 if (p
->ce_flags
& CE_REMOVE
)
1064 remove_index_entry_at(istate
, --pos
);
1071 * Like strcmp(), but also return the offset of the first change.
1072 * If strings are equal, return the length.
1074 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1079 return strcmp(s1
, s2
);
1081 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1086 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1090 * Do we have another file with a pathname that is a proper
1091 * subset of the name we're trying to add?
1093 * That is, is there another file in the index with a path
1094 * that matches a sub-directory in the given entry?
1096 static int has_dir_name(struct index_state
*istate
,
1097 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1100 int stage
= ce_stage(ce
);
1101 const char *name
= ce
->name
;
1102 const char *slash
= name
+ ce_namelen(ce
);
1107 * We are frequently called during an iteration on a sorted
1108 * list of pathnames and while building a new index. Therefore,
1109 * there is a high probability that this entry will eventually
1110 * be appended to the index, rather than inserted in the middle.
1111 * If we can confirm that, we can avoid binary searches on the
1112 * components of the pathname.
1114 * Compare the entry's full path with the last path in the index.
1116 if (istate
->cache_nr
> 0) {
1117 cmp_last
= strcmp_offset(name
,
1118 istate
->cache
[istate
->cache_nr
- 1]->name
,
1121 if (len_eq_last
== 0) {
1123 * The entry sorts AFTER the last one in the
1124 * index and their paths have no common prefix,
1125 * so there cannot be a F/D conflict.
1130 * The entry sorts AFTER the last one in the
1131 * index, but has a common prefix. Fall through
1132 * to the loop below to disect the entry's path
1133 * and see where the difference is.
1136 } else if (cmp_last
== 0) {
1138 * The entry exactly matches the last one in the
1139 * index, but because of multiple stage and CE_REMOVE
1140 * items, we fall through and let the regular search
1150 if (*--slash
== '/')
1152 if (slash
<= ce
->name
)
1159 * (len + 1) is a directory boundary (including
1160 * the trailing slash). And since the loop is
1161 * decrementing "slash", the first iteration is
1162 * the longest directory prefix; subsequent
1163 * iterations consider parent directories.
1166 if (len
+ 1 <= len_eq_last
) {
1168 * The directory prefix (including the trailing
1169 * slash) also appears as a prefix in the last
1170 * entry, so the remainder cannot collide (because
1171 * strcmp said the whole path was greater).
1176 * LT: last: xxx/file_A
1182 if (len
> len_eq_last
) {
1184 * This part of the directory prefix (excluding
1185 * the trailing slash) is longer than the known
1186 * equal portions, so this sub-directory cannot
1187 * collide with a file.
1196 * This is a possible collision. Fall through and
1197 * let the regular search code handle it.
1204 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1207 * Found one, but not so fast. This could
1208 * be a marker that says "I was here, but
1209 * I am being removed". Such an entry is
1210 * not a part of the resulting tree, and
1211 * it is Ok to have a directory at the same
1214 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1218 remove_index_entry_at(istate
, pos
);
1226 * Trivial optimization: if we find an entry that
1227 * already matches the sub-directory, then we know
1228 * we're ok, and we can exit.
1230 while (pos
< istate
->cache_nr
) {
1231 struct cache_entry
*p
= istate
->cache
[pos
];
1232 if ((ce_namelen(p
) <= len
) ||
1233 (p
->name
[len
] != '/') ||
1234 memcmp(p
->name
, name
, len
))
1235 break; /* not our subdirectory */
1236 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1238 * p is at the same stage as our entry, and
1239 * is a subdirectory of what we are looking
1240 * at, so we cannot have conflicts at our
1241 * level or anything shorter.
1250 /* We may be in a situation where we already have path/file and path
1251 * is being added, or we already have path and path/file is being
1252 * added. Either one would result in a nonsense tree that has path
1253 * twice when git-write-tree tries to write it out. Prevent it.
1255 * If ok-to-replace is specified, we remove the conflicting entries
1256 * from the cache so the caller should recompute the insert position.
1257 * When this happens, we return non-zero.
1259 static int check_file_directory_conflict(struct index_state
*istate
,
1260 const struct cache_entry
*ce
,
1261 int pos
, int ok_to_replace
)
1266 * When ce is an "I am going away" entry, we allow it to be added
1268 if (ce
->ce_flags
& CE_REMOVE
)
1272 * We check if the path is a sub-path of a subsequent pathname
1273 * first, since removing those will not change the position
1276 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1279 * Then check if the path might have a clashing sub-directory
1282 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1285 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1288 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1289 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1290 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1291 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1294 * If this entry's path sorts after the last entry in the index,
1295 * we can avoid searching for it.
1297 if (istate
->cache_nr
> 0 &&
1298 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1299 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1301 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1304 * Cache tree path should be invalidated only after index_name_stage_pos,
1305 * in case it expands a sparse index.
1307 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1308 cache_tree_invalidate_path(istate
, ce
->name
);
1310 /* existing match? Just replace it. */
1313 replace_index_entry(istate
, pos
, ce
);
1318 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1319 untracked_cache_add_to_index(istate
, ce
->name
);
1322 * Inserting a merged entry ("stage 0") into the index
1323 * will always replace all non-merged entries..
1325 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1326 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1328 if (!remove_index_entry_at(istate
, pos
))
1335 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1336 return error(_("invalid path '%s'"), ce
->name
);
1338 if (!skip_df_check
&&
1339 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1341 return error(_("'%s' appears as both a file and as a directory"),
1343 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1349 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1353 if (option
& ADD_CACHE_JUST_APPEND
)
1354 pos
= istate
->cache_nr
;
1357 ret
= add_index_entry_with_check(istate
, ce
, option
);
1363 /* Make sure the array is big enough .. */
1364 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1368 if (istate
->cache_nr
> pos
+ 1)
1369 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1370 istate
->cache_nr
- pos
- 1);
1371 set_index_entry(istate
, pos
, ce
);
1372 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1377 * "refresh" does not calculate a new sha1 file or bring the
1378 * cache up-to-date for mode/content changes. But what it
1379 * _does_ do is to "re-match" the stat information of a file
1380 * with the cache, so that you can refresh the cache for a
1381 * file that hasn't been changed but where the stat entry is
1384 * For example, you'd want to do this after doing a "git-read-tree",
1385 * to link up the stat cache details with the proper files.
1387 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1388 struct cache_entry
*ce
,
1389 unsigned int options
, int *err
,
1395 struct cache_entry
*updated
;
1397 int refresh
= options
& CE_MATCH_REFRESH
;
1398 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1399 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1400 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1401 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1403 if (!refresh
|| ce_uptodate(ce
))
1406 if (!ignore_fsmonitor
)
1407 refresh_fsmonitor(istate
);
1409 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1410 * that the change to the work tree does not matter and told
1413 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1414 ce_mark_uptodate(ce
);
1417 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1418 ce_mark_uptodate(ce
);
1421 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1422 ce_mark_uptodate(ce
);
1426 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1436 if (lstat(ce
->name
, &st
) < 0) {
1437 if (ignore_missing
&& errno
== ENOENT
)
1444 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1446 *changed_ret
= changed
;
1449 * The path is unchanged. If we were told to ignore
1450 * valid bit, then we did the actual stat check and
1451 * found that the entry is unmodified. If the entry
1452 * is not marked VALID, this is the place to mark it
1453 * valid again, under "assume unchanged" mode.
1455 if (ignore_valid
&& assume_unchanged
&&
1456 !(ce
->ce_flags
& CE_VALID
))
1457 ; /* mark this one VALID again */
1460 * We do not mark the index itself "modified"
1461 * because CE_UPTODATE flag is in-core only;
1462 * we are not going to write this change out.
1464 if (!S_ISGITLINK(ce
->ce_mode
)) {
1465 ce_mark_uptodate(ce
);
1466 mark_fsmonitor_valid(istate
, ce
);
1474 if (ie_modified(istate
, ce
, &st
, options
)) {
1480 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1481 copy_cache_entry(updated
, ce
);
1482 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1483 fill_stat_cache_info(istate
, updated
, &st
);
1485 * If ignore_valid is not set, we should leave CE_VALID bit
1486 * alone. Otherwise, paths marked with --no-assume-unchanged
1487 * (i.e. things to be edited) will reacquire CE_VALID bit
1488 * automatically, which is not really what we want.
1490 if (!ignore_valid
&& assume_unchanged
&&
1491 !(ce
->ce_flags
& CE_VALID
))
1492 updated
->ce_flags
&= ~CE_VALID
;
1494 /* istate->cache_changed is updated in the caller */
1498 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1499 int * first
, const char *header_msg
)
1501 if (in_porcelain
&& *first
&& header_msg
) {
1502 printf("%s\n", header_msg
);
1508 int repo_refresh_and_write_index(struct repository
*repo
,
1509 unsigned int refresh_flags
,
1510 unsigned int write_flags
,
1512 const struct pathspec
*pathspec
,
1513 char *seen
, const char *header_msg
)
1515 struct lock_file lock_file
= LOCK_INIT
;
1518 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1519 if (!gentle
&& fd
< 0)
1521 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1523 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1529 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1530 const struct pathspec
*pathspec
,
1531 char *seen
, const char *header_msg
)
1535 int really
= (flags
& REFRESH_REALLY
) != 0;
1536 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1537 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1538 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1539 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1540 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1542 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1543 unsigned int options
= (CE_MATCH_REFRESH
|
1544 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1545 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1546 const char *modified_fmt
;
1547 const char *deleted_fmt
;
1548 const char *typechange_fmt
;
1549 const char *added_fmt
;
1550 const char *unmerged_fmt
;
1551 struct progress
*progress
= NULL
;
1552 int t2_sum_lstat
= 0;
1553 int t2_sum_scan
= 0;
1555 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1556 progress
= start_delayed_progress(_("Refresh index"),
1559 trace_performance_enter();
1560 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1561 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1562 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1563 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1564 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1566 * Use the multi-threaded preload_index() to refresh most of the
1567 * cache entries quickly then in the single threaded loop below,
1568 * we only have to do the special cases that are left.
1570 preload_index(istate
, pathspec
, 0);
1571 trace2_region_enter("index", "refresh", NULL
);
1573 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1574 struct cache_entry
*ce
, *new_entry
;
1575 int cache_errno
= 0;
1578 int t2_did_lstat
= 0;
1579 int t2_did_scan
= 0;
1581 ce
= istate
->cache
[i
];
1582 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1584 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1588 * If this entry is a sparse directory, then there isn't
1589 * any stat() information to update. Ignore the entry.
1591 if (S_ISSPARSEDIR(ce
->ce_mode
))
1594 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1598 while ((i
< istate
->cache_nr
) &&
1599 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1605 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1606 &first
, header_msg
);
1614 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1615 &cache_errno
, &changed
,
1616 &t2_did_lstat
, &t2_did_scan
);
1617 t2_sum_lstat
+= t2_did_lstat
;
1618 t2_sum_scan
+= t2_did_scan
;
1619 if (new_entry
== ce
)
1621 display_progress(progress
, i
);
1625 if (really
&& cache_errno
== EINVAL
) {
1626 /* If we are doing --really-refresh that
1627 * means the index is not valid anymore.
1629 ce
->ce_flags
&= ~CE_VALID
;
1630 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1631 mark_fsmonitor_invalid(istate
, ce
);
1632 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1637 if (cache_errno
== ENOENT
)
1639 else if (ce_intent_to_add(ce
))
1640 fmt
= added_fmt
; /* must be before other checks */
1641 else if (changed
& TYPE_CHANGED
)
1642 fmt
= typechange_fmt
;
1646 ce
->name
, in_porcelain
, &first
, header_msg
);
1651 replace_index_entry(istate
, i
, new_entry
);
1653 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1654 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1655 trace2_region_leave("index", "refresh", NULL
);
1656 display_progress(progress
, istate
->cache_nr
);
1657 stop_progress(&progress
);
1658 trace_performance_leave("refresh index");
1662 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1663 struct cache_entry
*ce
,
1664 unsigned int options
)
1666 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1670 /*****************************************************************
1672 *****************************************************************/
1674 #define INDEX_FORMAT_DEFAULT 3
1676 static unsigned int get_index_format_default(struct repository
*r
)
1678 char *envversion
= getenv("GIT_INDEX_VERSION");
1680 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1683 prepare_repo_settings(r
);
1685 if (r
->settings
.index_version
>= 0)
1686 version
= r
->settings
.index_version
;
1687 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1688 warning(_("index.version set, but the value is invalid.\n"
1689 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1690 return INDEX_FORMAT_DEFAULT
;
1695 version
= strtoul(envversion
, &endp
, 10);
1697 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1698 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1699 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1700 version
= INDEX_FORMAT_DEFAULT
;
1706 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1707 * Again - this is just a (very strong in practice) heuristic that
1708 * the inode hasn't changed.
1710 * We save the fields in big-endian order to allow using the
1711 * index file over NFS transparently.
1713 struct ondisk_cache_entry
{
1714 struct cache_time ctime
;
1715 struct cache_time mtime
;
1723 * unsigned char hash[hashsz];
1725 * if (flags & CE_EXTENDED)
1728 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1729 char name
[FLEX_ARRAY
];
1732 /* These are only used for v3 or lower */
1733 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1734 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1735 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1736 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1737 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1738 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1739 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1741 /* Allow fsck to force verification of the index checksum. */
1742 int verify_index_checksum
;
1744 /* Allow fsck to force verification of the cache entry order. */
1745 int verify_ce_order
;
1747 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1750 unsigned char hash
[GIT_MAX_RAWSZ
];
1752 unsigned char *start
, *end
;
1753 struct object_id oid
;
1755 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1756 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1757 hdr_version
= ntohl(hdr
->hdr_version
);
1758 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1759 return error(_("bad index version %d"), hdr_version
);
1761 if (!verify_index_checksum
)
1764 end
= (unsigned char *)hdr
+ size
;
1765 start
= end
- the_hash_algo
->rawsz
;
1766 oidread(&oid
, start
);
1767 if (oideq(&oid
, null_oid()))
1770 the_hash_algo
->init_fn(&c
);
1771 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1772 the_hash_algo
->final_fn(hash
, &c
);
1773 if (!hasheq(hash
, start
))
1774 return error(_("bad index file sha1 signature"));
1778 static int read_index_extension(struct index_state
*istate
,
1779 const char *ext
, const char *data
, unsigned long sz
)
1781 switch (CACHE_EXT(ext
)) {
1782 case CACHE_EXT_TREE
:
1783 istate
->cache_tree
= cache_tree_read(data
, sz
);
1785 case CACHE_EXT_RESOLVE_UNDO
:
1786 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1788 case CACHE_EXT_LINK
:
1789 if (read_link_extension(istate
, data
, sz
))
1792 case CACHE_EXT_UNTRACKED
:
1793 istate
->untracked
= read_untracked_extension(data
, sz
);
1795 case CACHE_EXT_FSMONITOR
:
1796 read_fsmonitor_extension(istate
, data
, sz
);
1798 case CACHE_EXT_ENDOFINDEXENTRIES
:
1799 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1800 /* already handled in do_read_index() */
1802 case CACHE_EXT_SPARSE_DIRECTORIES
:
1803 /* no content, only an indicator */
1804 istate
->sparse_index
= INDEX_COLLAPSED
;
1807 if (*ext
< 'A' || 'Z' < *ext
)
1808 return error(_("index uses %.4s extension, which we do not understand"),
1810 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1817 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1818 * into a new incore 'cache_entry'.
1820 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1821 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1822 * its members. Instead, we use the byte offsets of members within the struct to
1823 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1824 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1825 * into the corresponding incore 'cache_entry' members.
1827 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1828 unsigned int version
,
1830 unsigned long *ent_size
,
1831 const struct cache_entry
*previous_ce
)
1833 struct cache_entry
*ce
;
1836 const unsigned hashsz
= the_hash_algo
->rawsz
;
1837 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1839 size_t copy_len
= 0;
1841 * Adjacent cache entries tend to share the leading paths, so it makes
1842 * sense to only store the differences in later entries. In the v4
1843 * on-disk format of the index, each on-disk cache entry stores the
1844 * number of bytes to be stripped from the end of the previous name,
1845 * and the bytes to append to the result, to come up with its name.
1847 int expand_name_field
= version
== 4;
1849 /* On-disk flags are just 16 bits */
1850 flags
= get_be16(flagsp
);
1851 len
= flags
& CE_NAMEMASK
;
1853 if (flags
& CE_EXTENDED
) {
1855 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1856 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1857 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1858 die(_("unknown index entry format 0x%08x"), extended_flags
);
1859 flags
|= extended_flags
;
1860 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1863 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1865 if (expand_name_field
) {
1866 const unsigned char *cp
= (const unsigned char *)name
;
1867 size_t strip_len
, previous_len
;
1869 /* If we're at the beginning of a block, ignore the previous name */
1870 strip_len
= decode_varint(&cp
);
1872 previous_len
= previous_ce
->ce_namelen
;
1873 if (previous_len
< strip_len
)
1874 die(_("malformed name field in the index, near path '%s'"),
1876 copy_len
= previous_len
- strip_len
;
1878 name
= (const char *)cp
;
1881 if (len
== CE_NAMEMASK
) {
1883 if (expand_name_field
)
1887 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1890 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1891 * with something more akin to 'load_bitmap_entries_v1()'s use of
1892 * 'read_be16'/'read_be32'. For consistency with the corresponding
1893 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1894 * should be done at the same time as removing references to
1895 * 'ondisk_cache_entry' there.
1897 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1898 + offsetof(struct cache_time
, sec
));
1899 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1900 + offsetof(struct cache_time
, sec
));
1901 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1902 + offsetof(struct cache_time
, nsec
));
1903 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1904 + offsetof(struct cache_time
, nsec
));
1905 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1906 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1907 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1908 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1909 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1910 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1911 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1912 ce
->ce_namelen
= len
;
1914 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
));
1916 if (expand_name_field
) {
1918 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1919 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1920 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1922 memcpy(ce
->name
, name
, len
+ 1);
1923 *ent_size
= ondisk_ce_size(ce
);
1928 static void check_ce_order(struct index_state
*istate
)
1932 if (!verify_ce_order
)
1935 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1936 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1937 struct cache_entry
*next_ce
= istate
->cache
[i
];
1938 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1940 if (0 < name_compare
)
1941 die(_("unordered stage entries in index"));
1942 if (!name_compare
) {
1944 die(_("multiple stage entries for merged file '%s'"),
1946 if (ce_stage(ce
) > ce_stage(next_ce
))
1947 die(_("unordered stage entries for '%s'"),
1953 static void tweak_untracked_cache(struct index_state
*istate
)
1955 struct repository
*r
= the_repository
;
1957 prepare_repo_settings(r
);
1959 switch (r
->settings
.core_untracked_cache
) {
1960 case UNTRACKED_CACHE_REMOVE
:
1961 remove_untracked_cache(istate
);
1963 case UNTRACKED_CACHE_WRITE
:
1964 add_untracked_cache(istate
);
1966 case UNTRACKED_CACHE_KEEP
:
1968 * Either an explicit "core.untrackedCache=keep", the
1969 * default if "core.untrackedCache" isn't configured,
1970 * or a fallback on an unknown "core.untrackedCache"
1977 static void tweak_split_index(struct index_state
*istate
)
1979 switch (git_config_get_split_index()) {
1980 case -1: /* unset: do nothing */
1983 remove_split_index(istate
);
1986 add_split_index(istate
);
1988 default: /* unknown value: do nothing */
1993 static void post_read_index_from(struct index_state
*istate
)
1995 check_ce_order(istate
);
1996 tweak_untracked_cache(istate
);
1997 tweak_split_index(istate
);
1998 tweak_fsmonitor(istate
);
2001 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
2003 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
2006 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
2008 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
2011 * Account for potential alignment differences.
2013 per_entry
+= align_padding_size(per_entry
, 0);
2014 return ondisk_size
+ entries
* per_entry
;
2017 struct index_entry_offset
2019 /* starting byte offset into index file, count of index entries in this block */
2023 struct index_entry_offset_table
2026 struct index_entry_offset entries
[FLEX_ARRAY
];
2029 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2030 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2032 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2033 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2035 struct load_index_extensions
2038 struct index_state
*istate
;
2041 unsigned long src_offset
;
2044 static void *load_index_extensions(void *_data
)
2046 struct load_index_extensions
*p
= _data
;
2047 unsigned long src_offset
= p
->src_offset
;
2049 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2050 /* After an array of active_nr index entries,
2051 * there can be arbitrary number of extended
2052 * sections, each of which is prefixed with
2053 * extension name (4-byte) and section length
2054 * in 4-byte network byte order.
2056 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2057 if (read_index_extension(p
->istate
,
2058 p
->mmap
+ src_offset
,
2059 p
->mmap
+ src_offset
+ 8,
2061 munmap((void *)p
->mmap
, p
->mmap_size
);
2062 die(_("index file corrupt"));
2065 src_offset
+= extsize
;
2072 * A helper function that will load the specified range of cache entries
2073 * from the memory mapped file and add them to the given index.
2075 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2076 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2077 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2080 unsigned long src_offset
= start_offset
;
2082 for (i
= offset
; i
< offset
+ nr
; i
++) {
2083 struct cache_entry
*ce
;
2084 unsigned long consumed
;
2086 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2088 &consumed
, previous_ce
);
2089 set_index_entry(istate
, i
, ce
);
2091 src_offset
+= consumed
;
2094 return src_offset
- start_offset
;
2097 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2098 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2100 unsigned long consumed
;
2102 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2103 if (istate
->version
== 4) {
2104 mem_pool_init(istate
->ce_mem_pool
,
2105 estimate_cache_size_from_compressed(istate
->cache_nr
));
2107 mem_pool_init(istate
->ce_mem_pool
,
2108 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2111 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2112 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2117 * Mostly randomly chosen maximum thread counts: we
2118 * cap the parallelism to online_cpus() threads, and we want
2119 * to have at least 10000 cache entries per thread for it to
2120 * be worth starting a thread.
2123 #define THREAD_COST (10000)
2125 struct load_cache_entries_thread_data
2128 struct index_state
*istate
;
2129 struct mem_pool
*ce_mem_pool
;
2132 struct index_entry_offset_table
*ieot
;
2133 int ieot_start
; /* starting index into the ieot array */
2134 int ieot_blocks
; /* count of ieot entries to process */
2135 unsigned long consumed
; /* return # of bytes in index file processed */
2139 * A thread proc to run the load_cache_entries() computation
2140 * across multiple background threads.
2142 static void *load_cache_entries_thread(void *_data
)
2144 struct load_cache_entries_thread_data
*p
= _data
;
2147 /* iterate across all ieot blocks assigned to this thread */
2148 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2149 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2150 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2151 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2156 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2157 int nr_threads
, struct index_entry_offset_table
*ieot
)
2159 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2160 struct load_cache_entries_thread_data
*data
;
2161 unsigned long consumed
= 0;
2163 /* a little sanity checking */
2164 if (istate
->name_hash_initialized
)
2165 BUG("the name hash isn't thread safe");
2167 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2168 mem_pool_init(istate
->ce_mem_pool
, 0);
2170 /* ensure we have no more threads than we have blocks to process */
2171 if (nr_threads
> ieot
->nr
)
2172 nr_threads
= ieot
->nr
;
2173 CALLOC_ARRAY(data
, nr_threads
);
2175 offset
= ieot_start
= 0;
2176 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2177 for (i
= 0; i
< nr_threads
; i
++) {
2178 struct load_cache_entries_thread_data
*p
= &data
[i
];
2181 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2182 ieot_blocks
= ieot
->nr
- ieot_start
;
2188 p
->ieot_start
= ieot_start
;
2189 p
->ieot_blocks
= ieot_blocks
;
2191 /* create a mem_pool for each thread */
2193 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2194 nr
+= p
->ieot
->entries
[j
].nr
;
2195 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2196 if (istate
->version
== 4) {
2197 mem_pool_init(p
->ce_mem_pool
,
2198 estimate_cache_size_from_compressed(nr
));
2200 mem_pool_init(p
->ce_mem_pool
,
2201 estimate_cache_size(mmap_size
, nr
));
2204 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2206 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2208 /* increment by the number of cache entries in the ieot block being processed */
2209 for (j
= 0; j
< ieot_blocks
; j
++)
2210 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2211 ieot_start
+= ieot_blocks
;
2214 for (i
= 0; i
< nr_threads
; i
++) {
2215 struct load_cache_entries_thread_data
*p
= &data
[i
];
2217 err
= pthread_join(p
->pthread
, NULL
);
2219 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2220 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2221 consumed
+= p
->consumed
;
2229 static void set_new_index_sparsity(struct index_state
*istate
)
2232 * If the index's repo exists, mark it sparse according to
2235 prepare_repo_settings(istate
->repo
);
2236 if (!istate
->repo
->settings
.command_requires_full_index
&&
2237 is_sparse_index_allowed(istate
, 0))
2238 istate
->sparse_index
= 1;
2241 /* remember to discard_cache() before reading a different cache! */
2242 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2246 unsigned long src_offset
;
2247 const struct cache_header
*hdr
;
2250 struct load_index_extensions p
;
2251 size_t extension_offset
= 0;
2252 int nr_threads
, cpus
;
2253 struct index_entry_offset_table
*ieot
= NULL
;
2255 if (istate
->initialized
)
2256 return istate
->cache_nr
;
2258 istate
->timestamp
.sec
= 0;
2259 istate
->timestamp
.nsec
= 0;
2260 fd
= open(path
, O_RDONLY
);
2262 if (!must_exist
&& errno
== ENOENT
) {
2263 set_new_index_sparsity(istate
);
2264 istate
->initialized
= 1;
2267 die_errno(_("%s: index file open failed"), path
);
2271 die_errno(_("%s: cannot stat the open index"), path
);
2273 mmap_size
= xsize_t(st
.st_size
);
2274 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2275 die(_("%s: index file smaller than expected"), path
);
2277 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2278 if (mmap
== MAP_FAILED
)
2279 die_errno(_("%s: unable to map index file%s"), path
,
2283 hdr
= (const struct cache_header
*)mmap
;
2284 if (verify_hdr(hdr
, mmap_size
) < 0)
2287 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2288 istate
->version
= ntohl(hdr
->hdr_version
);
2289 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2290 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2291 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2292 istate
->initialized
= 1;
2296 p
.mmap_size
= mmap_size
;
2298 src_offset
= sizeof(*hdr
);
2300 if (git_config_get_index_threads(&nr_threads
))
2303 /* TODO: does creating more threads than cores help? */
2305 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2306 cpus
= online_cpus();
2307 if (nr_threads
> cpus
)
2314 if (nr_threads
> 1) {
2315 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2316 if (extension_offset
) {
2319 p
.src_offset
= extension_offset
;
2320 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2322 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2329 * Locate and read the index entry offset table so that we can use it
2330 * to multi-thread the reading of the cache entries.
2332 if (extension_offset
&& nr_threads
> 1)
2333 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2336 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2339 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2342 istate
->timestamp
.sec
= st
.st_mtime
;
2343 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2345 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2346 if (extension_offset
) {
2347 int ret
= pthread_join(p
.pthread
, NULL
);
2349 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2351 p
.src_offset
= src_offset
;
2352 load_index_extensions(&p
);
2354 munmap((void *)mmap
, mmap_size
);
2357 * TODO trace2: replace "the_repository" with the actual repo instance
2358 * that is associated with the given "istate".
2360 trace2_data_intmax("index", the_repository
, "read/version",
2362 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2366 * If the command explicitly requires a full index, force it
2367 * to be full. Otherwise, correct the sparsity based on repository
2368 * settings and other properties of the index (if necessary).
2370 prepare_repo_settings(istate
->repo
);
2371 if (istate
->repo
->settings
.command_requires_full_index
)
2372 ensure_full_index(istate
);
2374 ensure_correct_sparsity(istate
);
2376 return istate
->cache_nr
;
2379 munmap((void *)mmap
, mmap_size
);
2380 die(_("index file corrupt"));
2384 * Signal that the shared index is used by updating its mtime.
2386 * This way, shared index can be removed if they have not been used
2389 static void freshen_shared_index(const char *shared_index
, int warn
)
2391 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2392 warning(_("could not freshen shared index '%s'"), shared_index
);
2395 int read_index_from(struct index_state
*istate
, const char *path
,
2398 struct split_index
*split_index
;
2403 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2404 if (istate
->initialized
)
2405 return istate
->cache_nr
;
2408 * TODO trace2: replace "the_repository" with the actual repo instance
2409 * that is associated with the given "istate".
2411 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2413 trace_performance_enter();
2414 ret
= do_read_index(istate
, path
, 0);
2415 trace_performance_leave("read cache %s", path
);
2416 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2419 split_index
= istate
->split_index
;
2420 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2421 post_read_index_from(istate
);
2425 trace_performance_enter();
2426 if (split_index
->base
)
2427 release_index(split_index
->base
);
2429 ALLOC_ARRAY(split_index
->base
, 1);
2430 index_state_init(split_index
->base
, istate
->repo
);
2432 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2433 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2434 if (file_exists(base_path
)) {
2435 trace2_region_enter_printf("index", "shared/do_read_index",
2436 the_repository
, "%s", base_path
);
2438 ret
= do_read_index(split_index
->base
, base_path
, 0);
2439 trace2_region_leave_printf("index", "shared/do_read_index",
2440 the_repository
, "%s", base_path
);
2442 char *path_copy
= xstrdup(path
);
2443 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2444 dirname(path_copy
), base_oid_hex
);
2446 trace2_region_enter_printf("index", "shared/do_read_index",
2447 the_repository
, "%s", base_path2
);
2448 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2449 trace2_region_leave_printf("index", "shared/do_read_index",
2450 the_repository
, "%s", base_path2
);
2453 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2454 die(_("broken index, expect %s in %s, got %s"),
2455 base_oid_hex
, base_path
,
2456 oid_to_hex(&split_index
->base
->oid
));
2458 freshen_shared_index(base_path
, 0);
2459 merge_base_index(istate
);
2460 post_read_index_from(istate
);
2461 trace_performance_leave("read cache %s", base_path
);
2466 int is_index_unborn(struct index_state
*istate
)
2468 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2471 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2473 struct index_state blank
= INDEX_STATE_INIT(r
);
2474 memcpy(istate
, &blank
, sizeof(*istate
));
2477 void release_index(struct index_state
*istate
)
2480 * Cache entries in istate->cache[] should have been allocated
2481 * from the memory pool associated with this index, or from an
2482 * associated split_index. There is no need to free individual
2483 * cache entries. validate_cache_entries can detect when this
2484 * assertion does not hold.
2486 validate_cache_entries(istate
);
2488 resolve_undo_clear_index(istate
);
2489 free_name_hash(istate
);
2490 cache_tree_free(&(istate
->cache_tree
));
2491 free(istate
->fsmonitor_last_update
);
2492 free(istate
->cache
);
2493 discard_split_index(istate
);
2494 free_untracked_cache(istate
->untracked
);
2496 if (istate
->sparse_checkout_patterns
) {
2497 clear_pattern_list(istate
->sparse_checkout_patterns
);
2498 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2501 if (istate
->ce_mem_pool
) {
2502 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2503 FREE_AND_NULL(istate
->ce_mem_pool
);
2507 void discard_index(struct index_state
*istate
)
2509 release_index(istate
);
2510 index_state_init(istate
, istate
->repo
);
2514 * Validate the cache entries of this index.
2515 * All cache entries associated with this index
2516 * should have been allocated by the memory pool
2517 * associated with this index, or by a referenced
2520 void validate_cache_entries(const struct index_state
*istate
)
2524 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2527 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2529 BUG("cache entry is not allocated from expected memory pool");
2530 } else if (!istate
->ce_mem_pool
||
2531 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2532 if (!istate
->split_index
||
2533 !istate
->split_index
->base
||
2534 !istate
->split_index
->base
->ce_mem_pool
||
2535 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2536 BUG("cache entry is not allocated from expected memory pool");
2541 if (istate
->split_index
)
2542 validate_cache_entries(istate
->split_index
->base
);
2545 int unmerged_index(const struct index_state
*istate
)
2548 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2549 if (ce_stage(istate
->cache
[i
]))
2555 int repo_index_has_changes(struct repository
*repo
,
2559 struct index_state
*istate
= repo
->index
;
2560 struct object_id cmp
;
2564 cmp
= tree
->object
.oid
;
2565 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2566 struct diff_options opt
;
2568 repo_diff_setup(repo
, &opt
);
2569 opt
.flags
.exit_with_status
= 1;
2571 opt
.flags
.quick
= 1;
2572 diff_setup_done(&opt
);
2573 do_diff_cache(&cmp
, &opt
);
2575 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2577 strbuf_addch(sb
, ' ');
2578 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2581 return opt
.flags
.has_changes
!= 0;
2583 /* TODO: audit for interaction with sparse-index. */
2584 ensure_full_index(istate
);
2585 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2587 strbuf_addch(sb
, ' ');
2588 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2590 return !!istate
->cache_nr
;
2594 static int write_index_ext_header(struct hashfile
*f
,
2595 git_hash_ctx
*eoie_f
,
2599 hashwrite_be32(f
, ext
);
2600 hashwrite_be32(f
, sz
);
2605 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2606 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2611 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2612 struct cache_entry
*ce
)
2615 * The only thing we care about in this function is to smudge the
2616 * falsely clean entry due to touch-update-touch race, so we leave
2617 * everything else as they are. We are called for entries whose
2618 * ce_stat_data.sd_mtime match the index file mtime.
2620 * Note that this actually does not do much for gitlinks, for
2621 * which ce_match_stat_basic() always goes to the actual
2622 * contents. The caller checks with is_racy_timestamp() which
2623 * always says "no" for gitlinks, so we are not called for them ;-)
2627 if (lstat(ce
->name
, &st
) < 0)
2629 if (ce_match_stat_basic(ce
, &st
))
2631 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2632 /* This is "racily clean"; smudge it. Note that this
2633 * is a tricky code. At first glance, it may appear
2634 * that it can break with this sequence:
2636 * $ echo xyzzy >frotz
2637 * $ git-update-index --add frotz
2640 * $ echo filfre >nitfol
2641 * $ git-update-index --add nitfol
2643 * but it does not. When the second update-index runs,
2644 * it notices that the entry "frotz" has the same timestamp
2645 * as index, and if we were to smudge it by resetting its
2646 * size to zero here, then the object name recorded
2647 * in index is the 6-byte file but the cached stat information
2648 * becomes zero --- which would then match what we would
2649 * obtain from the filesystem next time we stat("frotz").
2651 * However, the second update-index, before calling
2652 * this function, notices that the cached size is 6
2653 * bytes and what is on the filesystem is an empty
2654 * file, and never calls us, so the cached size information
2655 * for "frotz" stays 6 which does not match the filesystem.
2657 ce
->ce_stat_data
.sd_size
= 0;
2661 /* Copy miscellaneous fields but not the name */
2662 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2663 struct cache_entry
*ce
)
2666 const unsigned hashsz
= the_hash_algo
->rawsz
;
2667 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2669 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2670 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2671 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2672 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2673 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2674 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2675 ondisk
->mode
= htonl(ce
->ce_mode
);
2676 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2677 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2678 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2679 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2681 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2682 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2683 flagsp
[0] = htons(flags
);
2684 if (ce
->ce_flags
& CE_EXTENDED
) {
2685 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2689 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2690 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2693 unsigned int saved_namelen
;
2694 int stripped_name
= 0;
2695 static unsigned char padding
[8] = { 0x00 };
2697 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2698 saved_namelen
= ce_namelen(ce
);
2703 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2705 if (!previous_name
) {
2706 int len
= ce_namelen(ce
);
2707 copy_cache_entry_to_ondisk(ondisk
, ce
);
2708 hashwrite(f
, ondisk
, size
);
2709 hashwrite(f
, ce
->name
, len
);
2710 hashwrite(f
, padding
, align_padding_size(size
, len
));
2712 int common
, to_remove
, prefix_size
;
2713 unsigned char to_remove_vi
[16];
2715 (ce
->name
[common
] &&
2716 common
< previous_name
->len
&&
2717 ce
->name
[common
] == previous_name
->buf
[common
]);
2719 ; /* still matching */
2720 to_remove
= previous_name
->len
- common
;
2721 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2723 copy_cache_entry_to_ondisk(ondisk
, ce
);
2724 hashwrite(f
, ondisk
, size
);
2725 hashwrite(f
, to_remove_vi
, prefix_size
);
2726 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2727 hashwrite(f
, padding
, 1);
2729 strbuf_splice(previous_name
, common
, to_remove
,
2730 ce
->name
+ common
, ce_namelen(ce
) - common
);
2732 if (stripped_name
) {
2733 ce
->ce_namelen
= saved_namelen
;
2734 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2741 * This function verifies if index_state has the correct sha1 of the
2742 * index file. Don't die if we have any other failure, just return 0.
2744 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2749 unsigned char hash
[GIT_MAX_RAWSZ
];
2751 if (!istate
->initialized
)
2754 fd
= open(path
, O_RDONLY
);
2761 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2764 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2765 if (n
!= the_hash_algo
->rawsz
)
2768 if (!hasheq(istate
->oid
.hash
, hash
))
2779 static int repo_verify_index(struct repository
*repo
)
2781 return verify_index_from(repo
->index
, repo
->index_file
);
2784 int has_racy_timestamp(struct index_state
*istate
)
2786 int entries
= istate
->cache_nr
;
2789 for (i
= 0; i
< entries
; i
++) {
2790 struct cache_entry
*ce
= istate
->cache
[i
];
2791 if (is_racy_timestamp(istate
, ce
))
2797 void repo_update_index_if_able(struct repository
*repo
,
2798 struct lock_file
*lockfile
)
2800 if ((repo
->index
->cache_changed
||
2801 has_racy_timestamp(repo
->index
)) &&
2802 repo_verify_index(repo
))
2803 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2805 rollback_lock_file(lockfile
);
2808 static int record_eoie(void)
2812 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2816 * As a convenience, the end of index entries extension
2817 * used for threading is written by default if the user
2818 * explicitly requested threaded index reads.
2820 return !git_config_get_index_threads(&val
) && val
!= 1;
2823 static int record_ieot(void)
2827 if (!git_config_get_bool("index.recordoffsettable", &val
))
2831 * As a convenience, the offset table used for threading is
2832 * written by default if the user explicitly requested
2833 * threaded index reads.
2835 return !git_config_get_index_threads(&val
) && val
!= 1;
2838 enum write_extensions
{
2839 WRITE_NO_EXTENSION
= 0,
2840 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2841 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2842 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2843 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2844 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2846 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2849 * On success, `tempfile` is closed. If it is the temporary file
2850 * of a `struct lock_file`, we will therefore effectively perform
2851 * a 'close_lock_file_gently()`. Since that is an implementation
2852 * detail of lockfiles, callers of `do_write_index()` should not
2855 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2856 enum write_extensions write_extensions
, unsigned flags
)
2858 uint64_t start
= getnanotime();
2860 git_hash_ctx
*eoie_c
= NULL
;
2861 struct cache_header hdr
;
2862 int i
, err
= 0, removed
, extended
, hdr_version
;
2863 struct cache_entry
**cache
= istate
->cache
;
2864 int entries
= istate
->cache_nr
;
2866 struct ondisk_cache_entry ondisk
;
2867 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2868 int drop_cache_tree
= istate
->drop_cache_tree
;
2870 int csum_fsync_flag
;
2871 int ieot_entries
= 1;
2872 struct index_entry_offset_table
*ieot
= NULL
;
2874 struct repository
*r
= istate
->repo
;
2876 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2878 prepare_repo_settings(r
);
2879 f
->skip_hash
= r
->settings
.index_skip_hash
;
2881 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2882 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2885 /* reduce extended entries if possible */
2886 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2887 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2889 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2893 if (!istate
->version
)
2894 istate
->version
= get_index_format_default(r
);
2896 /* demote version 3 to version 2 when the latter suffices */
2897 if (istate
->version
== 3 || istate
->version
== 2)
2898 istate
->version
= extended
? 3 : 2;
2900 hdr_version
= istate
->version
;
2902 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2903 hdr
.hdr_version
= htonl(hdr_version
);
2904 hdr
.hdr_entries
= htonl(entries
- removed
);
2906 hashwrite(f
, &hdr
, sizeof(hdr
));
2908 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2911 if (nr_threads
!= 1 && record_ieot()) {
2912 int ieot_blocks
, cpus
;
2915 * ensure default number of ieot blocks maps evenly to the
2916 * default number of threads that will process them leaving
2917 * room for the thread to load the index extensions.
2920 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2921 cpus
= online_cpus();
2922 if (ieot_blocks
> cpus
- 1)
2923 ieot_blocks
= cpus
- 1;
2925 ieot_blocks
= nr_threads
;
2926 if (ieot_blocks
> istate
->cache_nr
)
2927 ieot_blocks
= istate
->cache_nr
;
2931 * no reason to write out the IEOT extension if we don't
2932 * have enough blocks to utilize multi-threading
2934 if (ieot_blocks
> 1) {
2935 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2936 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2937 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2941 offset
= hashfile_total(f
);
2944 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2946 for (i
= 0; i
< entries
; i
++) {
2947 struct cache_entry
*ce
= cache
[i
];
2948 if (ce
->ce_flags
& CE_REMOVE
)
2950 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2951 ce_smudge_racily_clean_entry(istate
, ce
);
2952 if (is_null_oid(&ce
->oid
)) {
2953 static const char msg
[] = "cache entry has null sha1: %s";
2954 static int allow
= -1;
2957 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2959 warning(msg
, ce
->name
);
2961 err
= error(msg
, ce
->name
);
2963 drop_cache_tree
= 1;
2965 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2966 ieot
->entries
[ieot
->nr
].nr
= nr
;
2967 ieot
->entries
[ieot
->nr
].offset
= offset
;
2970 * If we have a V4 index, set the first byte to an invalid
2971 * character to ensure there is nothing common with the previous
2975 previous_name
->buf
[0] = 0;
2978 offset
= hashfile_total(f
);
2980 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2988 ieot
->entries
[ieot
->nr
].nr
= nr
;
2989 ieot
->entries
[ieot
->nr
].offset
= offset
;
2992 strbuf_release(&previous_name_buf
);
2999 offset
= hashfile_total(f
);
3002 * The extension headers must be hashed on their own for the
3003 * EOIE extension. Create a hashfile here to compute that hash.
3005 if (offset
&& record_eoie()) {
3006 CALLOC_ARRAY(eoie_c
, 1);
3007 the_hash_algo
->init_fn(eoie_c
);
3011 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
3012 * can minimize the number of extensions we have to scan through to
3013 * find it during load. Write it out regardless of the
3014 * strip_extensions parameter as we need it when loading the shared
3018 struct strbuf sb
= STRBUF_INIT
;
3020 write_ieot_extension(&sb
, ieot
);
3021 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
3022 hashwrite(f
, sb
.buf
, sb
.len
);
3023 strbuf_release(&sb
);
3029 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3030 istate
->split_index
) {
3031 struct strbuf sb
= STRBUF_INIT
;
3033 if (istate
->sparse_index
)
3034 die(_("cannot write split index for a sparse index"));
3036 err
= write_link_extension(&sb
, istate
) < 0 ||
3037 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3039 hashwrite(f
, sb
.buf
, sb
.len
);
3040 strbuf_release(&sb
);
3044 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3045 !drop_cache_tree
&& istate
->cache_tree
) {
3046 struct strbuf sb
= STRBUF_INIT
;
3048 cache_tree_write(&sb
, istate
->cache_tree
);
3049 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3050 hashwrite(f
, sb
.buf
, sb
.len
);
3051 strbuf_release(&sb
);
3055 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3056 istate
->resolve_undo
) {
3057 struct strbuf sb
= STRBUF_INIT
;
3059 resolve_undo_write(&sb
, istate
->resolve_undo
);
3060 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3062 hashwrite(f
, sb
.buf
, sb
.len
);
3063 strbuf_release(&sb
);
3067 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3068 istate
->untracked
) {
3069 struct strbuf sb
= STRBUF_INIT
;
3071 write_untracked_extension(&sb
, istate
->untracked
);
3072 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3074 hashwrite(f
, sb
.buf
, sb
.len
);
3075 strbuf_release(&sb
);
3079 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3080 istate
->fsmonitor_last_update
) {
3081 struct strbuf sb
= STRBUF_INIT
;
3083 write_fsmonitor_extension(&sb
, istate
);
3084 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3085 hashwrite(f
, sb
.buf
, sb
.len
);
3086 strbuf_release(&sb
);
3090 if (istate
->sparse_index
) {
3091 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3096 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3097 * so that it can be found and processed before all the index entries are
3098 * read. Write it out regardless of the strip_extensions parameter as we need it
3099 * when loading the shared index.
3102 struct strbuf sb
= STRBUF_INIT
;
3104 write_eoie_extension(&sb
, eoie_c
, offset
);
3105 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3106 hashwrite(f
, sb
.buf
, sb
.len
);
3107 strbuf_release(&sb
);
3112 csum_fsync_flag
= 0;
3113 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3114 csum_fsync_flag
= CSUM_FSYNC
;
3116 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3117 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3119 if (close_tempfile_gently(tempfile
)) {
3120 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3123 if (stat(get_tempfile_path(tempfile
), &st
))
3125 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3126 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3127 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3130 * TODO trace2: replace "the_repository" with the actual repo instance
3131 * that is associated with the given "istate".
3133 trace2_data_intmax("index", the_repository
, "write/version",
3135 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3141 void set_alternate_index_output(const char *name
)
3143 alternate_index_output
= name
;
3146 static int commit_locked_index(struct lock_file
*lk
)
3148 if (alternate_index_output
)
3149 return commit_lock_file_to(lk
, alternate_index_output
);
3151 return commit_lock_file(lk
);
3154 static int do_write_locked_index(struct index_state
*istate
,
3155 struct lock_file
*lock
,
3157 enum write_extensions write_extensions
)
3160 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3162 ret
= convert_to_sparse(istate
, 0);
3165 warning(_("failed to convert to a sparse-index"));
3170 * TODO trace2: replace "the_repository" with the actual repo instance
3171 * that is associated with the given "istate".
3173 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3174 "%s", get_lock_file_path(lock
));
3175 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3176 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3177 "%s", get_lock_file_path(lock
));
3180 ensure_full_index(istate
);
3184 if (flags
& COMMIT_LOCK
)
3185 ret
= commit_locked_index(lock
);
3187 ret
= close_lock_file_gently(lock
);
3189 run_hooks_l("post-index-change",
3190 istate
->updated_workdir
? "1" : "0",
3191 istate
->updated_skipworktree
? "1" : "0", NULL
);
3192 istate
->updated_workdir
= 0;
3193 istate
->updated_skipworktree
= 0;
3198 static int write_split_index(struct index_state
*istate
,
3199 struct lock_file
*lock
,
3203 prepare_to_write_split_index(istate
);
3204 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3205 finish_writing_split_index(istate
);
3209 static const char *shared_index_expire
= "2.weeks.ago";
3211 static unsigned long get_shared_index_expire_date(void)
3213 static unsigned long shared_index_expire_date
;
3214 static int shared_index_expire_date_prepared
;
3216 if (!shared_index_expire_date_prepared
) {
3217 git_config_get_expiry("splitindex.sharedindexexpire",
3218 &shared_index_expire
);
3219 shared_index_expire_date
= approxidate(shared_index_expire
);
3220 shared_index_expire_date_prepared
= 1;
3223 return shared_index_expire_date
;
3226 static int should_delete_shared_index(const char *shared_index_path
)
3229 unsigned long expiration
;
3231 /* Check timestamp */
3232 expiration
= get_shared_index_expire_date();
3235 if (stat(shared_index_path
, &st
))
3236 return error_errno(_("could not stat '%s'"), shared_index_path
);
3237 if (st
.st_mtime
> expiration
)
3243 static int clean_shared_index_files(const char *current_hex
)
3246 DIR *dir
= opendir(get_git_dir());
3249 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3251 while ((de
= readdir(dir
)) != NULL
) {
3252 const char *sha1_hex
;
3253 const char *shared_index_path
;
3254 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3256 if (!strcmp(sha1_hex
, current_hex
))
3258 shared_index_path
= git_path("%s", de
->d_name
);
3259 if (should_delete_shared_index(shared_index_path
) > 0 &&
3260 unlink(shared_index_path
))
3261 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3268 static int write_shared_index(struct index_state
*istate
,
3269 struct tempfile
**temp
, unsigned flags
)
3271 struct split_index
*si
= istate
->split_index
;
3272 int ret
, was_full
= !istate
->sparse_index
;
3274 move_cache_to_base_index(istate
);
3275 convert_to_sparse(istate
, 0);
3277 trace2_region_enter_printf("index", "shared/do_write_index",
3278 the_repository
, "%s", get_tempfile_path(*temp
));
3279 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3280 trace2_region_leave_printf("index", "shared/do_write_index",
3281 the_repository
, "%s", get_tempfile_path(*temp
));
3284 ensure_full_index(istate
);
3288 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3290 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3293 ret
= rename_tempfile(temp
,
3294 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3296 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3297 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3303 static const int default_max_percent_split_change
= 20;
3305 static int too_many_not_shared_entries(struct index_state
*istate
)
3307 int i
, not_shared
= 0;
3308 int max_split
= git_config_get_max_percent_split_change();
3310 switch (max_split
) {
3312 /* not or badly configured: use the default value */
3313 max_split
= default_max_percent_split_change
;
3316 return 1; /* 0% means always write a new shared index */
3318 return 0; /* 100% means never write a new shared index */
3320 break; /* just use the configured value */
3323 /* Count not shared entries */
3324 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3325 struct cache_entry
*ce
= istate
->cache
[i
];
3330 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3333 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3336 int new_shared_index
, ret
, test_split_index_env
;
3337 struct split_index
*si
= istate
->split_index
;
3339 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3340 cache_tree_verify(the_repository
, istate
);
3342 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3343 if (flags
& COMMIT_LOCK
)
3344 rollback_lock_file(lock
);
3348 if (istate
->fsmonitor_last_update
)
3349 fill_fsmonitor_bitmap(istate
);
3351 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3353 if ((!si
&& !test_split_index_env
) ||
3354 alternate_index_output
||
3355 (istate
->cache_changed
& ~EXTMASK
)) {
3356 ret
= do_write_locked_index(istate
, lock
, flags
,
3357 ~WRITE_SPLIT_INDEX_EXTENSION
);
3361 if (test_split_index_env
) {
3363 si
= init_split_index(istate
);
3364 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3366 int v
= si
->base_oid
.hash
[0];
3368 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3371 if (too_many_not_shared_entries(istate
))
3372 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3374 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3376 if (new_shared_index
) {
3377 struct tempfile
*temp
;
3380 /* Same initial permissions as the main .git/index file */
3381 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3383 ret
= do_write_locked_index(istate
, lock
, flags
,
3384 ~WRITE_SPLIT_INDEX_EXTENSION
);
3387 ret
= write_shared_index(istate
, &temp
, flags
);
3389 saved_errno
= errno
;
3390 if (is_tempfile_active(temp
))
3391 delete_tempfile(&temp
);
3392 errno
= saved_errno
;
3398 ret
= write_split_index(istate
, lock
, flags
);
3400 /* Freshen the shared index only if the split-index was written */
3401 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3402 const char *shared_index
= git_path("sharedindex.%s",
3403 oid_to_hex(&si
->base_oid
));
3404 freshen_shared_index(shared_index
, 1);
3408 if (flags
& COMMIT_LOCK
)
3409 rollback_lock_file(lock
);
3414 * Read the index file that is potentially unmerged into given
3415 * index_state, dropping any unmerged entries to stage #0 (potentially
3416 * resulting in a path appearing as both a file and a directory in the
3417 * index; the caller is responsible to clear out the extra entries
3418 * before writing the index to a tree). Returns true if the index is
3419 * unmerged. Callers who want to refuse to work from an unmerged
3420 * state can call this and check its return value, instead of calling
3423 int repo_read_index_unmerged(struct repository
*repo
)
3425 struct index_state
*istate
;
3429 repo_read_index(repo
);
3430 istate
= repo
->index
;
3431 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3432 struct cache_entry
*ce
= istate
->cache
[i
];
3433 struct cache_entry
*new_ce
;
3439 len
= ce_namelen(ce
);
3440 new_ce
= make_empty_cache_entry(istate
, len
);
3441 memcpy(new_ce
->name
, ce
->name
, len
);
3442 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3443 new_ce
->ce_namelen
= len
;
3444 new_ce
->ce_mode
= ce
->ce_mode
;
3445 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3446 return error(_("%s: cannot drop to stage #0"),
3453 * Returns 1 if the path is an "other" path with respect to
3454 * the index; that is, the path is not mentioned in the index at all,
3455 * either as a file, a directory with some files in the index,
3456 * or as an unmerged entry.
3458 * We helpfully remove a trailing "/" from directories so that
3459 * the output of read_directory can be used as-is.
3461 int index_name_is_other(struct index_state
*istate
, const char *name
,
3465 if (namelen
&& name
[namelen
- 1] == '/')
3467 pos
= index_name_pos(istate
, name
, namelen
);
3469 return 0; /* exact match */
3471 if (pos
< istate
->cache_nr
) {
3472 struct cache_entry
*ce
= istate
->cache
[pos
];
3473 if (ce_namelen(ce
) == namelen
&&
3474 !memcmp(ce
->name
, name
, namelen
))
3475 return 0; /* Yup, this one exists unmerged */
3480 void *read_blob_data_from_index(struct index_state
*istate
,
3481 const char *path
, unsigned long *size
)
3485 enum object_type type
;
3489 pos
= index_name_pos(istate
, path
, len
);
3492 * We might be in the middle of a merge, in which
3493 * case we would read stage #2 (ours).
3497 (pos
< 0 && i
< istate
->cache_nr
&&
3498 !strcmp(istate
->cache
[i
]->name
, path
));
3500 if (ce_stage(istate
->cache
[i
]) == 2)
3505 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3507 if (!data
|| type
!= OBJ_BLOB
) {
3516 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3518 dst
->untracked
= src
->untracked
;
3519 src
->untracked
= NULL
;
3520 dst
->cache_tree
= src
->cache_tree
;
3521 src
->cache_tree
= NULL
;
3524 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3525 struct index_state
*istate
)
3527 unsigned int size
= ce_size(ce
);
3528 int mem_pool_allocated
;
3529 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3530 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3532 memcpy(new_entry
, ce
, size
);
3533 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3537 void discard_cache_entry(struct cache_entry
*ce
)
3539 if (ce
&& should_validate_cache_entries())
3540 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3542 if (ce
&& ce
->mem_pool_allocated
)
3548 int should_validate_cache_entries(void)
3550 static int validate_index_cache_entries
= -1;
3552 if (validate_index_cache_entries
< 0) {
3553 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3554 validate_index_cache_entries
= 1;
3556 validate_index_cache_entries
= 0;
3559 return validate_index_cache_entries
;
3562 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3563 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3565 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3568 * The end of index entries (EOIE) extension is guaranteed to be last
3569 * so that it can be found by scanning backwards from the EOF.
3576 const char *index
, *eoie
;
3578 size_t offset
, src_offset
;
3579 unsigned char hash
[GIT_MAX_RAWSZ
];
3582 /* ensure we have an index big enough to contain an EOIE extension */
3583 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3586 /* validate the extension signature */
3587 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3588 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3590 index
+= sizeof(uint32_t);
3592 /* validate the extension size */
3593 extsize
= get_be32(index
);
3594 if (extsize
!= EOIE_SIZE
)
3596 index
+= sizeof(uint32_t);
3599 * Validate the offset we're going to look for the first extension
3600 * signature is after the index header and before the eoie extension.
3602 offset
= get_be32(index
);
3603 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3605 if (mmap
+ offset
>= eoie
)
3607 index
+= sizeof(uint32_t);
3610 * The hash is computed over extension types and their sizes (but not
3611 * their contents). E.g. if we have "TREE" extension that is N-bytes
3612 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3613 * then the hash would be:
3615 * SHA-1("TREE" + <binary representation of N> +
3616 * "REUC" + <binary representation of M>)
3618 src_offset
= offset
;
3619 the_hash_algo
->init_fn(&c
);
3620 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3621 /* After an array of active_nr index entries,
3622 * there can be arbitrary number of extended
3623 * sections, each of which is prefixed with
3624 * extension name (4-byte) and section length
3625 * in 4-byte network byte order.
3628 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3629 extsize
= ntohl(extsize
);
3631 /* verify the extension size isn't so large it will wrap around */
3632 if (src_offset
+ 8 + extsize
< src_offset
)
3635 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3638 src_offset
+= extsize
;
3640 the_hash_algo
->final_fn(hash
, &c
);
3641 if (!hasheq(hash
, (const unsigned char *)index
))
3644 /* Validate that the extension offsets returned us back to the eoie extension. */
3645 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3651 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3654 unsigned char hash
[GIT_MAX_RAWSZ
];
3657 put_be32(&buffer
, offset
);
3658 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3661 the_hash_algo
->final_fn(hash
, eoie_context
);
3662 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3665 #define IEOT_VERSION (1)
3667 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3669 const char *index
= NULL
;
3670 uint32_t extsize
, ext_version
;
3671 struct index_entry_offset_table
*ieot
;
3674 /* find the IEOT extension */
3677 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3678 extsize
= get_be32(mmap
+ offset
+ 4);
3679 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3680 index
= mmap
+ offset
+ 4 + 4;
3689 /* validate the version is IEOT_VERSION */
3690 ext_version
= get_be32(index
);
3691 if (ext_version
!= IEOT_VERSION
) {
3692 error("invalid IEOT version %d", ext_version
);
3695 index
+= sizeof(uint32_t);
3697 /* extension size - version bytes / bytes per entry */
3698 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3700 error("invalid number of IEOT entries %d", nr
);
3703 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3704 + (nr
* sizeof(struct index_entry_offset
)));
3706 for (i
= 0; i
< nr
; i
++) {
3707 ieot
->entries
[i
].offset
= get_be32(index
);
3708 index
+= sizeof(uint32_t);
3709 ieot
->entries
[i
].nr
= get_be32(index
);
3710 index
+= sizeof(uint32_t);
3716 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3722 put_be32(&buffer
, IEOT_VERSION
);
3723 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3726 for (i
= 0; i
< ieot
->nr
; i
++) {
3729 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3730 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3733 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3734 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3738 void prefetch_cache_entries(const struct index_state
*istate
,
3739 must_prefetch_predicate must_prefetch
)
3742 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3744 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3745 struct cache_entry
*ce
= istate
->cache
[i
];
3747 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3749 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3751 OBJECT_INFO_FOR_PREFETCH
))
3753 oid_array_append(&to_fetch
, &ce
->oid
);
3755 promisor_remote_get_direct(the_repository
,
3756 to_fetch
.oid
, to_fetch
.nr
);
3757 oid_array_clear(&to_fetch
);
3760 static int read_one_entry_opt(struct index_state
*istate
,
3761 const struct object_id
*oid
,
3762 struct strbuf
*base
,
3763 const char *pathname
,
3764 unsigned mode
, int opt
)
3767 struct cache_entry
*ce
;
3770 return READ_TREE_RECURSIVE
;
3772 len
= strlen(pathname
);
3773 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3775 ce
->ce_mode
= create_ce_mode(mode
);
3776 ce
->ce_flags
= create_ce_flags(1);
3777 ce
->ce_namelen
= base
->len
+ len
;
3778 memcpy(ce
->name
, base
->buf
, base
->len
);
3779 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3780 oidcpy(&ce
->oid
, oid
);
3781 return add_index_entry(istate
, ce
, opt
);
3784 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3785 const char *pathname
, unsigned mode
,
3788 struct index_state
*istate
= context
;
3789 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3791 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3795 * This is used when the caller knows there is no existing entries at
3796 * the stage that will conflict with the entry being added.
3798 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3799 const char *pathname
, unsigned mode
,
3802 struct index_state
*istate
= context
;
3803 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3804 mode
, ADD_CACHE_JUST_APPEND
);
3808 * Read the tree specified with --with-tree option
3809 * (typically, HEAD) into stage #1 and then
3810 * squash them down to stage #0. This is used for
3811 * --error-unmatch to list and check the path patterns
3812 * that were given from the command line. We are not
3813 * going to write this index out.
3815 void overlay_tree_on_index(struct index_state
*istate
,
3816 const char *tree_name
, const char *prefix
)
3819 struct object_id oid
;
3820 struct pathspec pathspec
;
3821 struct cache_entry
*last_stage0
= NULL
;
3823 read_tree_fn_t fn
= NULL
;
3826 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3827 die("tree-ish %s not found.", tree_name
);
3828 tree
= parse_tree_indirect(&oid
);
3830 die("bad tree-ish %s", tree_name
);
3832 /* Hoist the unmerged entries up to stage #3 to make room */
3833 /* TODO: audit for interaction with sparse-index. */
3834 ensure_full_index(istate
);
3835 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3836 struct cache_entry
*ce
= istate
->cache
[i
];
3839 ce
->ce_flags
|= CE_STAGEMASK
;
3843 static const char *(matchbuf
[1]);
3845 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3846 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3848 memset(&pathspec
, 0, sizeof(pathspec
));
3851 * See if we have cache entry at the stage. If so,
3852 * do it the original slow way, otherwise, append and then
3855 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3856 const struct cache_entry
*ce
= istate
->cache
[i
];
3857 if (ce_stage(ce
) == 1)
3858 fn
= read_one_entry
;
3862 fn
= read_one_entry_quick
;
3863 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3864 clear_pathspec(&pathspec
);
3866 die("unable to read tree entries %s", tree_name
);
3869 * Sort the cache entry -- we need to nuke the cache tree, though.
3871 if (fn
== read_one_entry_quick
) {
3872 cache_tree_free(&istate
->cache_tree
);
3873 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3876 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3877 struct cache_entry
*ce
= istate
->cache
[i
];
3878 switch (ce_stage(ce
)) {
3886 * If there is stage #0 entry for this, we do not
3887 * need to show it. We use CE_UPDATE bit to mark
3891 !strcmp(last_stage0
->name
, ce
->name
))
3892 ce
->ce_flags
|= CE_UPDATE
;
3897 struct update_callback_data
{
3898 struct index_state
*index
;
3904 static int fix_unmerged_status(struct diff_filepair
*p
,
3905 struct update_callback_data
*data
)
3907 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3909 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3911 * This is not an explicit add request, and the
3912 * path is missing from the working tree (deleted)
3914 return DIFF_STATUS_DELETED
;
3917 * Either an explicit add request, or path exists
3918 * in the working tree. An attempt to explicitly
3919 * add a path that does not exist in the working tree
3920 * will be caught as an error by the caller immediately.
3922 return DIFF_STATUS_MODIFIED
;
3925 static void update_callback(struct diff_queue_struct
*q
,
3926 struct diff_options
*opt UNUSED
, void *cbdata
)
3929 struct update_callback_data
*data
= cbdata
;
3931 for (i
= 0; i
< q
->nr
; i
++) {
3932 struct diff_filepair
*p
= q
->queue
[i
];
3933 const char *path
= p
->one
->path
;
3935 if (!data
->include_sparse
&&
3936 !path_in_sparse_checkout(path
, data
->index
))
3939 switch (fix_unmerged_status(p
, data
)) {
3941 die(_("unexpected diff status %c"), p
->status
);
3942 case DIFF_STATUS_MODIFIED
:
3943 case DIFF_STATUS_TYPE_CHANGED
:
3944 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3945 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3946 die(_("updating files failed"));
3950 case DIFF_STATUS_DELETED
:
3951 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3953 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3954 remove_file_from_index(data
->index
, path
);
3955 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3956 printf(_("remove '%s'\n"), path
);
3962 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3963 const struct pathspec
*pathspec
, int include_sparse
,
3966 struct update_callback_data data
;
3967 struct rev_info rev
;
3969 memset(&data
, 0, sizeof(data
));
3970 data
.index
= repo
->index
;
3971 data
.include_sparse
= include_sparse
;
3974 repo_init_revisions(repo
, &rev
, prefix
);
3975 setup_revisions(0, NULL
, &rev
, NULL
);
3977 copy_pathspec(&rev
.prune_data
, pathspec
);
3978 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3979 rev
.diffopt
.format_callback
= update_callback
;
3980 rev
.diffopt
.format_callback_data
= &data
;
3981 rev
.diffopt
.flags
.override_submodule_config
= 1;
3982 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3985 * Use an ODB transaction to optimize adding multiple objects.
3986 * This function is invoked from commands other than 'add', which
3987 * may not have their own transaction active.
3989 begin_odb_transaction();
3990 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3991 end_odb_transaction();
3993 release_revisions(&rev
);
3994 return !!data
.add_errors
;