2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
7 #define USE_THE_REPOSITORY_VARIABLE
9 #include "git-compat-util.h"
10 #include "bulk-checkin.h"
18 #include "cache-tree.h"
21 #include "object-file.h"
22 #include "object-store-ll.h"
23 #include "oid-array.h"
26 #include "environment.h"
29 #include "name-hash.h"
30 #include "object-name.h"
32 #include "preload-index.h"
33 #include "read-cache.h"
34 #include "resolve-undo.h"
39 #include "split-index.h"
42 #include "fsmonitor.h"
43 #include "thread-utils.h"
45 #include "sparse-index.h"
46 #include "csum-file.h"
47 #include "promisor-remote.h"
50 /* Mask for the name length in ce_flags in the on-disk index */
52 #define CE_NAMEMASK (0x0fff)
56 * The first letter should be 'A'..'Z' for extensions that are not
57 * necessary for a correct operation (i.e. optimization data).
58 * When new extensions are added that _needs_ to be understood in
59 * order to correctly interpret the index file, pick character that
60 * is outside the range, to cause the reader to abort.
63 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
64 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
65 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
66 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
67 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
68 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
69 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
70 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
71 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
73 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
74 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
75 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
76 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
80 * This is an estimate of the pathname length in the index. We use
81 * this for V4 index files to guess the un-deltafied size of the index
82 * in memory because of pathname deltafication. This is not required
83 * for V2/V3 index formats because their pathnames are not compressed.
84 * If the initial amount of memory set aside is not sufficient, the
85 * mem pool will allocate extra memory.
87 #define CACHE_ENTRY_PATH_LENGTH 80
89 enum index_search_mode
{
94 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
96 struct cache_entry
*ce
;
97 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
98 ce
->mem_pool_allocated
= 1;
102 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
104 struct cache_entry
* ce
;
105 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
106 ce
->mem_pool_allocated
= 1;
110 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
112 struct mem_pool
**pool_ptr
;
114 if (istate
->split_index
&& istate
->split_index
->base
)
115 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
117 pool_ptr
= &istate
->ce_mem_pool
;
120 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
121 mem_pool_init(*pool_ptr
, 0);
127 static const char *alternate_index_output
;
129 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
131 if (S_ISSPARSEDIR(ce
->ce_mode
))
132 istate
->sparse_index
= INDEX_COLLAPSED
;
134 istate
->cache
[nr
] = ce
;
135 add_name_hash(istate
, ce
);
138 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
140 struct cache_entry
*old
= istate
->cache
[nr
];
142 replace_index_entry_in_base(istate
, old
, ce
);
143 remove_name_hash(istate
, old
);
144 discard_cache_entry(old
);
145 ce
->ce_flags
&= ~CE_HASHED
;
146 set_index_entry(istate
, nr
, ce
);
147 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
148 mark_fsmonitor_invalid(istate
, ce
);
149 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
152 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
154 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
155 int namelen
= strlen(new_name
);
157 new_entry
= make_empty_cache_entry(istate
, namelen
);
158 copy_cache_entry(new_entry
, old_entry
);
159 new_entry
->ce_flags
&= ~CE_HASHED
;
160 new_entry
->ce_namelen
= namelen
;
161 new_entry
->index
= 0;
162 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
164 cache_tree_invalidate_path(istate
, old_entry
->name
);
165 untracked_cache_remove_from_index(istate
, old_entry
->name
);
166 remove_index_entry_at(istate
, nr
);
169 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
170 * we only update stat info if the entry is otherwise up-to-date (i.e.,
171 * the contents/mode haven't changed). This ensures that we reflect the
172 * 'ctime' of the rename in the index without (incorrectly) updating
173 * the cached stat info to reflect unstaged changes on disk.
175 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
176 if (refreshed
&& refreshed
!= new_entry
) {
177 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
178 discard_cache_entry(new_entry
);
180 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
184 * This only updates the "non-critical" parts of the directory
185 * cache, ie the parts that aren't tracked by GIT, and only used
186 * to validate the cache.
188 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
190 fill_stat_data(&ce
->ce_stat_data
, st
);
192 if (assume_unchanged
)
193 ce
->ce_flags
|= CE_VALID
;
195 if (S_ISREG(st
->st_mode
)) {
196 ce_mark_uptodate(ce
);
197 mark_fsmonitor_valid(istate
, ce
);
201 static unsigned int st_mode_from_ce(const struct cache_entry
*ce
)
203 extern int trust_executable_bit
, has_symlinks
;
205 switch (ce
->ce_mode
& S_IFMT
) {
207 return has_symlinks
? S_IFLNK
: (S_IFREG
| 0644);
209 return (ce
->ce_mode
& (trust_executable_bit
? 0755 : 0644)) | S_IFREG
;
211 return S_IFDIR
| 0755;
215 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
219 int fake_lstat(const struct cache_entry
*ce
, struct stat
*st
)
221 fake_lstat_data(&ce
->ce_stat_data
, st
);
222 st
->st_mode
= st_mode_from_ce(ce
);
224 /* always succeed as lstat() replacement */
228 static int ce_compare_data(struct index_state
*istate
,
229 const struct cache_entry
*ce
,
233 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
236 struct object_id oid
;
237 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
238 match
= !oideq(&oid
, &ce
->oid
);
239 /* index_fd() closed the file descriptor already */
244 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
249 enum object_type type
;
250 struct strbuf sb
= STRBUF_INIT
;
252 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
255 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
258 match
= memcmp(buffer
, sb
.buf
, size
);
265 static int ce_compare_gitlink(const struct cache_entry
*ce
)
267 struct object_id oid
;
270 * We don't actually require that the .git directory
271 * under GITLINK directory be a valid git directory. It
272 * might even be missing (in case nobody populated that
275 * If so, we consider it always to match.
277 if (repo_resolve_gitlink_ref(the_repository
, ce
->name
,
280 return !oideq(&oid
, &ce
->oid
);
283 static int ce_modified_check_fs(struct index_state
*istate
,
284 const struct cache_entry
*ce
,
287 switch (st
->st_mode
& S_IFMT
) {
289 if (ce_compare_data(istate
, ce
, st
))
293 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
297 if (S_ISGITLINK(ce
->ce_mode
))
298 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
299 /* else fallthrough */
306 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
308 unsigned int changed
= 0;
310 if (ce
->ce_flags
& CE_REMOVE
)
311 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
313 switch (ce
->ce_mode
& S_IFMT
) {
315 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
316 /* We consider only the owner x bit to be relevant for
319 if (trust_executable_bit
&&
320 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
321 changed
|= MODE_CHANGED
;
324 if (!S_ISLNK(st
->st_mode
) &&
325 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
326 changed
|= TYPE_CHANGED
;
329 /* We ignore most of the st_xxx fields for gitlinks */
330 if (!S_ISDIR(st
->st_mode
))
331 changed
|= TYPE_CHANGED
;
332 else if (ce_compare_gitlink(ce
))
333 changed
|= DATA_CHANGED
;
336 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
339 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
341 /* Racily smudged entry? */
342 if (!ce
->ce_stat_data
.sd_size
) {
343 if (!is_empty_blob_oid(&ce
->oid
, the_repository
->hash_algo
))
344 changed
|= DATA_CHANGED
;
350 static int is_racy_stat(const struct index_state
*istate
,
351 const struct stat_data
*sd
)
353 return (istate
->timestamp
.sec
&&
355 /* nanosecond timestamped files can also be racy! */
356 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
357 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
358 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
360 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
365 int is_racy_timestamp(const struct index_state
*istate
,
366 const struct cache_entry
*ce
)
368 return (!S_ISGITLINK(ce
->ce_mode
) &&
369 is_racy_stat(istate
, &ce
->ce_stat_data
));
372 int match_stat_data_racy(const struct index_state
*istate
,
373 const struct stat_data
*sd
, struct stat
*st
)
375 if (is_racy_stat(istate
, sd
))
376 return MTIME_CHANGED
;
377 return match_stat_data(sd
, st
);
380 int ie_match_stat(struct index_state
*istate
,
381 const struct cache_entry
*ce
, struct stat
*st
,
382 unsigned int options
)
384 unsigned int changed
;
385 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
386 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
387 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
388 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
390 if (!ignore_fsmonitor
)
391 refresh_fsmonitor(istate
);
393 * If it's marked as always valid in the index, it's
394 * valid whatever the checked-out copy says.
396 * skip-worktree has the same effect with higher precedence
398 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
400 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
402 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
406 * Intent-to-add entries have not been added, so the index entry
407 * by definition never matches what is in the work tree until it
408 * actually gets added.
410 if (ce_intent_to_add(ce
))
411 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
413 changed
= ce_match_stat_basic(ce
, st
);
416 * Within 1 second of this sequence:
417 * echo xyzzy >file && git-update-index --add file
418 * running this command:
420 * would give a falsely clean cache entry. The mtime and
421 * length match the cache, and other stat fields do not change.
423 * We could detect this at update-index time (the cache entry
424 * being registered/updated records the same time as "now")
425 * and delay the return from git-update-index, but that would
426 * effectively mean we can make at most one commit per second,
427 * which is not acceptable. Instead, we check cache entries
428 * whose mtime are the same as the index file timestamp more
429 * carefully than others.
431 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
432 if (assume_racy_is_modified
)
433 changed
|= DATA_CHANGED
;
435 changed
|= ce_modified_check_fs(istate
, ce
, st
);
441 int ie_modified(struct index_state
*istate
,
442 const struct cache_entry
*ce
,
443 struct stat
*st
, unsigned int options
)
445 int changed
, changed_fs
;
447 changed
= ie_match_stat(istate
, ce
, st
, options
);
451 * If the mode or type has changed, there's no point in trying
452 * to refresh the entry - it's not going to match
454 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
458 * Immediately after read-tree or update-index --cacheinfo,
459 * the length field is zero, as we have never even read the
460 * lstat(2) information once, and we cannot trust DATA_CHANGED
461 * returned by ie_match_stat() which in turn was returned by
462 * ce_match_stat_basic() to signal that the filesize of the
463 * blob changed. We have to actually go to the filesystem to
464 * see if the contents match, and if so, should answer "unchanged".
466 * The logic does not apply to gitlinks, as ce_match_stat_basic()
467 * already has checked the actual HEAD from the filesystem in the
468 * subproject. If ie_match_stat() already said it is different,
469 * then we know it is.
471 if ((changed
& DATA_CHANGED
) &&
472 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
475 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
477 return changed
| changed_fs
;
481 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
482 const char *name2
, int len2
, int stage2
)
486 cmp
= name_compare(name1
, len1
, name2
, len2
);
497 int cmp_cache_name_compare(const void *a_
, const void *b_
)
499 const struct cache_entry
*ce1
, *ce2
;
501 ce1
= *((const struct cache_entry
**)a_
);
502 ce2
= *((const struct cache_entry
**)b_
);
503 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
504 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
507 static int index_name_stage_pos(struct index_state
*istate
,
508 const char *name
, int namelen
,
510 enum index_search_mode search_mode
)
515 last
= istate
->cache_nr
;
516 while (last
> first
) {
517 int next
= first
+ ((last
- first
) >> 1);
518 struct cache_entry
*ce
= istate
->cache
[next
];
519 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
529 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
531 /* Note: first <= istate->cache_nr */
532 struct cache_entry
*ce
= istate
->cache
[first
- 1];
535 * If we are in a sparse-index _and_ the entry before the
536 * insertion position is a sparse-directory entry that is
537 * an ancestor of 'name', then we need to expand the index
538 * and search again. This will only trigger once, because
539 * thereafter the index is fully expanded.
541 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
542 ce_namelen(ce
) < namelen
&&
543 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
544 ensure_full_index(istate
);
545 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
552 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
554 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
557 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
559 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
562 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
564 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
567 int remove_index_entry_at(struct index_state
*istate
, int pos
)
569 struct cache_entry
*ce
= istate
->cache
[pos
];
571 record_resolve_undo(istate
, ce
);
572 remove_name_hash(istate
, ce
);
573 save_or_free_index_entry(istate
, ce
);
574 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
576 if (pos
>= istate
->cache_nr
)
578 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
579 istate
->cache_nr
- pos
);
584 * Remove all cache entries marked for removal, that is where
585 * CE_REMOVE is set in ce_flags. This is much more effective than
586 * calling remove_index_entry_at() for each entry to be removed.
588 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
590 struct cache_entry
**ce_array
= istate
->cache
;
593 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
594 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
596 cache_tree_invalidate_path(istate
,
598 untracked_cache_remove_from_index(istate
,
601 remove_name_hash(istate
, ce_array
[i
]);
602 save_or_free_index_entry(istate
, ce_array
[i
]);
605 ce_array
[j
++] = ce_array
[i
];
607 if (j
== istate
->cache_nr
)
609 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
610 istate
->cache_nr
= j
;
613 int remove_file_from_index(struct index_state
*istate
, const char *path
)
615 int pos
= index_name_pos(istate
, path
, strlen(path
));
618 cache_tree_invalidate_path(istate
, path
);
619 untracked_cache_remove_from_index(istate
, path
);
620 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
621 remove_index_entry_at(istate
, pos
);
625 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
627 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
630 static int index_name_pos_also_unmerged(struct index_state
*istate
,
631 const char *path
, int namelen
)
633 int pos
= index_name_pos(istate
, path
, namelen
);
634 struct cache_entry
*ce
;
639 /* maybe unmerged? */
641 if (pos
>= istate
->cache_nr
||
642 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
645 /* order of preference: stage 2, 1, 3 */
646 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
647 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
648 !compare_name(ce
, path
, namelen
))
653 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
655 int len
= ce_namelen(ce
);
656 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
660 * If we add a filename that aliases in the cache, we will use the
661 * name that we already have - but we don't want to update the same
662 * alias twice, because that implies that there were actually two
663 * different files with aliasing names!
665 * So we use the CE_ADDED flag to verify that the alias was an old
666 * one before we accept it as
668 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
669 struct cache_entry
*ce
,
670 struct cache_entry
*alias
)
673 struct cache_entry
*new_entry
;
675 if (alias
->ce_flags
& CE_ADDED
)
676 die(_("will not add file alias '%s' ('%s' already exists in index)"),
677 ce
->name
, alias
->name
);
679 /* Ok, create the new entry using the name of the existing alias */
680 len
= ce_namelen(alias
);
681 new_entry
= make_empty_cache_entry(istate
, len
);
682 memcpy(new_entry
->name
, alias
->name
, len
);
683 copy_cache_entry(new_entry
, ce
);
684 save_or_free_index_entry(istate
, ce
);
688 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
690 struct object_id oid
;
691 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
692 die(_("cannot create an empty blob in the object database"));
693 oidcpy(&ce
->oid
, &oid
);
696 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
698 int namelen
, was_same
;
699 mode_t st_mode
= st
->st_mode
;
700 struct cache_entry
*ce
, *alias
= NULL
;
701 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
702 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
703 int pretend
= flags
& ADD_CACHE_PRETEND
;
704 int intent_only
= flags
& ADD_CACHE_INTENT
;
705 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
706 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
707 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
708 struct object_id oid
;
710 if (flags
& ADD_CACHE_RENORMALIZE
)
711 hash_flags
|= HASH_RENORMALIZE
;
713 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
714 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
716 namelen
= strlen(path
);
717 if (S_ISDIR(st_mode
)) {
718 if (repo_resolve_gitlink_ref(the_repository
, path
, "HEAD", &oid
) < 0)
719 return error(_("'%s' does not have a commit checked out"), path
);
720 while (namelen
&& path
[namelen
-1] == '/')
723 ce
= make_empty_cache_entry(istate
, namelen
);
724 memcpy(ce
->name
, path
, namelen
);
725 ce
->ce_namelen
= namelen
;
727 fill_stat_cache_info(istate
, ce
, st
);
729 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
732 if (trust_executable_bit
&& has_symlinks
) {
733 ce
->ce_mode
= create_ce_mode(st_mode
);
735 /* If there is an existing entry, pick the mode bits and type
736 * from it, otherwise assume unexecutable regular file.
738 struct cache_entry
*ent
;
739 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
741 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
742 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
745 /* When core.ignorecase=true, determine if a directory of the same name but differing
746 * case already exists within the Git repository. If it does, ensure the directory
747 * case of the file being added to the repository matches (is folded into) the existing
748 * entry's directory case.
751 adjust_dirname_case(istate
, ce
->name
);
753 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
754 alias
= index_file_exists(istate
, ce
->name
,
755 ce_namelen(ce
), ignore_case
);
758 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
759 /* Nothing changed, really */
760 if (!S_ISGITLINK(alias
->ce_mode
))
761 ce_mark_uptodate(alias
);
762 alias
->ce_flags
|= CE_ADDED
;
764 discard_cache_entry(ce
);
769 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
770 discard_cache_entry(ce
);
771 return error(_("unable to index file '%s'"), path
);
774 set_object_name_for_intent_to_add_entry(ce
);
776 if (ignore_case
&& alias
&& different_name(ce
, alias
))
777 ce
= create_alias_ce(istate
, ce
, alias
);
778 ce
->ce_flags
|= CE_ADDED
;
780 /* It was suspected to be racily clean, but it turns out to be Ok */
783 oideq(&alias
->oid
, &ce
->oid
) &&
784 ce
->ce_mode
== alias
->ce_mode
);
787 discard_cache_entry(ce
);
788 else if (add_index_entry(istate
, ce
, add_option
)) {
789 discard_cache_entry(ce
);
790 return error(_("unable to add '%s' to index"), path
);
792 if (verbose
&& !was_same
)
793 printf("add '%s'\n", path
);
797 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
800 if (lstat(path
, &st
))
801 die_errno(_("unable to stat '%s'"), path
);
802 return add_to_index(istate
, path
, &st
, flags
);
805 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
807 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
810 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
811 struct mem_pool
*ce_mem_pool
)
814 return mem_pool__ce_calloc(ce_mem_pool
, len
);
815 return xcalloc(1, cache_entry_size(len
));
818 enum verify_path_result
{
824 static enum verify_path_result
verify_path_internal(const char *, unsigned);
826 int verify_path(const char *path
, unsigned mode
)
828 return verify_path_internal(path
, mode
) == PATH_OK
;
831 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
833 const struct object_id
*oid
,
836 unsigned int refresh_options
)
838 struct cache_entry
*ce
, *ret
;
841 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
842 error(_("invalid path '%s'"), path
);
847 ce
= make_empty_cache_entry(istate
, len
);
849 oidcpy(&ce
->oid
, oid
);
850 memcpy(ce
->name
, path
, len
);
851 ce
->ce_flags
= create_ce_flags(stage
);
852 ce
->ce_namelen
= len
;
853 ce
->ce_mode
= create_ce_mode(mode
);
855 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
857 discard_cache_entry(ce
);
861 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
862 const struct object_id
*oid
,
865 struct mem_pool
*ce_mem_pool
)
867 struct cache_entry
*ce
;
870 if (!verify_path(path
, mode
)) {
871 error(_("invalid path '%s'"), path
);
876 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
878 oidcpy(&ce
->oid
, oid
);
879 memcpy(ce
->name
, path
, len
);
880 ce
->ce_flags
= create_ce_flags(stage
);
881 ce
->ce_namelen
= len
;
882 ce
->ce_mode
= create_ce_mode(mode
);
888 * Chmod an index entry with either +x or -x.
890 * Returns -1 if the chmod for the particular cache entry failed (if it's
891 * not a regular file), -2 if an invalid flip argument is passed in, 0
894 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
897 if (!S_ISREG(ce
->ce_mode
))
904 ce
->ce_mode
&= ~0111;
909 cache_tree_invalidate_path(istate
, ce
->name
);
910 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
911 mark_fsmonitor_invalid(istate
, ce
);
912 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
917 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
919 int len
= ce_namelen(a
);
920 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
924 * We fundamentally don't like some paths: we don't want
925 * dot or dot-dot anywhere, and for obvious reasons don't
926 * want to recurse into ".git" either.
928 * Also, we don't want double slashes or slashes at the
929 * end that can make pathnames ambiguous.
931 static int verify_dotfile(const char *rest
, unsigned mode
)
934 * The first character was '.', but that
935 * has already been discarded, we now test
939 /* "." is not allowed */
940 if (*rest
== '\0' || is_dir_sep(*rest
))
945 * ".git" followed by NUL or slash is bad. Note that we match
946 * case-insensitively here, even if ignore_case is not set.
947 * This outlaws ".GIT" everywhere out of an abundance of caution,
948 * since there's really no good reason to allow it.
950 * Once we've seen ".git", we can also find ".gitmodules", etc (also
951 * case-insensitively).
955 if (rest
[1] != 'i' && rest
[1] != 'I')
957 if (rest
[2] != 't' && rest
[2] != 'T')
959 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
963 if (skip_iprefix(rest
, "modules", &rest
) &&
964 (*rest
== '\0' || is_dir_sep(*rest
)))
969 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
975 static enum verify_path_result
verify_path_internal(const char *path
,
980 if (has_dos_drive_prefix(path
))
983 if (!is_valid_path(path
))
994 if (is_hfs_dotgit(path
))
997 if (is_hfs_dotgitmodules(path
))
1002 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1004 return PATH_INVALID
;
1006 if (is_ntfs_dotgit(path
))
1007 return PATH_INVALID
;
1008 if (S_ISLNK(mode
)) {
1009 if (is_ntfs_dotgitmodules(path
))
1010 return PATH_INVALID
;
1015 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1017 return PATH_INVALID
;
1019 * allow terminating directory separators for
1020 * sparse directory entries.
1023 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1025 } else if (c
== '\\' && protect_ntfs
) {
1026 if (is_ntfs_dotgit(path
))
1027 return PATH_INVALID
;
1028 if (S_ISLNK(mode
)) {
1029 if (is_ntfs_dotgitmodules(path
))
1030 return PATH_INVALID
;
1039 * Do we have another file that has the beginning components being a
1040 * proper superset of the name we're trying to add?
1042 static int has_file_name(struct index_state
*istate
,
1043 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1046 int len
= ce_namelen(ce
);
1047 int stage
= ce_stage(ce
);
1048 const char *name
= ce
->name
;
1050 while (pos
< istate
->cache_nr
) {
1051 struct cache_entry
*p
= istate
->cache
[pos
++];
1053 if (len
>= ce_namelen(p
))
1055 if (memcmp(name
, p
->name
, len
))
1057 if (ce_stage(p
) != stage
)
1059 if (p
->name
[len
] != '/')
1061 if (p
->ce_flags
& CE_REMOVE
)
1066 remove_index_entry_at(istate
, --pos
);
1073 * Like strcmp(), but also return the offset of the first change.
1074 * If strings are equal, return the length.
1076 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1081 return strcmp(s1
, s2
);
1083 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1088 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1092 * Do we have another file with a pathname that is a proper
1093 * subset of the name we're trying to add?
1095 * That is, is there another file in the index with a path
1096 * that matches a sub-directory in the given entry?
1098 static int has_dir_name(struct index_state
*istate
,
1099 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1102 int stage
= ce_stage(ce
);
1103 const char *name
= ce
->name
;
1104 const char *slash
= name
+ ce_namelen(ce
);
1109 * We are frequently called during an iteration on a sorted
1110 * list of pathnames and while building a new index. Therefore,
1111 * there is a high probability that this entry will eventually
1112 * be appended to the index, rather than inserted in the middle.
1113 * If we can confirm that, we can avoid binary searches on the
1114 * components of the pathname.
1116 * Compare the entry's full path with the last path in the index.
1118 if (istate
->cache_nr
> 0) {
1119 cmp_last
= strcmp_offset(name
,
1120 istate
->cache
[istate
->cache_nr
- 1]->name
,
1123 if (name
[len_eq_last
] != '/') {
1125 * The entry sorts AFTER the last one in the
1128 * If there were a conflict with "file", then our
1129 * name would start with "file/" and the last index
1130 * entry would start with "file" but not "file/".
1132 * The next character after common prefix is
1133 * not '/', so there can be no conflict.
1138 * The entry sorts AFTER the last one in the
1139 * index, and the next character after common
1142 * Either the last index entry is a file in
1143 * conflict with this entry, or it has a name
1144 * which sorts between this entry and the
1145 * potential conflicting file.
1147 * In both cases, we fall through to the loop
1148 * below and let the regular search code handle it.
1151 } else if (cmp_last
== 0) {
1153 * The entry exactly matches the last one in the
1154 * index, but because of multiple stage and CE_REMOVE
1155 * items, we fall through and let the regular search
1165 if (*--slash
== '/')
1167 if (slash
<= ce
->name
)
1172 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1175 * Found one, but not so fast. This could
1176 * be a marker that says "I was here, but
1177 * I am being removed". Such an entry is
1178 * not a part of the resulting tree, and
1179 * it is Ok to have a directory at the same
1182 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1186 remove_index_entry_at(istate
, pos
);
1194 * Trivial optimization: if we find an entry that
1195 * already matches the sub-directory, then we know
1196 * we're ok, and we can exit.
1198 while (pos
< istate
->cache_nr
) {
1199 struct cache_entry
*p
= istate
->cache
[pos
];
1200 if ((ce_namelen(p
) <= len
) ||
1201 (p
->name
[len
] != '/') ||
1202 memcmp(p
->name
, name
, len
))
1203 break; /* not our subdirectory */
1204 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1206 * p is at the same stage as our entry, and
1207 * is a subdirectory of what we are looking
1208 * at, so we cannot have conflicts at our
1209 * level or anything shorter.
1218 /* We may be in a situation where we already have path/file and path
1219 * is being added, or we already have path and path/file is being
1220 * added. Either one would result in a nonsense tree that has path
1221 * twice when git-write-tree tries to write it out. Prevent it.
1223 * If ok-to-replace is specified, we remove the conflicting entries
1224 * from the cache so the caller should recompute the insert position.
1225 * When this happens, we return non-zero.
1227 static int check_file_directory_conflict(struct index_state
*istate
,
1228 const struct cache_entry
*ce
,
1229 int pos
, int ok_to_replace
)
1234 * When ce is an "I am going away" entry, we allow it to be added
1236 if (ce
->ce_flags
& CE_REMOVE
)
1240 * We check if the path is a sub-path of a subsequent pathname
1241 * first, since removing those will not change the position
1244 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1247 * Then check if the path might have a clashing sub-directory
1250 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1253 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1256 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1257 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1258 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1259 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1262 * If this entry's path sorts after the last entry in the index,
1263 * we can avoid searching for it.
1265 if (istate
->cache_nr
> 0 &&
1266 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1267 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1269 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1272 * Cache tree path should be invalidated only after index_name_stage_pos,
1273 * in case it expands a sparse index.
1275 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1276 cache_tree_invalidate_path(istate
, ce
->name
);
1278 /* existing match? Just replace it. */
1281 replace_index_entry(istate
, pos
, ce
);
1286 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1287 untracked_cache_add_to_index(istate
, ce
->name
);
1290 * Inserting a merged entry ("stage 0") into the index
1291 * will always replace all non-merged entries..
1293 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1294 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1296 if (!remove_index_entry_at(istate
, pos
))
1303 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1304 return error(_("invalid path '%s'"), ce
->name
);
1306 if (!skip_df_check
&&
1307 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1309 return error(_("'%s' appears as both a file and as a directory"),
1311 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1317 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1321 if (option
& ADD_CACHE_JUST_APPEND
)
1322 pos
= istate
->cache_nr
;
1325 ret
= add_index_entry_with_check(istate
, ce
, option
);
1331 /* Make sure the array is big enough .. */
1332 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1336 if (istate
->cache_nr
> pos
+ 1)
1337 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1338 istate
->cache_nr
- pos
- 1);
1339 set_index_entry(istate
, pos
, ce
);
1340 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1345 * "refresh" does not calculate a new sha1 file or bring the
1346 * cache up-to-date for mode/content changes. But what it
1347 * _does_ do is to "re-match" the stat information of a file
1348 * with the cache, so that you can refresh the cache for a
1349 * file that hasn't been changed but where the stat entry is
1352 * For example, you'd want to do this after doing a "git-read-tree",
1353 * to link up the stat cache details with the proper files.
1355 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1356 struct cache_entry
*ce
,
1357 unsigned int options
, int *err
,
1363 struct cache_entry
*updated
;
1365 int refresh
= options
& CE_MATCH_REFRESH
;
1366 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1367 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1368 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1369 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1371 if (!refresh
|| ce_uptodate(ce
))
1374 if (!ignore_fsmonitor
)
1375 refresh_fsmonitor(istate
);
1377 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1378 * that the change to the work tree does not matter and told
1381 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1382 ce_mark_uptodate(ce
);
1385 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1386 ce_mark_uptodate(ce
);
1389 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1390 ce_mark_uptodate(ce
);
1394 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1404 if (lstat(ce
->name
, &st
) < 0) {
1405 if (ignore_missing
&& errno
== ENOENT
)
1412 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1414 *changed_ret
= changed
;
1417 * The path is unchanged. If we were told to ignore
1418 * valid bit, then we did the actual stat check and
1419 * found that the entry is unmodified. If the entry
1420 * is not marked VALID, this is the place to mark it
1421 * valid again, under "assume unchanged" mode.
1423 if (ignore_valid
&& assume_unchanged
&&
1424 !(ce
->ce_flags
& CE_VALID
))
1425 ; /* mark this one VALID again */
1428 * We do not mark the index itself "modified"
1429 * because CE_UPTODATE flag is in-core only;
1430 * we are not going to write this change out.
1432 if (!S_ISGITLINK(ce
->ce_mode
)) {
1433 ce_mark_uptodate(ce
);
1434 mark_fsmonitor_valid(istate
, ce
);
1442 if (ie_modified(istate
, ce
, &st
, options
)) {
1448 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1449 copy_cache_entry(updated
, ce
);
1450 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1451 fill_stat_cache_info(istate
, updated
, &st
);
1453 * If ignore_valid is not set, we should leave CE_VALID bit
1454 * alone. Otherwise, paths marked with --no-assume-unchanged
1455 * (i.e. things to be edited) will reacquire CE_VALID bit
1456 * automatically, which is not really what we want.
1458 if (!ignore_valid
&& assume_unchanged
&&
1459 !(ce
->ce_flags
& CE_VALID
))
1460 updated
->ce_flags
&= ~CE_VALID
;
1462 /* istate->cache_changed is updated in the caller */
1466 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1467 int * first
, const char *header_msg
)
1469 if (in_porcelain
&& *first
&& header_msg
) {
1470 printf("%s\n", header_msg
);
1476 int repo_refresh_and_write_index(struct repository
*repo
,
1477 unsigned int refresh_flags
,
1478 unsigned int write_flags
,
1480 const struct pathspec
*pathspec
,
1481 char *seen
, const char *header_msg
)
1483 struct lock_file lock_file
= LOCK_INIT
;
1486 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1487 if (!gentle
&& fd
< 0)
1489 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1491 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1497 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1498 const struct pathspec
*pathspec
,
1499 char *seen
, const char *header_msg
)
1503 int really
= (flags
& REFRESH_REALLY
) != 0;
1504 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1505 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1506 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1507 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1508 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1510 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1511 unsigned int options
= (CE_MATCH_REFRESH
|
1512 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1513 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1514 const char *modified_fmt
;
1515 const char *deleted_fmt
;
1516 const char *typechange_fmt
;
1517 const char *added_fmt
;
1518 const char *unmerged_fmt
;
1519 struct progress
*progress
= NULL
;
1520 int t2_sum_lstat
= 0;
1521 int t2_sum_scan
= 0;
1523 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1524 progress
= start_delayed_progress(_("Refresh index"),
1527 trace_performance_enter();
1528 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1529 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1530 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1531 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1532 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1534 * Use the multi-threaded preload_index() to refresh most of the
1535 * cache entries quickly then in the single threaded loop below,
1536 * we only have to do the special cases that are left.
1538 preload_index(istate
, pathspec
, 0);
1539 trace2_region_enter("index", "refresh", NULL
);
1541 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1542 struct cache_entry
*ce
, *new_entry
;
1543 int cache_errno
= 0;
1546 int t2_did_lstat
= 0;
1547 int t2_did_scan
= 0;
1549 ce
= istate
->cache
[i
];
1550 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1552 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1556 * If this entry is a sparse directory, then there isn't
1557 * any stat() information to update. Ignore the entry.
1559 if (S_ISSPARSEDIR(ce
->ce_mode
))
1562 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1566 while ((i
< istate
->cache_nr
) &&
1567 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1573 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1574 &first
, header_msg
);
1582 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1583 &cache_errno
, &changed
,
1584 &t2_did_lstat
, &t2_did_scan
);
1585 t2_sum_lstat
+= t2_did_lstat
;
1586 t2_sum_scan
+= t2_did_scan
;
1587 if (new_entry
== ce
)
1589 display_progress(progress
, i
);
1593 if (really
&& cache_errno
== EINVAL
) {
1594 /* If we are doing --really-refresh that
1595 * means the index is not valid anymore.
1597 ce
->ce_flags
&= ~CE_VALID
;
1598 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1599 mark_fsmonitor_invalid(istate
, ce
);
1600 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1605 if (cache_errno
== ENOENT
)
1607 else if (ce_intent_to_add(ce
))
1608 fmt
= added_fmt
; /* must be before other checks */
1609 else if (changed
& TYPE_CHANGED
)
1610 fmt
= typechange_fmt
;
1614 ce
->name
, in_porcelain
, &first
, header_msg
);
1619 replace_index_entry(istate
, i
, new_entry
);
1621 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1622 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1623 trace2_region_leave("index", "refresh", NULL
);
1624 display_progress(progress
, istate
->cache_nr
);
1625 stop_progress(&progress
);
1626 trace_performance_leave("refresh index");
1630 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1631 struct cache_entry
*ce
,
1632 unsigned int options
)
1634 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1638 /*****************************************************************
1640 *****************************************************************/
1642 #define INDEX_FORMAT_DEFAULT 3
1644 static unsigned int get_index_format_default(struct repository
*r
)
1646 char *envversion
= getenv("GIT_INDEX_VERSION");
1648 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1651 prepare_repo_settings(r
);
1653 if (r
->settings
.index_version
>= 0)
1654 version
= r
->settings
.index_version
;
1655 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1656 warning(_("index.version set, but the value is invalid.\n"
1657 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1658 return INDEX_FORMAT_DEFAULT
;
1663 version
= strtoul(envversion
, &endp
, 10);
1665 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1666 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1667 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1668 version
= INDEX_FORMAT_DEFAULT
;
1674 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1675 * Again - this is just a (very strong in practice) heuristic that
1676 * the inode hasn't changed.
1678 * We save the fields in big-endian order to allow using the
1679 * index file over NFS transparently.
1681 struct ondisk_cache_entry
{
1682 struct cache_time ctime
;
1683 struct cache_time mtime
;
1691 * unsigned char hash[hashsz];
1693 * if (flags & CE_EXTENDED)
1696 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1697 char name
[FLEX_ARRAY
];
1700 /* These are only used for v3 or lower */
1701 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1702 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1703 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1704 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1705 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1706 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1707 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1709 /* Allow fsck to force verification of the index checksum. */
1710 int verify_index_checksum
;
1712 /* Allow fsck to force verification of the cache entry order. */
1713 int verify_ce_order
;
1715 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1718 unsigned char hash
[GIT_MAX_RAWSZ
];
1720 unsigned char *start
, *end
;
1721 struct object_id oid
;
1723 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1724 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1725 hdr_version
= ntohl(hdr
->hdr_version
);
1726 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1727 return error(_("bad index version %d"), hdr_version
);
1729 if (!verify_index_checksum
)
1732 end
= (unsigned char *)hdr
+ size
;
1733 start
= end
- the_hash_algo
->rawsz
;
1734 oidread(&oid
, start
, the_repository
->hash_algo
);
1735 if (oideq(&oid
, null_oid()))
1738 the_hash_algo
->init_fn(&c
);
1739 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1740 the_hash_algo
->final_fn(hash
, &c
);
1741 if (!hasheq(hash
, start
, the_repository
->hash_algo
))
1742 return error(_("bad index file sha1 signature"));
1746 static int read_index_extension(struct index_state
*istate
,
1747 const char *ext
, const char *data
, unsigned long sz
)
1749 switch (CACHE_EXT(ext
)) {
1750 case CACHE_EXT_TREE
:
1751 istate
->cache_tree
= cache_tree_read(data
, sz
);
1753 case CACHE_EXT_RESOLVE_UNDO
:
1754 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1756 case CACHE_EXT_LINK
:
1757 if (read_link_extension(istate
, data
, sz
))
1760 case CACHE_EXT_UNTRACKED
:
1761 istate
->untracked
= read_untracked_extension(data
, sz
);
1763 case CACHE_EXT_FSMONITOR
:
1764 read_fsmonitor_extension(istate
, data
, sz
);
1766 case CACHE_EXT_ENDOFINDEXENTRIES
:
1767 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1768 /* already handled in do_read_index() */
1770 case CACHE_EXT_SPARSE_DIRECTORIES
:
1771 /* no content, only an indicator */
1772 istate
->sparse_index
= INDEX_COLLAPSED
;
1775 if (*ext
< 'A' || 'Z' < *ext
)
1776 return error(_("index uses %.4s extension, which we do not understand"),
1778 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1785 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1786 * into a new incore 'cache_entry'.
1788 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1789 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1790 * its members. Instead, we use the byte offsets of members within the struct to
1791 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1792 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1793 * into the corresponding incore 'cache_entry' members.
1795 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1796 unsigned int version
,
1798 unsigned long *ent_size
,
1799 const struct cache_entry
*previous_ce
)
1801 struct cache_entry
*ce
;
1804 const unsigned hashsz
= the_hash_algo
->rawsz
;
1805 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1807 size_t copy_len
= 0;
1809 * Adjacent cache entries tend to share the leading paths, so it makes
1810 * sense to only store the differences in later entries. In the v4
1811 * on-disk format of the index, each on-disk cache entry stores the
1812 * number of bytes to be stripped from the end of the previous name,
1813 * and the bytes to append to the result, to come up with its name.
1815 int expand_name_field
= version
== 4;
1817 /* On-disk flags are just 16 bits */
1818 flags
= get_be16(flagsp
);
1819 len
= flags
& CE_NAMEMASK
;
1821 if (flags
& CE_EXTENDED
) {
1823 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1824 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1825 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1826 die(_("unknown index entry format 0x%08x"), extended_flags
);
1827 flags
|= extended_flags
;
1828 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1831 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1833 if (expand_name_field
) {
1834 const unsigned char *cp
= (const unsigned char *)name
;
1835 size_t strip_len
, previous_len
;
1837 /* If we're at the beginning of a block, ignore the previous name */
1838 strip_len
= decode_varint(&cp
);
1840 previous_len
= previous_ce
->ce_namelen
;
1841 if (previous_len
< strip_len
)
1842 die(_("malformed name field in the index, near path '%s'"),
1844 copy_len
= previous_len
- strip_len
;
1846 name
= (const char *)cp
;
1849 if (len
== CE_NAMEMASK
) {
1851 if (expand_name_field
)
1855 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1858 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1859 * with something more akin to 'load_bitmap_entries_v1()'s use of
1860 * 'read_be16'/'read_be32'. For consistency with the corresponding
1861 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1862 * should be done at the same time as removing references to
1863 * 'ondisk_cache_entry' there.
1865 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1866 + offsetof(struct cache_time
, sec
));
1867 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1868 + offsetof(struct cache_time
, sec
));
1869 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1870 + offsetof(struct cache_time
, nsec
));
1871 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1872 + offsetof(struct cache_time
, nsec
));
1873 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1874 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1875 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1876 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1877 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1878 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1879 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1880 ce
->ce_namelen
= len
;
1882 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
),
1883 the_repository
->hash_algo
);
1885 if (expand_name_field
) {
1887 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1888 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1889 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1891 memcpy(ce
->name
, name
, len
+ 1);
1892 *ent_size
= ondisk_ce_size(ce
);
1897 static void check_ce_order(struct index_state
*istate
)
1901 if (!verify_ce_order
)
1904 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1905 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1906 struct cache_entry
*next_ce
= istate
->cache
[i
];
1907 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1909 if (0 < name_compare
)
1910 die(_("unordered stage entries in index"));
1911 if (!name_compare
) {
1913 die(_("multiple stage entries for merged file '%s'"),
1915 if (ce_stage(ce
) > ce_stage(next_ce
))
1916 die(_("unordered stage entries for '%s'"),
1922 static void tweak_untracked_cache(struct index_state
*istate
)
1924 struct repository
*r
= the_repository
;
1926 prepare_repo_settings(r
);
1928 switch (r
->settings
.core_untracked_cache
) {
1929 case UNTRACKED_CACHE_REMOVE
:
1930 remove_untracked_cache(istate
);
1932 case UNTRACKED_CACHE_WRITE
:
1933 add_untracked_cache(istate
);
1935 case UNTRACKED_CACHE_KEEP
:
1937 * Either an explicit "core.untrackedCache=keep", the
1938 * default if "core.untrackedCache" isn't configured,
1939 * or a fallback on an unknown "core.untrackedCache"
1946 static void tweak_split_index(struct index_state
*istate
)
1948 switch (git_config_get_split_index()) {
1949 case -1: /* unset: do nothing */
1952 remove_split_index(istate
);
1955 add_split_index(istate
);
1957 default: /* unknown value: do nothing */
1962 static void post_read_index_from(struct index_state
*istate
)
1964 check_ce_order(istate
);
1965 tweak_untracked_cache(istate
);
1966 tweak_split_index(istate
);
1967 tweak_fsmonitor(istate
);
1970 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1972 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1975 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1977 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1980 * Account for potential alignment differences.
1982 per_entry
+= align_padding_size(per_entry
, 0);
1983 return ondisk_size
+ entries
* per_entry
;
1986 struct index_entry_offset
1988 /* starting byte offset into index file, count of index entries in this block */
1992 struct index_entry_offset_table
1995 struct index_entry_offset entries
[FLEX_ARRAY
];
1998 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
1999 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2001 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2002 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2004 struct load_index_extensions
2007 struct index_state
*istate
;
2010 unsigned long src_offset
;
2013 static void *load_index_extensions(void *_data
)
2015 struct load_index_extensions
*p
= _data
;
2016 unsigned long src_offset
= p
->src_offset
;
2018 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2019 /* After an array of active_nr index entries,
2020 * there can be arbitrary number of extended
2021 * sections, each of which is prefixed with
2022 * extension name (4-byte) and section length
2023 * in 4-byte network byte order.
2025 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2026 if (read_index_extension(p
->istate
,
2027 p
->mmap
+ src_offset
,
2028 p
->mmap
+ src_offset
+ 8,
2030 munmap((void *)p
->mmap
, p
->mmap_size
);
2031 die(_("index file corrupt"));
2034 src_offset
+= extsize
;
2041 * A helper function that will load the specified range of cache entries
2042 * from the memory mapped file and add them to the given index.
2044 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2045 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2046 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2049 unsigned long src_offset
= start_offset
;
2051 for (i
= offset
; i
< offset
+ nr
; i
++) {
2052 struct cache_entry
*ce
;
2053 unsigned long consumed
;
2055 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2057 &consumed
, previous_ce
);
2058 set_index_entry(istate
, i
, ce
);
2060 src_offset
+= consumed
;
2063 return src_offset
- start_offset
;
2066 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2067 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2069 unsigned long consumed
;
2071 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2072 if (istate
->version
== 4) {
2073 mem_pool_init(istate
->ce_mem_pool
,
2074 estimate_cache_size_from_compressed(istate
->cache_nr
));
2076 mem_pool_init(istate
->ce_mem_pool
,
2077 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2080 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2081 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2086 * Mostly randomly chosen maximum thread counts: we
2087 * cap the parallelism to online_cpus() threads, and we want
2088 * to have at least 10000 cache entries per thread for it to
2089 * be worth starting a thread.
2092 #define THREAD_COST (10000)
2094 struct load_cache_entries_thread_data
2097 struct index_state
*istate
;
2098 struct mem_pool
*ce_mem_pool
;
2101 struct index_entry_offset_table
*ieot
;
2102 int ieot_start
; /* starting index into the ieot array */
2103 int ieot_blocks
; /* count of ieot entries to process */
2104 unsigned long consumed
; /* return # of bytes in index file processed */
2108 * A thread proc to run the load_cache_entries() computation
2109 * across multiple background threads.
2111 static void *load_cache_entries_thread(void *_data
)
2113 struct load_cache_entries_thread_data
*p
= _data
;
2116 /* iterate across all ieot blocks assigned to this thread */
2117 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2118 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2119 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2120 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2125 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2126 int nr_threads
, struct index_entry_offset_table
*ieot
)
2128 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2129 struct load_cache_entries_thread_data
*data
;
2130 unsigned long consumed
= 0;
2132 /* a little sanity checking */
2133 if (istate
->name_hash_initialized
)
2134 BUG("the name hash isn't thread safe");
2136 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2137 mem_pool_init(istate
->ce_mem_pool
, 0);
2139 /* ensure we have no more threads than we have blocks to process */
2140 if (nr_threads
> ieot
->nr
)
2141 nr_threads
= ieot
->nr
;
2142 CALLOC_ARRAY(data
, nr_threads
);
2144 offset
= ieot_start
= 0;
2145 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2146 for (i
= 0; i
< nr_threads
; i
++) {
2147 struct load_cache_entries_thread_data
*p
= &data
[i
];
2150 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2151 ieot_blocks
= ieot
->nr
- ieot_start
;
2157 p
->ieot_start
= ieot_start
;
2158 p
->ieot_blocks
= ieot_blocks
;
2160 /* create a mem_pool for each thread */
2162 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2163 nr
+= p
->ieot
->entries
[j
].nr
;
2164 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2165 if (istate
->version
== 4) {
2166 mem_pool_init(p
->ce_mem_pool
,
2167 estimate_cache_size_from_compressed(nr
));
2169 mem_pool_init(p
->ce_mem_pool
,
2170 estimate_cache_size(mmap_size
, nr
));
2173 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2175 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2177 /* increment by the number of cache entries in the ieot block being processed */
2178 for (j
= 0; j
< ieot_blocks
; j
++)
2179 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2180 ieot_start
+= ieot_blocks
;
2183 for (i
= 0; i
< nr_threads
; i
++) {
2184 struct load_cache_entries_thread_data
*p
= &data
[i
];
2186 err
= pthread_join(p
->pthread
, NULL
);
2188 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2189 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2190 consumed
+= p
->consumed
;
2198 static void set_new_index_sparsity(struct index_state
*istate
)
2201 * If the index's repo exists, mark it sparse according to
2204 prepare_repo_settings(istate
->repo
);
2205 if (!istate
->repo
->settings
.command_requires_full_index
&&
2206 is_sparse_index_allowed(istate
, 0))
2207 istate
->sparse_index
= 1;
2210 /* remember to discard_cache() before reading a different cache! */
2211 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2215 unsigned long src_offset
;
2216 const struct cache_header
*hdr
;
2219 struct load_index_extensions p
;
2220 size_t extension_offset
= 0;
2221 int nr_threads
, cpus
;
2222 struct index_entry_offset_table
*ieot
= NULL
;
2224 if (istate
->initialized
)
2225 return istate
->cache_nr
;
2227 istate
->timestamp
.sec
= 0;
2228 istate
->timestamp
.nsec
= 0;
2229 fd
= open(path
, O_RDONLY
);
2231 if (!must_exist
&& errno
== ENOENT
) {
2232 set_new_index_sparsity(istate
);
2233 istate
->initialized
= 1;
2236 die_errno(_("%s: index file open failed"), path
);
2240 die_errno(_("%s: cannot stat the open index"), path
);
2242 mmap_size
= xsize_t(st
.st_size
);
2243 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2244 die(_("%s: index file smaller than expected"), path
);
2246 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2247 if (mmap
== MAP_FAILED
)
2248 die_errno(_("%s: unable to map index file%s"), path
,
2252 hdr
= (const struct cache_header
*)mmap
;
2253 if (verify_hdr(hdr
, mmap_size
) < 0)
2256 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
,
2257 the_repository
->hash_algo
);
2258 istate
->version
= ntohl(hdr
->hdr_version
);
2259 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2260 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2261 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2262 istate
->initialized
= 1;
2266 p
.mmap_size
= mmap_size
;
2268 src_offset
= sizeof(*hdr
);
2270 if (git_config_get_index_threads(&nr_threads
))
2273 /* TODO: does creating more threads than cores help? */
2275 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2276 cpus
= online_cpus();
2277 if (nr_threads
> cpus
)
2284 if (nr_threads
> 1) {
2285 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2286 if (extension_offset
) {
2289 p
.src_offset
= extension_offset
;
2290 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2292 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2299 * Locate and read the index entry offset table so that we can use it
2300 * to multi-thread the reading of the cache entries.
2302 if (extension_offset
&& nr_threads
> 1)
2303 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2306 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2309 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2312 istate
->timestamp
.sec
= st
.st_mtime
;
2313 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2315 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2316 if (extension_offset
) {
2317 int ret
= pthread_join(p
.pthread
, NULL
);
2319 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2321 p
.src_offset
= src_offset
;
2322 load_index_extensions(&p
);
2324 munmap((void *)mmap
, mmap_size
);
2327 * TODO trace2: replace "the_repository" with the actual repo instance
2328 * that is associated with the given "istate".
2330 trace2_data_intmax("index", the_repository
, "read/version",
2332 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2336 * If the command explicitly requires a full index, force it
2337 * to be full. Otherwise, correct the sparsity based on repository
2338 * settings and other properties of the index (if necessary).
2340 prepare_repo_settings(istate
->repo
);
2341 if (istate
->repo
->settings
.command_requires_full_index
)
2342 ensure_full_index(istate
);
2344 ensure_correct_sparsity(istate
);
2346 return istate
->cache_nr
;
2349 munmap((void *)mmap
, mmap_size
);
2350 die(_("index file corrupt"));
2354 * Signal that the shared index is used by updating its mtime.
2356 * This way, shared index can be removed if they have not been used
2359 static void freshen_shared_index(const char *shared_index
, int warn
)
2361 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2362 warning(_("could not freshen shared index '%s'"), shared_index
);
2365 int read_index_from(struct index_state
*istate
, const char *path
,
2368 struct split_index
*split_index
;
2373 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2374 if (istate
->initialized
)
2375 return istate
->cache_nr
;
2378 * TODO trace2: replace "the_repository" with the actual repo instance
2379 * that is associated with the given "istate".
2381 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2383 trace_performance_enter();
2384 ret
= do_read_index(istate
, path
, 0);
2385 trace_performance_leave("read cache %s", path
);
2386 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2389 split_index
= istate
->split_index
;
2390 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2391 post_read_index_from(istate
);
2395 trace_performance_enter();
2396 if (split_index
->base
)
2397 release_index(split_index
->base
);
2399 ALLOC_ARRAY(split_index
->base
, 1);
2400 index_state_init(split_index
->base
, istate
->repo
);
2402 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2403 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2404 if (file_exists(base_path
)) {
2405 trace2_region_enter_printf("index", "shared/do_read_index",
2406 the_repository
, "%s", base_path
);
2408 ret
= do_read_index(split_index
->base
, base_path
, 0);
2409 trace2_region_leave_printf("index", "shared/do_read_index",
2410 the_repository
, "%s", base_path
);
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
, the_repository
->hash_algo
);
2651 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2652 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2653 flagsp
[0] = htons(flags
);
2654 if (ce
->ce_flags
& CE_EXTENDED
) {
2655 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2659 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2660 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
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
, the_repository
->hash_algo
))
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
;
2843 struct repository
*r
= istate
->repo
;
2844 struct strbuf sb
= STRBUF_INIT
;
2845 int nr
, nr_threads
, ret
;
2847 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2849 prepare_repo_settings(r
);
2850 f
->skip_hash
= r
->settings
.index_skip_hash
;
2852 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2853 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2856 /* reduce extended entries if possible */
2857 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2858 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2860 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2864 if (!istate
->version
)
2865 istate
->version
= get_index_format_default(r
);
2867 /* demote version 3 to version 2 when the latter suffices */
2868 if (istate
->version
== 3 || istate
->version
== 2)
2869 istate
->version
= extended
? 3 : 2;
2871 hdr_version
= istate
->version
;
2873 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2874 hdr
.hdr_version
= htonl(hdr_version
);
2875 hdr
.hdr_entries
= htonl(entries
- removed
);
2877 hashwrite(f
, &hdr
, sizeof(hdr
));
2879 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2882 if (nr_threads
!= 1 && record_ieot()) {
2883 int ieot_blocks
, cpus
;
2886 * ensure default number of ieot blocks maps evenly to the
2887 * default number of threads that will process them leaving
2888 * room for the thread to load the index extensions.
2891 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2892 cpus
= online_cpus();
2893 if (ieot_blocks
> cpus
- 1)
2894 ieot_blocks
= cpus
- 1;
2896 ieot_blocks
= nr_threads
;
2897 if (ieot_blocks
> istate
->cache_nr
)
2898 ieot_blocks
= istate
->cache_nr
;
2902 * no reason to write out the IEOT extension if we don't
2903 * have enough blocks to utilize multi-threading
2905 if (ieot_blocks
> 1) {
2906 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2907 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2908 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2912 offset
= hashfile_total(f
);
2915 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2917 for (i
= 0; i
< entries
; i
++) {
2918 struct cache_entry
*ce
= cache
[i
];
2919 if (ce
->ce_flags
& CE_REMOVE
)
2921 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2922 ce_smudge_racily_clean_entry(istate
, ce
);
2923 if (is_null_oid(&ce
->oid
)) {
2924 static const char msg
[] = "cache entry has null sha1: %s";
2925 static int allow
= -1;
2928 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2930 warning(msg
, ce
->name
);
2932 err
= error(msg
, ce
->name
);
2934 drop_cache_tree
= 1;
2936 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2937 ieot
->entries
[ieot
->nr
].nr
= nr
;
2938 ieot
->entries
[ieot
->nr
].offset
= offset
;
2941 * If we have a V4 index, set the first byte to an invalid
2942 * character to ensure there is nothing common with the previous
2946 previous_name
->buf
[0] = 0;
2949 offset
= hashfile_total(f
);
2951 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2959 ieot
->entries
[ieot
->nr
].nr
= nr
;
2960 ieot
->entries
[ieot
->nr
].offset
= offset
;
2963 strbuf_release(&previous_name_buf
);
2970 offset
= hashfile_total(f
);
2973 * The extension headers must be hashed on their own for the
2974 * EOIE extension. Create a hashfile here to compute that hash.
2976 if (offset
&& record_eoie()) {
2977 CALLOC_ARRAY(eoie_c
, 1);
2978 the_hash_algo
->init_fn(eoie_c
);
2982 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2983 * can minimize the number of extensions we have to scan through to
2984 * find it during load. Write it out regardless of the
2985 * strip_extensions parameter as we need it when loading the shared
2991 write_ieot_extension(&sb
, ieot
);
2992 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2993 hashwrite(f
, sb
.buf
, sb
.len
);
3000 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3001 istate
->split_index
) {
3004 if (istate
->sparse_index
)
3005 die(_("cannot write split index for a sparse index"));
3007 err
= write_link_extension(&sb
, istate
) < 0 ||
3008 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3010 hashwrite(f
, sb
.buf
, sb
.len
);
3016 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3017 !drop_cache_tree
&& istate
->cache_tree
) {
3020 cache_tree_write(&sb
, istate
->cache_tree
);
3021 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3022 hashwrite(f
, sb
.buf
, sb
.len
);
3028 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3029 istate
->resolve_undo
) {
3032 resolve_undo_write(&sb
, istate
->resolve_undo
);
3033 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3035 hashwrite(f
, sb
.buf
, sb
.len
);
3041 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3042 istate
->untracked
) {
3045 write_untracked_extension(&sb
, istate
->untracked
);
3046 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3048 hashwrite(f
, sb
.buf
, sb
.len
);
3054 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3055 istate
->fsmonitor_last_update
) {
3058 write_fsmonitor_extension(&sb
, istate
);
3059 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3060 hashwrite(f
, sb
.buf
, sb
.len
);
3066 if (istate
->sparse_index
) {
3067 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0) {
3074 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3075 * so that it can be found and processed before all the index entries are
3076 * read. Write it out regardless of the strip_extensions parameter as we need it
3077 * when loading the shared index.
3082 write_eoie_extension(&sb
, eoie_c
, offset
);
3083 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3084 hashwrite(f
, sb
.buf
, sb
.len
);
3091 csum_fsync_flag
= 0;
3092 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3093 csum_fsync_flag
= CSUM_FSYNC
;
3095 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3096 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3099 if (close_tempfile_gently(tempfile
)) {
3100 ret
= error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3103 if (stat(get_tempfile_path(tempfile
), &st
)) {
3107 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3108 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3109 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3112 * TODO trace2: replace "the_repository" with the actual repo instance
3113 * that is associated with the given "istate".
3115 trace2_data_intmax("index", the_repository
, "write/version",
3117 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3125 strbuf_release(&sb
);
3130 void set_alternate_index_output(const char *name
)
3132 alternate_index_output
= name
;
3135 static int commit_locked_index(struct lock_file
*lk
)
3137 if (alternate_index_output
)
3138 return commit_lock_file_to(lk
, alternate_index_output
);
3140 return commit_lock_file(lk
);
3143 static int do_write_locked_index(struct index_state
*istate
,
3144 struct lock_file
*lock
,
3146 enum write_extensions write_extensions
)
3149 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3151 ret
= convert_to_sparse(istate
, 0);
3154 warning(_("failed to convert to a sparse-index"));
3159 * TODO trace2: replace "the_repository" with the actual repo instance
3160 * that is associated with the given "istate".
3162 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3163 "%s", get_lock_file_path(lock
));
3164 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3165 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3166 "%s", get_lock_file_path(lock
));
3169 ensure_full_index(istate
);
3173 if (flags
& COMMIT_LOCK
)
3174 ret
= commit_locked_index(lock
);
3176 ret
= close_lock_file_gently(lock
);
3178 run_hooks_l("post-index-change",
3179 istate
->updated_workdir
? "1" : "0",
3180 istate
->updated_skipworktree
? "1" : "0", NULL
);
3181 istate
->updated_workdir
= 0;
3182 istate
->updated_skipworktree
= 0;
3187 static int write_split_index(struct index_state
*istate
,
3188 struct lock_file
*lock
,
3192 prepare_to_write_split_index(istate
);
3193 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3194 finish_writing_split_index(istate
);
3198 static const char *shared_index_expire
= "2.weeks.ago";
3200 static unsigned long get_shared_index_expire_date(void)
3202 static unsigned long shared_index_expire_date
;
3203 static int shared_index_expire_date_prepared
;
3205 if (!shared_index_expire_date_prepared
) {
3206 git_config_get_expiry("splitindex.sharedindexexpire",
3207 &shared_index_expire
);
3208 shared_index_expire_date
= approxidate(shared_index_expire
);
3209 shared_index_expire_date_prepared
= 1;
3212 return shared_index_expire_date
;
3215 static int should_delete_shared_index(const char *shared_index_path
)
3218 unsigned long expiration
;
3220 /* Check timestamp */
3221 expiration
= get_shared_index_expire_date();
3224 if (stat(shared_index_path
, &st
))
3225 return error_errno(_("could not stat '%s'"), shared_index_path
);
3226 if (st
.st_mtime
> expiration
)
3232 static int clean_shared_index_files(const char *current_hex
)
3235 DIR *dir
= opendir(get_git_dir());
3238 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3240 while ((de
= readdir(dir
)) != NULL
) {
3241 const char *sha1_hex
;
3242 const char *shared_index_path
;
3243 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3245 if (!strcmp(sha1_hex
, current_hex
))
3247 shared_index_path
= git_path("%s", de
->d_name
);
3248 if (should_delete_shared_index(shared_index_path
) > 0 &&
3249 unlink(shared_index_path
))
3250 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3257 static int write_shared_index(struct index_state
*istate
,
3258 struct tempfile
**temp
, unsigned flags
)
3260 struct split_index
*si
= istate
->split_index
;
3261 int ret
, was_full
= !istate
->sparse_index
;
3263 move_cache_to_base_index(istate
);
3264 convert_to_sparse(istate
, 0);
3266 trace2_region_enter_printf("index", "shared/do_write_index",
3267 the_repository
, "%s", get_tempfile_path(*temp
));
3268 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3269 trace2_region_leave_printf("index", "shared/do_write_index",
3270 the_repository
, "%s", get_tempfile_path(*temp
));
3273 ensure_full_index(istate
);
3277 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3279 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3282 ret
= rename_tempfile(temp
,
3283 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3285 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3286 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3292 static const int default_max_percent_split_change
= 20;
3294 static int too_many_not_shared_entries(struct index_state
*istate
)
3296 int i
, not_shared
= 0;
3297 int max_split
= git_config_get_max_percent_split_change();
3299 switch (max_split
) {
3301 /* not or badly configured: use the default value */
3302 max_split
= default_max_percent_split_change
;
3305 return 1; /* 0% means always write a new shared index */
3307 return 0; /* 100% means never write a new shared index */
3309 break; /* just use the configured value */
3312 /* Count not shared entries */
3313 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3314 struct cache_entry
*ce
= istate
->cache
[i
];
3319 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3322 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3325 int new_shared_index
, ret
, test_split_index_env
;
3326 struct split_index
*si
= istate
->split_index
;
3328 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3329 cache_tree_verify(the_repository
, istate
);
3331 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3332 if (flags
& COMMIT_LOCK
)
3333 rollback_lock_file(lock
);
3337 if (istate
->fsmonitor_last_update
)
3338 fill_fsmonitor_bitmap(istate
);
3340 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3342 if ((!si
&& !test_split_index_env
) ||
3343 alternate_index_output
||
3344 (istate
->cache_changed
& ~EXTMASK
)) {
3345 ret
= do_write_locked_index(istate
, lock
, flags
,
3346 ~WRITE_SPLIT_INDEX_EXTENSION
);
3350 if (test_split_index_env
) {
3352 si
= init_split_index(istate
);
3353 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3355 int v
= si
->base_oid
.hash
[0];
3357 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3360 if (too_many_not_shared_entries(istate
))
3361 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3363 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3365 if (new_shared_index
) {
3366 struct tempfile
*temp
;
3369 /* Same initial permissions as the main .git/index file */
3370 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3372 ret
= do_write_locked_index(istate
, lock
, flags
,
3373 ~WRITE_SPLIT_INDEX_EXTENSION
);
3376 ret
= write_shared_index(istate
, &temp
, flags
);
3378 saved_errno
= errno
;
3379 if (is_tempfile_active(temp
))
3380 delete_tempfile(&temp
);
3381 errno
= saved_errno
;
3387 ret
= write_split_index(istate
, lock
, flags
);
3389 /* Freshen the shared index only if the split-index was written */
3390 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3391 const char *shared_index
= git_path("sharedindex.%s",
3392 oid_to_hex(&si
->base_oid
));
3393 freshen_shared_index(shared_index
, 1);
3397 if (flags
& COMMIT_LOCK
)
3398 rollback_lock_file(lock
);
3403 * Read the index file that is potentially unmerged into given
3404 * index_state, dropping any unmerged entries to stage #0 (potentially
3405 * resulting in a path appearing as both a file and a directory in the
3406 * index; the caller is responsible to clear out the extra entries
3407 * before writing the index to a tree). Returns true if the index is
3408 * unmerged. Callers who want to refuse to work from an unmerged
3409 * state can call this and check its return value, instead of calling
3412 int repo_read_index_unmerged(struct repository
*repo
)
3414 struct index_state
*istate
;
3418 repo_read_index(repo
);
3419 istate
= repo
->index
;
3420 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3421 struct cache_entry
*ce
= istate
->cache
[i
];
3422 struct cache_entry
*new_ce
;
3428 len
= ce_namelen(ce
);
3429 new_ce
= make_empty_cache_entry(istate
, len
);
3430 memcpy(new_ce
->name
, ce
->name
, len
);
3431 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3432 new_ce
->ce_namelen
= len
;
3433 new_ce
->ce_mode
= ce
->ce_mode
;
3434 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3435 return error(_("%s: cannot drop to stage #0"),
3442 * Returns 1 if the path is an "other" path with respect to
3443 * the index; that is, the path is not mentioned in the index at all,
3444 * either as a file, a directory with some files in the index,
3445 * or as an unmerged entry.
3447 * We helpfully remove a trailing "/" from directories so that
3448 * the output of read_directory can be used as-is.
3450 int index_name_is_other(struct index_state
*istate
, const char *name
,
3454 if (namelen
&& name
[namelen
- 1] == '/')
3456 pos
= index_name_pos(istate
, name
, namelen
);
3458 return 0; /* exact match */
3460 if (pos
< istate
->cache_nr
) {
3461 struct cache_entry
*ce
= istate
->cache
[pos
];
3462 if (ce_namelen(ce
) == namelen
&&
3463 !memcmp(ce
->name
, name
, namelen
))
3464 return 0; /* Yup, this one exists unmerged */
3469 void *read_blob_data_from_index(struct index_state
*istate
,
3470 const char *path
, unsigned long *size
)
3474 enum object_type type
;
3478 pos
= index_name_pos(istate
, path
, len
);
3481 * We might be in the middle of a merge, in which
3482 * case we would read stage #2 (ours).
3486 (pos
< 0 && i
< istate
->cache_nr
&&
3487 !strcmp(istate
->cache
[i
]->name
, path
));
3489 if (ce_stage(istate
->cache
[i
]) == 2)
3494 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3496 if (!data
|| type
!= OBJ_BLOB
) {
3505 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3507 dst
->untracked
= src
->untracked
;
3508 src
->untracked
= NULL
;
3509 dst
->cache_tree
= src
->cache_tree
;
3510 src
->cache_tree
= NULL
;
3513 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3514 struct index_state
*istate
)
3516 unsigned int size
= ce_size(ce
);
3517 int mem_pool_allocated
;
3518 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3519 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3521 memcpy(new_entry
, ce
, size
);
3522 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3526 void discard_cache_entry(struct cache_entry
*ce
)
3528 if (ce
&& should_validate_cache_entries())
3529 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3531 if (ce
&& ce
->mem_pool_allocated
)
3537 int should_validate_cache_entries(void)
3539 static int validate_index_cache_entries
= -1;
3541 if (validate_index_cache_entries
< 0) {
3542 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3543 validate_index_cache_entries
= 1;
3545 validate_index_cache_entries
= 0;
3548 return validate_index_cache_entries
;
3551 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3552 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3554 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3557 * The end of index entries (EOIE) extension is guaranteed to be last
3558 * so that it can be found by scanning backwards from the EOF.
3565 const char *index
, *eoie
;
3567 size_t offset
, src_offset
;
3568 unsigned char hash
[GIT_MAX_RAWSZ
];
3571 /* ensure we have an index big enough to contain an EOIE extension */
3572 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3575 /* validate the extension signature */
3576 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3577 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3579 index
+= sizeof(uint32_t);
3581 /* validate the extension size */
3582 extsize
= get_be32(index
);
3583 if (extsize
!= EOIE_SIZE
)
3585 index
+= sizeof(uint32_t);
3588 * Validate the offset we're going to look for the first extension
3589 * signature is after the index header and before the eoie extension.
3591 offset
= get_be32(index
);
3592 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3594 if (mmap
+ offset
>= eoie
)
3596 index
+= sizeof(uint32_t);
3599 * The hash is computed over extension types and their sizes (but not
3600 * their contents). E.g. if we have "TREE" extension that is N-bytes
3601 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3602 * then the hash would be:
3604 * SHA-1("TREE" + <binary representation of N> +
3605 * "REUC" + <binary representation of M>)
3607 src_offset
= offset
;
3608 the_hash_algo
->init_fn(&c
);
3609 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3610 /* After an array of active_nr index entries,
3611 * there can be arbitrary number of extended
3612 * sections, each of which is prefixed with
3613 * extension name (4-byte) and section length
3614 * in 4-byte network byte order.
3617 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3618 extsize
= ntohl(extsize
);
3620 /* verify the extension size isn't so large it will wrap around */
3621 if (src_offset
+ 8 + extsize
< src_offset
)
3624 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3627 src_offset
+= extsize
;
3629 the_hash_algo
->final_fn(hash
, &c
);
3630 if (!hasheq(hash
, (const unsigned char *)index
, the_repository
->hash_algo
))
3633 /* Validate that the extension offsets returned us back to the eoie extension. */
3634 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3640 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3643 unsigned char hash
[GIT_MAX_RAWSZ
];
3646 put_be32(&buffer
, offset
);
3647 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3650 the_hash_algo
->final_fn(hash
, eoie_context
);
3651 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3654 #define IEOT_VERSION (1)
3656 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3658 const char *index
= NULL
;
3659 uint32_t extsize
, ext_version
;
3660 struct index_entry_offset_table
*ieot
;
3663 /* find the IEOT extension */
3666 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3667 extsize
= get_be32(mmap
+ offset
+ 4);
3668 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3669 index
= mmap
+ offset
+ 4 + 4;
3678 /* validate the version is IEOT_VERSION */
3679 ext_version
= get_be32(index
);
3680 if (ext_version
!= IEOT_VERSION
) {
3681 error("invalid IEOT version %d", ext_version
);
3684 index
+= sizeof(uint32_t);
3686 /* extension size - version bytes / bytes per entry */
3687 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3689 error("invalid number of IEOT entries %d", nr
);
3692 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3693 + (nr
* sizeof(struct index_entry_offset
)));
3695 for (i
= 0; i
< nr
; i
++) {
3696 ieot
->entries
[i
].offset
= get_be32(index
);
3697 index
+= sizeof(uint32_t);
3698 ieot
->entries
[i
].nr
= get_be32(index
);
3699 index
+= sizeof(uint32_t);
3705 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3711 put_be32(&buffer
, IEOT_VERSION
);
3712 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3715 for (i
= 0; i
< ieot
->nr
; i
++) {
3718 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3719 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3722 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3723 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3727 void prefetch_cache_entries(const struct index_state
*istate
,
3728 must_prefetch_predicate must_prefetch
)
3731 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3733 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3734 struct cache_entry
*ce
= istate
->cache
[i
];
3736 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3738 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3740 OBJECT_INFO_FOR_PREFETCH
))
3742 oid_array_append(&to_fetch
, &ce
->oid
);
3744 promisor_remote_get_direct(the_repository
,
3745 to_fetch
.oid
, to_fetch
.nr
);
3746 oid_array_clear(&to_fetch
);
3749 static int read_one_entry_opt(struct index_state
*istate
,
3750 const struct object_id
*oid
,
3751 struct strbuf
*base
,
3752 const char *pathname
,
3753 unsigned mode
, int opt
)
3756 struct cache_entry
*ce
;
3759 return READ_TREE_RECURSIVE
;
3761 len
= strlen(pathname
);
3762 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3764 ce
->ce_mode
= create_ce_mode(mode
);
3765 ce
->ce_flags
= create_ce_flags(1);
3766 ce
->ce_namelen
= base
->len
+ len
;
3767 memcpy(ce
->name
, base
->buf
, base
->len
);
3768 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3769 oidcpy(&ce
->oid
, oid
);
3770 return add_index_entry(istate
, ce
, opt
);
3773 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3774 const char *pathname
, unsigned mode
,
3777 struct index_state
*istate
= context
;
3778 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3780 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3784 * This is used when the caller knows there is no existing entries at
3785 * the stage that will conflict with the entry being added.
3787 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3788 const char *pathname
, unsigned mode
,
3791 struct index_state
*istate
= context
;
3792 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3793 mode
, ADD_CACHE_JUST_APPEND
);
3797 * Read the tree specified with --with-tree option
3798 * (typically, HEAD) into stage #1 and then
3799 * squash them down to stage #0. This is used for
3800 * --error-unmatch to list and check the path patterns
3801 * that were given from the command line. We are not
3802 * going to write this index out.
3804 void overlay_tree_on_index(struct index_state
*istate
,
3805 const char *tree_name
, const char *prefix
)
3808 struct object_id oid
;
3809 struct pathspec pathspec
;
3810 struct cache_entry
*last_stage0
= NULL
;
3812 read_tree_fn_t fn
= NULL
;
3815 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3816 die("tree-ish %s not found.", tree_name
);
3817 tree
= parse_tree_indirect(&oid
);
3819 die("bad tree-ish %s", tree_name
);
3821 /* Hoist the unmerged entries up to stage #3 to make room */
3822 /* TODO: audit for interaction with sparse-index. */
3823 ensure_full_index(istate
);
3824 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3825 struct cache_entry
*ce
= istate
->cache
[i
];
3828 ce
->ce_flags
|= CE_STAGEMASK
;
3832 static const char *(matchbuf
[1]);
3834 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3835 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3837 memset(&pathspec
, 0, sizeof(pathspec
));
3840 * See if we have cache entry at the stage. If so,
3841 * do it the original slow way, otherwise, append and then
3844 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3845 const struct cache_entry
*ce
= istate
->cache
[i
];
3846 if (ce_stage(ce
) == 1)
3847 fn
= read_one_entry
;
3851 fn
= read_one_entry_quick
;
3852 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3853 clear_pathspec(&pathspec
);
3855 die("unable to read tree entries %s", tree_name
);
3858 * Sort the cache entry -- we need to nuke the cache tree, though.
3860 if (fn
== read_one_entry_quick
) {
3861 cache_tree_free(&istate
->cache_tree
);
3862 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3865 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3866 struct cache_entry
*ce
= istate
->cache
[i
];
3867 switch (ce_stage(ce
)) {
3875 * If there is stage #0 entry for this, we do not
3876 * need to show it. We use CE_UPDATE bit to mark
3880 !strcmp(last_stage0
->name
, ce
->name
))
3881 ce
->ce_flags
|= CE_UPDATE
;
3886 struct update_callback_data
{
3887 struct index_state
*index
;
3893 static int fix_unmerged_status(struct diff_filepair
*p
,
3894 struct update_callback_data
*data
)
3896 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3898 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3900 * This is not an explicit add request, and the
3901 * path is missing from the working tree (deleted)
3903 return DIFF_STATUS_DELETED
;
3906 * Either an explicit add request, or path exists
3907 * in the working tree. An attempt to explicitly
3908 * add a path that does not exist in the working tree
3909 * will be caught as an error by the caller immediately.
3911 return DIFF_STATUS_MODIFIED
;
3914 static void update_callback(struct diff_queue_struct
*q
,
3915 struct diff_options
*opt UNUSED
, void *cbdata
)
3918 struct update_callback_data
*data
= cbdata
;
3920 for (i
= 0; i
< q
->nr
; i
++) {
3921 struct diff_filepair
*p
= q
->queue
[i
];
3922 const char *path
= p
->one
->path
;
3924 if (!data
->include_sparse
&&
3925 !path_in_sparse_checkout(path
, data
->index
))
3928 switch (fix_unmerged_status(p
, data
)) {
3930 die(_("unexpected diff status %c"), p
->status
);
3931 case DIFF_STATUS_MODIFIED
:
3932 case DIFF_STATUS_TYPE_CHANGED
:
3933 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3934 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3935 die(_("updating files failed"));
3939 case DIFF_STATUS_DELETED
:
3940 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3942 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3943 remove_file_from_index(data
->index
, path
);
3944 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3945 printf(_("remove '%s'\n"), path
);
3951 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3952 const struct pathspec
*pathspec
, char *ps_matched
,
3953 int include_sparse
, int flags
)
3955 struct update_callback_data data
;
3956 struct rev_info rev
;
3958 memset(&data
, 0, sizeof(data
));
3959 data
.index
= repo
->index
;
3960 data
.include_sparse
= include_sparse
;
3963 repo_init_revisions(repo
, &rev
, prefix
);
3964 setup_revisions(0, NULL
, &rev
, NULL
);
3966 copy_pathspec(&rev
.prune_data
, pathspec
);
3967 rev
.ps_matched
= ps_matched
;
3969 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3970 rev
.diffopt
.format_callback
= update_callback
;
3971 rev
.diffopt
.format_callback_data
= &data
;
3972 rev
.diffopt
.flags
.override_submodule_config
= 1;
3973 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3976 * Use an ODB transaction to optimize adding multiple objects.
3977 * This function is invoked from commands other than 'add', which
3978 * may not have their own transaction active.
3980 begin_odb_transaction();
3981 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3982 end_odb_transaction();
3984 release_revisions(&rev
);
3985 return !!data
.add_errors
;