2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 #include "bulk-checkin.h"
16 #include "cache-tree.h"
19 #include "object-file.h"
20 #include "object-store.h"
21 #include "oid-array.h"
25 #include "environment.h"
28 #include "name-hash.h"
29 #include "object-name.h"
30 #include "preload-index.h"
31 #include "resolve-undo.h"
33 #include "run-command.h"
37 #include "split-index.h"
40 #include "fsmonitor.h"
41 #include "thread-utils.h"
43 #include "sparse-index.h"
44 #include "csum-file.h"
45 #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 int ce_compare_data(struct index_state
*istate
,
201 const struct cache_entry
*ce
,
205 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
208 struct object_id oid
;
209 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
210 match
= !oideq(&oid
, &ce
->oid
);
211 /* index_fd() closed the file descriptor already */
216 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
221 enum object_type type
;
222 struct strbuf sb
= STRBUF_INIT
;
224 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
227 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
230 match
= memcmp(buffer
, sb
.buf
, size
);
237 static int ce_compare_gitlink(const struct cache_entry
*ce
)
239 struct object_id oid
;
242 * We don't actually require that the .git directory
243 * under GITLINK directory be a valid git directory. It
244 * might even be missing (in case nobody populated that
247 * If so, we consider it always to match.
249 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
251 return !oideq(&oid
, &ce
->oid
);
254 static int ce_modified_check_fs(struct index_state
*istate
,
255 const struct cache_entry
*ce
,
258 switch (st
->st_mode
& S_IFMT
) {
260 if (ce_compare_data(istate
, ce
, st
))
264 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
268 if (S_ISGITLINK(ce
->ce_mode
))
269 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
270 /* else fallthrough */
277 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
279 unsigned int changed
= 0;
281 if (ce
->ce_flags
& CE_REMOVE
)
282 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
284 switch (ce
->ce_mode
& S_IFMT
) {
286 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
287 /* We consider only the owner x bit to be relevant for
290 if (trust_executable_bit
&&
291 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
292 changed
|= MODE_CHANGED
;
295 if (!S_ISLNK(st
->st_mode
) &&
296 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
297 changed
|= TYPE_CHANGED
;
300 /* We ignore most of the st_xxx fields for gitlinks */
301 if (!S_ISDIR(st
->st_mode
))
302 changed
|= TYPE_CHANGED
;
303 else if (ce_compare_gitlink(ce
))
304 changed
|= DATA_CHANGED
;
307 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
310 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
312 /* Racily smudged entry? */
313 if (!ce
->ce_stat_data
.sd_size
) {
314 if (!is_empty_blob_sha1(ce
->oid
.hash
))
315 changed
|= DATA_CHANGED
;
321 static int is_racy_stat(const struct index_state
*istate
,
322 const struct stat_data
*sd
)
324 return (istate
->timestamp
.sec
&&
326 /* nanosecond timestamped files can also be racy! */
327 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
328 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
329 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
331 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
336 int is_racy_timestamp(const struct index_state
*istate
,
337 const struct cache_entry
*ce
)
339 return (!S_ISGITLINK(ce
->ce_mode
) &&
340 is_racy_stat(istate
, &ce
->ce_stat_data
));
343 int match_stat_data_racy(const struct index_state
*istate
,
344 const struct stat_data
*sd
, struct stat
*st
)
346 if (is_racy_stat(istate
, sd
))
347 return MTIME_CHANGED
;
348 return match_stat_data(sd
, st
);
351 int ie_match_stat(struct index_state
*istate
,
352 const struct cache_entry
*ce
, struct stat
*st
,
353 unsigned int options
)
355 unsigned int changed
;
356 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
357 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
358 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
359 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
361 if (!ignore_fsmonitor
)
362 refresh_fsmonitor(istate
);
364 * If it's marked as always valid in the index, it's
365 * valid whatever the checked-out copy says.
367 * skip-worktree has the same effect with higher precedence
369 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
371 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
373 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
377 * Intent-to-add entries have not been added, so the index entry
378 * by definition never matches what is in the work tree until it
379 * actually gets added.
381 if (ce_intent_to_add(ce
))
382 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
384 changed
= ce_match_stat_basic(ce
, st
);
387 * Within 1 second of this sequence:
388 * echo xyzzy >file && git-update-index --add file
389 * running this command:
391 * would give a falsely clean cache entry. The mtime and
392 * length match the cache, and other stat fields do not change.
394 * We could detect this at update-index time (the cache entry
395 * being registered/updated records the same time as "now")
396 * and delay the return from git-update-index, but that would
397 * effectively mean we can make at most one commit per second,
398 * which is not acceptable. Instead, we check cache entries
399 * whose mtime are the same as the index file timestamp more
400 * carefully than others.
402 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
403 if (assume_racy_is_modified
)
404 changed
|= DATA_CHANGED
;
406 changed
|= ce_modified_check_fs(istate
, ce
, st
);
412 int ie_modified(struct index_state
*istate
,
413 const struct cache_entry
*ce
,
414 struct stat
*st
, unsigned int options
)
416 int changed
, changed_fs
;
418 changed
= ie_match_stat(istate
, ce
, st
, options
);
422 * If the mode or type has changed, there's no point in trying
423 * to refresh the entry - it's not going to match
425 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
429 * Immediately after read-tree or update-index --cacheinfo,
430 * the length field is zero, as we have never even read the
431 * lstat(2) information once, and we cannot trust DATA_CHANGED
432 * returned by ie_match_stat() which in turn was returned by
433 * ce_match_stat_basic() to signal that the filesize of the
434 * blob changed. We have to actually go to the filesystem to
435 * see if the contents match, and if so, should answer "unchanged".
437 * The logic does not apply to gitlinks, as ce_match_stat_basic()
438 * already has checked the actual HEAD from the filesystem in the
439 * subproject. If ie_match_stat() already said it is different,
440 * then we know it is.
442 if ((changed
& DATA_CHANGED
) &&
443 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
446 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
448 return changed
| changed_fs
;
452 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
453 const char *name2
, int len2
, int stage2
)
457 cmp
= name_compare(name1
, len1
, name2
, len2
);
468 int cmp_cache_name_compare(const void *a_
, const void *b_
)
470 const struct cache_entry
*ce1
, *ce2
;
472 ce1
= *((const struct cache_entry
**)a_
);
473 ce2
= *((const struct cache_entry
**)b_
);
474 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
475 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
478 static int index_name_stage_pos(struct index_state
*istate
,
479 const char *name
, int namelen
,
481 enum index_search_mode search_mode
)
486 last
= istate
->cache_nr
;
487 while (last
> first
) {
488 int next
= first
+ ((last
- first
) >> 1);
489 struct cache_entry
*ce
= istate
->cache
[next
];
490 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
500 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
502 /* Note: first <= istate->cache_nr */
503 struct cache_entry
*ce
= istate
->cache
[first
- 1];
506 * If we are in a sparse-index _and_ the entry before the
507 * insertion position is a sparse-directory entry that is
508 * an ancestor of 'name', then we need to expand the index
509 * and search again. This will only trigger once, because
510 * thereafter the index is fully expanded.
512 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
513 ce_namelen(ce
) < namelen
&&
514 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
515 ensure_full_index(istate
);
516 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
523 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
525 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
528 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
530 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
533 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
535 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
538 int remove_index_entry_at(struct index_state
*istate
, int pos
)
540 struct cache_entry
*ce
= istate
->cache
[pos
];
542 record_resolve_undo(istate
, ce
);
543 remove_name_hash(istate
, ce
);
544 save_or_free_index_entry(istate
, ce
);
545 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
547 if (pos
>= istate
->cache_nr
)
549 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
550 istate
->cache_nr
- pos
);
555 * Remove all cache entries marked for removal, that is where
556 * CE_REMOVE is set in ce_flags. This is much more effective than
557 * calling remove_index_entry_at() for each entry to be removed.
559 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
561 struct cache_entry
**ce_array
= istate
->cache
;
564 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
565 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
567 cache_tree_invalidate_path(istate
,
569 untracked_cache_remove_from_index(istate
,
572 remove_name_hash(istate
, ce_array
[i
]);
573 save_or_free_index_entry(istate
, ce_array
[i
]);
576 ce_array
[j
++] = ce_array
[i
];
578 if (j
== istate
->cache_nr
)
580 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
581 istate
->cache_nr
= j
;
584 int remove_file_from_index(struct index_state
*istate
, const char *path
)
586 int pos
= index_name_pos(istate
, path
, strlen(path
));
589 cache_tree_invalidate_path(istate
, path
);
590 untracked_cache_remove_from_index(istate
, path
);
591 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
592 remove_index_entry_at(istate
, pos
);
596 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
598 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
601 static int index_name_pos_also_unmerged(struct index_state
*istate
,
602 const char *path
, int namelen
)
604 int pos
= index_name_pos(istate
, path
, namelen
);
605 struct cache_entry
*ce
;
610 /* maybe unmerged? */
612 if (pos
>= istate
->cache_nr
||
613 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
616 /* order of preference: stage 2, 1, 3 */
617 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
618 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
619 !compare_name(ce
, path
, namelen
))
624 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
626 int len
= ce_namelen(ce
);
627 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
631 * If we add a filename that aliases in the cache, we will use the
632 * name that we already have - but we don't want to update the same
633 * alias twice, because that implies that there were actually two
634 * different files with aliasing names!
636 * So we use the CE_ADDED flag to verify that the alias was an old
637 * one before we accept it as
639 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
640 struct cache_entry
*ce
,
641 struct cache_entry
*alias
)
644 struct cache_entry
*new_entry
;
646 if (alias
->ce_flags
& CE_ADDED
)
647 die(_("will not add file alias '%s' ('%s' already exists in index)"),
648 ce
->name
, alias
->name
);
650 /* Ok, create the new entry using the name of the existing alias */
651 len
= ce_namelen(alias
);
652 new_entry
= make_empty_cache_entry(istate
, len
);
653 memcpy(new_entry
->name
, alias
->name
, len
);
654 copy_cache_entry(new_entry
, ce
);
655 save_or_free_index_entry(istate
, ce
);
659 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
661 struct object_id oid
;
662 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
663 die(_("cannot create an empty blob in the object database"));
664 oidcpy(&ce
->oid
, &oid
);
667 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
669 int namelen
, was_same
;
670 mode_t st_mode
= st
->st_mode
;
671 struct cache_entry
*ce
, *alias
= NULL
;
672 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
673 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
674 int pretend
= flags
& ADD_CACHE_PRETEND
;
675 int intent_only
= flags
& ADD_CACHE_INTENT
;
676 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
677 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
678 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
679 struct object_id oid
;
681 if (flags
& ADD_CACHE_RENORMALIZE
)
682 hash_flags
|= HASH_RENORMALIZE
;
684 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
685 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
687 namelen
= strlen(path
);
688 if (S_ISDIR(st_mode
)) {
689 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
690 return error(_("'%s' does not have a commit checked out"), path
);
691 while (namelen
&& path
[namelen
-1] == '/')
694 ce
= make_empty_cache_entry(istate
, namelen
);
695 memcpy(ce
->name
, path
, namelen
);
696 ce
->ce_namelen
= namelen
;
698 fill_stat_cache_info(istate
, ce
, st
);
700 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
703 if (trust_executable_bit
&& has_symlinks
) {
704 ce
->ce_mode
= create_ce_mode(st_mode
);
706 /* If there is an existing entry, pick the mode bits and type
707 * from it, otherwise assume unexecutable regular file.
709 struct cache_entry
*ent
;
710 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
712 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
713 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
716 /* When core.ignorecase=true, determine if a directory of the same name but differing
717 * case already exists within the Git repository. If it does, ensure the directory
718 * case of the file being added to the repository matches (is folded into) the existing
719 * entry's directory case.
722 adjust_dirname_case(istate
, ce
->name
);
724 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
725 alias
= index_file_exists(istate
, ce
->name
,
726 ce_namelen(ce
), ignore_case
);
729 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
730 /* Nothing changed, really */
731 if (!S_ISGITLINK(alias
->ce_mode
))
732 ce_mark_uptodate(alias
);
733 alias
->ce_flags
|= CE_ADDED
;
735 discard_cache_entry(ce
);
740 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
741 discard_cache_entry(ce
);
742 return error(_("unable to index file '%s'"), path
);
745 set_object_name_for_intent_to_add_entry(ce
);
747 if (ignore_case
&& alias
&& different_name(ce
, alias
))
748 ce
= create_alias_ce(istate
, ce
, alias
);
749 ce
->ce_flags
|= CE_ADDED
;
751 /* It was suspected to be racily clean, but it turns out to be Ok */
754 oideq(&alias
->oid
, &ce
->oid
) &&
755 ce
->ce_mode
== alias
->ce_mode
);
758 discard_cache_entry(ce
);
759 else if (add_index_entry(istate
, ce
, add_option
)) {
760 discard_cache_entry(ce
);
761 return error(_("unable to add '%s' to index"), path
);
763 if (verbose
&& !was_same
)
764 printf("add '%s'\n", path
);
768 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
771 if (lstat(path
, &st
))
772 die_errno(_("unable to stat '%s'"), path
);
773 return add_to_index(istate
, path
, &st
, flags
);
776 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
778 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
781 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
782 struct mem_pool
*ce_mem_pool
)
785 return mem_pool__ce_calloc(ce_mem_pool
, len
);
786 return xcalloc(1, cache_entry_size(len
));
789 enum verify_path_result
{
795 static enum verify_path_result
verify_path_internal(const char *, unsigned);
797 int verify_path(const char *path
, unsigned mode
)
799 return verify_path_internal(path
, mode
) == PATH_OK
;
802 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
804 const struct object_id
*oid
,
807 unsigned int refresh_options
)
809 struct cache_entry
*ce
, *ret
;
812 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
813 error(_("invalid path '%s'"), path
);
818 ce
= make_empty_cache_entry(istate
, len
);
820 oidcpy(&ce
->oid
, oid
);
821 memcpy(ce
->name
, path
, len
);
822 ce
->ce_flags
= create_ce_flags(stage
);
823 ce
->ce_namelen
= len
;
824 ce
->ce_mode
= create_ce_mode(mode
);
826 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
828 discard_cache_entry(ce
);
832 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
833 const struct object_id
*oid
,
836 struct mem_pool
*ce_mem_pool
)
838 struct cache_entry
*ce
;
841 if (!verify_path(path
, mode
)) {
842 error(_("invalid path '%s'"), path
);
847 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
849 oidcpy(&ce
->oid
, oid
);
850 memcpy(ce
->name
, path
, len
);
851 ce
->ce_flags
= create_ce_flags(stage
);
852 ce
->ce_namelen
= len
;
853 ce
->ce_mode
= create_ce_mode(mode
);
859 * Chmod an index entry with either +x or -x.
861 * Returns -1 if the chmod for the particular cache entry failed (if it's
862 * not a regular file), -2 if an invalid flip argument is passed in, 0
865 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
868 if (!S_ISREG(ce
->ce_mode
))
875 ce
->ce_mode
&= ~0111;
880 cache_tree_invalidate_path(istate
, ce
->name
);
881 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
882 mark_fsmonitor_invalid(istate
, ce
);
883 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
888 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
890 int len
= ce_namelen(a
);
891 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
895 * We fundamentally don't like some paths: we don't want
896 * dot or dot-dot anywhere, and for obvious reasons don't
897 * want to recurse into ".git" either.
899 * Also, we don't want double slashes or slashes at the
900 * end that can make pathnames ambiguous.
902 static int verify_dotfile(const char *rest
, unsigned mode
)
905 * The first character was '.', but that
906 * has already been discarded, we now test
910 /* "." is not allowed */
911 if (*rest
== '\0' || is_dir_sep(*rest
))
916 * ".git" followed by NUL or slash is bad. Note that we match
917 * case-insensitively here, even if ignore_case is not set.
918 * This outlaws ".GIT" everywhere out of an abundance of caution,
919 * since there's really no good reason to allow it.
921 * Once we've seen ".git", we can also find ".gitmodules", etc (also
922 * case-insensitively).
926 if (rest
[1] != 'i' && rest
[1] != 'I')
928 if (rest
[2] != 't' && rest
[2] != 'T')
930 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
934 if (skip_iprefix(rest
, "modules", &rest
) &&
935 (*rest
== '\0' || is_dir_sep(*rest
)))
940 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
946 static enum verify_path_result
verify_path_internal(const char *path
,
951 if (has_dos_drive_prefix(path
))
954 if (!is_valid_path(path
))
965 if (is_hfs_dotgit(path
))
968 if (is_hfs_dotgitmodules(path
))
973 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
977 if (is_ntfs_dotgit(path
))
980 if (is_ntfs_dotgitmodules(path
))
986 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
990 * allow terminating directory separators for
991 * sparse directory entries.
994 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
996 } else if (c
== '\\' && protect_ntfs
) {
997 if (is_ntfs_dotgit(path
))
1000 if (is_ntfs_dotgitmodules(path
))
1001 return PATH_INVALID
;
1010 * Do we have another file that has the beginning components being a
1011 * proper superset of the name we're trying to add?
1013 static int has_file_name(struct index_state
*istate
,
1014 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1017 int len
= ce_namelen(ce
);
1018 int stage
= ce_stage(ce
);
1019 const char *name
= ce
->name
;
1021 while (pos
< istate
->cache_nr
) {
1022 struct cache_entry
*p
= istate
->cache
[pos
++];
1024 if (len
>= ce_namelen(p
))
1026 if (memcmp(name
, p
->name
, len
))
1028 if (ce_stage(p
) != stage
)
1030 if (p
->name
[len
] != '/')
1032 if (p
->ce_flags
& CE_REMOVE
)
1037 remove_index_entry_at(istate
, --pos
);
1044 * Like strcmp(), but also return the offset of the first change.
1045 * If strings are equal, return the length.
1047 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1052 return strcmp(s1
, s2
);
1054 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1059 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1063 * Do we have another file with a pathname that is a proper
1064 * subset of the name we're trying to add?
1066 * That is, is there another file in the index with a path
1067 * that matches a sub-directory in the given entry?
1069 static int has_dir_name(struct index_state
*istate
,
1070 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1073 int stage
= ce_stage(ce
);
1074 const char *name
= ce
->name
;
1075 const char *slash
= name
+ ce_namelen(ce
);
1080 * We are frequently called during an iteration on a sorted
1081 * list of pathnames and while building a new index. Therefore,
1082 * there is a high probability that this entry will eventually
1083 * be appended to the index, rather than inserted in the middle.
1084 * If we can confirm that, we can avoid binary searches on the
1085 * components of the pathname.
1087 * Compare the entry's full path with the last path in the index.
1089 if (istate
->cache_nr
> 0) {
1090 cmp_last
= strcmp_offset(name
,
1091 istate
->cache
[istate
->cache_nr
- 1]->name
,
1094 if (len_eq_last
== 0) {
1096 * The entry sorts AFTER the last one in the
1097 * index and their paths have no common prefix,
1098 * so there cannot be a F/D conflict.
1103 * The entry sorts AFTER the last one in the
1104 * index, but has a common prefix. Fall through
1105 * to the loop below to disect the entry's path
1106 * and see where the difference is.
1109 } else if (cmp_last
== 0) {
1111 * The entry exactly matches the last one in the
1112 * index, but because of multiple stage and CE_REMOVE
1113 * items, we fall through and let the regular search
1123 if (*--slash
== '/')
1125 if (slash
<= ce
->name
)
1132 * (len + 1) is a directory boundary (including
1133 * the trailing slash). And since the loop is
1134 * decrementing "slash", the first iteration is
1135 * the longest directory prefix; subsequent
1136 * iterations consider parent directories.
1139 if (len
+ 1 <= len_eq_last
) {
1141 * The directory prefix (including the trailing
1142 * slash) also appears as a prefix in the last
1143 * entry, so the remainder cannot collide (because
1144 * strcmp said the whole path was greater).
1149 * LT: last: xxx/file_A
1155 if (len
> len_eq_last
) {
1157 * This part of the directory prefix (excluding
1158 * the trailing slash) is longer than the known
1159 * equal portions, so this sub-directory cannot
1160 * collide with a file.
1169 * This is a possible collision. Fall through and
1170 * let the regular search code handle it.
1177 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1180 * Found one, but not so fast. This could
1181 * be a marker that says "I was here, but
1182 * I am being removed". Such an entry is
1183 * not a part of the resulting tree, and
1184 * it is Ok to have a directory at the same
1187 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1191 remove_index_entry_at(istate
, pos
);
1199 * Trivial optimization: if we find an entry that
1200 * already matches the sub-directory, then we know
1201 * we're ok, and we can exit.
1203 while (pos
< istate
->cache_nr
) {
1204 struct cache_entry
*p
= istate
->cache
[pos
];
1205 if ((ce_namelen(p
) <= len
) ||
1206 (p
->name
[len
] != '/') ||
1207 memcmp(p
->name
, name
, len
))
1208 break; /* not our subdirectory */
1209 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1211 * p is at the same stage as our entry, and
1212 * is a subdirectory of what we are looking
1213 * at, so we cannot have conflicts at our
1214 * level or anything shorter.
1223 /* We may be in a situation where we already have path/file and path
1224 * is being added, or we already have path and path/file is being
1225 * added. Either one would result in a nonsense tree that has path
1226 * twice when git-write-tree tries to write it out. Prevent it.
1228 * If ok-to-replace is specified, we remove the conflicting entries
1229 * from the cache so the caller should recompute the insert position.
1230 * When this happens, we return non-zero.
1232 static int check_file_directory_conflict(struct index_state
*istate
,
1233 const struct cache_entry
*ce
,
1234 int pos
, int ok_to_replace
)
1239 * When ce is an "I am going away" entry, we allow it to be added
1241 if (ce
->ce_flags
& CE_REMOVE
)
1245 * We check if the path is a sub-path of a subsequent pathname
1246 * first, since removing those will not change the position
1249 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1252 * Then check if the path might have a clashing sub-directory
1255 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1258 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1261 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1262 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1263 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1264 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1267 * If this entry's path sorts after the last entry in the index,
1268 * we can avoid searching for it.
1270 if (istate
->cache_nr
> 0 &&
1271 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1272 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1274 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1277 * Cache tree path should be invalidated only after index_name_stage_pos,
1278 * in case it expands a sparse index.
1280 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1281 cache_tree_invalidate_path(istate
, ce
->name
);
1283 /* existing match? Just replace it. */
1286 replace_index_entry(istate
, pos
, ce
);
1291 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1292 untracked_cache_add_to_index(istate
, ce
->name
);
1295 * Inserting a merged entry ("stage 0") into the index
1296 * will always replace all non-merged entries..
1298 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1299 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1301 if (!remove_index_entry_at(istate
, pos
))
1308 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1309 return error(_("invalid path '%s'"), ce
->name
);
1311 if (!skip_df_check
&&
1312 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1314 return error(_("'%s' appears as both a file and as a directory"),
1316 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1322 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1326 if (option
& ADD_CACHE_JUST_APPEND
)
1327 pos
= istate
->cache_nr
;
1330 ret
= add_index_entry_with_check(istate
, ce
, option
);
1336 /* Make sure the array is big enough .. */
1337 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1341 if (istate
->cache_nr
> pos
+ 1)
1342 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1343 istate
->cache_nr
- pos
- 1);
1344 set_index_entry(istate
, pos
, ce
);
1345 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1350 * "refresh" does not calculate a new sha1 file or bring the
1351 * cache up-to-date for mode/content changes. But what it
1352 * _does_ do is to "re-match" the stat information of a file
1353 * with the cache, so that you can refresh the cache for a
1354 * file that hasn't been changed but where the stat entry is
1357 * For example, you'd want to do this after doing a "git-read-tree",
1358 * to link up the stat cache details with the proper files.
1360 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1361 struct cache_entry
*ce
,
1362 unsigned int options
, int *err
,
1368 struct cache_entry
*updated
;
1370 int refresh
= options
& CE_MATCH_REFRESH
;
1371 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1372 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1373 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1374 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1376 if (!refresh
|| ce_uptodate(ce
))
1379 if (!ignore_fsmonitor
)
1380 refresh_fsmonitor(istate
);
1382 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1383 * that the change to the work tree does not matter and told
1386 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1387 ce_mark_uptodate(ce
);
1390 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1391 ce_mark_uptodate(ce
);
1394 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1395 ce_mark_uptodate(ce
);
1399 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1409 if (lstat(ce
->name
, &st
) < 0) {
1410 if (ignore_missing
&& errno
== ENOENT
)
1417 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1419 *changed_ret
= changed
;
1422 * The path is unchanged. If we were told to ignore
1423 * valid bit, then we did the actual stat check and
1424 * found that the entry is unmodified. If the entry
1425 * is not marked VALID, this is the place to mark it
1426 * valid again, under "assume unchanged" mode.
1428 if (ignore_valid
&& assume_unchanged
&&
1429 !(ce
->ce_flags
& CE_VALID
))
1430 ; /* mark this one VALID again */
1433 * We do not mark the index itself "modified"
1434 * because CE_UPTODATE flag is in-core only;
1435 * we are not going to write this change out.
1437 if (!S_ISGITLINK(ce
->ce_mode
)) {
1438 ce_mark_uptodate(ce
);
1439 mark_fsmonitor_valid(istate
, ce
);
1447 if (ie_modified(istate
, ce
, &st
, options
)) {
1453 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1454 copy_cache_entry(updated
, ce
);
1455 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1456 fill_stat_cache_info(istate
, updated
, &st
);
1458 * If ignore_valid is not set, we should leave CE_VALID bit
1459 * alone. Otherwise, paths marked with --no-assume-unchanged
1460 * (i.e. things to be edited) will reacquire CE_VALID bit
1461 * automatically, which is not really what we want.
1463 if (!ignore_valid
&& assume_unchanged
&&
1464 !(ce
->ce_flags
& CE_VALID
))
1465 updated
->ce_flags
&= ~CE_VALID
;
1467 /* istate->cache_changed is updated in the caller */
1471 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1472 int * first
, const char *header_msg
)
1474 if (in_porcelain
&& *first
&& header_msg
) {
1475 printf("%s\n", header_msg
);
1481 int repo_refresh_and_write_index(struct repository
*repo
,
1482 unsigned int refresh_flags
,
1483 unsigned int write_flags
,
1485 const struct pathspec
*pathspec
,
1486 char *seen
, const char *header_msg
)
1488 struct lock_file lock_file
= LOCK_INIT
;
1491 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1492 if (!gentle
&& fd
< 0)
1494 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1496 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1502 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1503 const struct pathspec
*pathspec
,
1504 char *seen
, const char *header_msg
)
1508 int really
= (flags
& REFRESH_REALLY
) != 0;
1509 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1510 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1511 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1512 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1513 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1515 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1516 unsigned int options
= (CE_MATCH_REFRESH
|
1517 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1518 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1519 const char *modified_fmt
;
1520 const char *deleted_fmt
;
1521 const char *typechange_fmt
;
1522 const char *added_fmt
;
1523 const char *unmerged_fmt
;
1524 struct progress
*progress
= NULL
;
1525 int t2_sum_lstat
= 0;
1526 int t2_sum_scan
= 0;
1528 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1529 progress
= start_delayed_progress(_("Refresh index"),
1532 trace_performance_enter();
1533 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1534 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1535 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1536 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1537 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1539 * Use the multi-threaded preload_index() to refresh most of the
1540 * cache entries quickly then in the single threaded loop below,
1541 * we only have to do the special cases that are left.
1543 preload_index(istate
, pathspec
, 0);
1544 trace2_region_enter("index", "refresh", NULL
);
1546 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1547 struct cache_entry
*ce
, *new_entry
;
1548 int cache_errno
= 0;
1551 int t2_did_lstat
= 0;
1552 int t2_did_scan
= 0;
1554 ce
= istate
->cache
[i
];
1555 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1557 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1561 * If this entry is a sparse directory, then there isn't
1562 * any stat() information to update. Ignore the entry.
1564 if (S_ISSPARSEDIR(ce
->ce_mode
))
1567 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1571 while ((i
< istate
->cache_nr
) &&
1572 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1578 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1579 &first
, header_msg
);
1587 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1588 &cache_errno
, &changed
,
1589 &t2_did_lstat
, &t2_did_scan
);
1590 t2_sum_lstat
+= t2_did_lstat
;
1591 t2_sum_scan
+= t2_did_scan
;
1592 if (new_entry
== ce
)
1594 display_progress(progress
, i
);
1598 if (really
&& cache_errno
== EINVAL
) {
1599 /* If we are doing --really-refresh that
1600 * means the index is not valid anymore.
1602 ce
->ce_flags
&= ~CE_VALID
;
1603 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1604 mark_fsmonitor_invalid(istate
, ce
);
1605 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1610 if (cache_errno
== ENOENT
)
1612 else if (ce_intent_to_add(ce
))
1613 fmt
= added_fmt
; /* must be before other checks */
1614 else if (changed
& TYPE_CHANGED
)
1615 fmt
= typechange_fmt
;
1619 ce
->name
, in_porcelain
, &first
, header_msg
);
1624 replace_index_entry(istate
, i
, new_entry
);
1626 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1627 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1628 trace2_region_leave("index", "refresh", NULL
);
1629 display_progress(progress
, istate
->cache_nr
);
1630 stop_progress(&progress
);
1631 trace_performance_leave("refresh index");
1635 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1636 struct cache_entry
*ce
,
1637 unsigned int options
)
1639 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1643 /*****************************************************************
1645 *****************************************************************/
1647 #define INDEX_FORMAT_DEFAULT 3
1649 static unsigned int get_index_format_default(struct repository
*r
)
1651 char *envversion
= getenv("GIT_INDEX_VERSION");
1653 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1656 prepare_repo_settings(r
);
1658 if (r
->settings
.index_version
>= 0)
1659 version
= r
->settings
.index_version
;
1660 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1661 warning(_("index.version set, but the value is invalid.\n"
1662 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1663 return INDEX_FORMAT_DEFAULT
;
1668 version
= strtoul(envversion
, &endp
, 10);
1670 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1671 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1672 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1673 version
= INDEX_FORMAT_DEFAULT
;
1679 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1680 * Again - this is just a (very strong in practice) heuristic that
1681 * the inode hasn't changed.
1683 * We save the fields in big-endian order to allow using the
1684 * index file over NFS transparently.
1686 struct ondisk_cache_entry
{
1687 struct cache_time ctime
;
1688 struct cache_time mtime
;
1696 * unsigned char hash[hashsz];
1698 * if (flags & CE_EXTENDED)
1701 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1702 char name
[FLEX_ARRAY
];
1705 /* These are only used for v3 or lower */
1706 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1707 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1708 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1709 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1710 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1711 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1712 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1714 /* Allow fsck to force verification of the index checksum. */
1715 int verify_index_checksum
;
1717 /* Allow fsck to force verification of the cache entry order. */
1718 int verify_ce_order
;
1720 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1723 unsigned char hash
[GIT_MAX_RAWSZ
];
1725 unsigned char *start
, *end
;
1726 struct object_id oid
;
1728 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1729 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1730 hdr_version
= ntohl(hdr
->hdr_version
);
1731 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1732 return error(_("bad index version %d"), hdr_version
);
1734 if (!verify_index_checksum
)
1737 end
= (unsigned char *)hdr
+ size
;
1738 start
= end
- the_hash_algo
->rawsz
;
1739 oidread(&oid
, start
);
1740 if (oideq(&oid
, null_oid()))
1743 the_hash_algo
->init_fn(&c
);
1744 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1745 the_hash_algo
->final_fn(hash
, &c
);
1746 if (!hasheq(hash
, start
))
1747 return error(_("bad index file sha1 signature"));
1751 static int read_index_extension(struct index_state
*istate
,
1752 const char *ext
, const char *data
, unsigned long sz
)
1754 switch (CACHE_EXT(ext
)) {
1755 case CACHE_EXT_TREE
:
1756 istate
->cache_tree
= cache_tree_read(data
, sz
);
1758 case CACHE_EXT_RESOLVE_UNDO
:
1759 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1761 case CACHE_EXT_LINK
:
1762 if (read_link_extension(istate
, data
, sz
))
1765 case CACHE_EXT_UNTRACKED
:
1766 istate
->untracked
= read_untracked_extension(data
, sz
);
1768 case CACHE_EXT_FSMONITOR
:
1769 read_fsmonitor_extension(istate
, data
, sz
);
1771 case CACHE_EXT_ENDOFINDEXENTRIES
:
1772 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1773 /* already handled in do_read_index() */
1775 case CACHE_EXT_SPARSE_DIRECTORIES
:
1776 /* no content, only an indicator */
1777 istate
->sparse_index
= INDEX_COLLAPSED
;
1780 if (*ext
< 'A' || 'Z' < *ext
)
1781 return error(_("index uses %.4s extension, which we do not understand"),
1783 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1790 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1791 * into a new incore 'cache_entry'.
1793 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1794 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1795 * its members. Instead, we use the byte offsets of members within the struct to
1796 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1797 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1798 * into the corresponding incore 'cache_entry' members.
1800 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1801 unsigned int version
,
1803 unsigned long *ent_size
,
1804 const struct cache_entry
*previous_ce
)
1806 struct cache_entry
*ce
;
1809 const unsigned hashsz
= the_hash_algo
->rawsz
;
1810 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1812 size_t copy_len
= 0;
1814 * Adjacent cache entries tend to share the leading paths, so it makes
1815 * sense to only store the differences in later entries. In the v4
1816 * on-disk format of the index, each on-disk cache entry stores the
1817 * number of bytes to be stripped from the end of the previous name,
1818 * and the bytes to append to the result, to come up with its name.
1820 int expand_name_field
= version
== 4;
1822 /* On-disk flags are just 16 bits */
1823 flags
= get_be16(flagsp
);
1824 len
= flags
& CE_NAMEMASK
;
1826 if (flags
& CE_EXTENDED
) {
1828 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1829 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1830 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1831 die(_("unknown index entry format 0x%08x"), extended_flags
);
1832 flags
|= extended_flags
;
1833 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1836 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1838 if (expand_name_field
) {
1839 const unsigned char *cp
= (const unsigned char *)name
;
1840 size_t strip_len
, previous_len
;
1842 /* If we're at the beginning of a block, ignore the previous name */
1843 strip_len
= decode_varint(&cp
);
1845 previous_len
= previous_ce
->ce_namelen
;
1846 if (previous_len
< strip_len
)
1847 die(_("malformed name field in the index, near path '%s'"),
1849 copy_len
= previous_len
- strip_len
;
1851 name
= (const char *)cp
;
1854 if (len
== CE_NAMEMASK
) {
1856 if (expand_name_field
)
1860 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1863 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1864 * with something more akin to 'load_bitmap_entries_v1()'s use of
1865 * 'read_be16'/'read_be32'. For consistency with the corresponding
1866 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1867 * should be done at the same time as removing references to
1868 * 'ondisk_cache_entry' there.
1870 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1871 + offsetof(struct cache_time
, sec
));
1872 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1873 + offsetof(struct cache_time
, sec
));
1874 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1875 + offsetof(struct cache_time
, nsec
));
1876 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1877 + offsetof(struct cache_time
, nsec
));
1878 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1879 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1880 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1881 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1882 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1883 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1884 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1885 ce
->ce_namelen
= len
;
1887 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
));
1889 if (expand_name_field
) {
1891 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1892 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1893 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1895 memcpy(ce
->name
, name
, len
+ 1);
1896 *ent_size
= ondisk_ce_size(ce
);
1901 static void check_ce_order(struct index_state
*istate
)
1905 if (!verify_ce_order
)
1908 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1909 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1910 struct cache_entry
*next_ce
= istate
->cache
[i
];
1911 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1913 if (0 < name_compare
)
1914 die(_("unordered stage entries in index"));
1915 if (!name_compare
) {
1917 die(_("multiple stage entries for merged file '%s'"),
1919 if (ce_stage(ce
) > ce_stage(next_ce
))
1920 die(_("unordered stage entries for '%s'"),
1926 static void tweak_untracked_cache(struct index_state
*istate
)
1928 struct repository
*r
= the_repository
;
1930 prepare_repo_settings(r
);
1932 switch (r
->settings
.core_untracked_cache
) {
1933 case UNTRACKED_CACHE_REMOVE
:
1934 remove_untracked_cache(istate
);
1936 case UNTRACKED_CACHE_WRITE
:
1937 add_untracked_cache(istate
);
1939 case UNTRACKED_CACHE_KEEP
:
1941 * Either an explicit "core.untrackedCache=keep", the
1942 * default if "core.untrackedCache" isn't configured,
1943 * or a fallback on an unknown "core.untrackedCache"
1950 static void tweak_split_index(struct index_state
*istate
)
1952 switch (git_config_get_split_index()) {
1953 case -1: /* unset: do nothing */
1956 remove_split_index(istate
);
1959 add_split_index(istate
);
1961 default: /* unknown value: do nothing */
1966 static void post_read_index_from(struct index_state
*istate
)
1968 check_ce_order(istate
);
1969 tweak_untracked_cache(istate
);
1970 tweak_split_index(istate
);
1971 tweak_fsmonitor(istate
);
1974 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1976 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1979 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1981 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1984 * Account for potential alignment differences.
1986 per_entry
+= align_padding_size(per_entry
, 0);
1987 return ondisk_size
+ entries
* per_entry
;
1990 struct index_entry_offset
1992 /* starting byte offset into index file, count of index entries in this block */
1996 struct index_entry_offset_table
1999 struct index_entry_offset entries
[FLEX_ARRAY
];
2002 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2003 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2005 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2006 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2008 struct load_index_extensions
2011 struct index_state
*istate
;
2014 unsigned long src_offset
;
2017 static void *load_index_extensions(void *_data
)
2019 struct load_index_extensions
*p
= _data
;
2020 unsigned long src_offset
= p
->src_offset
;
2022 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2023 /* After an array of active_nr index entries,
2024 * there can be arbitrary number of extended
2025 * sections, each of which is prefixed with
2026 * extension name (4-byte) and section length
2027 * in 4-byte network byte order.
2029 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2030 if (read_index_extension(p
->istate
,
2031 p
->mmap
+ src_offset
,
2032 p
->mmap
+ src_offset
+ 8,
2034 munmap((void *)p
->mmap
, p
->mmap_size
);
2035 die(_("index file corrupt"));
2038 src_offset
+= extsize
;
2045 * A helper function that will load the specified range of cache entries
2046 * from the memory mapped file and add them to the given index.
2048 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2049 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2050 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2053 unsigned long src_offset
= start_offset
;
2055 for (i
= offset
; i
< offset
+ nr
; i
++) {
2056 struct cache_entry
*ce
;
2057 unsigned long consumed
;
2059 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2061 &consumed
, previous_ce
);
2062 set_index_entry(istate
, i
, ce
);
2064 src_offset
+= consumed
;
2067 return src_offset
- start_offset
;
2070 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2071 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2073 unsigned long consumed
;
2075 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2076 if (istate
->version
== 4) {
2077 mem_pool_init(istate
->ce_mem_pool
,
2078 estimate_cache_size_from_compressed(istate
->cache_nr
));
2080 mem_pool_init(istate
->ce_mem_pool
,
2081 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2084 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2085 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2090 * Mostly randomly chosen maximum thread counts: we
2091 * cap the parallelism to online_cpus() threads, and we want
2092 * to have at least 10000 cache entries per thread for it to
2093 * be worth starting a thread.
2096 #define THREAD_COST (10000)
2098 struct load_cache_entries_thread_data
2101 struct index_state
*istate
;
2102 struct mem_pool
*ce_mem_pool
;
2105 struct index_entry_offset_table
*ieot
;
2106 int ieot_start
; /* starting index into the ieot array */
2107 int ieot_blocks
; /* count of ieot entries to process */
2108 unsigned long consumed
; /* return # of bytes in index file processed */
2112 * A thread proc to run the load_cache_entries() computation
2113 * across multiple background threads.
2115 static void *load_cache_entries_thread(void *_data
)
2117 struct load_cache_entries_thread_data
*p
= _data
;
2120 /* iterate across all ieot blocks assigned to this thread */
2121 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2122 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2123 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2124 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2129 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2130 int nr_threads
, struct index_entry_offset_table
*ieot
)
2132 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2133 struct load_cache_entries_thread_data
*data
;
2134 unsigned long consumed
= 0;
2136 /* a little sanity checking */
2137 if (istate
->name_hash_initialized
)
2138 BUG("the name hash isn't thread safe");
2140 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2141 mem_pool_init(istate
->ce_mem_pool
, 0);
2143 /* ensure we have no more threads than we have blocks to process */
2144 if (nr_threads
> ieot
->nr
)
2145 nr_threads
= ieot
->nr
;
2146 CALLOC_ARRAY(data
, nr_threads
);
2148 offset
= ieot_start
= 0;
2149 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2150 for (i
= 0; i
< nr_threads
; i
++) {
2151 struct load_cache_entries_thread_data
*p
= &data
[i
];
2154 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2155 ieot_blocks
= ieot
->nr
- ieot_start
;
2161 p
->ieot_start
= ieot_start
;
2162 p
->ieot_blocks
= ieot_blocks
;
2164 /* create a mem_pool for each thread */
2166 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2167 nr
+= p
->ieot
->entries
[j
].nr
;
2168 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2169 if (istate
->version
== 4) {
2170 mem_pool_init(p
->ce_mem_pool
,
2171 estimate_cache_size_from_compressed(nr
));
2173 mem_pool_init(p
->ce_mem_pool
,
2174 estimate_cache_size(mmap_size
, nr
));
2177 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2179 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2181 /* increment by the number of cache entries in the ieot block being processed */
2182 for (j
= 0; j
< ieot_blocks
; j
++)
2183 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2184 ieot_start
+= ieot_blocks
;
2187 for (i
= 0; i
< nr_threads
; i
++) {
2188 struct load_cache_entries_thread_data
*p
= &data
[i
];
2190 err
= pthread_join(p
->pthread
, NULL
);
2192 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2193 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2194 consumed
+= p
->consumed
;
2202 static void set_new_index_sparsity(struct index_state
*istate
)
2205 * If the index's repo exists, mark it sparse according to
2208 prepare_repo_settings(istate
->repo
);
2209 if (!istate
->repo
->settings
.command_requires_full_index
&&
2210 is_sparse_index_allowed(istate
, 0))
2211 istate
->sparse_index
= 1;
2214 /* remember to discard_cache() before reading a different cache! */
2215 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2219 unsigned long src_offset
;
2220 const struct cache_header
*hdr
;
2223 struct load_index_extensions p
;
2224 size_t extension_offset
= 0;
2225 int nr_threads
, cpus
;
2226 struct index_entry_offset_table
*ieot
= NULL
;
2228 if (istate
->initialized
)
2229 return istate
->cache_nr
;
2231 istate
->timestamp
.sec
= 0;
2232 istate
->timestamp
.nsec
= 0;
2233 fd
= open(path
, O_RDONLY
);
2235 if (!must_exist
&& errno
== ENOENT
) {
2236 set_new_index_sparsity(istate
);
2239 die_errno(_("%s: index file open failed"), path
);
2243 die_errno(_("%s: cannot stat the open index"), path
);
2245 mmap_size
= xsize_t(st
.st_size
);
2246 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2247 die(_("%s: index file smaller than expected"), path
);
2249 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2250 if (mmap
== MAP_FAILED
)
2251 die_errno(_("%s: unable to map index file%s"), path
,
2255 hdr
= (const struct cache_header
*)mmap
;
2256 if (verify_hdr(hdr
, mmap_size
) < 0)
2259 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2260 istate
->version
= ntohl(hdr
->hdr_version
);
2261 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2262 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2263 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2264 istate
->initialized
= 1;
2268 p
.mmap_size
= mmap_size
;
2270 src_offset
= sizeof(*hdr
);
2272 if (git_config_get_index_threads(&nr_threads
))
2275 /* TODO: does creating more threads than cores help? */
2277 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2278 cpus
= online_cpus();
2279 if (nr_threads
> cpus
)
2286 if (nr_threads
> 1) {
2287 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2288 if (extension_offset
) {
2291 p
.src_offset
= extension_offset
;
2292 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2294 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2301 * Locate and read the index entry offset table so that we can use it
2302 * to multi-thread the reading of the cache entries.
2304 if (extension_offset
&& nr_threads
> 1)
2305 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2308 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2311 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2314 istate
->timestamp
.sec
= st
.st_mtime
;
2315 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2317 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2318 if (extension_offset
) {
2319 int ret
= pthread_join(p
.pthread
, NULL
);
2321 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2323 p
.src_offset
= src_offset
;
2324 load_index_extensions(&p
);
2326 munmap((void *)mmap
, mmap_size
);
2329 * TODO trace2: replace "the_repository" with the actual repo instance
2330 * that is associated with the given "istate".
2332 trace2_data_intmax("index", the_repository
, "read/version",
2334 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2338 * If the command explicitly requires a full index, force it
2339 * to be full. Otherwise, correct the sparsity based on repository
2340 * settings and other properties of the index (if necessary).
2342 prepare_repo_settings(istate
->repo
);
2343 if (istate
->repo
->settings
.command_requires_full_index
)
2344 ensure_full_index(istate
);
2346 ensure_correct_sparsity(istate
);
2348 return istate
->cache_nr
;
2351 munmap((void *)mmap
, mmap_size
);
2352 die(_("index file corrupt"));
2356 * Signal that the shared index is used by updating its mtime.
2358 * This way, shared index can be removed if they have not been used
2361 static void freshen_shared_index(const char *shared_index
, int warn
)
2363 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2364 warning(_("could not freshen shared index '%s'"), shared_index
);
2367 int read_index_from(struct index_state
*istate
, const char *path
,
2370 struct split_index
*split_index
;
2375 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2376 if (istate
->initialized
)
2377 return istate
->cache_nr
;
2380 * TODO trace2: replace "the_repository" with the actual repo instance
2381 * that is associated with the given "istate".
2383 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2385 trace_performance_enter();
2386 ret
= do_read_index(istate
, path
, 0);
2387 trace_performance_leave("read cache %s", path
);
2388 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2391 split_index
= istate
->split_index
;
2392 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2393 post_read_index_from(istate
);
2397 trace_performance_enter();
2398 if (split_index
->base
)
2399 release_index(split_index
->base
);
2401 ALLOC_ARRAY(split_index
->base
, 1);
2402 index_state_init(split_index
->base
, istate
->repo
);
2404 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2405 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2406 trace2_region_enter_printf("index", "shared/do_read_index",
2407 the_repository
, "%s", base_path
);
2408 ret
= do_read_index(split_index
->base
, base_path
, 0);
2409 trace2_region_leave_printf("index", "shared/do_read_index",
2410 the_repository
, "%s", base_path
);
2412 char *path_copy
= xstrdup(path
);
2413 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2414 dirname(path_copy
), base_oid_hex
);
2416 trace2_region_enter_printf("index", "shared/do_read_index",
2417 the_repository
, "%s", base_path2
);
2418 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2419 trace2_region_leave_printf("index", "shared/do_read_index",
2420 the_repository
, "%s", base_path2
);
2423 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2424 die(_("broken index, expect %s in %s, got %s"),
2425 base_oid_hex
, base_path
,
2426 oid_to_hex(&split_index
->base
->oid
));
2428 freshen_shared_index(base_path
, 0);
2429 merge_base_index(istate
);
2430 post_read_index_from(istate
);
2431 trace_performance_leave("read cache %s", base_path
);
2436 int is_index_unborn(struct index_state
*istate
)
2438 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2441 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2443 struct index_state blank
= INDEX_STATE_INIT(r
);
2444 memcpy(istate
, &blank
, sizeof(*istate
));
2447 void release_index(struct index_state
*istate
)
2450 * Cache entries in istate->cache[] should have been allocated
2451 * from the memory pool associated with this index, or from an
2452 * associated split_index. There is no need to free individual
2453 * cache entries. validate_cache_entries can detect when this
2454 * assertion does not hold.
2456 validate_cache_entries(istate
);
2458 resolve_undo_clear_index(istate
);
2459 free_name_hash(istate
);
2460 cache_tree_free(&(istate
->cache_tree
));
2461 free(istate
->fsmonitor_last_update
);
2462 free(istate
->cache
);
2463 discard_split_index(istate
);
2464 free_untracked_cache(istate
->untracked
);
2466 if (istate
->sparse_checkout_patterns
) {
2467 clear_pattern_list(istate
->sparse_checkout_patterns
);
2468 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2471 if (istate
->ce_mem_pool
) {
2472 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2473 FREE_AND_NULL(istate
->ce_mem_pool
);
2477 void discard_index(struct index_state
*istate
)
2479 release_index(istate
);
2480 index_state_init(istate
, istate
->repo
);
2484 * Validate the cache entries of this index.
2485 * All cache entries associated with this index
2486 * should have been allocated by the memory pool
2487 * associated with this index, or by a referenced
2490 void validate_cache_entries(const struct index_state
*istate
)
2494 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2497 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2499 BUG("cache entry is not allocated from expected memory pool");
2500 } else if (!istate
->ce_mem_pool
||
2501 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2502 if (!istate
->split_index
||
2503 !istate
->split_index
->base
||
2504 !istate
->split_index
->base
->ce_mem_pool
||
2505 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2506 BUG("cache entry is not allocated from expected memory pool");
2511 if (istate
->split_index
)
2512 validate_cache_entries(istate
->split_index
->base
);
2515 int unmerged_index(const struct index_state
*istate
)
2518 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2519 if (ce_stage(istate
->cache
[i
]))
2525 int repo_index_has_changes(struct repository
*repo
,
2529 struct index_state
*istate
= repo
->index
;
2530 struct object_id cmp
;
2534 cmp
= tree
->object
.oid
;
2535 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2536 struct diff_options opt
;
2538 repo_diff_setup(repo
, &opt
);
2539 opt
.flags
.exit_with_status
= 1;
2541 opt
.flags
.quick
= 1;
2542 diff_setup_done(&opt
);
2543 do_diff_cache(&cmp
, &opt
);
2545 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2547 strbuf_addch(sb
, ' ');
2548 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2551 return opt
.flags
.has_changes
!= 0;
2553 /* TODO: audit for interaction with sparse-index. */
2554 ensure_full_index(istate
);
2555 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2557 strbuf_addch(sb
, ' ');
2558 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2560 return !!istate
->cache_nr
;
2564 static int write_index_ext_header(struct hashfile
*f
,
2565 git_hash_ctx
*eoie_f
,
2569 hashwrite_be32(f
, ext
);
2570 hashwrite_be32(f
, sz
);
2575 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2576 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2581 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2582 struct cache_entry
*ce
)
2585 * The only thing we care about in this function is to smudge the
2586 * falsely clean entry due to touch-update-touch race, so we leave
2587 * everything else as they are. We are called for entries whose
2588 * ce_stat_data.sd_mtime match the index file mtime.
2590 * Note that this actually does not do much for gitlinks, for
2591 * which ce_match_stat_basic() always goes to the actual
2592 * contents. The caller checks with is_racy_timestamp() which
2593 * always says "no" for gitlinks, so we are not called for them ;-)
2597 if (lstat(ce
->name
, &st
) < 0)
2599 if (ce_match_stat_basic(ce
, &st
))
2601 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2602 /* This is "racily clean"; smudge it. Note that this
2603 * is a tricky code. At first glance, it may appear
2604 * that it can break with this sequence:
2606 * $ echo xyzzy >frotz
2607 * $ git-update-index --add frotz
2610 * $ echo filfre >nitfol
2611 * $ git-update-index --add nitfol
2613 * but it does not. When the second update-index runs,
2614 * it notices that the entry "frotz" has the same timestamp
2615 * as index, and if we were to smudge it by resetting its
2616 * size to zero here, then the object name recorded
2617 * in index is the 6-byte file but the cached stat information
2618 * becomes zero --- which would then match what we would
2619 * obtain from the filesystem next time we stat("frotz").
2621 * However, the second update-index, before calling
2622 * this function, notices that the cached size is 6
2623 * bytes and what is on the filesystem is an empty
2624 * file, and never calls us, so the cached size information
2625 * for "frotz" stays 6 which does not match the filesystem.
2627 ce
->ce_stat_data
.sd_size
= 0;
2631 /* Copy miscellaneous fields but not the name */
2632 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2633 struct cache_entry
*ce
)
2636 const unsigned hashsz
= the_hash_algo
->rawsz
;
2637 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2639 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2640 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2641 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2642 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2643 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2644 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2645 ondisk
->mode
= htonl(ce
->ce_mode
);
2646 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2647 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2648 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2649 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2651 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2652 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2653 flagsp
[0] = htons(flags
);
2654 if (ce
->ce_flags
& CE_EXTENDED
) {
2655 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2659 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2660 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2663 unsigned int saved_namelen
;
2664 int stripped_name
= 0;
2665 static unsigned char padding
[8] = { 0x00 };
2667 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2668 saved_namelen
= ce_namelen(ce
);
2673 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2675 if (!previous_name
) {
2676 int len
= ce_namelen(ce
);
2677 copy_cache_entry_to_ondisk(ondisk
, ce
);
2678 hashwrite(f
, ondisk
, size
);
2679 hashwrite(f
, ce
->name
, len
);
2680 hashwrite(f
, padding
, align_padding_size(size
, len
));
2682 int common
, to_remove
, prefix_size
;
2683 unsigned char to_remove_vi
[16];
2685 (ce
->name
[common
] &&
2686 common
< previous_name
->len
&&
2687 ce
->name
[common
] == previous_name
->buf
[common
]);
2689 ; /* still matching */
2690 to_remove
= previous_name
->len
- common
;
2691 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2693 copy_cache_entry_to_ondisk(ondisk
, ce
);
2694 hashwrite(f
, ondisk
, size
);
2695 hashwrite(f
, to_remove_vi
, prefix_size
);
2696 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2697 hashwrite(f
, padding
, 1);
2699 strbuf_splice(previous_name
, common
, to_remove
,
2700 ce
->name
+ common
, ce_namelen(ce
) - common
);
2702 if (stripped_name
) {
2703 ce
->ce_namelen
= saved_namelen
;
2704 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2711 * This function verifies if index_state has the correct sha1 of the
2712 * index file. Don't die if we have any other failure, just return 0.
2714 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2719 unsigned char hash
[GIT_MAX_RAWSZ
];
2721 if (!istate
->initialized
)
2724 fd
= open(path
, O_RDONLY
);
2731 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2734 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2735 if (n
!= the_hash_algo
->rawsz
)
2738 if (!hasheq(istate
->oid
.hash
, hash
))
2749 static int repo_verify_index(struct repository
*repo
)
2751 return verify_index_from(repo
->index
, repo
->index_file
);
2754 int has_racy_timestamp(struct index_state
*istate
)
2756 int entries
= istate
->cache_nr
;
2759 for (i
= 0; i
< entries
; i
++) {
2760 struct cache_entry
*ce
= istate
->cache
[i
];
2761 if (is_racy_timestamp(istate
, ce
))
2767 void repo_update_index_if_able(struct repository
*repo
,
2768 struct lock_file
*lockfile
)
2770 if ((repo
->index
->cache_changed
||
2771 has_racy_timestamp(repo
->index
)) &&
2772 repo_verify_index(repo
))
2773 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2775 rollback_lock_file(lockfile
);
2778 static int record_eoie(void)
2782 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2786 * As a convenience, the end of index entries extension
2787 * used for threading is written by default if the user
2788 * explicitly requested threaded index reads.
2790 return !git_config_get_index_threads(&val
) && val
!= 1;
2793 static int record_ieot(void)
2797 if (!git_config_get_bool("index.recordoffsettable", &val
))
2801 * As a convenience, the offset table used for threading is
2802 * written by default if the user explicitly requested
2803 * threaded index reads.
2805 return !git_config_get_index_threads(&val
) && val
!= 1;
2808 enum write_extensions
{
2809 WRITE_NO_EXTENSION
= 0,
2810 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2811 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2812 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2813 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2814 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2816 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2819 * On success, `tempfile` is closed. If it is the temporary file
2820 * of a `struct lock_file`, we will therefore effectively perform
2821 * a 'close_lock_file_gently()`. Since that is an implementation
2822 * detail of lockfiles, callers of `do_write_index()` should not
2825 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2826 enum write_extensions write_extensions
, unsigned flags
)
2828 uint64_t start
= getnanotime();
2830 git_hash_ctx
*eoie_c
= NULL
;
2831 struct cache_header hdr
;
2832 int i
, err
= 0, removed
, extended
, hdr_version
;
2833 struct cache_entry
**cache
= istate
->cache
;
2834 int entries
= istate
->cache_nr
;
2836 struct ondisk_cache_entry ondisk
;
2837 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2838 int drop_cache_tree
= istate
->drop_cache_tree
;
2840 int csum_fsync_flag
;
2841 int ieot_entries
= 1;
2842 struct index_entry_offset_table
*ieot
= NULL
;
2844 struct repository
*r
= istate
->repo
;
2846 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2848 prepare_repo_settings(r
);
2849 f
->skip_hash
= r
->settings
.index_skip_hash
;
2851 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2852 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2855 /* reduce extended entries if possible */
2856 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2857 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2859 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2863 if (!istate
->version
)
2864 istate
->version
= get_index_format_default(r
);
2866 /* demote version 3 to version 2 when the latter suffices */
2867 if (istate
->version
== 3 || istate
->version
== 2)
2868 istate
->version
= extended
? 3 : 2;
2870 hdr_version
= istate
->version
;
2872 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2873 hdr
.hdr_version
= htonl(hdr_version
);
2874 hdr
.hdr_entries
= htonl(entries
- removed
);
2876 hashwrite(f
, &hdr
, sizeof(hdr
));
2878 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2881 if (nr_threads
!= 1 && record_ieot()) {
2882 int ieot_blocks
, cpus
;
2885 * ensure default number of ieot blocks maps evenly to the
2886 * default number of threads that will process them leaving
2887 * room for the thread to load the index extensions.
2890 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2891 cpus
= online_cpus();
2892 if (ieot_blocks
> cpus
- 1)
2893 ieot_blocks
= cpus
- 1;
2895 ieot_blocks
= nr_threads
;
2896 if (ieot_blocks
> istate
->cache_nr
)
2897 ieot_blocks
= istate
->cache_nr
;
2901 * no reason to write out the IEOT extension if we don't
2902 * have enough blocks to utilize multi-threading
2904 if (ieot_blocks
> 1) {
2905 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2906 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2907 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2911 offset
= hashfile_total(f
);
2914 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2916 for (i
= 0; i
< entries
; i
++) {
2917 struct cache_entry
*ce
= cache
[i
];
2918 if (ce
->ce_flags
& CE_REMOVE
)
2920 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2921 ce_smudge_racily_clean_entry(istate
, ce
);
2922 if (is_null_oid(&ce
->oid
)) {
2923 static const char msg
[] = "cache entry has null sha1: %s";
2924 static int allow
= -1;
2927 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2929 warning(msg
, ce
->name
);
2931 err
= error(msg
, ce
->name
);
2933 drop_cache_tree
= 1;
2935 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2936 ieot
->entries
[ieot
->nr
].nr
= nr
;
2937 ieot
->entries
[ieot
->nr
].offset
= offset
;
2940 * If we have a V4 index, set the first byte to an invalid
2941 * character to ensure there is nothing common with the previous
2945 previous_name
->buf
[0] = 0;
2948 offset
= hashfile_total(f
);
2950 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2958 ieot
->entries
[ieot
->nr
].nr
= nr
;
2959 ieot
->entries
[ieot
->nr
].offset
= offset
;
2962 strbuf_release(&previous_name_buf
);
2969 offset
= hashfile_total(f
);
2972 * The extension headers must be hashed on their own for the
2973 * EOIE extension. Create a hashfile here to compute that hash.
2975 if (offset
&& record_eoie()) {
2976 CALLOC_ARRAY(eoie_c
, 1);
2977 the_hash_algo
->init_fn(eoie_c
);
2981 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2982 * can minimize the number of extensions we have to scan through to
2983 * find it during load. Write it out regardless of the
2984 * strip_extensions parameter as we need it when loading the shared
2988 struct strbuf sb
= STRBUF_INIT
;
2990 write_ieot_extension(&sb
, ieot
);
2991 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2992 hashwrite(f
, sb
.buf
, sb
.len
);
2993 strbuf_release(&sb
);
2999 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3000 istate
->split_index
) {
3001 struct strbuf sb
= STRBUF_INIT
;
3003 if (istate
->sparse_index
)
3004 die(_("cannot write split index for a sparse index"));
3006 err
= write_link_extension(&sb
, istate
) < 0 ||
3007 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3009 hashwrite(f
, sb
.buf
, sb
.len
);
3010 strbuf_release(&sb
);
3014 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3015 !drop_cache_tree
&& istate
->cache_tree
) {
3016 struct strbuf sb
= STRBUF_INIT
;
3018 cache_tree_write(&sb
, istate
->cache_tree
);
3019 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3020 hashwrite(f
, sb
.buf
, sb
.len
);
3021 strbuf_release(&sb
);
3025 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3026 istate
->resolve_undo
) {
3027 struct strbuf sb
= STRBUF_INIT
;
3029 resolve_undo_write(&sb
, istate
->resolve_undo
);
3030 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3032 hashwrite(f
, sb
.buf
, sb
.len
);
3033 strbuf_release(&sb
);
3037 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3038 istate
->untracked
) {
3039 struct strbuf sb
= STRBUF_INIT
;
3041 write_untracked_extension(&sb
, istate
->untracked
);
3042 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3044 hashwrite(f
, sb
.buf
, sb
.len
);
3045 strbuf_release(&sb
);
3049 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3050 istate
->fsmonitor_last_update
) {
3051 struct strbuf sb
= STRBUF_INIT
;
3053 write_fsmonitor_extension(&sb
, istate
);
3054 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3055 hashwrite(f
, sb
.buf
, sb
.len
);
3056 strbuf_release(&sb
);
3060 if (istate
->sparse_index
) {
3061 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3066 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3067 * so that it can be found and processed before all the index entries are
3068 * read. Write it out regardless of the strip_extensions parameter as we need it
3069 * when loading the shared index.
3072 struct strbuf sb
= STRBUF_INIT
;
3074 write_eoie_extension(&sb
, eoie_c
, offset
);
3075 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3076 hashwrite(f
, sb
.buf
, sb
.len
);
3077 strbuf_release(&sb
);
3082 csum_fsync_flag
= 0;
3083 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3084 csum_fsync_flag
= CSUM_FSYNC
;
3086 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3087 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3089 if (close_tempfile_gently(tempfile
)) {
3090 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3093 if (stat(get_tempfile_path(tempfile
), &st
))
3095 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3096 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3097 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3100 * TODO trace2: replace "the_repository" with the actual repo instance
3101 * that is associated with the given "istate".
3103 trace2_data_intmax("index", the_repository
, "write/version",
3105 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3111 void set_alternate_index_output(const char *name
)
3113 alternate_index_output
= name
;
3116 static int commit_locked_index(struct lock_file
*lk
)
3118 if (alternate_index_output
)
3119 return commit_lock_file_to(lk
, alternate_index_output
);
3121 return commit_lock_file(lk
);
3124 static int do_write_locked_index(struct index_state
*istate
,
3125 struct lock_file
*lock
,
3127 enum write_extensions write_extensions
)
3130 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3132 ret
= convert_to_sparse(istate
, 0);
3135 warning(_("failed to convert to a sparse-index"));
3140 * TODO trace2: replace "the_repository" with the actual repo instance
3141 * that is associated with the given "istate".
3143 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3144 "%s", get_lock_file_path(lock
));
3145 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3146 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3147 "%s", get_lock_file_path(lock
));
3150 ensure_full_index(istate
);
3154 if (flags
& COMMIT_LOCK
)
3155 ret
= commit_locked_index(lock
);
3157 ret
= close_lock_file_gently(lock
);
3159 run_hooks_l("post-index-change",
3160 istate
->updated_workdir
? "1" : "0",
3161 istate
->updated_skipworktree
? "1" : "0", NULL
);
3162 istate
->updated_workdir
= 0;
3163 istate
->updated_skipworktree
= 0;
3168 static int write_split_index(struct index_state
*istate
,
3169 struct lock_file
*lock
,
3173 prepare_to_write_split_index(istate
);
3174 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3175 finish_writing_split_index(istate
);
3179 static const char *shared_index_expire
= "2.weeks.ago";
3181 static unsigned long get_shared_index_expire_date(void)
3183 static unsigned long shared_index_expire_date
;
3184 static int shared_index_expire_date_prepared
;
3186 if (!shared_index_expire_date_prepared
) {
3187 git_config_get_expiry("splitindex.sharedindexexpire",
3188 &shared_index_expire
);
3189 shared_index_expire_date
= approxidate(shared_index_expire
);
3190 shared_index_expire_date_prepared
= 1;
3193 return shared_index_expire_date
;
3196 static int should_delete_shared_index(const char *shared_index_path
)
3199 unsigned long expiration
;
3201 /* Check timestamp */
3202 expiration
= get_shared_index_expire_date();
3205 if (stat(shared_index_path
, &st
))
3206 return error_errno(_("could not stat '%s'"), shared_index_path
);
3207 if (st
.st_mtime
> expiration
)
3213 static int clean_shared_index_files(const char *current_hex
)
3216 DIR *dir
= opendir(get_git_dir());
3219 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3221 while ((de
= readdir(dir
)) != NULL
) {
3222 const char *sha1_hex
;
3223 const char *shared_index_path
;
3224 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3226 if (!strcmp(sha1_hex
, current_hex
))
3228 shared_index_path
= git_path("%s", de
->d_name
);
3229 if (should_delete_shared_index(shared_index_path
) > 0 &&
3230 unlink(shared_index_path
))
3231 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3238 static int write_shared_index(struct index_state
*istate
,
3239 struct tempfile
**temp
, unsigned flags
)
3241 struct split_index
*si
= istate
->split_index
;
3242 int ret
, was_full
= !istate
->sparse_index
;
3244 move_cache_to_base_index(istate
);
3245 convert_to_sparse(istate
, 0);
3247 trace2_region_enter_printf("index", "shared/do_write_index",
3248 the_repository
, "%s", get_tempfile_path(*temp
));
3249 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3250 trace2_region_leave_printf("index", "shared/do_write_index",
3251 the_repository
, "%s", get_tempfile_path(*temp
));
3254 ensure_full_index(istate
);
3258 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3260 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3263 ret
= rename_tempfile(temp
,
3264 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3266 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3267 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3273 static const int default_max_percent_split_change
= 20;
3275 static int too_many_not_shared_entries(struct index_state
*istate
)
3277 int i
, not_shared
= 0;
3278 int max_split
= git_config_get_max_percent_split_change();
3280 switch (max_split
) {
3282 /* not or badly configured: use the default value */
3283 max_split
= default_max_percent_split_change
;
3286 return 1; /* 0% means always write a new shared index */
3288 return 0; /* 100% means never write a new shared index */
3290 break; /* just use the configured value */
3293 /* Count not shared entries */
3294 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3295 struct cache_entry
*ce
= istate
->cache
[i
];
3300 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3303 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3306 int new_shared_index
, ret
, test_split_index_env
;
3307 struct split_index
*si
= istate
->split_index
;
3309 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3310 cache_tree_verify(the_repository
, istate
);
3312 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3313 if (flags
& COMMIT_LOCK
)
3314 rollback_lock_file(lock
);
3318 if (istate
->fsmonitor_last_update
)
3319 fill_fsmonitor_bitmap(istate
);
3321 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3323 if ((!si
&& !test_split_index_env
) ||
3324 alternate_index_output
||
3325 (istate
->cache_changed
& ~EXTMASK
)) {
3326 ret
= do_write_locked_index(istate
, lock
, flags
,
3327 ~WRITE_SPLIT_INDEX_EXTENSION
);
3331 if (test_split_index_env
) {
3333 si
= init_split_index(istate
);
3334 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3336 int v
= si
->base_oid
.hash
[0];
3338 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3341 if (too_many_not_shared_entries(istate
))
3342 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3344 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3346 if (new_shared_index
) {
3347 struct tempfile
*temp
;
3350 /* Same initial permissions as the main .git/index file */
3351 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3353 ret
= do_write_locked_index(istate
, lock
, flags
,
3354 ~WRITE_SPLIT_INDEX_EXTENSION
);
3357 ret
= write_shared_index(istate
, &temp
, flags
);
3359 saved_errno
= errno
;
3360 if (is_tempfile_active(temp
))
3361 delete_tempfile(&temp
);
3362 errno
= saved_errno
;
3368 ret
= write_split_index(istate
, lock
, flags
);
3370 /* Freshen the shared index only if the split-index was written */
3371 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3372 const char *shared_index
= git_path("sharedindex.%s",
3373 oid_to_hex(&si
->base_oid
));
3374 freshen_shared_index(shared_index
, 1);
3378 if (flags
& COMMIT_LOCK
)
3379 rollback_lock_file(lock
);
3384 * Read the index file that is potentially unmerged into given
3385 * index_state, dropping any unmerged entries to stage #0 (potentially
3386 * resulting in a path appearing as both a file and a directory in the
3387 * index; the caller is responsible to clear out the extra entries
3388 * before writing the index to a tree). Returns true if the index is
3389 * unmerged. Callers who want to refuse to work from an unmerged
3390 * state can call this and check its return value, instead of calling
3393 int repo_read_index_unmerged(struct repository
*repo
)
3395 struct index_state
*istate
;
3399 repo_read_index(repo
);
3400 istate
= repo
->index
;
3401 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3402 struct cache_entry
*ce
= istate
->cache
[i
];
3403 struct cache_entry
*new_ce
;
3409 len
= ce_namelen(ce
);
3410 new_ce
= make_empty_cache_entry(istate
, len
);
3411 memcpy(new_ce
->name
, ce
->name
, len
);
3412 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3413 new_ce
->ce_namelen
= len
;
3414 new_ce
->ce_mode
= ce
->ce_mode
;
3415 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3416 return error(_("%s: cannot drop to stage #0"),
3423 * Returns 1 if the path is an "other" path with respect to
3424 * the index; that is, the path is not mentioned in the index at all,
3425 * either as a file, a directory with some files in the index,
3426 * or as an unmerged entry.
3428 * We helpfully remove a trailing "/" from directories so that
3429 * the output of read_directory can be used as-is.
3431 int index_name_is_other(struct index_state
*istate
, const char *name
,
3435 if (namelen
&& name
[namelen
- 1] == '/')
3437 pos
= index_name_pos(istate
, name
, namelen
);
3439 return 0; /* exact match */
3441 if (pos
< istate
->cache_nr
) {
3442 struct cache_entry
*ce
= istate
->cache
[pos
];
3443 if (ce_namelen(ce
) == namelen
&&
3444 !memcmp(ce
->name
, name
, namelen
))
3445 return 0; /* Yup, this one exists unmerged */
3450 void *read_blob_data_from_index(struct index_state
*istate
,
3451 const char *path
, unsigned long *size
)
3455 enum object_type type
;
3459 pos
= index_name_pos(istate
, path
, len
);
3462 * We might be in the middle of a merge, in which
3463 * case we would read stage #2 (ours).
3467 (pos
< 0 && i
< istate
->cache_nr
&&
3468 !strcmp(istate
->cache
[i
]->name
, path
));
3470 if (ce_stage(istate
->cache
[i
]) == 2)
3475 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3477 if (!data
|| type
!= OBJ_BLOB
) {
3486 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3488 dst
->untracked
= src
->untracked
;
3489 src
->untracked
= NULL
;
3490 dst
->cache_tree
= src
->cache_tree
;
3491 src
->cache_tree
= NULL
;
3494 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3495 struct index_state
*istate
)
3497 unsigned int size
= ce_size(ce
);
3498 int mem_pool_allocated
;
3499 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3500 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3502 memcpy(new_entry
, ce
, size
);
3503 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3507 void discard_cache_entry(struct cache_entry
*ce
)
3509 if (ce
&& should_validate_cache_entries())
3510 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3512 if (ce
&& ce
->mem_pool_allocated
)
3518 int should_validate_cache_entries(void)
3520 static int validate_index_cache_entries
= -1;
3522 if (validate_index_cache_entries
< 0) {
3523 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3524 validate_index_cache_entries
= 1;
3526 validate_index_cache_entries
= 0;
3529 return validate_index_cache_entries
;
3532 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3533 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3535 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3538 * The end of index entries (EOIE) extension is guaranteed to be last
3539 * so that it can be found by scanning backwards from the EOF.
3546 const char *index
, *eoie
;
3548 size_t offset
, src_offset
;
3549 unsigned char hash
[GIT_MAX_RAWSZ
];
3552 /* ensure we have an index big enough to contain an EOIE extension */
3553 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3556 /* validate the extension signature */
3557 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3558 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3560 index
+= sizeof(uint32_t);
3562 /* validate the extension size */
3563 extsize
= get_be32(index
);
3564 if (extsize
!= EOIE_SIZE
)
3566 index
+= sizeof(uint32_t);
3569 * Validate the offset we're going to look for the first extension
3570 * signature is after the index header and before the eoie extension.
3572 offset
= get_be32(index
);
3573 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3575 if (mmap
+ offset
>= eoie
)
3577 index
+= sizeof(uint32_t);
3580 * The hash is computed over extension types and their sizes (but not
3581 * their contents). E.g. if we have "TREE" extension that is N-bytes
3582 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3583 * then the hash would be:
3585 * SHA-1("TREE" + <binary representation of N> +
3586 * "REUC" + <binary representation of M>)
3588 src_offset
= offset
;
3589 the_hash_algo
->init_fn(&c
);
3590 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3591 /* After an array of active_nr index entries,
3592 * there can be arbitrary number of extended
3593 * sections, each of which is prefixed with
3594 * extension name (4-byte) and section length
3595 * in 4-byte network byte order.
3598 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3599 extsize
= ntohl(extsize
);
3601 /* verify the extension size isn't so large it will wrap around */
3602 if (src_offset
+ 8 + extsize
< src_offset
)
3605 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3608 src_offset
+= extsize
;
3610 the_hash_algo
->final_fn(hash
, &c
);
3611 if (!hasheq(hash
, (const unsigned char *)index
))
3614 /* Validate that the extension offsets returned us back to the eoie extension. */
3615 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3621 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3624 unsigned char hash
[GIT_MAX_RAWSZ
];
3627 put_be32(&buffer
, offset
);
3628 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3631 the_hash_algo
->final_fn(hash
, eoie_context
);
3632 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3635 #define IEOT_VERSION (1)
3637 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3639 const char *index
= NULL
;
3640 uint32_t extsize
, ext_version
;
3641 struct index_entry_offset_table
*ieot
;
3644 /* find the IEOT extension */
3647 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3648 extsize
= get_be32(mmap
+ offset
+ 4);
3649 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3650 index
= mmap
+ offset
+ 4 + 4;
3659 /* validate the version is IEOT_VERSION */
3660 ext_version
= get_be32(index
);
3661 if (ext_version
!= IEOT_VERSION
) {
3662 error("invalid IEOT version %d", ext_version
);
3665 index
+= sizeof(uint32_t);
3667 /* extension size - version bytes / bytes per entry */
3668 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3670 error("invalid number of IEOT entries %d", nr
);
3673 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3674 + (nr
* sizeof(struct index_entry_offset
)));
3676 for (i
= 0; i
< nr
; i
++) {
3677 ieot
->entries
[i
].offset
= get_be32(index
);
3678 index
+= sizeof(uint32_t);
3679 ieot
->entries
[i
].nr
= get_be32(index
);
3680 index
+= sizeof(uint32_t);
3686 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3692 put_be32(&buffer
, IEOT_VERSION
);
3693 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3696 for (i
= 0; i
< ieot
->nr
; i
++) {
3699 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3700 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3703 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3704 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3708 void prefetch_cache_entries(const struct index_state
*istate
,
3709 must_prefetch_predicate must_prefetch
)
3712 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3714 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3715 struct cache_entry
*ce
= istate
->cache
[i
];
3717 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3719 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3721 OBJECT_INFO_FOR_PREFETCH
))
3723 oid_array_append(&to_fetch
, &ce
->oid
);
3725 promisor_remote_get_direct(the_repository
,
3726 to_fetch
.oid
, to_fetch
.nr
);
3727 oid_array_clear(&to_fetch
);
3730 static int read_one_entry_opt(struct index_state
*istate
,
3731 const struct object_id
*oid
,
3732 struct strbuf
*base
,
3733 const char *pathname
,
3734 unsigned mode
, int opt
)
3737 struct cache_entry
*ce
;
3740 return READ_TREE_RECURSIVE
;
3742 len
= strlen(pathname
);
3743 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3745 ce
->ce_mode
= create_ce_mode(mode
);
3746 ce
->ce_flags
= create_ce_flags(1);
3747 ce
->ce_namelen
= base
->len
+ len
;
3748 memcpy(ce
->name
, base
->buf
, base
->len
);
3749 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3750 oidcpy(&ce
->oid
, oid
);
3751 return add_index_entry(istate
, ce
, opt
);
3754 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3755 const char *pathname
, unsigned mode
,
3758 struct index_state
*istate
= context
;
3759 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3761 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3765 * This is used when the caller knows there is no existing entries at
3766 * the stage that will conflict with the entry being added.
3768 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3769 const char *pathname
, unsigned mode
,
3772 struct index_state
*istate
= context
;
3773 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3774 mode
, ADD_CACHE_JUST_APPEND
);
3778 * Read the tree specified with --with-tree option
3779 * (typically, HEAD) into stage #1 and then
3780 * squash them down to stage #0. This is used for
3781 * --error-unmatch to list and check the path patterns
3782 * that were given from the command line. We are not
3783 * going to write this index out.
3785 void overlay_tree_on_index(struct index_state
*istate
,
3786 const char *tree_name
, const char *prefix
)
3789 struct object_id oid
;
3790 struct pathspec pathspec
;
3791 struct cache_entry
*last_stage0
= NULL
;
3793 read_tree_fn_t fn
= NULL
;
3796 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3797 die("tree-ish %s not found.", tree_name
);
3798 tree
= parse_tree_indirect(&oid
);
3800 die("bad tree-ish %s", tree_name
);
3802 /* Hoist the unmerged entries up to stage #3 to make room */
3803 /* TODO: audit for interaction with sparse-index. */
3804 ensure_full_index(istate
);
3805 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3806 struct cache_entry
*ce
= istate
->cache
[i
];
3809 ce
->ce_flags
|= CE_STAGEMASK
;
3813 static const char *(matchbuf
[1]);
3815 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3816 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3818 memset(&pathspec
, 0, sizeof(pathspec
));
3821 * See if we have cache entry at the stage. If so,
3822 * do it the original slow way, otherwise, append and then
3825 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3826 const struct cache_entry
*ce
= istate
->cache
[i
];
3827 if (ce_stage(ce
) == 1)
3828 fn
= read_one_entry
;
3832 fn
= read_one_entry_quick
;
3833 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3834 clear_pathspec(&pathspec
);
3836 die("unable to read tree entries %s", tree_name
);
3839 * Sort the cache entry -- we need to nuke the cache tree, though.
3841 if (fn
== read_one_entry_quick
) {
3842 cache_tree_free(&istate
->cache_tree
);
3843 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3846 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3847 struct cache_entry
*ce
= istate
->cache
[i
];
3848 switch (ce_stage(ce
)) {
3856 * If there is stage #0 entry for this, we do not
3857 * need to show it. We use CE_UPDATE bit to mark
3861 !strcmp(last_stage0
->name
, ce
->name
))
3862 ce
->ce_flags
|= CE_UPDATE
;
3867 struct update_callback_data
{
3868 struct index_state
*index
;
3874 static int fix_unmerged_status(struct diff_filepair
*p
,
3875 struct update_callback_data
*data
)
3877 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3879 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3881 * This is not an explicit add request, and the
3882 * path is missing from the working tree (deleted)
3884 return DIFF_STATUS_DELETED
;
3887 * Either an explicit add request, or path exists
3888 * in the working tree. An attempt to explicitly
3889 * add a path that does not exist in the working tree
3890 * will be caught as an error by the caller immediately.
3892 return DIFF_STATUS_MODIFIED
;
3895 static void update_callback(struct diff_queue_struct
*q
,
3896 struct diff_options
*opt UNUSED
, void *cbdata
)
3899 struct update_callback_data
*data
= cbdata
;
3901 for (i
= 0; i
< q
->nr
; i
++) {
3902 struct diff_filepair
*p
= q
->queue
[i
];
3903 const char *path
= p
->one
->path
;
3905 if (!data
->include_sparse
&&
3906 !path_in_sparse_checkout(path
, data
->index
))
3909 switch (fix_unmerged_status(p
, data
)) {
3911 die(_("unexpected diff status %c"), p
->status
);
3912 case DIFF_STATUS_MODIFIED
:
3913 case DIFF_STATUS_TYPE_CHANGED
:
3914 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3915 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3916 die(_("updating files failed"));
3920 case DIFF_STATUS_DELETED
:
3921 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3923 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3924 remove_file_from_index(data
->index
, path
);
3925 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3926 printf(_("remove '%s'\n"), path
);
3932 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3933 const struct pathspec
*pathspec
, int include_sparse
,
3936 struct update_callback_data data
;
3937 struct rev_info rev
;
3939 memset(&data
, 0, sizeof(data
));
3940 data
.index
= repo
->index
;
3941 data
.include_sparse
= include_sparse
;
3944 repo_init_revisions(repo
, &rev
, prefix
);
3945 setup_revisions(0, NULL
, &rev
, NULL
);
3947 copy_pathspec(&rev
.prune_data
, pathspec
);
3948 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3949 rev
.diffopt
.format_callback
= update_callback
;
3950 rev
.diffopt
.format_callback_data
= &data
;
3951 rev
.diffopt
.flags
.override_submodule_config
= 1;
3952 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3955 * Use an ODB transaction to optimize adding multiple objects.
3956 * This function is invoked from commands other than 'add', which
3957 * may not have their own transaction active.
3959 begin_odb_transaction();
3960 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3961 end_odb_transaction();
3963 release_revisions(&rev
);
3964 return !!data
.add_errors
;