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-ll.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 : HASH_WRITE_OBJECT
;
710 struct object_id oid
;
712 if (flags
& ADD_CACHE_RENORMALIZE
)
713 hash_flags
|= HASH_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
> 0) {
1121 cmp_last
= strcmp_offset(name
,
1122 istate
->cache
[istate
->cache_nr
- 1]->name
,
1125 if (name
[len_eq_last
] != '/') {
1127 * The entry sorts AFTER the last one in the
1130 * If there were a conflict with "file", then our
1131 * name would start with "file/" and the last index
1132 * entry would start with "file" but not "file/".
1134 * The next character after common prefix is
1135 * not '/', so there can be no conflict.
1140 * The entry sorts AFTER the last one in the
1141 * index, and the next character after common
1144 * Either the last index entry is a file in
1145 * conflict with this entry, or it has a name
1146 * which sorts between this entry and the
1147 * potential conflicting file.
1149 * In both cases, we fall through to the loop
1150 * below and let the regular search code handle it.
1153 } else if (cmp_last
== 0) {
1155 * The entry exactly matches the last one in the
1156 * index, but because of multiple stage and CE_REMOVE
1157 * items, we fall through and let the regular search
1167 if (*--slash
== '/')
1169 if (slash
<= ce
->name
)
1174 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1177 * Found one, but not so fast. This could
1178 * be a marker that says "I was here, but
1179 * I am being removed". Such an entry is
1180 * not a part of the resulting tree, and
1181 * it is Ok to have a directory at the same
1184 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1188 remove_index_entry_at(istate
, pos
);
1196 * Trivial optimization: if we find an entry that
1197 * already matches the sub-directory, then we know
1198 * we're ok, and we can exit.
1200 while (pos
< istate
->cache_nr
) {
1201 struct cache_entry
*p
= istate
->cache
[pos
];
1202 if ((ce_namelen(p
) <= len
) ||
1203 (p
->name
[len
] != '/') ||
1204 memcmp(p
->name
, name
, len
))
1205 break; /* not our subdirectory */
1206 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1208 * p is at the same stage as our entry, and
1209 * is a subdirectory of what we are looking
1210 * at, so we cannot have conflicts at our
1211 * level or anything shorter.
1220 /* We may be in a situation where we already have path/file and path
1221 * is being added, or we already have path and path/file is being
1222 * added. Either one would result in a nonsense tree that has path
1223 * twice when git-write-tree tries to write it out. Prevent it.
1225 * If ok-to-replace is specified, we remove the conflicting entries
1226 * from the cache so the caller should recompute the insert position.
1227 * When this happens, we return non-zero.
1229 static int check_file_directory_conflict(struct index_state
*istate
,
1230 const struct cache_entry
*ce
,
1231 int pos
, int ok_to_replace
)
1236 * When ce is an "I am going away" entry, we allow it to be added
1238 if (ce
->ce_flags
& CE_REMOVE
)
1242 * We check if the path is a sub-path of a subsequent pathname
1243 * first, since removing those will not change the position
1246 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1249 * Then check if the path might have a clashing sub-directory
1252 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1255 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1258 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1259 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1260 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1261 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1264 * If this entry's path sorts after the last entry in the index,
1265 * we can avoid searching for it.
1267 if (istate
->cache_nr
> 0 &&
1268 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1269 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1271 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1274 * Cache tree path should be invalidated only after index_name_stage_pos,
1275 * in case it expands a sparse index.
1277 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1278 cache_tree_invalidate_path(istate
, ce
->name
);
1280 /* existing match? Just replace it. */
1283 replace_index_entry(istate
, pos
, ce
);
1288 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1289 untracked_cache_add_to_index(istate
, ce
->name
);
1292 * Inserting a merged entry ("stage 0") into the index
1293 * will always replace all non-merged entries..
1295 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1296 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1298 if (!remove_index_entry_at(istate
, pos
))
1305 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1306 return error(_("invalid path '%s'"), ce
->name
);
1308 if (!skip_df_check
&&
1309 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1311 return error(_("'%s' appears as both a file and as a directory"),
1313 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1319 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1323 if (option
& ADD_CACHE_JUST_APPEND
)
1324 pos
= istate
->cache_nr
;
1327 ret
= add_index_entry_with_check(istate
, ce
, option
);
1333 /* Make sure the array is big enough .. */
1334 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1338 if (istate
->cache_nr
> pos
+ 1)
1339 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1340 istate
->cache_nr
- pos
- 1);
1341 set_index_entry(istate
, pos
, ce
);
1342 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1347 * "refresh" does not calculate a new sha1 file or bring the
1348 * cache up-to-date for mode/content changes. But what it
1349 * _does_ do is to "re-match" the stat information of a file
1350 * with the cache, so that you can refresh the cache for a
1351 * file that hasn't been changed but where the stat entry is
1354 * For example, you'd want to do this after doing a "git-read-tree",
1355 * to link up the stat cache details with the proper files.
1357 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1358 struct cache_entry
*ce
,
1359 unsigned int options
, int *err
,
1365 struct cache_entry
*updated
;
1367 int refresh
= options
& CE_MATCH_REFRESH
;
1368 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1369 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1370 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1371 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1373 if (!refresh
|| ce_uptodate(ce
))
1376 if (!ignore_fsmonitor
)
1377 refresh_fsmonitor(istate
);
1379 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1380 * that the change to the work tree does not matter and told
1383 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1384 ce_mark_uptodate(ce
);
1387 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1388 ce_mark_uptodate(ce
);
1391 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1392 ce_mark_uptodate(ce
);
1396 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1406 if (lstat(ce
->name
, &st
) < 0) {
1407 if (ignore_missing
&& errno
== ENOENT
)
1414 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1416 *changed_ret
= changed
;
1419 * The path is unchanged. If we were told to ignore
1420 * valid bit, then we did the actual stat check and
1421 * found that the entry is unmodified. If the entry
1422 * is not marked VALID, this is the place to mark it
1423 * valid again, under "assume unchanged" mode.
1425 if (ignore_valid
&& assume_unchanged
&&
1426 !(ce
->ce_flags
& CE_VALID
))
1427 ; /* mark this one VALID again */
1430 * We do not mark the index itself "modified"
1431 * because CE_UPTODATE flag is in-core only;
1432 * we are not going to write this change out.
1434 if (!S_ISGITLINK(ce
->ce_mode
)) {
1435 ce_mark_uptodate(ce
);
1436 mark_fsmonitor_valid(istate
, ce
);
1444 if (ie_modified(istate
, ce
, &st
, options
)) {
1450 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1451 copy_cache_entry(updated
, ce
);
1452 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1453 fill_stat_cache_info(istate
, updated
, &st
);
1455 * If ignore_valid is not set, we should leave CE_VALID bit
1456 * alone. Otherwise, paths marked with --no-assume-unchanged
1457 * (i.e. things to be edited) will reacquire CE_VALID bit
1458 * automatically, which is not really what we want.
1460 if (!ignore_valid
&& assume_unchanged
&&
1461 !(ce
->ce_flags
& CE_VALID
))
1462 updated
->ce_flags
&= ~CE_VALID
;
1464 /* istate->cache_changed is updated in the caller */
1468 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1469 int * first
, const char *header_msg
)
1471 if (in_porcelain
&& *first
&& header_msg
) {
1472 printf("%s\n", header_msg
);
1478 int repo_refresh_and_write_index(struct repository
*repo
,
1479 unsigned int refresh_flags
,
1480 unsigned int write_flags
,
1482 const struct pathspec
*pathspec
,
1483 char *seen
, const char *header_msg
)
1485 struct lock_file lock_file
= LOCK_INIT
;
1488 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1489 if (!gentle
&& fd
< 0)
1491 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1493 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1499 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1500 const struct pathspec
*pathspec
,
1501 char *seen
, const char *header_msg
)
1505 int really
= (flags
& REFRESH_REALLY
) != 0;
1506 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1507 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1508 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1509 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1510 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1512 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1513 unsigned int options
= (CE_MATCH_REFRESH
|
1514 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1515 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1516 const char *modified_fmt
;
1517 const char *deleted_fmt
;
1518 const char *typechange_fmt
;
1519 const char *added_fmt
;
1520 const char *unmerged_fmt
;
1521 struct progress
*progress
= NULL
;
1522 int t2_sum_lstat
= 0;
1523 int t2_sum_scan
= 0;
1525 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1526 progress
= start_delayed_progress(the_repository
,
1530 trace_performance_enter();
1531 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1532 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1533 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1534 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1535 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1537 * Use the multi-threaded preload_index() to refresh most of the
1538 * cache entries quickly then in the single threaded loop below,
1539 * we only have to do the special cases that are left.
1541 preload_index(istate
, pathspec
, 0);
1542 trace2_region_enter("index", "refresh", NULL
);
1544 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1545 struct cache_entry
*ce
, *new_entry
;
1546 int cache_errno
= 0;
1549 int t2_did_lstat
= 0;
1550 int t2_did_scan
= 0;
1552 ce
= istate
->cache
[i
];
1553 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1555 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1559 * If this entry is a sparse directory, then there isn't
1560 * any stat() information to update. Ignore the entry.
1562 if (S_ISSPARSEDIR(ce
->ce_mode
))
1565 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1569 while ((i
< istate
->cache_nr
) &&
1570 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1576 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1577 &first
, header_msg
);
1585 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1586 &cache_errno
, &changed
,
1587 &t2_did_lstat
, &t2_did_scan
);
1588 t2_sum_lstat
+= t2_did_lstat
;
1589 t2_sum_scan
+= t2_did_scan
;
1590 if (new_entry
== ce
)
1592 display_progress(progress
, i
);
1596 if (really
&& cache_errno
== EINVAL
) {
1597 /* If we are doing --really-refresh that
1598 * means the index is not valid anymore.
1600 ce
->ce_flags
&= ~CE_VALID
;
1601 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1602 mark_fsmonitor_invalid(istate
, ce
);
1603 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1608 if (cache_errno
== ENOENT
)
1610 else if (ce_intent_to_add(ce
))
1611 fmt
= added_fmt
; /* must be before other checks */
1612 else if (changed
& TYPE_CHANGED
)
1613 fmt
= typechange_fmt
;
1617 ce
->name
, in_porcelain
, &first
, header_msg
);
1622 replace_index_entry(istate
, i
, new_entry
);
1624 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1625 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1626 trace2_region_leave("index", "refresh", NULL
);
1627 display_progress(progress
, istate
->cache_nr
);
1628 stop_progress(&progress
);
1629 trace_performance_leave("refresh index");
1633 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1634 struct cache_entry
*ce
,
1635 unsigned int options
)
1637 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1641 /*****************************************************************
1643 *****************************************************************/
1645 #define INDEX_FORMAT_DEFAULT 3
1647 static unsigned int get_index_format_default(struct repository
*r
)
1649 char *envversion
= getenv("GIT_INDEX_VERSION");
1651 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1654 prepare_repo_settings(r
);
1656 if (r
->settings
.index_version
>= 0)
1657 version
= r
->settings
.index_version
;
1658 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1659 warning(_("index.version set, but the value is invalid.\n"
1660 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1661 return INDEX_FORMAT_DEFAULT
;
1666 version
= strtoul(envversion
, &endp
, 10);
1668 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1669 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1670 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1671 version
= INDEX_FORMAT_DEFAULT
;
1677 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1678 * Again - this is just a (very strong in practice) heuristic that
1679 * the inode hasn't changed.
1681 * We save the fields in big-endian order to allow using the
1682 * index file over NFS transparently.
1684 struct ondisk_cache_entry
{
1685 struct cache_time ctime
;
1686 struct cache_time mtime
;
1694 * unsigned char hash[hashsz];
1696 * if (flags & CE_EXTENDED)
1699 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1700 char name
[FLEX_ARRAY
];
1703 /* These are only used for v3 or lower */
1704 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1705 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1706 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1707 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1708 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1709 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1710 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1712 /* Allow fsck to force verification of the index checksum. */
1713 int verify_index_checksum
;
1715 /* Allow fsck to force verification of the cache entry order. */
1716 int verify_ce_order
;
1718 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1721 unsigned char hash
[GIT_MAX_RAWSZ
];
1723 unsigned char *start
, *end
;
1724 struct object_id oid
;
1726 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1727 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1728 hdr_version
= ntohl(hdr
->hdr_version
);
1729 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1730 return error(_("bad index version %d"), hdr_version
);
1732 if (!verify_index_checksum
)
1735 end
= (unsigned char *)hdr
+ size
;
1736 start
= end
- the_hash_algo
->rawsz
;
1737 oidread(&oid
, start
, the_repository
->hash_algo
);
1738 if (oideq(&oid
, null_oid()))
1741 the_hash_algo
->init_fn(&c
);
1742 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1743 the_hash_algo
->final_fn(hash
, &c
);
1744 if (!hasheq(hash
, start
, the_repository
->hash_algo
))
1745 return error(_("bad index file sha1 signature"));
1749 static int read_index_extension(struct index_state
*istate
,
1750 const char *ext
, const char *data
, unsigned long sz
)
1752 switch (CACHE_EXT(ext
)) {
1753 case CACHE_EXT_TREE
:
1754 istate
->cache_tree
= cache_tree_read(data
, sz
);
1756 case CACHE_EXT_RESOLVE_UNDO
:
1757 istate
->resolve_undo
= resolve_undo_read(data
, sz
, the_hash_algo
);
1759 case CACHE_EXT_LINK
:
1760 if (read_link_extension(istate
, data
, sz
))
1763 case CACHE_EXT_UNTRACKED
:
1764 istate
->untracked
= read_untracked_extension(data
, sz
);
1766 case CACHE_EXT_FSMONITOR
:
1767 read_fsmonitor_extension(istate
, data
, sz
);
1769 case CACHE_EXT_ENDOFINDEXENTRIES
:
1770 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1771 /* already handled in do_read_index() */
1773 case CACHE_EXT_SPARSE_DIRECTORIES
:
1774 /* no content, only an indicator */
1775 istate
->sparse_index
= INDEX_COLLAPSED
;
1778 if (*ext
< 'A' || 'Z' < *ext
)
1779 return error(_("index uses %.4s extension, which we do not understand"),
1781 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1788 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1789 * into a new incore 'cache_entry'.
1791 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1792 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1793 * its members. Instead, we use the byte offsets of members within the struct to
1794 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1795 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1796 * into the corresponding incore 'cache_entry' members.
1798 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1799 unsigned int version
,
1801 unsigned long *ent_size
,
1802 const struct cache_entry
*previous_ce
)
1804 struct cache_entry
*ce
;
1807 const unsigned hashsz
= the_hash_algo
->rawsz
;
1808 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1810 size_t copy_len
= 0;
1812 * Adjacent cache entries tend to share the leading paths, so it makes
1813 * sense to only store the differences in later entries. In the v4
1814 * on-disk format of the index, each on-disk cache entry stores the
1815 * number of bytes to be stripped from the end of the previous name,
1816 * and the bytes to append to the result, to come up with its name.
1818 int expand_name_field
= version
== 4;
1820 /* On-disk flags are just 16 bits */
1821 flags
= get_be16(flagsp
);
1822 len
= flags
& CE_NAMEMASK
;
1824 if (flags
& CE_EXTENDED
) {
1826 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1827 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1828 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1829 die(_("unknown index entry format 0x%08x"), extended_flags
);
1830 flags
|= extended_flags
;
1831 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1834 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1836 if (expand_name_field
) {
1837 const unsigned char *cp
= (const unsigned char *)name
;
1838 size_t strip_len
, previous_len
;
1840 /* If we're at the beginning of a block, ignore the previous name */
1841 strip_len
= decode_varint(&cp
);
1843 previous_len
= previous_ce
->ce_namelen
;
1844 if (previous_len
< strip_len
)
1845 die(_("malformed name field in the index, near path '%s'"),
1847 copy_len
= previous_len
- strip_len
;
1849 name
= (const char *)cp
;
1852 if (len
== CE_NAMEMASK
) {
1854 if (expand_name_field
)
1858 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1861 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1862 * with something more akin to 'load_bitmap_entries_v1()'s use of
1863 * 'read_be16'/'read_be32'. For consistency with the corresponding
1864 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1865 * should be done at the same time as removing references to
1866 * 'ondisk_cache_entry' there.
1868 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1869 + offsetof(struct cache_time
, sec
));
1870 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1871 + offsetof(struct cache_time
, sec
));
1872 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1873 + offsetof(struct cache_time
, nsec
));
1874 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1875 + offsetof(struct cache_time
, nsec
));
1876 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1877 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1878 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1879 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1880 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1881 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1882 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1883 ce
->ce_namelen
= len
;
1885 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
),
1886 the_repository
->hash_algo
);
1888 if (expand_name_field
) {
1890 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1891 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1892 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1894 memcpy(ce
->name
, name
, len
+ 1);
1895 *ent_size
= ondisk_ce_size(ce
);
1900 static void check_ce_order(struct index_state
*istate
)
1904 if (!verify_ce_order
)
1907 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1908 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1909 struct cache_entry
*next_ce
= istate
->cache
[i
];
1910 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1912 if (0 < name_compare
)
1913 die(_("unordered stage entries in index"));
1914 if (!name_compare
) {
1916 die(_("multiple stage entries for merged file '%s'"),
1918 if (ce_stage(ce
) > ce_stage(next_ce
))
1919 die(_("unordered stage entries for '%s'"),
1925 static void tweak_untracked_cache(struct index_state
*istate
)
1927 struct repository
*r
= the_repository
;
1929 prepare_repo_settings(r
);
1931 switch (r
->settings
.core_untracked_cache
) {
1932 case UNTRACKED_CACHE_REMOVE
:
1933 remove_untracked_cache(istate
);
1935 case UNTRACKED_CACHE_WRITE
:
1936 add_untracked_cache(istate
);
1938 case UNTRACKED_CACHE_KEEP
:
1940 * Either an explicit "core.untrackedCache=keep", the
1941 * default if "core.untrackedCache" isn't configured,
1942 * or a fallback on an unknown "core.untrackedCache"
1949 static void tweak_split_index(struct index_state
*istate
)
1951 switch (repo_config_get_split_index(the_repository
)) {
1952 case -1: /* unset: do nothing */
1955 remove_split_index(istate
);
1958 add_split_index(istate
);
1960 default: /* unknown value: do nothing */
1965 static void post_read_index_from(struct index_state
*istate
)
1967 check_ce_order(istate
);
1968 tweak_untracked_cache(istate
);
1969 tweak_split_index(istate
);
1970 tweak_fsmonitor(istate
);
1973 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1975 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1978 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1980 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1983 * Account for potential alignment differences.
1985 per_entry
+= align_padding_size(per_entry
, 0);
1986 return ondisk_size
+ entries
* per_entry
;
1989 struct index_entry_offset
1991 /* starting byte offset into index file, count of index entries in this block */
1995 struct index_entry_offset_table
1998 struct index_entry_offset entries
[FLEX_ARRAY
];
2001 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2002 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2004 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2005 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2007 struct load_index_extensions
2010 struct index_state
*istate
;
2013 unsigned long src_offset
;
2016 static void *load_index_extensions(void *_data
)
2018 struct load_index_extensions
*p
= _data
;
2019 unsigned long src_offset
= p
->src_offset
;
2021 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2022 /* After an array of active_nr index entries,
2023 * there can be arbitrary number of extended
2024 * sections, each of which is prefixed with
2025 * extension name (4-byte) and section length
2026 * in 4-byte network byte order.
2028 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2029 if (read_index_extension(p
->istate
,
2030 p
->mmap
+ src_offset
,
2031 p
->mmap
+ src_offset
+ 8,
2033 munmap((void *)p
->mmap
, p
->mmap_size
);
2034 die(_("index file corrupt"));
2037 src_offset
+= extsize
;
2044 * A helper function that will load the specified range of cache entries
2045 * from the memory mapped file and add them to the given index.
2047 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2048 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2049 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2052 unsigned long src_offset
= start_offset
;
2054 for (i
= offset
; i
< offset
+ nr
; i
++) {
2055 struct cache_entry
*ce
;
2056 unsigned long consumed
;
2058 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2060 &consumed
, previous_ce
);
2061 set_index_entry(istate
, i
, ce
);
2063 src_offset
+= consumed
;
2066 return src_offset
- start_offset
;
2069 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2070 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2072 unsigned long consumed
;
2074 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2075 if (istate
->version
== 4) {
2076 mem_pool_init(istate
->ce_mem_pool
,
2077 estimate_cache_size_from_compressed(istate
->cache_nr
));
2079 mem_pool_init(istate
->ce_mem_pool
,
2080 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2083 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2084 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2089 * Mostly randomly chosen maximum thread counts: we
2090 * cap the parallelism to online_cpus() threads, and we want
2091 * to have at least 10000 cache entries per thread for it to
2092 * be worth starting a thread.
2095 #define THREAD_COST (10000)
2097 struct load_cache_entries_thread_data
2100 struct index_state
*istate
;
2101 struct mem_pool
*ce_mem_pool
;
2104 struct index_entry_offset_table
*ieot
;
2105 int ieot_start
; /* starting index into the ieot array */
2106 int ieot_blocks
; /* count of ieot entries to process */
2107 unsigned long consumed
; /* return # of bytes in index file processed */
2111 * A thread proc to run the load_cache_entries() computation
2112 * across multiple background threads.
2114 static void *load_cache_entries_thread(void *_data
)
2116 struct load_cache_entries_thread_data
*p
= _data
;
2119 /* iterate across all ieot blocks assigned to this thread */
2120 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2121 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2122 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2123 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2128 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2129 int nr_threads
, struct index_entry_offset_table
*ieot
)
2131 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2132 struct load_cache_entries_thread_data
*data
;
2133 unsigned long consumed
= 0;
2135 /* a little sanity checking */
2136 if (istate
->name_hash_initialized
)
2137 BUG("the name hash isn't thread safe");
2139 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2140 mem_pool_init(istate
->ce_mem_pool
, 0);
2142 /* ensure we have no more threads than we have blocks to process */
2143 if (nr_threads
> ieot
->nr
)
2144 nr_threads
= ieot
->nr
;
2145 CALLOC_ARRAY(data
, nr_threads
);
2147 offset
= ieot_start
= 0;
2148 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2149 for (i
= 0; i
< nr_threads
; i
++) {
2150 struct load_cache_entries_thread_data
*p
= &data
[i
];
2153 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2154 ieot_blocks
= ieot
->nr
- ieot_start
;
2160 p
->ieot_start
= ieot_start
;
2161 p
->ieot_blocks
= ieot_blocks
;
2163 /* create a mem_pool for each thread */
2165 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2166 nr
+= p
->ieot
->entries
[j
].nr
;
2167 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2168 if (istate
->version
== 4) {
2169 mem_pool_init(p
->ce_mem_pool
,
2170 estimate_cache_size_from_compressed(nr
));
2172 mem_pool_init(p
->ce_mem_pool
,
2173 estimate_cache_size(mmap_size
, nr
));
2176 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2178 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2180 /* increment by the number of cache entries in the ieot block being processed */
2181 for (j
= 0; j
< ieot_blocks
; j
++)
2182 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2183 ieot_start
+= ieot_blocks
;
2186 for (i
= 0; i
< nr_threads
; i
++) {
2187 struct load_cache_entries_thread_data
*p
= &data
[i
];
2189 err
= pthread_join(p
->pthread
, NULL
);
2191 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2192 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2193 free(p
->ce_mem_pool
);
2194 consumed
+= p
->consumed
;
2202 static void set_new_index_sparsity(struct index_state
*istate
)
2205 * If the index's repo exists, mark it sparse according to
2208 prepare_repo_settings(istate
->repo
);
2209 if (!istate
->repo
->settings
.command_requires_full_index
&&
2210 is_sparse_index_allowed(istate
, 0))
2211 istate
->sparse_index
= 1;
2214 /* remember to discard_cache() before reading a different cache! */
2215 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2219 unsigned long src_offset
;
2220 const struct cache_header
*hdr
;
2223 struct load_index_extensions p
;
2224 size_t extension_offset
= 0;
2225 int nr_threads
, cpus
;
2226 struct index_entry_offset_table
*ieot
= NULL
;
2228 if (istate
->initialized
)
2229 return istate
->cache_nr
;
2231 istate
->timestamp
.sec
= 0;
2232 istate
->timestamp
.nsec
= 0;
2233 fd
= open(path
, O_RDONLY
);
2235 if (!must_exist
&& errno
== ENOENT
) {
2236 set_new_index_sparsity(istate
);
2237 istate
->initialized
= 1;
2240 die_errno(_("%s: index file open failed"), path
);
2244 die_errno(_("%s: cannot stat the open index"), path
);
2246 mmap_size
= xsize_t(st
.st_size
);
2247 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2248 die(_("%s: index file smaller than expected"), path
);
2250 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2251 if (mmap
== MAP_FAILED
)
2252 die_errno(_("%s: unable to map index file%s"), path
,
2256 hdr
= (const struct cache_header
*)mmap
;
2257 if (verify_hdr(hdr
, mmap_size
) < 0)
2260 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
,
2261 the_repository
->hash_algo
);
2262 istate
->version
= ntohl(hdr
->hdr_version
);
2263 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2264 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2265 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2266 istate
->initialized
= 1;
2270 p
.mmap_size
= mmap_size
;
2272 src_offset
= sizeof(*hdr
);
2274 if (repo_config_get_index_threads(the_repository
, &nr_threads
))
2277 /* TODO: does creating more threads than cores help? */
2279 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2280 cpus
= online_cpus();
2281 if (nr_threads
> cpus
)
2288 if (nr_threads
> 1) {
2289 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2290 if (extension_offset
) {
2293 p
.src_offset
= extension_offset
;
2294 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2296 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2303 * Locate and read the index entry offset table so that we can use it
2304 * to multi-thread the reading of the cache entries.
2306 if (extension_offset
&& nr_threads
> 1)
2307 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2310 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2313 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2316 istate
->timestamp
.sec
= st
.st_mtime
;
2317 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2319 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2320 if (extension_offset
) {
2321 int ret
= pthread_join(p
.pthread
, NULL
);
2323 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2325 p
.src_offset
= src_offset
;
2326 load_index_extensions(&p
);
2328 munmap((void *)mmap
, mmap_size
);
2331 * TODO trace2: replace "the_repository" with the actual repo instance
2332 * that is associated with the given "istate".
2334 trace2_data_intmax("index", the_repository
, "read/version",
2336 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2340 * If the command explicitly requires a full index, force it
2341 * to be full. Otherwise, correct the sparsity based on repository
2342 * settings and other properties of the index (if necessary).
2344 prepare_repo_settings(istate
->repo
);
2345 if (istate
->repo
->settings
.command_requires_full_index
)
2346 ensure_full_index(istate
);
2348 ensure_correct_sparsity(istate
);
2350 return istate
->cache_nr
;
2353 munmap((void *)mmap
, mmap_size
);
2354 die(_("index file corrupt"));
2358 * Signal that the shared index is used by updating its mtime.
2360 * This way, shared index can be removed if they have not been used
2363 static void freshen_shared_index(const char *shared_index
, int warn
)
2365 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2366 warning(_("could not freshen shared index '%s'"), shared_index
);
2369 int read_index_from(struct index_state
*istate
, const char *path
,
2372 struct split_index
*split_index
;
2377 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2378 if (istate
->initialized
)
2379 return istate
->cache_nr
;
2382 * TODO trace2: replace "the_repository" with the actual repo instance
2383 * that is associated with the given "istate".
2385 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2387 trace_performance_enter();
2388 ret
= do_read_index(istate
, path
, 0);
2389 trace_performance_leave("read cache %s", path
);
2390 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2393 split_index
= istate
->split_index
;
2394 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2395 post_read_index_from(istate
);
2399 trace_performance_enter();
2400 if (split_index
->base
)
2401 release_index(split_index
->base
);
2403 ALLOC_ARRAY(split_index
->base
, 1);
2404 index_state_init(split_index
->base
, istate
->repo
);
2406 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2407 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2408 if (file_exists(base_path
)) {
2409 trace2_region_enter_printf("index", "shared/do_read_index",
2410 the_repository
, "%s", base_path
);
2412 ret
= do_read_index(split_index
->base
, base_path
, 0);
2413 trace2_region_leave_printf("index", "shared/do_read_index",
2414 the_repository
, "%s", base_path
);
2416 char *path_copy
= xstrdup(path
);
2417 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2418 dirname(path_copy
), base_oid_hex
);
2420 trace2_region_enter_printf("index", "shared/do_read_index",
2421 the_repository
, "%s", base_path2
);
2422 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2423 trace2_region_leave_printf("index", "shared/do_read_index",
2424 the_repository
, "%s", base_path2
);
2427 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2428 die(_("broken index, expect %s in %s, got %s"),
2429 base_oid_hex
, base_path
,
2430 oid_to_hex(&split_index
->base
->oid
));
2432 freshen_shared_index(base_path
, 0);
2433 merge_base_index(istate
);
2434 post_read_index_from(istate
);
2435 trace_performance_leave("read cache %s", base_path
);
2440 int is_index_unborn(struct index_state
*istate
)
2442 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2445 void index_state_init(struct index_state
*istate
, struct repository
*r
)
2447 struct index_state blank
= INDEX_STATE_INIT(r
);
2448 memcpy(istate
, &blank
, sizeof(*istate
));
2451 void release_index(struct index_state
*istate
)
2454 * Cache entries in istate->cache[] should have been allocated
2455 * from the memory pool associated with this index, or from an
2456 * associated split_index. There is no need to free individual
2457 * cache entries. validate_cache_entries can detect when this
2458 * assertion does not hold.
2460 validate_cache_entries(istate
);
2462 resolve_undo_clear_index(istate
);
2463 free_name_hash(istate
);
2464 cache_tree_free(&(istate
->cache_tree
));
2465 free(istate
->fsmonitor_last_update
);
2466 free(istate
->cache
);
2467 discard_split_index(istate
);
2468 free_untracked_cache(istate
->untracked
);
2470 if (istate
->sparse_checkout_patterns
) {
2471 clear_pattern_list(istate
->sparse_checkout_patterns
);
2472 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2475 if (istate
->ce_mem_pool
) {
2476 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2477 FREE_AND_NULL(istate
->ce_mem_pool
);
2481 void discard_index(struct index_state
*istate
)
2483 release_index(istate
);
2484 index_state_init(istate
, istate
->repo
);
2488 * Validate the cache entries of this index.
2489 * All cache entries associated with this index
2490 * should have been allocated by the memory pool
2491 * associated with this index, or by a referenced
2494 void validate_cache_entries(const struct index_state
*istate
)
2498 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2501 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2503 BUG("cache entry is not allocated from expected memory pool");
2504 } else if (!istate
->ce_mem_pool
||
2505 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2506 if (!istate
->split_index
||
2507 !istate
->split_index
->base
||
2508 !istate
->split_index
->base
->ce_mem_pool
||
2509 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2510 BUG("cache entry is not allocated from expected memory pool");
2515 if (istate
->split_index
)
2516 validate_cache_entries(istate
->split_index
->base
);
2519 int unmerged_index(const struct index_state
*istate
)
2522 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2523 if (ce_stage(istate
->cache
[i
]))
2529 int repo_index_has_changes(struct repository
*repo
,
2533 struct index_state
*istate
= repo
->index
;
2534 struct object_id cmp
;
2538 cmp
= tree
->object
.oid
;
2539 if (tree
|| !repo_get_oid_tree(repo
, "HEAD", &cmp
)) {
2540 struct diff_options opt
;
2542 repo_diff_setup(repo
, &opt
);
2543 opt
.flags
.exit_with_status
= 1;
2545 opt
.flags
.quick
= 1;
2546 diff_setup_done(&opt
);
2547 do_diff_cache(&cmp
, &opt
);
2549 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2551 strbuf_addch(sb
, ' ');
2552 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2555 return opt
.flags
.has_changes
!= 0;
2557 /* TODO: audit for interaction with sparse-index. */
2558 ensure_full_index(istate
);
2559 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2561 strbuf_addch(sb
, ' ');
2562 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2564 return !!istate
->cache_nr
;
2568 static int write_index_ext_header(struct hashfile
*f
,
2569 git_hash_ctx
*eoie_f
,
2573 hashwrite_be32(f
, ext
);
2574 hashwrite_be32(f
, sz
);
2579 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2580 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2585 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2586 struct cache_entry
*ce
)
2589 * The only thing we care about in this function is to smudge the
2590 * falsely clean entry due to touch-update-touch race, so we leave
2591 * everything else as they are. We are called for entries whose
2592 * ce_stat_data.sd_mtime match the index file mtime.
2594 * Note that this actually does not do much for gitlinks, for
2595 * which ce_match_stat_basic() always goes to the actual
2596 * contents. The caller checks with is_racy_timestamp() which
2597 * always says "no" for gitlinks, so we are not called for them ;-)
2601 if (lstat(ce
->name
, &st
) < 0)
2603 if (ce_match_stat_basic(ce
, &st
))
2605 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2606 /* This is "racily clean"; smudge it. Note that this
2607 * is a tricky code. At first glance, it may appear
2608 * that it can break with this sequence:
2610 * $ echo xyzzy >frotz
2611 * $ git-update-index --add frotz
2614 * $ echo filfre >nitfol
2615 * $ git-update-index --add nitfol
2617 * but it does not. When the second update-index runs,
2618 * it notices that the entry "frotz" has the same timestamp
2619 * as index, and if we were to smudge it by resetting its
2620 * size to zero here, then the object name recorded
2621 * in index is the 6-byte file but the cached stat information
2622 * becomes zero --- which would then match what we would
2623 * obtain from the filesystem next time we stat("frotz").
2625 * However, the second update-index, before calling
2626 * this function, notices that the cached size is 6
2627 * bytes and what is on the filesystem is an empty
2628 * file, and never calls us, so the cached size information
2629 * for "frotz" stays 6 which does not match the filesystem.
2631 ce
->ce_stat_data
.sd_size
= 0;
2635 /* Copy miscellaneous fields but not the name */
2636 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2637 struct cache_entry
*ce
)
2640 const unsigned hashsz
= the_hash_algo
->rawsz
;
2641 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2643 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2644 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2645 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2646 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2647 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2648 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2649 ondisk
->mode
= htonl(ce
->ce_mode
);
2650 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2651 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2652 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2653 hashcpy(ondisk
->data
, ce
->oid
.hash
, the_repository
->hash_algo
);
2655 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2656 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2657 flagsp
[0] = htons(flags
);
2658 if (ce
->ce_flags
& CE_EXTENDED
) {
2659 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2663 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2664 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2667 unsigned int saved_namelen
;
2668 int stripped_name
= 0;
2669 static unsigned char padding
[8] = { 0x00 };
2671 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2672 saved_namelen
= ce_namelen(ce
);
2677 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2679 if (!previous_name
) {
2680 int len
= ce_namelen(ce
);
2681 copy_cache_entry_to_ondisk(ondisk
, ce
);
2682 hashwrite(f
, ondisk
, size
);
2683 hashwrite(f
, ce
->name
, len
);
2684 hashwrite(f
, padding
, align_padding_size(size
, len
));
2686 int common
, to_remove
, prefix_size
;
2687 unsigned char to_remove_vi
[16];
2689 (ce
->name
[common
] &&
2690 common
< previous_name
->len
&&
2691 ce
->name
[common
] == previous_name
->buf
[common
]);
2693 ; /* still matching */
2694 to_remove
= previous_name
->len
- common
;
2695 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2697 copy_cache_entry_to_ondisk(ondisk
, ce
);
2698 hashwrite(f
, ondisk
, size
);
2699 hashwrite(f
, to_remove_vi
, prefix_size
);
2700 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2701 hashwrite(f
, padding
, 1);
2703 strbuf_splice(previous_name
, common
, to_remove
,
2704 ce
->name
+ common
, ce_namelen(ce
) - common
);
2706 if (stripped_name
) {
2707 ce
->ce_namelen
= saved_namelen
;
2708 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2715 * This function verifies if index_state has the correct sha1 of the
2716 * index file. Don't die if we have any other failure, just return 0.
2718 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2723 unsigned char hash
[GIT_MAX_RAWSZ
];
2725 if (!istate
->initialized
)
2728 fd
= open(path
, O_RDONLY
);
2735 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2738 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2739 if (n
!= the_hash_algo
->rawsz
)
2742 if (!hasheq(istate
->oid
.hash
, hash
, the_repository
->hash_algo
))
2753 static int repo_verify_index(struct repository
*repo
)
2755 return verify_index_from(repo
->index
, repo
->index_file
);
2758 int has_racy_timestamp(struct index_state
*istate
)
2760 int entries
= istate
->cache_nr
;
2763 for (i
= 0; i
< entries
; i
++) {
2764 struct cache_entry
*ce
= istate
->cache
[i
];
2765 if (is_racy_timestamp(istate
, ce
))
2771 void repo_update_index_if_able(struct repository
*repo
,
2772 struct lock_file
*lockfile
)
2774 if ((repo
->index
->cache_changed
||
2775 has_racy_timestamp(repo
->index
)) &&
2776 repo_verify_index(repo
))
2777 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2779 rollback_lock_file(lockfile
);
2782 static int record_eoie(void)
2786 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2790 * As a convenience, the end of index entries extension
2791 * used for threading is written by default if the user
2792 * explicitly requested threaded index reads.
2794 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2797 static int record_ieot(void)
2801 if (!git_config_get_bool("index.recordoffsettable", &val
))
2805 * As a convenience, the offset table used for threading is
2806 * written by default if the user explicitly requested
2807 * threaded index reads.
2809 return !repo_config_get_index_threads(the_repository
, &val
) && val
!= 1;
2812 enum write_extensions
{
2813 WRITE_NO_EXTENSION
= 0,
2814 WRITE_SPLIT_INDEX_EXTENSION
= 1<<0,
2815 WRITE_CACHE_TREE_EXTENSION
= 1<<1,
2816 WRITE_RESOLVE_UNDO_EXTENSION
= 1<<2,
2817 WRITE_UNTRACKED_CACHE_EXTENSION
= 1<<3,
2818 WRITE_FSMONITOR_EXTENSION
= 1<<4,
2820 #define WRITE_ALL_EXTENSIONS ((enum write_extensions)-1)
2823 * On success, `tempfile` is closed. If it is the temporary file
2824 * of a `struct lock_file`, we will therefore effectively perform
2825 * a 'close_lock_file_gently()`. Since that is an implementation
2826 * detail of lockfiles, callers of `do_write_index()` should not
2829 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2830 enum write_extensions write_extensions
, unsigned flags
)
2832 uint64_t start
= getnanotime();
2834 git_hash_ctx
*eoie_c
= NULL
;
2835 struct cache_header hdr
;
2836 int i
, err
= 0, removed
, extended
, hdr_version
;
2837 struct cache_entry
**cache
= istate
->cache
;
2838 int entries
= istate
->cache_nr
;
2840 struct ondisk_cache_entry ondisk
;
2841 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2842 int drop_cache_tree
= istate
->drop_cache_tree
;
2844 int csum_fsync_flag
;
2845 int ieot_entries
= 1;
2846 struct index_entry_offset_table
*ieot
= NULL
;
2847 struct repository
*r
= istate
->repo
;
2848 struct strbuf sb
= STRBUF_INIT
;
2849 int nr
, nr_threads
, ret
;
2851 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2853 prepare_repo_settings(r
);
2854 f
->skip_hash
= r
->settings
.index_skip_hash
;
2856 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2857 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2860 /* reduce extended entries if possible */
2861 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2862 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2864 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2868 if (!istate
->version
)
2869 istate
->version
= get_index_format_default(r
);
2871 /* demote version 3 to version 2 when the latter suffices */
2872 if (istate
->version
== 3 || istate
->version
== 2)
2873 istate
->version
= extended
? 3 : 2;
2875 hdr_version
= istate
->version
;
2877 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2878 hdr
.hdr_version
= htonl(hdr_version
);
2879 hdr
.hdr_entries
= htonl(entries
- removed
);
2881 hashwrite(f
, &hdr
, sizeof(hdr
));
2883 if (!HAVE_THREADS
|| repo_config_get_index_threads(the_repository
, &nr_threads
))
2886 if (nr_threads
!= 1 && record_ieot()) {
2887 int ieot_blocks
, cpus
;
2890 * ensure default number of ieot blocks maps evenly to the
2891 * default number of threads that will process them leaving
2892 * room for the thread to load the index extensions.
2895 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2896 cpus
= online_cpus();
2897 if (ieot_blocks
> cpus
- 1)
2898 ieot_blocks
= cpus
- 1;
2900 ieot_blocks
= nr_threads
;
2901 if (ieot_blocks
> istate
->cache_nr
)
2902 ieot_blocks
= istate
->cache_nr
;
2906 * no reason to write out the IEOT extension if we don't
2907 * have enough blocks to utilize multi-threading
2909 if (ieot_blocks
> 1) {
2910 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2911 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2912 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2916 offset
= hashfile_total(f
);
2919 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2921 for (i
= 0; i
< entries
; i
++) {
2922 struct cache_entry
*ce
= cache
[i
];
2923 if (ce
->ce_flags
& CE_REMOVE
)
2925 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2926 ce_smudge_racily_clean_entry(istate
, ce
);
2927 if (is_null_oid(&ce
->oid
)) {
2928 static const char msg
[] = "cache entry has null sha1: %s";
2929 static int allow
= -1;
2932 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2934 warning(msg
, ce
->name
);
2936 err
= error(msg
, ce
->name
);
2938 drop_cache_tree
= 1;
2940 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2941 ieot
->entries
[ieot
->nr
].nr
= nr
;
2942 ieot
->entries
[ieot
->nr
].offset
= offset
;
2945 * If we have a V4 index, set the first byte to an invalid
2946 * character to ensure there is nothing common with the previous
2950 previous_name
->buf
[0] = 0;
2953 offset
= hashfile_total(f
);
2955 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2963 ieot
->entries
[ieot
->nr
].nr
= nr
;
2964 ieot
->entries
[ieot
->nr
].offset
= offset
;
2967 strbuf_release(&previous_name_buf
);
2974 offset
= hashfile_total(f
);
2977 * The extension headers must be hashed on their own for the
2978 * EOIE extension. Create a hashfile here to compute that hash.
2980 if (offset
&& record_eoie()) {
2981 CALLOC_ARRAY(eoie_c
, 1);
2982 the_hash_algo
->init_fn(eoie_c
);
2986 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2987 * can minimize the number of extensions we have to scan through to
2988 * find it during load. Write it out regardless of the
2989 * strip_extensions parameter as we need it when loading the shared
2995 write_ieot_extension(&sb
, ieot
);
2996 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2997 hashwrite(f
, sb
.buf
, sb
.len
);
3004 if (write_extensions
& WRITE_SPLIT_INDEX_EXTENSION
&&
3005 istate
->split_index
) {
3008 if (istate
->sparse_index
)
3009 die(_("cannot write split index for a sparse index"));
3011 err
= write_link_extension(&sb
, istate
) < 0 ||
3012 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3014 hashwrite(f
, sb
.buf
, sb
.len
);
3020 if (write_extensions
& WRITE_CACHE_TREE_EXTENSION
&&
3021 !drop_cache_tree
&& istate
->cache_tree
) {
3024 cache_tree_write(&sb
, istate
->cache_tree
);
3025 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3026 hashwrite(f
, sb
.buf
, sb
.len
);
3032 if (write_extensions
& WRITE_RESOLVE_UNDO_EXTENSION
&&
3033 istate
->resolve_undo
) {
3036 resolve_undo_write(&sb
, istate
->resolve_undo
, the_hash_algo
);
3037 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3039 hashwrite(f
, sb
.buf
, sb
.len
);
3045 if (write_extensions
& WRITE_UNTRACKED_CACHE_EXTENSION
&&
3046 istate
->untracked
) {
3049 write_untracked_extension(&sb
, istate
->untracked
);
3050 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3052 hashwrite(f
, sb
.buf
, sb
.len
);
3058 if (write_extensions
& WRITE_FSMONITOR_EXTENSION
&&
3059 istate
->fsmonitor_last_update
) {
3062 write_fsmonitor_extension(&sb
, istate
);
3063 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3064 hashwrite(f
, sb
.buf
, sb
.len
);
3070 if (istate
->sparse_index
) {
3071 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0) {
3078 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3079 * so that it can be found and processed before all the index entries are
3080 * read. Write it out regardless of the strip_extensions parameter as we need it
3081 * when loading the shared index.
3086 write_eoie_extension(&sb
, eoie_c
, offset
);
3087 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3088 hashwrite(f
, sb
.buf
, sb
.len
);
3095 csum_fsync_flag
= 0;
3096 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3097 csum_fsync_flag
= CSUM_FSYNC
;
3099 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3100 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3103 if (close_tempfile_gently(tempfile
)) {
3104 ret
= error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3107 if (stat(get_tempfile_path(tempfile
), &st
)) {
3111 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3112 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3113 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3116 * TODO trace2: replace "the_repository" with the actual repo instance
3117 * that is associated with the given "istate".
3119 trace2_data_intmax("index", the_repository
, "write/version",
3121 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3129 strbuf_release(&sb
);
3135 void set_alternate_index_output(const char *name
)
3137 alternate_index_output
= name
;
3140 static int commit_locked_index(struct lock_file
*lk
)
3142 if (alternate_index_output
)
3143 return commit_lock_file_to(lk
, alternate_index_output
);
3145 return commit_lock_file(lk
);
3148 static int do_write_locked_index(struct index_state
*istate
,
3149 struct lock_file
*lock
,
3151 enum write_extensions write_extensions
)
3154 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3156 ret
= convert_to_sparse(istate
, 0);
3159 warning(_("failed to convert to a sparse-index"));
3164 * TODO trace2: replace "the_repository" with the actual repo instance
3165 * that is associated with the given "istate".
3167 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3168 "%s", get_lock_file_path(lock
));
3169 ret
= do_write_index(istate
, lock
->tempfile
, write_extensions
, flags
);
3170 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3171 "%s", get_lock_file_path(lock
));
3174 ensure_full_index(istate
);
3178 if (flags
& COMMIT_LOCK
)
3179 ret
= commit_locked_index(lock
);
3181 ret
= close_lock_file_gently(lock
);
3183 run_hooks_l(the_repository
, "post-index-change",
3184 istate
->updated_workdir
? "1" : "0",
3185 istate
->updated_skipworktree
? "1" : "0", NULL
);
3186 istate
->updated_workdir
= 0;
3187 istate
->updated_skipworktree
= 0;
3192 static int write_split_index(struct index_state
*istate
,
3193 struct lock_file
*lock
,
3197 prepare_to_write_split_index(istate
);
3198 ret
= do_write_locked_index(istate
, lock
, flags
, WRITE_ALL_EXTENSIONS
);
3199 finish_writing_split_index(istate
);
3203 static unsigned long get_shared_index_expire_date(void)
3205 static unsigned long shared_index_expire_date
;
3206 static int shared_index_expire_date_prepared
;
3208 if (!shared_index_expire_date_prepared
) {
3209 const char *shared_index_expire
= "2.weeks.ago";
3212 repo_config_get_expiry(the_repository
, "splitindex.sharedindexexpire",
3215 shared_index_expire
= value
;
3217 shared_index_expire_date
= approxidate(shared_index_expire
);
3218 shared_index_expire_date_prepared
= 1;
3223 return shared_index_expire_date
;
3226 static int should_delete_shared_index(const char *shared_index_path
)
3229 unsigned long expiration
;
3231 /* Check timestamp */
3232 expiration
= get_shared_index_expire_date();
3235 if (stat(shared_index_path
, &st
))
3236 return error_errno(_("could not stat '%s'"), shared_index_path
);
3237 if (st
.st_mtime
> expiration
)
3243 static int clean_shared_index_files(const char *current_hex
)
3246 DIR *dir
= opendir(repo_get_git_dir(the_repository
));
3249 return error_errno(_("unable to open git dir: %s"),
3250 repo_get_git_dir(the_repository
));
3252 while ((de
= readdir(dir
)) != NULL
) {
3253 const char *sha1_hex
;
3254 const char *shared_index_path
;
3255 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3257 if (!strcmp(sha1_hex
, current_hex
))
3259 shared_index_path
= git_path("%s", de
->d_name
);
3260 if (should_delete_shared_index(shared_index_path
) > 0 &&
3261 unlink(shared_index_path
))
3262 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3269 static int write_shared_index(struct index_state
*istate
,
3270 struct tempfile
**temp
, unsigned flags
)
3272 struct split_index
*si
= istate
->split_index
;
3273 int ret
, was_full
= !istate
->sparse_index
;
3275 move_cache_to_base_index(istate
);
3276 convert_to_sparse(istate
, 0);
3278 trace2_region_enter_printf("index", "shared/do_write_index",
3279 the_repository
, "%s", get_tempfile_path(*temp
));
3280 ret
= do_write_index(si
->base
, *temp
, WRITE_NO_EXTENSION
, flags
);
3281 trace2_region_leave_printf("index", "shared/do_write_index",
3282 the_repository
, "%s", get_tempfile_path(*temp
));
3285 ensure_full_index(istate
);
3289 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3291 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3294 ret
= rename_tempfile(temp
,
3295 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3297 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3298 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3304 static const int default_max_percent_split_change
= 20;
3306 static int too_many_not_shared_entries(struct index_state
*istate
)
3308 int i
, not_shared
= 0;
3309 int max_split
= repo_config_get_max_percent_split_change(the_repository
);
3311 switch (max_split
) {
3313 /* not or badly configured: use the default value */
3314 max_split
= default_max_percent_split_change
;
3317 return 1; /* 0% means always write a new shared index */
3319 return 0; /* 100% means never write a new shared index */
3321 break; /* just use the configured value */
3324 /* Count not shared entries */
3325 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3326 struct cache_entry
*ce
= istate
->cache
[i
];
3331 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3334 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3337 int new_shared_index
, ret
, test_split_index_env
;
3338 struct split_index
*si
= istate
->split_index
;
3340 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0) &&
3341 cache_tree_verify(the_repository
, istate
) < 0)
3344 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3345 if (flags
& COMMIT_LOCK
)
3346 rollback_lock_file(lock
);
3350 if (istate
->fsmonitor_last_update
)
3351 fill_fsmonitor_bitmap(istate
);
3353 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3355 if ((!si
&& !test_split_index_env
) ||
3356 alternate_index_output
||
3357 (istate
->cache_changed
& ~EXTMASK
)) {
3358 ret
= do_write_locked_index(istate
, lock
, flags
,
3359 ~WRITE_SPLIT_INDEX_EXTENSION
);
3363 if (test_split_index_env
) {
3365 si
= init_split_index(istate
);
3366 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3368 int v
= si
->base_oid
.hash
[0];
3370 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3373 if (too_many_not_shared_entries(istate
))
3374 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3376 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3378 if (new_shared_index
) {
3379 struct tempfile
*temp
;
3382 /* Same initial permissions as the main .git/index file */
3383 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3385 ret
= do_write_locked_index(istate
, lock
, flags
,
3386 ~WRITE_SPLIT_INDEX_EXTENSION
);
3389 ret
= write_shared_index(istate
, &temp
, flags
);
3391 saved_errno
= errno
;
3392 if (is_tempfile_active(temp
))
3393 delete_tempfile(&temp
);
3394 errno
= saved_errno
;
3400 ret
= write_split_index(istate
, lock
, flags
);
3402 /* Freshen the shared index only if the split-index was written */
3403 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3404 const char *shared_index
= git_path("sharedindex.%s",
3405 oid_to_hex(&si
->base_oid
));
3406 freshen_shared_index(shared_index
, 1);
3410 if (flags
& COMMIT_LOCK
)
3411 rollback_lock_file(lock
);
3416 * Read the index file that is potentially unmerged into given
3417 * index_state, dropping any unmerged entries to stage #0 (potentially
3418 * resulting in a path appearing as both a file and a directory in the
3419 * index; the caller is responsible to clear out the extra entries
3420 * before writing the index to a tree). Returns true if the index is
3421 * unmerged. Callers who want to refuse to work from an unmerged
3422 * state can call this and check its return value, instead of calling
3425 int repo_read_index_unmerged(struct repository
*repo
)
3427 struct index_state
*istate
;
3431 repo_read_index(repo
);
3432 istate
= repo
->index
;
3433 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3434 struct cache_entry
*ce
= istate
->cache
[i
];
3435 struct cache_entry
*new_ce
;
3441 len
= ce_namelen(ce
);
3442 new_ce
= make_empty_cache_entry(istate
, len
);
3443 memcpy(new_ce
->name
, ce
->name
, len
);
3444 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3445 new_ce
->ce_namelen
= len
;
3446 new_ce
->ce_mode
= ce
->ce_mode
;
3447 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3448 return error(_("%s: cannot drop to stage #0"),
3455 * Returns 1 if the path is an "other" path with respect to
3456 * the index; that is, the path is not mentioned in the index at all,
3457 * either as a file, a directory with some files in the index,
3458 * or as an unmerged entry.
3460 * We helpfully remove a trailing "/" from directories so that
3461 * the output of read_directory can be used as-is.
3463 int index_name_is_other(struct index_state
*istate
, const char *name
,
3467 if (namelen
&& name
[namelen
- 1] == '/')
3469 pos
= index_name_pos(istate
, name
, namelen
);
3471 return 0; /* exact match */
3473 if (pos
< istate
->cache_nr
) {
3474 struct cache_entry
*ce
= istate
->cache
[pos
];
3475 if (ce_namelen(ce
) == namelen
&&
3476 !memcmp(ce
->name
, name
, namelen
))
3477 return 0; /* Yup, this one exists unmerged */
3482 void *read_blob_data_from_index(struct index_state
*istate
,
3483 const char *path
, unsigned long *size
)
3487 enum object_type type
;
3491 pos
= index_name_pos(istate
, path
, len
);
3494 * We might be in the middle of a merge, in which
3495 * case we would read stage #2 (ours).
3499 (pos
< 0 && i
< istate
->cache_nr
&&
3500 !strcmp(istate
->cache
[i
]->name
, path
));
3502 if (ce_stage(istate
->cache
[i
]) == 2)
3507 data
= repo_read_object_file(the_repository
, &istate
->cache
[pos
]->oid
,
3509 if (!data
|| type
!= OBJ_BLOB
) {
3518 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3520 dst
->untracked
= src
->untracked
;
3521 src
->untracked
= NULL
;
3522 dst
->cache_tree
= src
->cache_tree
;
3523 src
->cache_tree
= NULL
;
3526 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3527 struct index_state
*istate
)
3529 unsigned int size
= ce_size(ce
);
3530 int mem_pool_allocated
;
3531 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3532 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3534 memcpy(new_entry
, ce
, size
);
3535 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3539 void discard_cache_entry(struct cache_entry
*ce
)
3541 if (ce
&& should_validate_cache_entries())
3542 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3544 if (ce
&& ce
->mem_pool_allocated
)
3550 int should_validate_cache_entries(void)
3552 static int validate_index_cache_entries
= -1;
3554 if (validate_index_cache_entries
< 0) {
3555 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3556 validate_index_cache_entries
= 1;
3558 validate_index_cache_entries
= 0;
3561 return validate_index_cache_entries
;
3564 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3565 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3567 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3570 * The end of index entries (EOIE) extension is guaranteed to be last
3571 * so that it can be found by scanning backwards from the EOF.
3578 const char *index
, *eoie
;
3580 size_t offset
, src_offset
;
3581 unsigned char hash
[GIT_MAX_RAWSZ
];
3584 /* ensure we have an index big enough to contain an EOIE extension */
3585 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3588 /* validate the extension signature */
3589 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3590 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3592 index
+= sizeof(uint32_t);
3594 /* validate the extension size */
3595 extsize
= get_be32(index
);
3596 if (extsize
!= EOIE_SIZE
)
3598 index
+= sizeof(uint32_t);
3601 * Validate the offset we're going to look for the first extension
3602 * signature is after the index header and before the eoie extension.
3604 offset
= get_be32(index
);
3605 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3607 if (mmap
+ offset
>= eoie
)
3609 index
+= sizeof(uint32_t);
3612 * The hash is computed over extension types and their sizes (but not
3613 * their contents). E.g. if we have "TREE" extension that is N-bytes
3614 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3615 * then the hash would be:
3617 * SHA-1("TREE" + <binary representation of N> +
3618 * "REUC" + <binary representation of M>)
3620 src_offset
= offset
;
3621 the_hash_algo
->init_fn(&c
);
3622 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3623 /* After an array of active_nr index entries,
3624 * there can be arbitrary number of extended
3625 * sections, each of which is prefixed with
3626 * extension name (4-byte) and section length
3627 * in 4-byte network byte order.
3630 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3631 extsize
= ntohl(extsize
);
3633 /* verify the extension size isn't so large it will wrap around */
3634 if (src_offset
+ 8 + extsize
< src_offset
)
3637 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3640 src_offset
+= extsize
;
3642 the_hash_algo
->final_fn(hash
, &c
);
3643 if (!hasheq(hash
, (const unsigned char *)index
, the_repository
->hash_algo
))
3646 /* Validate that the extension offsets returned us back to the eoie extension. */
3647 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3653 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3656 unsigned char hash
[GIT_MAX_RAWSZ
];
3659 put_be32(&buffer
, offset
);
3660 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3663 the_hash_algo
->final_fn(hash
, eoie_context
);
3664 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3667 #define IEOT_VERSION (1)
3669 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3671 const char *index
= NULL
;
3672 uint32_t extsize
, ext_version
;
3673 struct index_entry_offset_table
*ieot
;
3676 /* find the IEOT extension */
3679 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3680 extsize
= get_be32(mmap
+ offset
+ 4);
3681 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3682 index
= mmap
+ offset
+ 4 + 4;
3691 /* validate the version is IEOT_VERSION */
3692 ext_version
= get_be32(index
);
3693 if (ext_version
!= IEOT_VERSION
) {
3694 error("invalid IEOT version %d", ext_version
);
3697 index
+= sizeof(uint32_t);
3699 /* extension size - version bytes / bytes per entry */
3700 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3702 error("invalid number of IEOT entries %d", nr
);
3705 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3706 + (nr
* sizeof(struct index_entry_offset
)));
3708 for (i
= 0; i
< nr
; i
++) {
3709 ieot
->entries
[i
].offset
= get_be32(index
);
3710 index
+= sizeof(uint32_t);
3711 ieot
->entries
[i
].nr
= get_be32(index
);
3712 index
+= sizeof(uint32_t);
3718 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3724 put_be32(&buffer
, IEOT_VERSION
);
3725 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3728 for (i
= 0; i
< ieot
->nr
; i
++) {
3731 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3732 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3735 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3736 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3740 void prefetch_cache_entries(const struct index_state
*istate
,
3741 must_prefetch_predicate must_prefetch
)
3744 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3746 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3747 struct cache_entry
*ce
= istate
->cache
[i
];
3749 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3751 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3753 OBJECT_INFO_FOR_PREFETCH
))
3755 oid_array_append(&to_fetch
, &ce
->oid
);
3757 promisor_remote_get_direct(the_repository
,
3758 to_fetch
.oid
, to_fetch
.nr
);
3759 oid_array_clear(&to_fetch
);
3762 static int read_one_entry_opt(struct index_state
*istate
,
3763 const struct object_id
*oid
,
3764 struct strbuf
*base
,
3765 const char *pathname
,
3766 unsigned mode
, int opt
)
3769 struct cache_entry
*ce
;
3772 return READ_TREE_RECURSIVE
;
3774 len
= strlen(pathname
);
3775 ce
= make_empty_cache_entry(istate
, base
->len
+ len
);
3777 ce
->ce_mode
= create_ce_mode(mode
);
3778 ce
->ce_flags
= create_ce_flags(1);
3779 ce
->ce_namelen
= base
->len
+ len
;
3780 memcpy(ce
->name
, base
->buf
, base
->len
);
3781 memcpy(ce
->name
+ base
->len
, pathname
, len
+1);
3782 oidcpy(&ce
->oid
, oid
);
3783 return add_index_entry(istate
, ce
, opt
);
3786 static int read_one_entry(const struct object_id
*oid
, struct strbuf
*base
,
3787 const char *pathname
, unsigned mode
,
3790 struct index_state
*istate
= context
;
3791 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3793 ADD_CACHE_OK_TO_ADD
|ADD_CACHE_SKIP_DFCHECK
);
3797 * This is used when the caller knows there is no existing entries at
3798 * the stage that will conflict with the entry being added.
3800 static int read_one_entry_quick(const struct object_id
*oid
, struct strbuf
*base
,
3801 const char *pathname
, unsigned mode
,
3804 struct index_state
*istate
= context
;
3805 return read_one_entry_opt(istate
, oid
, base
, pathname
,
3806 mode
, ADD_CACHE_JUST_APPEND
);
3810 * Read the tree specified with --with-tree option
3811 * (typically, HEAD) into stage #1 and then
3812 * squash them down to stage #0. This is used for
3813 * --error-unmatch to list and check the path patterns
3814 * that were given from the command line. We are not
3815 * going to write this index out.
3817 void overlay_tree_on_index(struct index_state
*istate
,
3818 const char *tree_name
, const char *prefix
)
3821 struct object_id oid
;
3822 struct pathspec pathspec
;
3823 struct cache_entry
*last_stage0
= NULL
;
3825 read_tree_fn_t fn
= NULL
;
3828 if (repo_get_oid(the_repository
, tree_name
, &oid
))
3829 die("tree-ish %s not found.", tree_name
);
3830 tree
= parse_tree_indirect(&oid
);
3832 die("bad tree-ish %s", tree_name
);
3834 /* Hoist the unmerged entries up to stage #3 to make room */
3835 /* TODO: audit for interaction with sparse-index. */
3836 ensure_full_index(istate
);
3837 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3838 struct cache_entry
*ce
= istate
->cache
[i
];
3841 ce
->ce_flags
|= CE_STAGEMASK
;
3845 static const char *(matchbuf
[1]);
3847 parse_pathspec(&pathspec
, PATHSPEC_ALL_MAGIC
,
3848 PATHSPEC_PREFER_CWD
, prefix
, matchbuf
);
3850 memset(&pathspec
, 0, sizeof(pathspec
));
3853 * See if we have cache entry at the stage. If so,
3854 * do it the original slow way, otherwise, append and then
3857 for (i
= 0; !fn
&& i
< istate
->cache_nr
; i
++) {
3858 const struct cache_entry
*ce
= istate
->cache
[i
];
3859 if (ce_stage(ce
) == 1)
3860 fn
= read_one_entry
;
3864 fn
= read_one_entry_quick
;
3865 err
= read_tree(the_repository
, tree
, &pathspec
, fn
, istate
);
3866 clear_pathspec(&pathspec
);
3868 die("unable to read tree entries %s", tree_name
);
3871 * Sort the cache entry -- we need to nuke the cache tree, though.
3873 if (fn
== read_one_entry_quick
) {
3874 cache_tree_free(&istate
->cache_tree
);
3875 QSORT(istate
->cache
, istate
->cache_nr
, cmp_cache_name_compare
);
3878 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3879 struct cache_entry
*ce
= istate
->cache
[i
];
3880 switch (ce_stage(ce
)) {
3888 * If there is stage #0 entry for this, we do not
3889 * need to show it. We use CE_UPDATE bit to mark
3893 !strcmp(last_stage0
->name
, ce
->name
))
3894 ce
->ce_flags
|= CE_UPDATE
;
3899 struct update_callback_data
{
3900 struct index_state
*index
;
3906 static int fix_unmerged_status(struct diff_filepair
*p
,
3907 struct update_callback_data
*data
)
3909 if (p
->status
!= DIFF_STATUS_UNMERGED
)
3911 if (!(data
->flags
& ADD_CACHE_IGNORE_REMOVAL
) && !p
->two
->mode
)
3913 * This is not an explicit add request, and the
3914 * path is missing from the working tree (deleted)
3916 return DIFF_STATUS_DELETED
;
3919 * Either an explicit add request, or path exists
3920 * in the working tree. An attempt to explicitly
3921 * add a path that does not exist in the working tree
3922 * will be caught as an error by the caller immediately.
3924 return DIFF_STATUS_MODIFIED
;
3927 static void update_callback(struct diff_queue_struct
*q
,
3928 struct diff_options
*opt UNUSED
, void *cbdata
)
3931 struct update_callback_data
*data
= cbdata
;
3933 for (i
= 0; i
< q
->nr
; i
++) {
3934 struct diff_filepair
*p
= q
->queue
[i
];
3935 const char *path
= p
->one
->path
;
3937 if (!data
->include_sparse
&&
3938 !path_in_sparse_checkout(path
, data
->index
))
3941 switch (fix_unmerged_status(p
, data
)) {
3943 die(_("unexpected diff status %c"), p
->status
);
3944 case DIFF_STATUS_MODIFIED
:
3945 case DIFF_STATUS_TYPE_CHANGED
:
3946 if (add_file_to_index(data
->index
, path
, data
->flags
)) {
3947 if (!(data
->flags
& ADD_CACHE_IGNORE_ERRORS
))
3948 die(_("updating files failed"));
3952 case DIFF_STATUS_DELETED
:
3953 if (data
->flags
& ADD_CACHE_IGNORE_REMOVAL
)
3955 if (!(data
->flags
& ADD_CACHE_PRETEND
))
3956 remove_file_from_index(data
->index
, path
);
3957 if (data
->flags
& (ADD_CACHE_PRETEND
|ADD_CACHE_VERBOSE
))
3958 printf(_("remove '%s'\n"), path
);
3964 int add_files_to_cache(struct repository
*repo
, const char *prefix
,
3965 const struct pathspec
*pathspec
, char *ps_matched
,
3966 int include_sparse
, int flags
)
3968 struct update_callback_data data
;
3969 struct rev_info rev
;
3971 memset(&data
, 0, sizeof(data
));
3972 data
.index
= repo
->index
;
3973 data
.include_sparse
= include_sparse
;
3976 repo_init_revisions(repo
, &rev
, prefix
);
3977 setup_revisions(0, NULL
, &rev
, NULL
);
3979 copy_pathspec(&rev
.prune_data
, pathspec
);
3980 rev
.ps_matched
= ps_matched
;
3982 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
3983 rev
.diffopt
.format_callback
= update_callback
;
3984 rev
.diffopt
.format_callback_data
= &data
;
3985 rev
.diffopt
.flags
.override_submodule_config
= 1;
3986 rev
.max_count
= 0; /* do not compare unmerged paths with stage #2 */
3989 * Use an ODB transaction to optimize adding multiple objects.
3990 * This function is invoked from commands other than 'add', which
3991 * may not have their own transaction active.
3993 begin_odb_transaction();
3994 run_diff_files(&rev
, DIFF_RACY_IS_MODIFIED
);
3995 end_odb_transaction();
3997 release_revisions(&rev
);
3998 return !!data
.add_errors
;