2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
7 #define USE_THE_REPOSITORY_VARIABLE
8 #define DISABLE_SIGN_COMPARE_WARNINGS
10 #include "git-compat-util.h"
11 #include "bulk-checkin.h"
19 #include "cache-tree.h"
22 #include "object-file.h"
23 #include "object-store.h"
24 #include "oid-array.h"
27 #include "environment.h"
30 #include "name-hash.h"
31 #include "object-name.h"
33 #include "preload-index.h"
34 #include "read-cache.h"
35 #include "repository.h"
36 #include "resolve-undo.h"
41 #include "split-index.h"
44 #include "fsmonitor.h"
45 #include "thread-utils.h"
47 #include "sparse-index.h"
48 #include "csum-file.h"
49 #include "promisor-remote.h"
52 /* Mask for the name length in ce_flags in the on-disk index */
54 #define CE_NAMEMASK (0x0fff)
58 * The first letter should be 'A'..'Z' for extensions that are not
59 * necessary for a correct operation (i.e. optimization data).
60 * When new extensions are added that _needs_ to be understood in
61 * order to correctly interpret the index file, pick character that
62 * is outside the range, to cause the reader to abort.
65 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
66 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
67 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
68 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
69 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
70 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
71 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
72 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
73 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
75 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
76 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
77 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
78 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
82 * This is an estimate of the pathname length in the index. We use
83 * this for V4 index files to guess the un-deltafied size of the index
84 * in memory because of pathname deltafication. This is not required
85 * for V2/V3 index formats because their pathnames are not compressed.
86 * If the initial amount of memory set aside is not sufficient, the
87 * mem pool will allocate extra memory.
89 #define CACHE_ENTRY_PATH_LENGTH 80
91 enum index_search_mode
{
96 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
98 struct cache_entry
*ce
;
99 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
100 ce
->mem_pool_allocated
= 1;
104 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
106 struct cache_entry
* ce
;
107 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
108 ce
->mem_pool_allocated
= 1;
112 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
114 struct mem_pool
**pool_ptr
;
116 if (istate
->split_index
&& istate
->split_index
->base
)
117 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
119 pool_ptr
= &istate
->ce_mem_pool
;
122 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
123 mem_pool_init(*pool_ptr
, 0);
129 static const char *alternate_index_output
;
131 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
133 if (S_ISSPARSEDIR(ce
->ce_mode
))
134 istate
->sparse_index
= INDEX_COLLAPSED
;
136 istate
->cache
[nr
] = ce
;
137 add_name_hash(istate
, ce
);
140 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
142 struct cache_entry
*old
= istate
->cache
[nr
];
144 replace_index_entry_in_base(istate
, old
, ce
);
145 remove_name_hash(istate
, old
);
146 discard_cache_entry(old
);
147 ce
->ce_flags
&= ~CE_HASHED
;
148 set_index_entry(istate
, nr
, ce
);
149 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
150 mark_fsmonitor_invalid(istate
, ce
);
151 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
154 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
156 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
157 int namelen
= strlen(new_name
);
159 new_entry
= make_empty_cache_entry(istate
, namelen
);
160 copy_cache_entry(new_entry
, old_entry
);
161 new_entry
->ce_flags
&= ~CE_HASHED
;
162 new_entry
->ce_namelen
= namelen
;
163 new_entry
->index
= 0;
164 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
166 cache_tree_invalidate_path(istate
, old_entry
->name
);
167 untracked_cache_remove_from_index(istate
, old_entry
->name
);
168 remove_index_entry_at(istate
, nr
);
171 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
172 * we only update stat info if the entry is otherwise up-to-date (i.e.,
173 * the contents/mode haven't changed). This ensures that we reflect the
174 * 'ctime' of the rename in the index without (incorrectly) updating
175 * the cached stat info to reflect unstaged changes on disk.
177 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
178 if (refreshed
&& refreshed
!= new_entry
) {
179 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
180 discard_cache_entry(new_entry
);
182 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
186 * This only updates the "non-critical" parts of the directory
187 * cache, ie the parts that aren't tracked by GIT, and only used
188 * to validate the cache.
190 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
192 fill_stat_data(&ce
->ce_stat_data
, st
);
194 if (assume_unchanged
)
195 ce
->ce_flags
|= CE_VALID
;
197 if (S_ISREG(st
->st_mode
)) {
198 ce_mark_uptodate(ce
);
199 mark_fsmonitor_valid(istate
, ce
);
203 static unsigned int st_mode_from_ce(const struct cache_entry
*ce
)
205 extern int trust_executable_bit
, has_symlinks
;
207 switch (ce
->ce_mode
& S_IFMT
) {
209 return has_symlinks
? S_IFLNK
: (S_IFREG
| 0644);
211 return (ce
->ce_mode
& (trust_executable_bit
? 0755 : 0644)) | S_IFREG
;
213 return S_IFDIR
| 0755;
217 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
221 int fake_lstat(const struct cache_entry
*ce
, struct stat
*st
)
223 fake_lstat_data(&ce
->ce_stat_data
, st
);
224 st
->st_mode
= st_mode_from_ce(ce
);
226 /* always succeed as lstat() replacement */
230 static int ce_compare_data(struct index_state
*istate
,
231 const struct cache_entry
*ce
,
235 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
238 struct object_id oid
;
239 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
240 match
= !oideq(&oid
, &ce
->oid
);
241 /* index_fd() closed the file descriptor already */
246 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
251 enum object_type type
;
252 struct strbuf sb
= STRBUF_INIT
;
254 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
257 buffer
= repo_read_object_file(the_repository
, &ce
->oid
, &type
, &size
);
260 match
= memcmp(buffer
, sb
.buf
, size
);
267 static int ce_compare_gitlink(const struct cache_entry
*ce
)
269 struct object_id oid
;
272 * We don't actually require that the .git directory
273 * under GITLINK directory be a valid git directory. It
274 * might even be missing (in case nobody populated that
277 * If so, we consider it always to match.
279 if (repo_resolve_gitlink_ref(the_repository
, ce
->name
,
282 return !oideq(&oid
, &ce
->oid
);
285 static int ce_modified_check_fs(struct index_state
*istate
,
286 const struct cache_entry
*ce
,
289 switch (st
->st_mode
& S_IFMT
) {
291 if (ce_compare_data(istate
, ce
, st
))
295 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
299 if (S_ISGITLINK(ce
->ce_mode
))
300 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
301 /* else fallthrough */
308 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
310 unsigned int changed
= 0;
312 if (ce
->ce_flags
& CE_REMOVE
)
313 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
315 switch (ce
->ce_mode
& S_IFMT
) {
317 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
318 /* We consider only the owner x bit to be relevant for
321 if (trust_executable_bit
&&
322 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
323 changed
|= MODE_CHANGED
;
326 if (!S_ISLNK(st
->st_mode
) &&
327 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
328 changed
|= TYPE_CHANGED
;
331 /* We ignore most of the st_xxx fields for gitlinks */
332 if (!S_ISDIR(st
->st_mode
))
333 changed
|= TYPE_CHANGED
;
334 else if (ce_compare_gitlink(ce
))
335 changed
|= DATA_CHANGED
;
338 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
341 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
343 /* Racily smudged entry? */
344 if (!ce
->ce_stat_data
.sd_size
) {
345 if (!is_empty_blob_oid(&ce
->oid
, the_repository
->hash_algo
))
346 changed
|= DATA_CHANGED
;
352 static int is_racy_stat(const struct index_state
*istate
,
353 const struct stat_data
*sd
)
355 return (istate
->timestamp
.sec
&&
357 /* nanosecond timestamped files can also be racy! */
358 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
359 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
360 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
362 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
367 int is_racy_timestamp(const struct index_state
*istate
,
368 const struct cache_entry
*ce
)
370 return (!S_ISGITLINK(ce
->ce_mode
) &&
371 is_racy_stat(istate
, &ce
->ce_stat_data
));
374 int match_stat_data_racy(const struct index_state
*istate
,
375 const struct stat_data
*sd
, struct stat
*st
)
377 if (is_racy_stat(istate
, sd
))
378 return MTIME_CHANGED
;
379 return match_stat_data(sd
, st
);
382 int ie_match_stat(struct index_state
*istate
,
383 const struct cache_entry
*ce
, struct stat
*st
,
384 unsigned int options
)
386 unsigned int changed
;
387 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
388 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
389 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
390 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
392 if (!ignore_fsmonitor
)
393 refresh_fsmonitor(istate
);
395 * If it's marked as always valid in the index, it's
396 * valid whatever the checked-out copy says.
398 * skip-worktree has the same effect with higher precedence
400 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
402 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
404 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
408 * Intent-to-add entries have not been added, so the index entry
409 * by definition never matches what is in the work tree until it
410 * actually gets added.
412 if (ce_intent_to_add(ce
))
413 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
415 changed
= ce_match_stat_basic(ce
, st
);
418 * Within 1 second of this sequence:
419 * echo xyzzy >file && git-update-index --add file
420 * running this command:
422 * would give a falsely clean cache entry. The mtime and
423 * length match the cache, and other stat fields do not change.
425 * We could detect this at update-index time (the cache entry
426 * being registered/updated records the same time as "now")
427 * and delay the return from git-update-index, but that would
428 * effectively mean we can make at most one commit per second,
429 * which is not acceptable. Instead, we check cache entries
430 * whose mtime are the same as the index file timestamp more
431 * carefully than others.
433 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
434 if (assume_racy_is_modified
)
435 changed
|= DATA_CHANGED
;
437 changed
|= ce_modified_check_fs(istate
, ce
, st
);
443 int ie_modified(struct index_state
*istate
,
444 const struct cache_entry
*ce
,
445 struct stat
*st
, unsigned int options
)
447 int changed
, changed_fs
;
449 changed
= ie_match_stat(istate
, ce
, st
, options
);
453 * If the mode or type has changed, there's no point in trying
454 * to refresh the entry - it's not going to match
456 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
460 * Immediately after read-tree or update-index --cacheinfo,
461 * the length field is zero, as we have never even read the
462 * lstat(2) information once, and we cannot trust DATA_CHANGED
463 * returned by ie_match_stat() which in turn was returned by
464 * ce_match_stat_basic() to signal that the filesize of the
465 * blob changed. We have to actually go to the filesystem to
466 * see if the contents match, and if so, should answer "unchanged".
468 * The logic does not apply to gitlinks, as ce_match_stat_basic()
469 * already has checked the actual HEAD from the filesystem in the
470 * subproject. If ie_match_stat() already said it is different,
471 * then we know it is.
473 if ((changed
& DATA_CHANGED
) &&
474 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
477 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
479 return changed
| changed_fs
;
483 static int cache_name_stage_compare(const char *name1
, int len1
, int stage1
,
484 const char *name2
, int len2
, int stage2
)
488 cmp
= name_compare(name1
, len1
, name2
, len2
);
499 int cmp_cache_name_compare(const void *a_
, const void *b_
)
501 const struct cache_entry
*ce1
, *ce2
;
503 ce1
= *((const struct cache_entry
**)a_
);
504 ce2
= *((const struct cache_entry
**)b_
);
505 return cache_name_stage_compare(ce1
->name
, ce1
->ce_namelen
, ce_stage(ce1
),
506 ce2
->name
, ce2
->ce_namelen
, ce_stage(ce2
));
509 static int index_name_stage_pos(struct index_state
*istate
,
510 const char *name
, int namelen
,
512 enum index_search_mode search_mode
)
517 last
= istate
->cache_nr
;
518 while (last
> first
) {
519 int next
= first
+ ((last
- first
) >> 1);
520 struct cache_entry
*ce
= istate
->cache
[next
];
521 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
531 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
533 /* Note: first <= istate->cache_nr */
534 struct cache_entry
*ce
= istate
->cache
[first
- 1];
537 * If we are in a sparse-index _and_ the entry before the
538 * insertion position is a sparse-directory entry that is
539 * an ancestor of 'name', then we need to expand the index
540 * and search again. This will only trigger once, because
541 * thereafter the index is fully expanded.
543 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
544 ce_namelen(ce
) < namelen
&&
545 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
546 ensure_full_index(istate
);
547 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
554 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
556 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
559 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
561 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
564 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
566 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
569 int remove_index_entry_at(struct index_state
*istate
, int pos
)
571 struct cache_entry
*ce
= istate
->cache
[pos
];
573 record_resolve_undo(istate
, ce
);
574 remove_name_hash(istate
, ce
);
575 save_or_free_index_entry(istate
, ce
);
576 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
578 if (pos
>= istate
->cache_nr
)
580 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
581 istate
->cache_nr
- pos
);
586 * Remove all cache entries marked for removal, that is where
587 * CE_REMOVE is set in ce_flags. This is much more effective than
588 * calling remove_index_entry_at() for each entry to be removed.
590 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
592 struct cache_entry
**ce_array
= istate
->cache
;
595 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
596 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
598 cache_tree_invalidate_path(istate
,
600 untracked_cache_remove_from_index(istate
,
603 remove_name_hash(istate
, ce_array
[i
]);
604 save_or_free_index_entry(istate
, ce_array
[i
]);
607 ce_array
[j
++] = ce_array
[i
];
609 if (j
== istate
->cache_nr
)
611 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
612 istate
->cache_nr
= j
;
615 int remove_file_from_index(struct index_state
*istate
, const char *path
)
617 int pos
= index_name_pos(istate
, path
, strlen(path
));
620 cache_tree_invalidate_path(istate
, path
);
621 untracked_cache_remove_from_index(istate
, path
);
622 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
623 remove_index_entry_at(istate
, pos
);
627 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
629 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
632 static int index_name_pos_also_unmerged(struct index_state
*istate
,
633 const char *path
, int namelen
)
635 int pos
= index_name_pos(istate
, path
, namelen
);
636 struct cache_entry
*ce
;
641 /* maybe unmerged? */
643 if (pos
>= istate
->cache_nr
||
644 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
647 /* order of preference: stage 2, 1, 3 */
648 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
649 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
650 !compare_name(ce
, path
, namelen
))
655 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
657 int len
= ce_namelen(ce
);
658 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
662 * If we add a filename that aliases in the cache, we will use the
663 * name that we already have - but we don't want to update the same
664 * alias twice, because that implies that there were actually two
665 * different files with aliasing names!
667 * So we use the CE_ADDED flag to verify that the alias was an old
668 * one before we accept it as
670 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
671 struct cache_entry
*ce
,
672 struct cache_entry
*alias
)
675 struct cache_entry
*new_entry
;
677 if (alias
->ce_flags
& CE_ADDED
)
678 die(_("will not add file alias '%s' ('%s' already exists in index)"),
679 ce
->name
, alias
->name
);
681 /* Ok, create the new entry using the name of the existing alias */
682 len
= ce_namelen(alias
);
683 new_entry
= make_empty_cache_entry(istate
, len
);
684 memcpy(new_entry
->name
, alias
->name
, len
);
685 copy_cache_entry(new_entry
, ce
);
686 save_or_free_index_entry(istate
, ce
);
690 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
692 struct object_id oid
;
693 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
694 die(_("cannot create an empty blob in the object database"));
695 oidcpy(&ce
->oid
, &oid
);
698 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
700 int namelen
, was_same
;
701 mode_t st_mode
= st
->st_mode
;
702 struct cache_entry
*ce
, *alias
= NULL
;
703 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
704 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
705 int pretend
= flags
& ADD_CACHE_PRETEND
;
706 int intent_only
= flags
& ADD_CACHE_INTENT
;
707 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
708 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
709 unsigned hash_flags
= pretend
? 0 : INDEX_WRITE_OBJECT
;
710 struct object_id oid
;
712 if (flags
& ADD_CACHE_RENORMALIZE
)
713 hash_flags
|= INDEX_RENORMALIZE
;
715 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
716 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
718 namelen
= strlen(path
);
719 if (S_ISDIR(st_mode
)) {
720 if (repo_resolve_gitlink_ref(the_repository
, path
, "HEAD", &oid
) < 0)
721 return error(_("'%s' does not have a commit checked out"), path
);
722 while (namelen
&& path
[namelen
-1] == '/')
725 ce
= make_empty_cache_entry(istate
, namelen
);
726 memcpy(ce
->name
, path
, namelen
);
727 ce
->ce_namelen
= namelen
;
729 fill_stat_cache_info(istate
, ce
, st
);
731 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
734 if (trust_executable_bit
&& has_symlinks
) {
735 ce
->ce_mode
= create_ce_mode(st_mode
);
737 /* If there is an existing entry, pick the mode bits and type
738 * from it, otherwise assume unexecutable regular file.
740 struct cache_entry
*ent
;
741 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
743 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
744 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
747 /* When core.ignorecase=true, determine if a directory of the same name but differing
748 * case already exists within the Git repository. If it does, ensure the directory
749 * case of the file being added to the repository matches (is folded into) the existing
750 * entry's directory case.
753 adjust_dirname_case(istate
, ce
->name
);
755 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
756 alias
= index_file_exists(istate
, ce
->name
,
757 ce_namelen(ce
), ignore_case
);
760 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
761 /* Nothing changed, really */
762 if (!S_ISGITLINK(alias
->ce_mode
))
763 ce_mark_uptodate(alias
);
764 alias
->ce_flags
|= CE_ADDED
;
766 discard_cache_entry(ce
);
771 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
772 discard_cache_entry(ce
);
773 return error(_("unable to index file '%s'"), path
);
776 set_object_name_for_intent_to_add_entry(ce
);
778 if (ignore_case
&& alias
&& different_name(ce
, alias
))
779 ce
= create_alias_ce(istate
, ce
, alias
);
780 ce
->ce_flags
|= CE_ADDED
;
782 /* It was suspected to be racily clean, but it turns out to be Ok */
785 oideq(&alias
->oid
, &ce
->oid
) &&
786 ce
->ce_mode
== alias
->ce_mode
);
789 discard_cache_entry(ce
);
790 else if (add_index_entry(istate
, ce
, add_option
)) {
791 discard_cache_entry(ce
);
792 return error(_("unable to add '%s' to index"), path
);
794 if (verbose
&& !was_same
)
795 printf("add '%s'\n", path
);
799 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
802 if (lstat(path
, &st
))
803 die_errno(_("unable to stat '%s'"), path
);
804 return add_to_index(istate
, path
, &st
, flags
);
807 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
809 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
812 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
813 struct mem_pool
*ce_mem_pool
)
816 return mem_pool__ce_calloc(ce_mem_pool
, len
);
817 return xcalloc(1, cache_entry_size(len
));
820 enum verify_path_result
{
826 static enum verify_path_result
verify_path_internal(const char *, unsigned);
828 int verify_path(const char *path
, unsigned mode
)
830 return verify_path_internal(path
, mode
) == PATH_OK
;
833 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
835 const struct object_id
*oid
,
838 unsigned int refresh_options
)
840 struct cache_entry
*ce
, *ret
;
843 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
844 error(_("invalid path '%s'"), path
);
849 ce
= make_empty_cache_entry(istate
, len
);
851 oidcpy(&ce
->oid
, oid
);
852 memcpy(ce
->name
, path
, len
);
853 ce
->ce_flags
= create_ce_flags(stage
);
854 ce
->ce_namelen
= len
;
855 ce
->ce_mode
= create_ce_mode(mode
);
857 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
859 discard_cache_entry(ce
);
863 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
864 const struct object_id
*oid
,
867 struct mem_pool
*ce_mem_pool
)
869 struct cache_entry
*ce
;
872 if (!verify_path(path
, mode
)) {
873 error(_("invalid path '%s'"), path
);
878 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
880 oidcpy(&ce
->oid
, oid
);
881 memcpy(ce
->name
, path
, len
);
882 ce
->ce_flags
= create_ce_flags(stage
);
883 ce
->ce_namelen
= len
;
884 ce
->ce_mode
= create_ce_mode(mode
);
890 * Chmod an index entry with either +x or -x.
892 * Returns -1 if the chmod for the particular cache entry failed (if it's
893 * not a regular file), -2 if an invalid flip argument is passed in, 0
896 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
899 if (!S_ISREG(ce
->ce_mode
))
906 ce
->ce_mode
&= ~0111;
911 cache_tree_invalidate_path(istate
, ce
->name
);
912 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
913 mark_fsmonitor_invalid(istate
, ce
);
914 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
919 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
921 int len
= ce_namelen(a
);
922 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
926 * We fundamentally don't like some paths: we don't want
927 * dot or dot-dot anywhere, and for obvious reasons don't
928 * want to recurse into ".git" either.
930 * Also, we don't want double slashes or slashes at the
931 * end that can make pathnames ambiguous.
933 static int verify_dotfile(const char *rest
, unsigned mode
)
936 * The first character was '.', but that
937 * has already been discarded, we now test
941 /* "." is not allowed */
942 if (*rest
== '\0' || is_dir_sep(*rest
))
947 * ".git" followed by NUL or slash is bad. Note that we match
948 * case-insensitively here, even if ignore_case is not set.
949 * This outlaws ".GIT" everywhere out of an abundance of caution,
950 * since there's really no good reason to allow it.
952 * Once we've seen ".git", we can also find ".gitmodules", etc (also
953 * case-insensitively).
957 if (rest
[1] != 'i' && rest
[1] != 'I')
959 if (rest
[2] != 't' && rest
[2] != 'T')
961 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
965 if (skip_iprefix(rest
, "modules", &rest
) &&
966 (*rest
== '\0' || is_dir_sep(*rest
)))
971 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
977 static enum verify_path_result
verify_path_internal(const char *path
,
982 if (has_dos_drive_prefix(path
))
985 if (!is_valid_path(path
))
996 if (is_hfs_dotgit(path
))
999 if (is_hfs_dotgitmodules(path
))
1000 return PATH_INVALID
;
1004 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1006 return PATH_INVALID
;
1008 if (is_ntfs_dotgit(path
))
1009 return PATH_INVALID
;
1010 if (S_ISLNK(mode
)) {
1011 if (is_ntfs_dotgitmodules(path
))
1012 return PATH_INVALID
;
1017 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1019 return PATH_INVALID
;
1021 * allow terminating directory separators for
1022 * sparse directory entries.
1025 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1027 } else if (c
== '\\' && protect_ntfs
) {
1028 if (is_ntfs_dotgit(path
))
1029 return PATH_INVALID
;
1030 if (S_ISLNK(mode
)) {
1031 if (is_ntfs_dotgitmodules(path
))
1032 return PATH_INVALID
;
1041 * Do we have another file that has the beginning components being a
1042 * proper superset of the name we're trying to add?
1044 static int has_file_name(struct index_state
*istate
,
1045 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1048 int len
= ce_namelen(ce
);
1049 int stage
= ce_stage(ce
);
1050 const char *name
= ce
->name
;
1052 while (pos
< istate
->cache_nr
) {
1053 struct cache_entry
*p
= istate
->cache
[pos
++];
1055 if (len
>= ce_namelen(p
))
1057 if (memcmp(name
, p
->name
, len
))
1059 if (ce_stage(p
) != stage
)
1061 if (p
->name
[len
] != '/')
1063 if (p
->ce_flags
& CE_REMOVE
)
1068 remove_index_entry_at(istate
, --pos
);
1075 * Like strcmp(), but also return the offset of the first change.
1076 * If strings are equal, return the length.
1078 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1083 return strcmp(s1
, s2
);
1085 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1090 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1094 * Do we have another file with a pathname that is a proper
1095 * subset of the name we're trying to add?
1097 * That is, is there another file in the index with a path
1098 * that matches a sub-directory in the given entry?
1100 static int has_dir_name(struct index_state
*istate
,
1101 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1104 int stage
= ce_stage(ce
);
1105 const char *name
= ce
->name
;
1106 const char *slash
= name
+ ce_namelen(ce
);
1111 * We are frequently called during an iteration on a sorted
1112 * list of pathnames and while building a new index. Therefore,
1113 * there is a high probability that this entry will eventually
1114 * be appended to the index, rather than inserted in the middle.
1115 * If we can confirm that, we can avoid binary searches on the
1116 * components of the pathname.
1118 * Compare the entry's full path with the last path in the index.
1120 if (!istate
->cache_nr
)
1123 cmp_last
= strcmp_offset(name
,
1124 istate
->cache
[istate
->cache_nr
- 1]->name
,
1126 if (cmp_last
> 0 && name
[len_eq_last
] != '/')
1128 * The entry sorts AFTER the last one in the
1129 * index and their paths have no common prefix,
1130 * so there cannot be a F/D conflict.
1138 if (*--slash
== '/')
1140 if (slash
<= ce
->name
)
1145 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1148 * Found one, but not so fast. This could
1149 * be a marker that says "I was here, but
1150 * I am being removed". Such an entry is
1151 * not a part of the resulting tree, and
1152 * it is Ok to have a directory at the same
1155 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1159 remove_index_entry_at(istate
, pos
);
1167 * Trivial optimization: if we find an entry that
1168 * already matches the sub-directory, then we know
1169 * we're ok, and we can exit.
1171 while (pos
< istate
->cache_nr
) {
1172 struct cache_entry
*p
= istate
->cache
[pos
];
1173 if ((ce_namelen(p
) <= len
) ||
1174 (p
->name
[len
] != '/') ||
1175 memcmp(p
->name
, name
, len
))
1176 break; /* not our subdirectory */
1177 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1179 * p is at the same stage as our entry, and
1180 * is a subdirectory of what we are looking
1181 * at, so we cannot have conflicts at our
1182 * level or anything shorter.
1191 /* We may be in a situation where we already have path/file and path
1192 * is being added, or we already have path and path/file is being
1193 * added. Either one would result in a nonsense tree that has path
1194 * twice when git-write-tree tries to write it out. Prevent it.
1196 * If ok-to-replace is specified, we remove the conflicting entries
1197 * from the cache so the caller should recompute the insert position.
1198 * When this happens, we return non-zero.
1200 static int check_file_directory_conflict(struct index_state
*istate
,
1201 const struct cache_entry
*ce
,
1202 int pos
, int ok_to_replace
)
1207 * When ce is an "I am going away" entry, we allow it to be added
1209 if (ce
->ce_flags
& CE_REMOVE
)
1213 * We check if the path is a sub-path of a subsequent pathname
1214 * first, since removing those will not change the position
1217 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1220 * Then check if the path might have a clashing sub-directory
1223 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1226 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1229 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1230 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1231 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1232 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1235 * If this entry's path sorts after the last entry in the index,
1236 * we can avoid searching for it.
1238 if (istate
->cache_nr
> 0 &&
1239 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1240 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1242 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1245 * Cache tree path should be invalidated only after index_name_stage_pos,
1246 * in case it expands a sparse index.
1248 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1249 cache_tree_invalidate_path(istate
, ce
->name
);
1251 /* existing match? Just replace it. */
1254 replace_index_entry(istate
, pos
, ce
);
1259 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1260 untracked_cache_add_to_index(istate
, ce
->name
);
1263 * Inserting a merged entry ("stage 0") into the index
1264 * will always replace all non-merged entries..
1266 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1267 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1269 if (!remove_index_entry_at(istate
, pos
))
1276 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1277 return error(_("invalid path '%s'"), ce
->name
);
1279 if (!skip_df_check
&&
1280 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1282 return error(_("'%s' appears as both a file and as a directory"),
1284 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1290 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1294 if (option
& ADD_CACHE_JUST_APPEND
)
1295 pos
= istate
->cache_nr
;
1298 ret
= add_index_entry_with_check(istate
, ce
, option
);
1304 /* Make sure the array is big enough .. */
1305 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1309 if (istate
->cache_nr
> pos
+ 1)
1310 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1311 istate
->cache_nr
- pos
- 1);
1312 set_index_entry(istate
, pos
, ce
);
1313 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1318 * "refresh" does not calculate a new sha1 file or bring the
1319 * cache up-to-date for mode/content changes. But what it
1320 * _does_ do is to "re-match" the stat information of a file
1321 * with the cache, so that you can refresh the cache for a
1322 * file that hasn't been changed but where the stat entry is
1325 * For example, you'd want to do this after doing a "git-read-tree",
1326 * to link up the stat cache details with the proper files.
1328 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1329 struct cache_entry
*ce
,
1330 unsigned int options
, int *err
,
1336 struct cache_entry
*updated
;
1338 int refresh
= options
& CE_MATCH_REFRESH
;
1339 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1340 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1341 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1342 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1344 if (!refresh
|| ce_uptodate(ce
))
1347 if (!ignore_fsmonitor
)
1348 refresh_fsmonitor(istate
);
1350 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1351 * that the change to the work tree does not matter and told
1354 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1355 ce_mark_uptodate(ce
);
1358 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1359 ce_mark_uptodate(ce
);
1362 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1363 ce_mark_uptodate(ce
);
1367 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1377 if (lstat(ce
->name
, &st
) < 0) {
1378 if (ignore_missing
&& errno
== ENOENT
)
1385 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1387 *changed_ret
= changed
;
1390 * The path is unchanged. If we were told to ignore
1391 * valid bit, then we did the actual stat check and
1392 * found that the entry is unmodified. If the entry
1393 * is not marked VALID, this is the place to mark it
1394 * valid again, under "assume unchanged" mode.
1396 if (ignore_valid
&& assume_unchanged
&&
1397 !(ce
->ce_flags
& CE_VALID
))
1398 ; /* mark this one VALID again */
1401 * We do not mark the index itself "modified"
1402 * because CE_UPTODATE flag is in-core only;
1403 * we are not going to write this change out.
1405 if (!S_ISGITLINK(ce
->ce_mode
)) {
1406 ce_mark_uptodate(ce
);
1407 mark_fsmonitor_valid(istate
, ce
);
1415 if (ie_modified(istate
, ce
, &st
, options
)) {
1421 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1422 copy_cache_entry(updated
, ce
);
1423 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1424 fill_stat_cache_info(istate
, updated
, &st
);
1426 * If ignore_valid is not set, we should leave CE_VALID bit
1427 * alone. Otherwise, paths marked with --no-assume-unchanged
1428 * (i.e. things to be edited) will reacquire CE_VALID bit
1429 * automatically, which is not really what we want.
1431 if (!ignore_valid
&& assume_unchanged
&&
1432 !(ce
->ce_flags
& CE_VALID
))
1433 updated
->ce_flags
&= ~CE_VALID
;
1435 /* istate->cache_changed is updated in the caller */
1439 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1440 int * first
, const char *header_msg
)
1442 if (in_porcelain
&& *first
&& header_msg
) {
1443 printf("%s\n", header_msg
);
1449 int repo_refresh_and_write_index(struct repository
*repo
,
1450 unsigned int refresh_flags
,
1451 unsigned int write_flags
,
1453 const struct pathspec
*pathspec
,
1454 char *seen
, const char *header_msg
)
1456 struct lock_file lock_file
= LOCK_INIT
;
1459 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1460 if (!gentle
&& fd
< 0)
1462 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1464 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1470 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1471 const struct pathspec
*pathspec
,
1472 char *seen
, const char *header_msg
)
1476 int really
= (flags
& REFRESH_REALLY
) != 0;
1477 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1478 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1479 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1480 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1481 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1483 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1484 unsigned int options
= (CE_MATCH_REFRESH
|
1485 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1486 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1487 const char *modified_fmt
;
1488 const char *deleted_fmt
;
1489 const char *typechange_fmt
;
1490 const char *added_fmt
;
1491 const char *unmerged_fmt
;
1492 struct progress
*progress
= NULL
;
1493 int t2_sum_lstat
= 0;
1494 int t2_sum_scan
= 0;
1496 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1497 progress
= start_delayed_progress(the_repository
,
1501 trace_performance_enter();
1502 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1503 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1504 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1505 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1506 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1508 * Use the multi-threaded preload_index() to refresh most of the
1509 * cache entries quickly then in the single threaded loop below,
1510 * we only have to do the special cases that are left.
1512 preload_index(istate
, pathspec
, 0);
1513 trace2_region_enter("index", "refresh", NULL
);
1515 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1516 struct cache_entry
*ce
, *new_entry
;
1517 int cache_errno
= 0;
1520 int t2_did_lstat
= 0;
1521 int t2_did_scan
= 0;
1523 ce
= istate
->cache
[i
];
1524 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1526 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1530 * If this entry is a sparse directory, then there isn't
1531 * any stat() information to update. Ignore the entry.
1533 if (S_ISSPARSEDIR(ce
->ce_mode
))
1536 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1540 while ((i
< istate
->cache_nr
) &&
1541 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1547 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1548 &first
, header_msg
);
1556 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1557 &cache_errno
, &changed
,
1558 &t2_did_lstat
, &t2_did_scan
);
1559 t2_sum_lstat
+= t2_did_lstat
;
1560 t2_sum_scan
+= t2_did_scan
;
1561 if (new_entry
== ce
)
1563 display_progress(progress
, i
);
1567 if (really
&& cache_errno
== EINVAL
) {
1568 /* If we are doing --really-refresh that
1569 * means the index is not valid anymore.
1571 ce
->ce_flags
&= ~CE_VALID
;
1572 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1573 mark_fsmonitor_invalid(istate
, ce
);
1574 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1579 if (cache_errno
== ENOENT
)
1581 else if (ce_intent_to_add(ce
))
1582 fmt
= added_fmt
; /* must be before other checks */
1583 else if (changed
& TYPE_CHANGED
)
1584 fmt
= typechange_fmt
;
1588 ce
->name
, in_porcelain
, &first
, header_msg
);
1593 replace_index_entry(istate
, i
, new_entry
);
1595 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1596 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1597 trace2_region_leave("index", "refresh", NULL
);
1598 display_progress(progress
, istate
->cache_nr
);
1599 stop_progress(&progress
);
1600 trace_performance_leave("refresh index");
1604 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1605 struct cache_entry
*ce
,
1606 unsigned int options
)
1608 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1612 /*****************************************************************
1614 *****************************************************************/
1616 #define INDEX_FORMAT_DEFAULT 3
1618 static unsigned int get_index_format_default(struct repository
*r
)
1620 char *envversion
= getenv("GIT_INDEX_VERSION");
1622 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1625 prepare_repo_settings(r
);
1627 if (r
->settings
.index_version
>= 0)
1628 version
= r
->settings
.index_version
;
1629 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1630 warning(_("index.version set, but the value is invalid.\n"
1631 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1632 return INDEX_FORMAT_DEFAULT
;
1637 version
= strtoul(envversion
, &endp
, 10);
1639 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1640 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1641 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1642 version
= INDEX_FORMAT_DEFAULT
;
1648 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1649 * Again - this is just a (very strong in practice) heuristic that
1650 * the inode hasn't changed.
1652 * We save the fields in big-endian order to allow using the
1653 * index file over NFS transparently.
1655 struct ondisk_cache_entry
{
1656 struct cache_time ctime
;
1657 struct cache_time mtime
;
1665 * unsigned char hash[hashsz];
1667 * if (flags & CE_EXTENDED)
1670 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1671 char name
[FLEX_ARRAY
];
1674 /* These are only used for v3 or lower */
1675 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1676 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1677 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1678 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1679 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1680 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1681 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1683 /* Allow fsck to force verification of the index checksum. */
1684 int verify_index_checksum
;
1686 /* Allow fsck to force verification of the cache entry order. */
1687 int verify_ce_order
;
1689 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1691 struct git_hash_ctx c
;
1692 unsigned char hash
[GIT_MAX_RAWSZ
];
1694 unsigned char *start
, *end
;
1695 struct object_id oid
;
1697 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1698 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1699 hdr_version
= ntohl(hdr
->hdr_version
);
1700 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1701 return error(_("bad index version %d"), hdr_version
);
1703 if (!verify_index_checksum
)
1706 end
= (unsigned char *)hdr
+ size
;
1707 start
= end
- the_hash_algo
->rawsz
;
1708 oidread(&oid
, start
, the_repository
->hash_algo
);
1709 if (oideq(&oid
, null_oid(the_hash_algo
)))
1712 the_hash_algo
->init_fn(&c
);
1713 git_hash_update(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1714 git_hash_final(hash
, &c
);
1715 if (!hasheq(hash
, start
, the_repository
->hash_algo
))
1716 return error(_("bad index file sha1 signature"));
1720 static int read_index_extension(struct index_state
*istate
,
1721 const char *ext
, const char *data
, unsigned long sz
)
1723 switch (CACHE_EXT(ext
)) {
1724 case CACHE_EXT_TREE
:
1725 istate
->cache_tree
= cache_tree_read(data
, sz
);
1727 case CACHE_EXT_RESOLVE_UNDO
:
1728 istate
->resolve_undo
= resolve_undo_read(data
, sz
, the_hash_algo
);
1730 case CACHE_EXT_LINK
:
1731 if (read_link_extension(istate
, data
, sz
))
1734 case CACHE_EXT_UNTRACKED
:
1735 istate
->untracked
= read_untracked_extension(data
, sz
);
1737 case CACHE_EXT_FSMONITOR
:
1738 read_fsmonitor_extension(istate
, data
, sz
);
1740 case CACHE_EXT_ENDOFINDEXENTRIES
:
1741 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1742 /* already handled in do_read_index() */
1744 case CACHE_EXT_SPARSE_DIRECTORIES
:
1745 /* no content, only an indicator */
1746 istate
->sparse_index
= INDEX_COLLAPSED
;
1749 if (*ext
< 'A' || 'Z' < *ext
)
1750 return error(_("index uses %.4s extension, which we do not understand"),
1752 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1759 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1760 * into a new incore 'cache_entry'.
1762 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1763 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1764 * its members. Instead, we use the byte offsets of members within the struct to
1765 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1766 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1767 * into the corresponding incore 'cache_entry' members.
1769 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1770 unsigned int version
,
1772 unsigned long *ent_size
,
1773 const struct cache_entry
*previous_ce
)
1775 struct cache_entry
*ce
;
1778 const unsigned hashsz
= the_hash_algo
->rawsz
;
1779 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1781 size_t copy_len
= 0;
1783 * Adjacent cache entries tend to share the leading paths, so it makes
1784 * sense to only store the differences in later entries. In the v4
1785 * on-disk format of the index, each on-disk cache entry stores the
1786 * number of bytes to be stripped from the end of the previous name,
1787 * and the bytes to append to the result, to come up with its name.
1789 int expand_name_field
= version
== 4;
1791 /* On-disk flags are just 16 bits */
1792 flags
= get_be16(flagsp
);
1793 len
= flags
& CE_NAMEMASK
;
1795 if (flags
& CE_EXTENDED
) {
1797 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1798 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1799 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1800 die(_("unknown index entry format 0x%08x"), extended_flags
);
1801 flags
|= extended_flags
;
1802 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1805 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1807 if (expand_name_field
) {
1808 const unsigned char *cp
= (const unsigned char *)name
;
1809 size_t strip_len
, previous_len
;
1811 /* If we're at the beginning of a block, ignore the previous name */
1812 strip_len
= decode_varint(&cp
);
1814 previous_len
= previous_ce
->ce_namelen
;
1815 if (previous_len
< strip_len
)
1816 die(_("malformed name field in the index, near path '%s'"),
1818 copy_len
= previous_len
- strip_len
;
1820 name
= (const char *)cp
;
1823 if (len
== CE_NAMEMASK
) {
1825 if (expand_name_field
)
1829 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1832 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1833 * with something more akin to 'load_bitmap_entries_v1()'s use of
1834 * 'read_be16'/'read_be32'. For consistency with the corresponding
1835 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1836 * should be done at the same time as removing references to
1837 * 'ondisk_cache_entry' there.
1839 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1840 + offsetof(struct cache_time
, sec
));
1841 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1842 + offsetof(struct cache_time
, sec
));
1843 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1844 + offsetof(struct cache_time
, nsec
));
1845 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1846 + offsetof(struct cache_time
, nsec
));
1847 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1848 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1849 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1850 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1851 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1852 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1853 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1854 ce
->ce_namelen
= len
;
1856 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
),
1857 the_repository
->hash_algo
);
1859 if (expand_name_field
) {
1861 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1862 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1863 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1865 memcpy(ce
->name
, name
, len
+ 1);
1866 *ent_size
= ondisk_ce_size(ce
);
1871 static void check_ce_order(struct index_state
*istate
)
1875 if (!verify_ce_order
)
1878 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1879 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1880 struct cache_entry
*next_ce
= istate
->cache
[i
];
1881 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1883 if (0 < name_compare
)
1884 die(_("unordered stage entries in index"));
1885 if (!name_compare
) {
1887 die(_("multiple stage entries for merged file '%s'"),
1889 if (ce_stage(ce
) > ce_stage(next_ce
))
1890 die(_("unordered stage entries for '%s'"),
1896 static void tweak_untracked_cache(struct index_state
*istate
)
1898 struct repository
*r
= the_repository
;
1900 prepare_repo_settings(r
);
1902 switch (r
->settings
.core_untracked_cache
) {
1903 case UNTRACKED_CACHE_REMOVE
:
1904 remove_untracked_cache(istate
);
1906 case UNTRACKED_CACHE_WRITE
:
1907 add_untracked_cache(istate
);
1909 case UNTRACKED_CACHE_KEEP
:
1911 * Either an explicit "core.untrackedCache=keep", the
1912 * default if "core.untrackedCache" isn't configured,
1913 * or a fallback on an unknown "core.untrackedCache"
1920 static void tweak_split_index(struct index_state
*istate
)
1922 switch (repo_config_get_split_index(the_repository
)) {
1923 case -1: /* unset: do nothing */
1926 remove_split_index(istate
);
1929 add_split_index(istate
);
1931 default: /* unknown value: do nothing */
1936 static void post_read_index_from(struct index_state
*istate
)
1938 check_ce_order(istate
);
1939 tweak_untracked_cache(istate
);
1940 tweak_split_index(istate
);
1941 tweak_fsmonitor(istate
);
1944 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1946 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1949 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1951 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1954 * Account for potential alignment differences.
1956 per_entry
+= align_padding_size(per_entry
, 0);
1957 return ondisk_size
+ entries
* per_entry
;
1960 struct index_entry_offset
1962 /* starting byte offset into index file, count of index entries in this block */
1966 struct index_entry_offset_table
1969 struct index_entry_offset entries
[FLEX_ARRAY
];
1972 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
1973 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
1975 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
1976 static void write_eoie_extension(struct strbuf
*sb
, struct git_hash_ctx
*eoie_context
, size_t offset
);
1978 struct load_index_extensions
1981 struct index_state
*istate
;
1984 unsigned long src_offset
;
1987 static void *load_index_extensions(void *_data
)
1989 struct load_index_extensions
*p
= _data
;
1990 unsigned long src_offset
= p
->src_offset
;
1992 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
1993 /* After an array of active_nr index entries,
1994 * there can be arbitrary number of extended
1995 * sections, each of which is prefixed with
1996 * extension name (4-byte) and section length
1997 * in 4-byte network byte order.
1999 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2000 if (read_index_extension(p
->istate
,
2001 p
->mmap
+ src_offset
,
2002 p
->mmap
+ src_offset
+ 8,
2004 munmap((void *)p
->mmap
, p
->mmap_size
);
2005 die(_("index file corrupt"));
2008 src_offset
+= extsize
;
2015 * A helper function that will load the specified range of cache entries
2016 * from the memory mapped file and add them to the given index.
2018 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2019 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2020 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2023 unsigned long src_offset
= start_offset
;
2025 for (i
= offset
; i
< offset
+ nr
; i
++) {
2026 struct cache_entry
*ce
;
2027 unsigned long consumed
;
2029 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2031 &consumed
, previous_ce
);
2032 set_index_entry(istate
, i
, ce
);
2034 src_offset
+= consumed
;
2037 return src_offset
- start_offset
;
2040 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2041 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2043 unsigned long consumed
;
2045 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2046 if (istate
->version
== 4) {
2047 mem_pool_init(istate
->ce_mem_pool
,
2048 estimate_cache_size_from_compressed(istate
->cache_nr
));
2050 mem_pool_init(istate
->ce_mem_pool
,
2051 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2054 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2055 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2060 * Mostly randomly chosen maximum thread counts: we
2061 * cap the parallelism to online_cpus() threads, and we want
2062 * to have at least 10000 cache entries per thread for it to
2063 * be worth starting a thread.
2066 #define THREAD_COST (10000)
2068 struct load_cache_entries_thread_data
2071 struct index_state
*istate
;
2072 struct mem_pool
*ce_mem_pool
;
2075 struct index_entry_offset_table
*ieot
;
2076 int ieot_start
; /* starting index into the ieot array */
2077 int ieot_blocks
; /* count of ieot entries to process */
2078 unsigned long consumed
; /* return # of bytes in index file processed */
2082 * A thread proc to run the load_cache_entries() computation
2083 * across multiple background threads.
2085 static void *load_cache_entries_thread(void *_data
)
2087 struct load_cache_entries_thread_data
*p
= _data
;
2090 /* iterate across all ieot blocks assigned to this thread */
2091 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2092 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2093 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2094 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2099 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2100 int nr_threads
, struct index_entry_offset_table
*ieot
)
2102 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2103 struct load_cache_entries_thread_data
*data
;
2104 unsigned long consumed
= 0;
2106 /* a little sanity checking */
2107 if (istate
->name_hash_initialized
)
2108 BUG("the name hash isn't thread safe");
2110 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2111 mem_pool_init(istate
->ce_mem_pool
, 0);
2113 /* ensure we have no more threads than we have blocks to process */
2114 if (nr_threads
> ieot
->nr
)
2115 nr_threads
= ieot
->nr
;
2116 CALLOC_ARRAY(data
, nr_threads
);
2118 offset
= ieot_start
= 0;
2119 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2120 for (i
= 0; i
< nr_threads
; i
++) {
2121 struct load_cache_entries_thread_data
*p
= &data
[i
];
2124 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2125 ieot_blocks
= ieot
->nr
- ieot_start
;
2131 p
->ieot_start
= ieot_start
;
2132 p
->ieot_blocks
= ieot_blocks
;
2134 /* create a mem_pool for each thread */
2136 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2137 nr
+= p
->ieot
->entries
[j
].nr
;
2138 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2139 if (istate
->version
== 4) {
2140 mem_pool_init(p
->ce_mem_pool
,
2141 estimate_cache_size_from_compressed(nr
));
2143 mem_pool_init(p
->ce_mem_pool
,
2144 estimate_cache_size(mmap_size
, nr
));
2147 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2149 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2151 /* increment by the number of cache entries in the ieot block being processed */
2152 for (j
= 0; j
< ieot_blocks
; j
++)
2153 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2154 ieot_start
+= ieot_blocks
;
2157 for (i
= 0; i
< nr_threads
; i
++) {
2158 struct load_cache_entries_thread_data
*p
= &data
[i
];
2160 err
= pthread_join(p
->pthread
, NULL
);
2162 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2163 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2164 free(p
->ce_mem_pool
);
2165 consumed
+= p
->consumed
;
2173 static void set_new_index_sparsity(struct index_state
*istate
)
2176 * If the index's repo exists, mark it sparse according to
2179 prepare_repo_settings(istate
->repo
);
2180 if (!istate
->repo
->settings
.command_requires_full_index
&&
2181 is_sparse_index_allowed(istate
, 0))
2182 istate
->sparse_index
= 1;
2185 /* remember to discard_cache() before reading a different cache! */
2186 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2190 unsigned long src_offset
;
2191 const struct cache_header
*hdr
;
2194 struct load_index_extensions p
;
2195 size_t extension_offset
= 0;
2196 int nr_threads
, cpus
;
2197 struct index_entry_offset_table
*ieot
= NULL
;
2199 if (istate
->initialized
)
2200 return istate
->cache_nr
;
2202 istate
->timestamp
.sec
= 0;
2203 istate
->timestamp
.nsec
= 0;
2204 fd
= open(path
, O_RDONLY
);
2206 if (!must_exist
&& errno
== ENOENT
) {
2207 set_new_index_sparsity(istate
);
2208 istate
->initialized
= 1;
2211 die_errno(_("%s: index file open failed"), path
);
2215 die_errno(_("%s: cannot stat the open index"), path
);
2217 mmap_size
= xsize_t(st
.st_size
);
2218 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2219 die(_("%s: index file smaller than expected"), path
);
2221 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2222 if (mmap
== MAP_FAILED
)
2223 die_errno(_("%s: unable to map index file%s"), path
,
2227 hdr
= (const struct cache_header
*)mmap
;
2228 if (verify_hdr(hdr
, mmap_size
) < 0)
2231 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
,
2232 the_repository
->hash_algo
);
2233 istate
->version
= ntohl(hdr
->hdr_version
);
2234 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2235 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2236 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2237 istate
->initialized
= 1;
2241 p
.mmap_size
= mmap_size
;
2243 src_offset
= sizeof(*hdr
);
2245 if (repo_config_get_index_threads(the_repository
, &nr_threads
))
2248 /* TODO: does creating more threads than cores help? */
2250 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2251 cpus
= online_cpus();
2252 if (nr_threads
> cpus
)
2259 if (nr_threads
> 1) {
2260 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2261 if (extension_offset
) {
2264 p
.src_offset
= extension_offset
;
2265 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2267 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2274 * Locate and read the index entry offset table so that we can use it
2275 * to multi-thread the reading of the cache entries.
2277 if (extension_offset
&& nr_threads
> 1)
2278 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2281 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2284 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2287 istate
->timestamp
.sec
= st
.st_mtime
;
2288 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2290 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2291 if (extension_offset
) {
2292 int ret
= pthread_join(p
.pthread
, NULL
);
2294 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2296 p
.src_offset
= src_offset
;
2297 load_index_extensions(&p
);
2299 munmap((void *)mmap
, mmap_size
);
2302 * TODO trace2: replace "the_repository" with the actual repo instance
2303 * that is associated with the given "istate".
2305 trace2_data_intmax("index", the_repository
, "read/version",
2307 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2311 * If the command explicitly requires a full index, force it
2312 * to be full. Otherwise, correct the sparsity based on repository
2313 * settings and other properties of the index (if necessary).
2315 prepare_repo_settings(istate
->repo
);
2316 if (istate
->repo
->settings
.command_requires_full_index
)
2317 ensure_full_index(istate
);
2319 ensure_correct_sparsity(istate
);
2321 return istate
->cache_nr
;
2324 munmap((void *)mmap
, mmap_size
);
2325 die(_("index file corrupt"));
2329 * Signal that the shared index is used by updating its mtime.
2331 * This way, shared index can be removed if they have not been used
2334 static void freshen_shared_index(const char *shared_index
, int warn
)
2336 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2337 warning(_("could not freshen shared index '%s'"), shared_index
);
2340 int read_index_from(struct index_state
*istate
, const char *path
,
2343 struct split_index
*split_index
;
2348 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2349 if (istate
->initialized
)
2350 return istate
->cache_nr
;
2353 * TODO trace2: replace "the_repository" with the actual repo instance
2354 * that is associated with the given "istate".
2356 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2358 trace_performance_enter();
2359 ret
= do_read_index(istate
, path
, 0);
2360 trace_performance_leave("read cache %s", path
);
2361 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2364 split_index
= istate
->split_index
;
2365 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2366 post_read_index_from(istate
);
2370 trace_performance_enter();
2371 if (split_index
->base
)
2372 release_index(split_index
->base
);
2374 ALLOC_ARRAY(split_index
->base
, 1);
2375 index_state_init(split_index
->base
, istate
->repo
);
2377 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2378 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2379 if (file_exists(base_path
)) {
2380 trace2_region_enter_printf("index", "shared/do_read_index",
2381 the_repository
, "%s", base_path
);
2383 ret
= do_read_index(split_index
->base
, base_path
, 0);
2384 trace2_region_leave_printf("index", "shared/do_read_index",
2385 the_repository
, "%s", base_path
);
2387 char *path_copy
= xstrdup(path
);
2388 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2389 dirname(path_copy
), base_oid_hex
);
2391 trace2_region_enter_printf("index", "shared/do_read_index",
2392 the_repository
, "%s", base_path2
);
2393 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2394 trace2_region_leave_printf("index", "shared/do_read_index",
2395 the_repository
, "%s", base_path2
);
2398 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2399 die(_("broken index, expect %s in %s, got %s"),
2400 base_oid_hex
, base_path
,
2401 oid_to_hex(&split_index
->base
->oid
));
2403 freshen_shared_index(base_path
, 0);
2404 merge_base_index(istate
);
2405 post_read_index_from(istate
);
2406 trace_performance_leave("read cache %s", base_path
);
2411 int is_index_unborn(struct index_state
*istate
)
2413 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2416 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2418 struct index_state blank
= INDEX_STATE_INIT(r
);
2419 memcpy(istate
, &blank
, sizeof(*istate
));
2422 void release_index(struct index_state
*istate
)
2425 * Cache entries in istate->cache[] should have been allocated
2426 * from the memory pool associated with this index, or from an
2427 * associated split_index. There is no need to free individual
2428 * cache entries. validate_cache_entries can detect when this
2429 * assertion does not hold.
2431 validate_cache_entries(istate
);
2433 resolve_undo_clear_index(istate
);
2434 free_name_hash(istate
);
2435 cache_tree_free(&(istate
->cache_tree
));
2436 free(istate
->fsmonitor_last_update
);
2437 free(istate
->cache
);
2438 discard_split_index(istate
);
2439 free_untracked_cache(istate
->untracked
);
2441 if (istate
->sparse_checkout_patterns
) {
2442 clear_pattern_list(istate
->sparse_checkout_patterns
);
2443 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2446 if (istate
->ce_mem_pool
) {
2447 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2448 FREE_AND_NULL(istate
->ce_mem_pool
);
2452 void discard_index(struct index_state
*istate
)
2454 release_index(istate
);
2455 index_state_init(istate
, istate
->repo
);
2459 * Validate the cache entries of this index.
2460 * All cache entries associated with this index
2461 * should have been allocated by the memory pool
2462 * associated with this index, or by a referenced
2465 void validate_cache_entries(const struct index_state
*istate
)
2469 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2472 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2474 BUG("cache entry is not allocated from expected memory pool");
2475 } else if (!istate
->ce_mem_pool
||
2476 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2477 if (!istate
->split_index
||
2478 !istate
->split_index
->base
||
2479 !istate
->split_index
->base
->ce_mem_pool
||
2480 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2481 BUG("cache entry is not allocated from expected memory pool");
2486 if (istate
->split_index
)
2487 validate_cache_entries(istate
->split_index
->base
);
2490 int unmerged_index(const struct index_state
*istate
)
2493 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2494 if (ce_stage(istate
->cache
[i
]))
2500 int repo_index_has_changes(struct repository
*repo
,
2504 struct index_state
*istate
= repo
->index
;
2505 struct object_id cmp
;
2509 cmp
= tree
->object
.oid
;
2510 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2511 struct diff_options opt
;
2513 repo_diff_setup(repo
, &opt
);
2514 opt
.flags
.exit_with_status
= 1;
2516 opt
.flags
.quick
= 1;
2517 diff_setup_done(&opt
);
2518 do_diff_cache(&cmp
, &opt
);
2520 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2522 strbuf_addch(sb
, ' ');
2523 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2526 return opt
.flags
.has_changes
!= 0;
2528 /* TODO: audit for interaction with sparse-index. */
2529 ensure_full_index(istate
);
2530 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2532 strbuf_addch(sb
, ' ');
2533 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2535 return !!istate
->cache_nr
;
2539 static int write_index_ext_header(struct hashfile
*f
,
2540 struct git_hash_ctx
*eoie_f
,
2544 hashwrite_be32(f
, ext
);
2545 hashwrite_be32(f
, sz
);
2550 git_hash_update(eoie_f
, &ext
, sizeof(ext
));
2551 git_hash_update(eoie_f
, &sz
, sizeof(sz
));
2556 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2557 struct cache_entry
*ce
)
2560 * The only thing we care about in this function is to smudge the
2561 * falsely clean entry due to touch-update-touch race, so we leave
2562 * everything else as they are. We are called for entries whose
2563 * ce_stat_data.sd_mtime match the index file mtime.
2565 * Note that this actually does not do much for gitlinks, for
2566 * which ce_match_stat_basic() always goes to the actual
2567 * contents. The caller checks with is_racy_timestamp() which
2568 * always says "no" for gitlinks, so we are not called for them ;-)
2572 if (lstat(ce
->name
, &st
) < 0)
2574 if (ce_match_stat_basic(ce
, &st
))
2576 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2577 /* This is "racily clean"; smudge it. Note that this
2578 * is a tricky code. At first glance, it may appear
2579 * that it can break with this sequence:
2581 * $ echo xyzzy >frotz
2582 * $ git-update-index --add frotz
2585 * $ echo filfre >nitfol
2586 * $ git-update-index --add nitfol
2588 * but it does not. When the second update-index runs,
2589 * it notices that the entry "frotz" has the same timestamp
2590 * as index, and if we were to smudge it by resetting its
2591 * size to zero here, then the object name recorded
2592 * in index is the 6-byte file but the cached stat information
2593 * becomes zero --- which would then match what we would
2594 * obtain from the filesystem next time we stat("frotz").
2596 * However, the second update-index, before calling
2597 * this function, notices that the cached size is 6
2598 * bytes and what is on the filesystem is an empty
2599 * file, and never calls us, so the cached size information
2600 * for "frotz" stays 6 which does not match the filesystem.
2602 ce
->ce_stat_data
.sd_size
= 0;
2606 /* Copy miscellaneous fields but not the name */
2607 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2608 struct cache_entry
*ce
)
2611 const unsigned hashsz
= the_hash_algo
->rawsz
;
2612 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2614 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2615 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2616 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2617 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2618 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2619 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2620 ondisk
->mode
= htonl(ce
->ce_mode
);
2621 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2622 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2623 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2624 hashcpy(ondisk
->data
, ce
->oid
.hash
, the_repository
->hash_algo
);
2626 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2627 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2628 flagsp
[0] = htons(flags
);
2629 if (ce
->ce_flags
& CE_EXTENDED
) {
2630 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2634 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2635 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2638 unsigned int saved_namelen
;
2639 int stripped_name
= 0;
2640 static unsigned char padding
[8] = { 0x00 };
2642 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2643 saved_namelen
= ce_namelen(ce
);
2648 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2650 if (!previous_name
) {
2651 int len
= ce_namelen(ce
);
2652 copy_cache_entry_to_ondisk(ondisk
, ce
);
2653 hashwrite(f
, ondisk
, size
);
2654 hashwrite(f
, ce
->name
, len
);
2655 hashwrite(f
, padding
, align_padding_size(size
, len
));
2657 int common
, to_remove
, prefix_size
;
2658 unsigned char to_remove_vi
[16];
2660 (common
< previous_name
->len
&&
2662 ce
->name
[common
] == previous_name
->buf
[common
]);
2664 ; /* still matching */
2665 to_remove
= previous_name
->len
- common
;
2666 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2668 copy_cache_entry_to_ondisk(ondisk
, ce
);
2669 hashwrite(f
, ondisk
, size
);
2670 hashwrite(f
, to_remove_vi
, prefix_size
);
2671 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2672 hashwrite(f
, padding
, 1);
2674 strbuf_splice(previous_name
, common
, to_remove
,
2675 ce
->name
+ common
, ce_namelen(ce
) - common
);
2677 if (stripped_name
) {
2678 ce
->ce_namelen
= saved_namelen
;
2679 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2686 * This function verifies if index_state has the correct sha1 of the
2687 * index file. Don't die if we have any other failure, just return 0.
2689 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2694 unsigned char hash
[GIT_MAX_RAWSZ
];
2696 if (!istate
->initialized
)
2699 fd
= open(path
, O_RDONLY
);
2706 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2709 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2710 if (n
!= the_hash_algo
->rawsz
)
2713 if (!hasheq(istate
->oid
.hash
, hash
, the_repository
->hash_algo
))
2724 static int repo_verify_index(struct repository
*repo
)
2726 return verify_index_from(repo
->index
, repo
->index_file
);
2729 int has_racy_timestamp(struct index_state
*istate
)
2731 int entries
= istate
->cache_nr
;
2734 for (i
= 0; i
< entries
; i
++) {
2735 struct cache_entry
*ce
= istate
->cache
[i
];
2736 if (is_racy_timestamp(istate
, ce
))
2742 void repo_update_index_if_able(struct repository
*repo
,
2743 struct lock_file
*lockfile
)
2745 if ((repo
->index
->cache_changed
||
2746 has_racy_timestamp(repo
->index
)) &&
2747 repo_verify_index(repo
))
2748 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2750 rollback_lock_file(lockfile
);
2753 static int record_eoie(void)
2757 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2761 * As a convenience, the end of index entries extension
2762 * used for threading is written by default if the user
2763 * explicitly requested threaded index reads.
2765 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2768 static int record_ieot(void)
2772 if (!git_config_get_bool("index.recordoffsettable", &val
))
2776 * As a convenience, the offset table used for threading is
2777 * written by default if the user explicitly requested
2778 * threaded index reads.
2780 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2783 enum write_extensions
{
2784 WRITE_NO_EXTENSION
= 0,
2785 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2786 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2787 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2788 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2789 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2791 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2794 * On success, `tempfile` is closed. If it is the temporary file
2795 * of a `struct lock_file`, we will therefore effectively perform
2796 * a 'close_lock_file_gently()`. Since that is an implementation
2797 * detail of lockfiles, callers of `do_write_index()` should not
2800 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2801 enum write_extensions write_extensions
, unsigned flags
)
2803 uint64_t start
= getnanotime();
2805 struct git_hash_ctx
*eoie_c
= NULL
;
2806 struct cache_header hdr
;
2807 int i
, err
= 0, removed
, extended
, hdr_version
;
2808 struct cache_entry
**cache
= istate
->cache
;
2809 int entries
= istate
->cache_nr
;
2811 struct ondisk_cache_entry ondisk
;
2812 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2813 int drop_cache_tree
= istate
->drop_cache_tree
;
2815 int csum_fsync_flag
;
2816 int ieot_entries
= 1;
2817 struct index_entry_offset_table
*ieot
= NULL
;
2818 struct repository
*r
= istate
->repo
;
2819 struct strbuf sb
= STRBUF_INIT
;
2820 int nr
, nr_threads
, ret
;
2822 f
= hashfd(the_repository
->hash_algo
, tempfile
->fd
, tempfile
->filename
.buf
);
2824 prepare_repo_settings(r
);
2825 f
->skip_hash
= r
->settings
.index_skip_hash
;
2827 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2828 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2831 /* reduce extended entries if possible */
2832 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2833 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2835 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2839 if (!istate
->version
)
2840 istate
->version
= get_index_format_default(r
);
2842 /* demote version 3 to version 2 when the latter suffices */
2843 if (istate
->version
== 3 || istate
->version
== 2)
2844 istate
->version
= extended
? 3 : 2;
2846 hdr_version
= istate
->version
;
2848 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2849 hdr
.hdr_version
= htonl(hdr_version
);
2850 hdr
.hdr_entries
= htonl(entries
- removed
);
2852 hashwrite(f
, &hdr
, sizeof(hdr
));
2854 if (!HAVE_THREADS
|| repo_config_get_index_threads(the_repository
, &nr_threads
))
2857 if (nr_threads
!= 1 && record_ieot()) {
2858 int ieot_blocks
, cpus
;
2861 * ensure default number of ieot blocks maps evenly to the
2862 * default number of threads that will process them leaving
2863 * room for the thread to load the index extensions.
2866 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2867 cpus
= online_cpus();
2868 if (ieot_blocks
> cpus
- 1)
2869 ieot_blocks
= cpus
- 1;
2871 ieot_blocks
= nr_threads
;
2872 if (ieot_blocks
> istate
->cache_nr
)
2873 ieot_blocks
= istate
->cache_nr
;
2877 * no reason to write out the IEOT extension if we don't
2878 * have enough blocks to utilize multi-threading
2880 if (ieot_blocks
> 1) {
2881 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2882 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2883 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2887 offset
= hashfile_total(f
);
2890 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2892 for (i
= 0; i
< entries
; i
++) {
2893 struct cache_entry
*ce
= cache
[i
];
2894 if (ce
->ce_flags
& CE_REMOVE
)
2896 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2897 ce_smudge_racily_clean_entry(istate
, ce
);
2898 if (is_null_oid(&ce
->oid
)) {
2899 static const char msg
[] = "cache entry has null sha1: %s";
2900 static int allow
= -1;
2903 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2905 warning(msg
, ce
->name
);
2907 err
= error(msg
, ce
->name
);
2909 drop_cache_tree
= 1;
2911 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2912 ieot
->entries
[ieot
->nr
].nr
= nr
;
2913 ieot
->entries
[ieot
->nr
].offset
= offset
;
2916 * If we have a V4 index, set the first byte to an invalid
2917 * character to ensure there is nothing common with the previous
2921 previous_name
->buf
[0] = 0;
2924 offset
= hashfile_total(f
);
2926 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2934 ieot
->entries
[ieot
->nr
].nr
= nr
;
2935 ieot
->entries
[ieot
->nr
].offset
= offset
;
2938 strbuf_release(&previous_name_buf
);
2945 offset
= hashfile_total(f
);
2948 * The extension headers must be hashed on their own for the
2949 * EOIE extension. Create a hashfile here to compute that hash.
2951 if (offset
&& record_eoie()) {
2952 CALLOC_ARRAY(eoie_c
, 1);
2953 the_hash_algo
->init_fn(eoie_c
);
2957 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2958 * can minimize the number of extensions we have to scan through to
2959 * find it during load. Write it out regardless of the
2960 * strip_extensions parameter as we need it when loading the shared
2966 write_ieot_extension(&sb
, ieot
);
2967 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2968 hashwrite(f
, sb
.buf
, sb
.len
);
2975 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
2976 istate
->split_index
) {
2979 if (istate
->sparse_index
)
2980 die(_("cannot write split index for a sparse index"));
2982 err
= write_link_extension(&sb
, istate
) < 0 ||
2983 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
2985 hashwrite(f
, sb
.buf
, sb
.len
);
2991 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
2992 !drop_cache_tree
&& istate
->cache_tree
) {
2995 cache_tree_write(&sb
, istate
->cache_tree
);
2996 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
2997 hashwrite(f
, sb
.buf
, sb
.len
);
3003 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3004 istate
->resolve_undo
) {
3007 resolve_undo_write(&sb
, istate
->resolve_undo
, the_hash_algo
);
3008 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3010 hashwrite(f
, sb
.buf
, sb
.len
);
3016 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3017 istate
->untracked
) {
3020 write_untracked_extension(&sb
, istate
->untracked
);
3021 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3023 hashwrite(f
, sb
.buf
, sb
.len
);
3029 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3030 istate
->fsmonitor_last_update
) {
3033 write_fsmonitor_extension(&sb
, istate
);
3034 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3035 hashwrite(f
, sb
.buf
, sb
.len
);
3041 if (istate
->sparse_index
) {
3042 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0) {
3049 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3050 * so that it can be found and processed before all the index entries are
3051 * read. Write it out regardless of the strip_extensions parameter as we need it
3052 * when loading the shared index.
3057 write_eoie_extension(&sb
, eoie_c
, offset
);
3058 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3059 hashwrite(f
, sb
.buf
, sb
.len
);
3066 csum_fsync_flag
= 0;
3067 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3068 csum_fsync_flag
= CSUM_FSYNC
;
3070 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3071 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3074 if (close_tempfile_gently(tempfile
)) {
3075 ret
= error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3078 if (stat(get_tempfile_path(tempfile
), &st
)) {
3082 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3083 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3084 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3087 * TODO trace2: replace "the_repository" with the actual repo instance
3088 * that is associated with the given "istate".
3090 trace2_data_intmax("index", the_repository
, "write/version",
3092 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3100 strbuf_release(&sb
);
3106 void set_alternate_index_output(const char *name
)
3108 alternate_index_output
= name
;
3111 static int commit_locked_index(struct lock_file
*lk
)
3113 if (alternate_index_output
)
3114 return commit_lock_file_to(lk
, alternate_index_output
);
3116 return commit_lock_file(lk
);
3119 static int do_write_locked_index(struct index_state
*istate
,
3120 struct lock_file
*lock
,
3122 enum write_extensions write_extensions
)
3125 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3127 ret
= convert_to_sparse(istate
, 0);
3130 warning(_("failed to convert to a sparse-index"));
3135 * TODO trace2: replace "the_repository" with the actual repo instance
3136 * that is associated with the given "istate".
3138 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3139 "%s", get_lock_file_path(lock
));
3140 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3141 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3142 "%s", get_lock_file_path(lock
));
3145 ensure_full_index(istate
);
3149 if (flags
& COMMIT_LOCK
)
3150 ret
= commit_locked_index(lock
);
3152 ret
= close_lock_file_gently(lock
);
3154 run_hooks_l(the_repository
, "post-index-change",
3155 istate
->updated_workdir
? "1" : "0",
3156 istate
->updated_skipworktree
? "1" : "0", NULL
);
3157 istate
->updated_workdir
= 0;
3158 istate
->updated_skipworktree
= 0;
3163 static int write_split_index(struct index_state
*istate
,
3164 struct lock_file
*lock
,
3168 prepare_to_write_split_index(istate
);
3169 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3170 finish_writing_split_index(istate
);
3174 static unsigned long get_shared_index_expire_date(void)
3176 static unsigned long shared_index_expire_date
;
3177 static int shared_index_expire_date_prepared
;
3179 if (!shared_index_expire_date_prepared
) {
3180 const char *shared_index_expire
= "2.weeks.ago";
3183 repo_config_get_expiry(the_repository
, "splitindex.sharedindexexpire",
3186 shared_index_expire
= value
;
3188 shared_index_expire_date
= approxidate(shared_index_expire
);
3189 shared_index_expire_date_prepared
= 1;
3194 return shared_index_expire_date
;
3197 static int should_delete_shared_index(const char *shared_index_path
)
3200 unsigned long expiration
;
3202 /* Check timestamp */
3203 expiration
= get_shared_index_expire_date();
3206 if (stat(shared_index_path
, &st
))
3207 return error_errno(_("could not stat '%s'"), shared_index_path
);
3208 if (st
.st_mtime
> expiration
)
3214 static int clean_shared_index_files(const char *current_hex
)
3217 DIR *dir
= opendir(repo_get_git_dir(the_repository
));
3220 return error_errno(_("unable to open git dir: %s"),
3221 repo_get_git_dir(the_repository
));
3223 while ((de
= readdir(dir
)) != NULL
) {
3224 const char *sha1_hex
;
3225 char *shared_index_path
;
3226 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3228 if (!strcmp(sha1_hex
, current_hex
))
3231 shared_index_path
= repo_git_path(the_repository
, "%s", de
->d_name
);
3232 if (should_delete_shared_index(shared_index_path
) > 0 &&
3233 unlink(shared_index_path
))
3234 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3236 free(shared_index_path
);
3243 static int write_shared_index(struct index_state
*istate
,
3244 struct tempfile
**temp
, unsigned flags
)
3246 struct split_index
*si
= istate
->split_index
;
3247 int ret
, was_full
= !istate
->sparse_index
;
3250 move_cache_to_base_index(istate
);
3251 convert_to_sparse(istate
, 0);
3253 trace2_region_enter_printf("index", "shared/do_write_index",
3254 the_repository
, "%s", get_tempfile_path(*temp
));
3255 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3256 trace2_region_leave_printf("index", "shared/do_write_index",
3257 the_repository
, "%s", get_tempfile_path(*temp
));
3260 ensure_full_index(istate
);
3264 ret
= adjust_shared_perm(the_repository
, get_tempfile_path(*temp
));
3266 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3270 path
= repo_git_path(the_repository
, "sharedindex.%s", oid_to_hex(&si
->base
->oid
));
3271 ret
= rename_tempfile(temp
, path
);
3273 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3274 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3281 static const int default_max_percent_split_change
= 20;
3283 static int too_many_not_shared_entries(struct index_state
*istate
)
3285 int i
, not_shared
= 0;
3286 int max_split
= repo_config_get_max_percent_split_change(the_repository
);
3288 switch (max_split
) {
3290 /* not or badly configured: use the default value */
3291 max_split
= default_max_percent_split_change
;
3294 return 1; /* 0% means always write a new shared index */
3296 return 0; /* 100% means never write a new shared index */
3298 break; /* just use the configured value */
3301 /* Count not shared entries */
3302 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3303 struct cache_entry
*ce
= istate
->cache
[i
];
3308 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3311 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3314 int new_shared_index
, ret
, test_split_index_env
;
3315 struct split_index
*si
= istate
->split_index
;
3317 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0) &&
3318 cache_tree_verify(the_repository
, istate
) < 0)
3321 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3322 if (flags
& COMMIT_LOCK
)
3323 rollback_lock_file(lock
);
3327 if (istate
->fsmonitor_last_update
)
3328 fill_fsmonitor_bitmap(istate
);
3330 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3332 if ((!si
&& !test_split_index_env
) ||
3333 alternate_index_output
||
3334 (istate
->cache_changed
& ~EXTMASK
)) {
3335 ret
= do_write_locked_index(istate
, lock
, flags
,
3336 ~WRITE_SPLIT_INDEX_EXTENSION
);
3340 if (test_split_index_env
) {
3342 si
= init_split_index(istate
);
3343 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3345 int v
= si
->base_oid
.hash
[0];
3347 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3350 if (too_many_not_shared_entries(istate
))
3351 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3353 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3355 if (new_shared_index
) {
3356 struct tempfile
*temp
;
3360 /* Same initial permissions as the main .git/index file */
3361 path
= repo_git_path(the_repository
, "sharedindex_XXXXXX");
3362 temp
= mks_tempfile_sm(path
, 0, 0666);
3365 ret
= do_write_locked_index(istate
, lock
, flags
,
3366 ~WRITE_SPLIT_INDEX_EXTENSION
);
3369 ret
= write_shared_index(istate
, &temp
, flags
);
3371 saved_errno
= errno
;
3372 if (is_tempfile_active(temp
))
3373 delete_tempfile(&temp
);
3374 errno
= saved_errno
;
3380 ret
= write_split_index(istate
, lock
, flags
);
3382 /* Freshen the shared index only if the split-index was written */
3383 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3384 char *shared_index
= repo_git_path(the_repository
, "sharedindex.%s",
3385 oid_to_hex(&si
->base_oid
));
3386 freshen_shared_index(shared_index
, 1);
3391 if (flags
& COMMIT_LOCK
)
3392 rollback_lock_file(lock
);
3397 * Read the index file that is potentially unmerged into given
3398 * index_state, dropping any unmerged entries to stage #0 (potentially
3399 * resulting in a path appearing as both a file and a directory in the
3400 * index; the caller is responsible to clear out the extra entries
3401 * before writing the index to a tree). Returns true if the index is
3402 * unmerged. Callers who want to refuse to work from an unmerged
3403 * state can call this and check its return value, instead of calling
3406 int repo_read_index_unmerged(struct repository
*repo
)
3408 struct index_state
*istate
;
3412 repo_read_index(repo
);
3413 istate
= repo
->index
;
3414 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3415 struct cache_entry
*ce
= istate
->cache
[i
];
3416 struct cache_entry
*new_ce
;
3422 len
= ce_namelen(ce
);
3423 new_ce
= make_empty_cache_entry(istate
, len
);
3424 memcpy(new_ce
->name
, ce
->name
, len
);
3425 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3426 new_ce
->ce_namelen
= len
;
3427 new_ce
->ce_mode
= ce
->ce_mode
;
3428 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3429 return error(_("%s: cannot drop to stage #0"),
3436 * Returns 1 if the path is an "other" path with respect to
3437 * the index; that is, the path is not mentioned in the index at all,
3438 * either as a file, a directory with some files in the index,
3439 * or as an unmerged entry.
3441 * We helpfully remove a trailing "/" from directories so that
3442 * the output of read_directory can be used as-is.
3444 int index_name_is_other(struct index_state
*istate
, const char *name
,
3448 if (namelen
&& name
[namelen
- 1] == '/')
3450 pos
= index_name_pos(istate
, name
, namelen
);
3452 return 0; /* exact match */
3454 if (pos
< istate
->cache_nr
) {
3455 struct cache_entry
*ce
= istate
->cache
[pos
];
3456 if (ce_namelen(ce
) == namelen
&&
3457 !memcmp(ce
->name
, name
, namelen
))
3458 return 0; /* Yup, this one exists unmerged */
3463 void *read_blob_data_from_index(struct index_state
*istate
,
3464 const char *path
, unsigned long *size
)
3468 enum object_type type
;
3472 pos
= index_name_pos(istate
, path
, len
);
3475 * We might be in the middle of a merge, in which
3476 * case we would read stage #2 (ours).
3480 (pos
< 0 && i
< istate
->cache_nr
&&
3481 !strcmp(istate
->cache
[i
]->name
, path
));
3483 if (ce_stage(istate
->cache
[i
]) == 2)
3488 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3490 if (!data
|| type
!= OBJ_BLOB
) {
3499 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3501 dst
->untracked
= src
->untracked
;
3502 src
->untracked
= NULL
;
3503 dst
->cache_tree
= src
->cache_tree
;
3504 src
->cache_tree
= NULL
;
3507 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3508 struct index_state
*istate
)
3510 unsigned int size
= ce_size(ce
);
3511 int mem_pool_allocated
;
3512 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3513 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3515 memcpy(new_entry
, ce
, size
);
3516 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3520 void discard_cache_entry(struct cache_entry
*ce
)
3522 if (ce
&& should_validate_cache_entries())
3523 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3525 if (ce
&& ce
->mem_pool_allocated
)
3531 int should_validate_cache_entries(void)
3533 static int validate_index_cache_entries
= -1;
3535 if (validate_index_cache_entries
< 0) {
3536 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3537 validate_index_cache_entries
= 1;
3539 validate_index_cache_entries
= 0;
3542 return validate_index_cache_entries
;
3545 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3546 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3548 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3551 * The end of index entries (EOIE) extension is guaranteed to be last
3552 * so that it can be found by scanning backwards from the EOF.
3559 const char *index
, *eoie
;
3561 size_t offset
, src_offset
;
3562 unsigned char hash
[GIT_MAX_RAWSZ
];
3563 struct git_hash_ctx c
;
3565 /* ensure we have an index big enough to contain an EOIE extension */
3566 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3569 /* validate the extension signature */
3570 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3571 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3573 index
+= sizeof(uint32_t);
3575 /* validate the extension size */
3576 extsize
= get_be32(index
);
3577 if (extsize
!= EOIE_SIZE
)
3579 index
+= sizeof(uint32_t);
3582 * Validate the offset we're going to look for the first extension
3583 * signature is after the index header and before the eoie extension.
3585 offset
= get_be32(index
);
3586 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3588 if (mmap
+ offset
>= eoie
)
3590 index
+= sizeof(uint32_t);
3593 * The hash is computed over extension types and their sizes (but not
3594 * their contents). E.g. if we have "TREE" extension that is N-bytes
3595 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3596 * then the hash would be:
3598 * SHA-1("TREE" + <binary representation of N> +
3599 * "REUC" + <binary representation of M>)
3601 src_offset
= offset
;
3602 the_hash_algo
->init_fn(&c
);
3603 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3604 /* After an array of active_nr index entries,
3605 * there can be arbitrary number of extended
3606 * sections, each of which is prefixed with
3607 * extension name (4-byte) and section length
3608 * in 4-byte network byte order.
3611 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3612 extsize
= ntohl(extsize
);
3614 /* verify the extension size isn't so large it will wrap around */
3615 if (src_offset
+ 8 + extsize
< src_offset
)
3618 git_hash_update(&c
, mmap
+ src_offset
, 8);
3621 src_offset
+= extsize
;
3623 git_hash_final(hash
, &c
);
3624 if (!hasheq(hash
, (const unsigned char *)index
, the_repository
->hash_algo
))
3627 /* Validate that the extension offsets returned us back to the eoie extension. */
3628 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3634 static void write_eoie_extension(struct strbuf
*sb
, struct git_hash_ctx
*eoie_context
, size_t offset
)
3637 unsigned char hash
[GIT_MAX_RAWSZ
];
3640 put_be32(&buffer
, offset
);
3641 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3644 git_hash_final(hash
, eoie_context
);
3645 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3648 #define IEOT_VERSION (1)
3650 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3652 const char *index
= NULL
;
3653 uint32_t extsize
, ext_version
;
3654 struct index_entry_offset_table
*ieot
;
3657 /* find the IEOT extension */
3660 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3661 extsize
= get_be32(mmap
+ offset
+ 4);
3662 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3663 index
= mmap
+ offset
+ 4 + 4;
3672 /* validate the version is IEOT_VERSION */
3673 ext_version
= get_be32(index
);
3674 if (ext_version
!= IEOT_VERSION
) {
3675 error("invalid IEOT version %d", ext_version
);
3678 index
+= sizeof(uint32_t);
3680 /* extension size - version bytes / bytes per entry */
3681 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3683 error("invalid number of IEOT entries %d", nr
);
3686 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3687 + (nr
* sizeof(struct index_entry_offset
)));
3689 for (i
= 0; i
< nr
; i
++) {
3690 ieot
->entries
[i
].offset
= get_be32(index
);
3691 index
+= sizeof(uint32_t);
3692 ieot
->entries
[i
].nr
= get_be32(index
);
3693 index
+= sizeof(uint32_t);
3699 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3705 put_be32(&buffer
, IEOT_VERSION
);
3706 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3709 for (i
= 0; i
< ieot
->nr
; i
++) {
3712 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3713 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3716 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3717 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3721 void prefetch_cache_entries(const struct index_state
*istate
,
3722 must_prefetch_predicate must_prefetch
)
3725 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3727 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3728 struct cache_entry
*ce
= istate
->cache
[i
];
3730 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3732 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3734 OBJECT_INFO_FOR_PREFETCH
))
3736 oid_array_append(&to_fetch
, &ce
->oid
);
3738 promisor_remote_get_direct(the_repository
,
3739 to_fetch
.oid
, to_fetch
.nr
);
3740 oid_array_clear(&to_fetch
);
3743 static int read_one_entry_opt(struct index_state
*istate
,
3744 const struct object_id
*oid
,
3745 struct strbuf
*base
,
3746 const char *pathname
,
3747 unsigned mode
, int opt
)
3750 struct cache_entry
*ce
;
3753 return READ_TREE_RECURSIVE
;
3755 len
= strlen(pathname
);
3756 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3758 ce
->ce_mode
= create_ce_mode(mode
);
3759 ce
->ce_flags
= create_ce_flags(1);
3760 ce
->ce_namelen
= base
->len
+ len
;
3761 memcpy(ce
->name
, base
->buf
, base
->len
);
3762 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3763 oidcpy(&ce
->oid
, oid
);
3764 return add_index_entry(istate
, ce
, opt
);
3767 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3768 const char *pathname
, unsigned mode
,
3771 struct index_state
*istate
= context
;
3772 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3774 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3778 * This is used when the caller knows there is no existing entries at
3779 * the stage that will conflict with the entry being added.
3781 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3782 const char *pathname
, unsigned mode
,
3785 struct index_state
*istate
= context
;
3786 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3787 mode
, ADD_CACHE_JUST_APPEND
);
3791 * Read the tree specified with --with-tree option
3792 * (typically, HEAD) into stage #1 and then
3793 * squash them down to stage #0. This is used for
3794 * --error-unmatch to list and check the path patterns
3795 * that were given from the command line. We are not
3796 * going to write this index out.
3798 void overlay_tree_on_index(struct index_state
*istate
,
3799 const char *tree_name
, const char *prefix
)
3802 struct object_id oid
;
3803 struct pathspec pathspec
;
3804 struct cache_entry
*last_stage0
= NULL
;
3806 read_tree_fn_t fn
= NULL
;
3809 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3810 die("tree-ish %s not found.", tree_name
);
3811 tree
= parse_tree_indirect(&oid
);
3813 die("bad tree-ish %s", tree_name
);
3815 /* Hoist the unmerged entries up to stage #3 to make room */
3816 /* TODO: audit for interaction with sparse-index. */
3817 ensure_full_index(istate
);
3818 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3819 struct cache_entry
*ce
= istate
->cache
[i
];
3822 ce
->ce_flags
|= CE_STAGEMASK
;
3826 static const char *(matchbuf
[1]);
3828 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3829 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3831 memset(&pathspec
, 0, sizeof(pathspec
));
3834 * See if we have cache entry at the stage. If so,
3835 * do it the original slow way, otherwise, append and then
3838 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3839 const struct cache_entry
*ce
= istate
->cache
[i
];
3840 if (ce_stage(ce
) == 1)
3841 fn
= read_one_entry
;
3845 fn
= read_one_entry_quick
;
3846 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3847 clear_pathspec(&pathspec
);
3849 die("unable to read tree entries %s", tree_name
);
3852 * Sort the cache entry -- we need to nuke the cache tree, though.
3854 if (fn
== read_one_entry_quick
) {
3855 cache_tree_free(&istate
->cache_tree
);
3856 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3859 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3860 struct cache_entry
*ce
= istate
->cache
[i
];
3861 switch (ce_stage(ce
)) {
3869 * If there is stage #0 entry for this, we do not
3870 * need to show it. We use CE_UPDATE bit to mark
3874 !strcmp(last_stage0
->name
, ce
->name
))
3875 ce
->ce_flags
|= CE_UPDATE
;
3880 struct update_callback_data
{
3881 struct index_state
*index
;
3887 static int fix_unmerged_status(struct diff_filepair
*p
,
3888 struct update_callback_data
*data
)
3890 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3892 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3894 * This is not an explicit add request, and the
3895 * path is missing from the working tree (deleted)
3897 return DIFF_STATUS_DELETED
;
3900 * Either an explicit add request, or path exists
3901 * in the working tree. An attempt to explicitly
3902 * add a path that does not exist in the working tree
3903 * will be caught as an error by the caller immediately.
3905 return DIFF_STATUS_MODIFIED
;
3908 static void update_callback(struct diff_queue_struct
*q
,
3909 struct diff_options
*opt UNUSED
, void *cbdata
)
3912 struct update_callback_data
*data
= cbdata
;
3914 for (i
= 0; i
< q
->nr
; i
++) {
3915 struct diff_filepair
*p
= q
->queue
[i
];
3916 const char *path
= p
->one
->path
;
3918 if (!data
->include_sparse
&&
3919 !path_in_sparse_checkout(path
, data
->index
))
3922 switch (fix_unmerged_status(p
, data
)) {
3924 die(_("unexpected diff status %c"), p
->status
);
3925 case DIFF_STATUS_MODIFIED
:
3926 case DIFF_STATUS_TYPE_CHANGED
:
3927 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3928 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3929 die(_("updating files failed"));
3933 case DIFF_STATUS_DELETED
:
3934 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3936 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3937 remove_file_from_index(data
->index
, path
);
3938 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3939 printf(_("remove '%s'\n"), path
);
3945 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3946 const struct pathspec
*pathspec
, char *ps_matched
,
3947 int include_sparse
, int flags
)
3949 struct update_callback_data data
;
3950 struct rev_info rev
;
3952 memset(&data
, 0, sizeof(data
));
3953 data
.index
= repo
->index
;
3954 data
.include_sparse
= include_sparse
;
3957 repo_init_revisions(repo
, &rev
, prefix
);
3958 setup_revisions(0, NULL
, &rev
, NULL
);
3960 copy_pathspec(&rev
.prune_data
, pathspec
);
3961 rev
.ps_matched
= ps_matched
;
3963 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3964 rev
.diffopt
.format_callback
= update_callback
;
3965 rev
.diffopt
.format_callback_data
= &data
;
3966 rev
.diffopt
.flags
.override_submodule_config
= 1;
3967 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3970 * Use an ODB transaction to optimize adding multiple objects.
3971 * This function is invoked from commands other than 'add', which
3972 * may not have their own transaction active.
3974 begin_odb_transaction();
3975 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3976 end_odb_transaction();
3978 release_revisions(&rev
);
3979 return !!data
.add_errors
;