2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 #include "cache-tree.h"
15 #include "object-store.h"
19 #include "resolve-undo.h"
20 #include "run-command.h"
23 #include "split-index.h"
25 #include "fsmonitor.h"
26 #include "thread-utils.h"
28 #include "sparse-index.h"
29 #include "csum-file.h"
30 #include "promisor-remote.h"
32 /* Mask for the name length in ce_flags in the on-disk index */
34 #define CE_NAMEMASK (0x0fff)
38 * The first letter should be 'A'..'Z' for extensions that are not
39 * necessary for a correct operation (i.e. optimization data).
40 * When new extensions are added that _needs_ to be understood in
41 * order to correctly interpret the index file, pick character that
42 * is outside the range, to cause the reader to abort.
45 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
46 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
47 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
48 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
49 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
50 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
51 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
52 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
53 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
55 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
56 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
57 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
58 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
62 * This is an estimate of the pathname length in the index. We use
63 * this for V4 index files to guess the un-deltafied size of the index
64 * in memory because of pathname deltafication. This is not required
65 * for V2/V3 index formats because their pathnames are not compressed.
66 * If the initial amount of memory set aside is not sufficient, the
67 * mem pool will allocate extra memory.
69 #define CACHE_ENTRY_PATH_LENGTH 80
71 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
73 struct cache_entry
*ce
;
74 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
75 ce
->mem_pool_allocated
= 1;
79 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
81 struct cache_entry
* ce
;
82 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
83 ce
->mem_pool_allocated
= 1;
87 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
89 struct mem_pool
**pool_ptr
;
91 if (istate
->split_index
&& istate
->split_index
->base
)
92 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
94 pool_ptr
= &istate
->ce_mem_pool
;
97 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
98 mem_pool_init(*pool_ptr
, 0);
104 static const char *alternate_index_output
;
106 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
108 if (S_ISSPARSEDIR(ce
->ce_mode
))
109 istate
->sparse_index
= 1;
111 istate
->cache
[nr
] = ce
;
112 add_name_hash(istate
, ce
);
115 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
117 struct cache_entry
*old
= istate
->cache
[nr
];
119 replace_index_entry_in_base(istate
, old
, ce
);
120 remove_name_hash(istate
, old
);
121 discard_cache_entry(old
);
122 ce
->ce_flags
&= ~CE_HASHED
;
123 set_index_entry(istate
, nr
, ce
);
124 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
125 mark_fsmonitor_invalid(istate
, ce
);
126 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
129 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
131 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
;
132 int namelen
= strlen(new_name
);
134 new_entry
= make_empty_cache_entry(istate
, namelen
);
135 copy_cache_entry(new_entry
, old_entry
);
136 new_entry
->ce_flags
&= ~CE_HASHED
;
137 new_entry
->ce_namelen
= namelen
;
138 new_entry
->index
= 0;
139 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
141 cache_tree_invalidate_path(istate
, old_entry
->name
);
142 untracked_cache_remove_from_index(istate
, old_entry
->name
);
143 remove_index_entry_at(istate
, nr
);
144 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
147 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
149 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
150 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
151 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
152 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
153 sd
->sd_dev
= st
->st_dev
;
154 sd
->sd_ino
= st
->st_ino
;
155 sd
->sd_uid
= st
->st_uid
;
156 sd
->sd_gid
= st
->st_gid
;
157 sd
->sd_size
= st
->st_size
;
160 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
164 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
165 changed
|= MTIME_CHANGED
;
166 if (trust_ctime
&& check_stat
&&
167 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
168 changed
|= CTIME_CHANGED
;
171 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
172 changed
|= MTIME_CHANGED
;
173 if (trust_ctime
&& check_stat
&&
174 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
175 changed
|= CTIME_CHANGED
;
179 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
180 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
181 changed
|= OWNER_CHANGED
;
182 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
183 changed
|= INODE_CHANGED
;
188 * st_dev breaks on network filesystems where different
189 * clients will have different views of what "device"
190 * the filesystem is on
192 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
193 changed
|= INODE_CHANGED
;
196 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
197 changed
|= DATA_CHANGED
;
203 * This only updates the "non-critical" parts of the directory
204 * cache, ie the parts that aren't tracked by GIT, and only used
205 * to validate the cache.
207 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
209 fill_stat_data(&ce
->ce_stat_data
, st
);
211 if (assume_unchanged
)
212 ce
->ce_flags
|= CE_VALID
;
214 if (S_ISREG(st
->st_mode
)) {
215 ce_mark_uptodate(ce
);
216 mark_fsmonitor_valid(istate
, ce
);
220 static int ce_compare_data(struct index_state
*istate
,
221 const struct cache_entry
*ce
,
225 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
228 struct object_id oid
;
229 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
230 match
= !oideq(&oid
, &ce
->oid
);
231 /* index_fd() closed the file descriptor already */
236 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
241 enum object_type type
;
242 struct strbuf sb
= STRBUF_INIT
;
244 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
247 buffer
= read_object_file(&ce
->oid
, &type
, &size
);
250 match
= memcmp(buffer
, sb
.buf
, size
);
257 static int ce_compare_gitlink(const struct cache_entry
*ce
)
259 struct object_id oid
;
262 * We don't actually require that the .git directory
263 * under GITLINK directory be a valid git directory. It
264 * might even be missing (in case nobody populated that
267 * If so, we consider it always to match.
269 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
271 return !oideq(&oid
, &ce
->oid
);
274 static int ce_modified_check_fs(struct index_state
*istate
,
275 const struct cache_entry
*ce
,
278 switch (st
->st_mode
& S_IFMT
) {
280 if (ce_compare_data(istate
, ce
, st
))
284 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
288 if (S_ISGITLINK(ce
->ce_mode
))
289 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
290 /* else fallthrough */
297 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
299 unsigned int changed
= 0;
301 if (ce
->ce_flags
& CE_REMOVE
)
302 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
304 switch (ce
->ce_mode
& S_IFMT
) {
306 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
307 /* We consider only the owner x bit to be relevant for
310 if (trust_executable_bit
&&
311 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
312 changed
|= MODE_CHANGED
;
315 if (!S_ISLNK(st
->st_mode
) &&
316 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
317 changed
|= TYPE_CHANGED
;
320 /* We ignore most of the st_xxx fields for gitlinks */
321 if (!S_ISDIR(st
->st_mode
))
322 changed
|= TYPE_CHANGED
;
323 else if (ce_compare_gitlink(ce
))
324 changed
|= DATA_CHANGED
;
327 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
330 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
332 /* Racily smudged entry? */
333 if (!ce
->ce_stat_data
.sd_size
) {
334 if (!is_empty_blob_sha1(ce
->oid
.hash
))
335 changed
|= DATA_CHANGED
;
341 static int is_racy_stat(const struct index_state
*istate
,
342 const struct stat_data
*sd
)
344 return (istate
->timestamp
.sec
&&
346 /* nanosecond timestamped files can also be racy! */
347 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
348 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
349 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
351 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
356 int is_racy_timestamp(const struct index_state
*istate
,
357 const struct cache_entry
*ce
)
359 return (!S_ISGITLINK(ce
->ce_mode
) &&
360 is_racy_stat(istate
, &ce
->ce_stat_data
));
363 int match_stat_data_racy(const struct index_state
*istate
,
364 const struct stat_data
*sd
, struct stat
*st
)
366 if (is_racy_stat(istate
, sd
))
367 return MTIME_CHANGED
;
368 return match_stat_data(sd
, st
);
371 int ie_match_stat(struct index_state
*istate
,
372 const struct cache_entry
*ce
, struct stat
*st
,
373 unsigned int options
)
375 unsigned int changed
;
376 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
377 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
378 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
379 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
381 if (!ignore_fsmonitor
)
382 refresh_fsmonitor(istate
);
384 * If it's marked as always valid in the index, it's
385 * valid whatever the checked-out copy says.
387 * skip-worktree has the same effect with higher precedence
389 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
391 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
393 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
397 * Intent-to-add entries have not been added, so the index entry
398 * by definition never matches what is in the work tree until it
399 * actually gets added.
401 if (ce_intent_to_add(ce
))
402 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
404 changed
= ce_match_stat_basic(ce
, st
);
407 * Within 1 second of this sequence:
408 * echo xyzzy >file && git-update-index --add file
409 * running this command:
411 * would give a falsely clean cache entry. The mtime and
412 * length match the cache, and other stat fields do not change.
414 * We could detect this at update-index time (the cache entry
415 * being registered/updated records the same time as "now")
416 * and delay the return from git-update-index, but that would
417 * effectively mean we can make at most one commit per second,
418 * which is not acceptable. Instead, we check cache entries
419 * whose mtime are the same as the index file timestamp more
420 * carefully than others.
422 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
423 if (assume_racy_is_modified
)
424 changed
|= DATA_CHANGED
;
426 changed
|= ce_modified_check_fs(istate
, ce
, st
);
432 int ie_modified(struct index_state
*istate
,
433 const struct cache_entry
*ce
,
434 struct stat
*st
, unsigned int options
)
436 int changed
, changed_fs
;
438 changed
= ie_match_stat(istate
, ce
, st
, options
);
442 * If the mode or type has changed, there's no point in trying
443 * to refresh the entry - it's not going to match
445 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
449 * Immediately after read-tree or update-index --cacheinfo,
450 * the length field is zero, as we have never even read the
451 * lstat(2) information once, and we cannot trust DATA_CHANGED
452 * returned by ie_match_stat() which in turn was returned by
453 * ce_match_stat_basic() to signal that the filesize of the
454 * blob changed. We have to actually go to the filesystem to
455 * see if the contents match, and if so, should answer "unchanged".
457 * The logic does not apply to gitlinks, as ce_match_stat_basic()
458 * already has checked the actual HEAD from the filesystem in the
459 * subproject. If ie_match_stat() already said it is different,
460 * then we know it is.
462 if ((changed
& DATA_CHANGED
) &&
463 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
466 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
468 return changed
| changed_fs
;
472 int base_name_compare(const char *name1
, int len1
, int mode1
,
473 const char *name2
, int len2
, int mode2
)
475 unsigned char c1
, c2
;
476 int len
= len1
< len2
? len1
: len2
;
479 cmp
= memcmp(name1
, name2
, len
);
484 if (!c1
&& S_ISDIR(mode1
))
486 if (!c2
&& S_ISDIR(mode2
))
488 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
492 * df_name_compare() is identical to base_name_compare(), except it
493 * compares conflicting directory/file entries as equal. Note that
494 * while a directory name compares as equal to a regular file, they
495 * then individually compare _differently_ to a filename that has
496 * a dot after the basename (because '\0' < '.' < '/').
498 * This is used by routines that want to traverse the git namespace
499 * but then handle conflicting entries together when possible.
501 int df_name_compare(const char *name1
, int len1
, int mode1
,
502 const char *name2
, int len2
, int mode2
)
504 int len
= len1
< len2
? len1
: len2
, cmp
;
505 unsigned char c1
, c2
;
507 cmp
= memcmp(name1
, name2
, len
);
510 /* Directories and files compare equal (same length, same name) */
514 if (!c1
&& S_ISDIR(mode1
))
517 if (!c2
&& S_ISDIR(mode2
))
519 if (c1
== '/' && !c2
)
521 if (c2
== '/' && !c1
)
526 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
528 size_t min_len
= (len1
< len2
) ? len1
: len2
;
529 int cmp
= memcmp(name1
, name2
, min_len
);
539 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
543 cmp
= name_compare(name1
, len1
, name2
, len2
);
554 static int index_name_stage_pos(struct index_state
*istate
, const char *name
, int namelen
, int stage
)
559 last
= istate
->cache_nr
;
560 while (last
> first
) {
561 int next
= first
+ ((last
- first
) >> 1);
562 struct cache_entry
*ce
= istate
->cache
[next
];
563 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
573 if (istate
->sparse_index
&&
575 /* Note: first <= istate->cache_nr */
576 struct cache_entry
*ce
= istate
->cache
[first
- 1];
579 * If we are in a sparse-index _and_ the entry before the
580 * insertion position is a sparse-directory entry that is
581 * an ancestor of 'name', then we need to expand the index
582 * and search again. This will only trigger once, because
583 * thereafter the index is fully expanded.
585 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
586 ce_namelen(ce
) < namelen
&&
587 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
588 ensure_full_index(istate
);
589 return index_name_stage_pos(istate
, name
, namelen
, stage
);
596 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
598 return index_name_stage_pos(istate
, name
, namelen
, 0);
601 int remove_index_entry_at(struct index_state
*istate
, int pos
)
603 struct cache_entry
*ce
= istate
->cache
[pos
];
605 record_resolve_undo(istate
, ce
);
606 remove_name_hash(istate
, ce
);
607 save_or_free_index_entry(istate
, ce
);
608 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
610 if (pos
>= istate
->cache_nr
)
612 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
613 istate
->cache_nr
- pos
);
618 * Remove all cache entries marked for removal, that is where
619 * CE_REMOVE is set in ce_flags. This is much more effective than
620 * calling remove_index_entry_at() for each entry to be removed.
622 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
624 struct cache_entry
**ce_array
= istate
->cache
;
627 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
628 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
630 cache_tree_invalidate_path(istate
,
632 untracked_cache_remove_from_index(istate
,
635 remove_name_hash(istate
, ce_array
[i
]);
636 save_or_free_index_entry(istate
, ce_array
[i
]);
639 ce_array
[j
++] = ce_array
[i
];
641 if (j
== istate
->cache_nr
)
643 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
644 istate
->cache_nr
= j
;
647 int remove_file_from_index(struct index_state
*istate
, const char *path
)
649 int pos
= index_name_pos(istate
, path
, strlen(path
));
652 cache_tree_invalidate_path(istate
, path
);
653 untracked_cache_remove_from_index(istate
, path
);
654 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
655 remove_index_entry_at(istate
, pos
);
659 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
661 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
664 static int index_name_pos_also_unmerged(struct index_state
*istate
,
665 const char *path
, int namelen
)
667 int pos
= index_name_pos(istate
, path
, namelen
);
668 struct cache_entry
*ce
;
673 /* maybe unmerged? */
675 if (pos
>= istate
->cache_nr
||
676 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
679 /* order of preference: stage 2, 1, 3 */
680 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
681 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
682 !compare_name(ce
, path
, namelen
))
687 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
689 int len
= ce_namelen(ce
);
690 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
694 * If we add a filename that aliases in the cache, we will use the
695 * name that we already have - but we don't want to update the same
696 * alias twice, because that implies that there were actually two
697 * different files with aliasing names!
699 * So we use the CE_ADDED flag to verify that the alias was an old
700 * one before we accept it as
702 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
703 struct cache_entry
*ce
,
704 struct cache_entry
*alias
)
707 struct cache_entry
*new_entry
;
709 if (alias
->ce_flags
& CE_ADDED
)
710 die(_("will not add file alias '%s' ('%s' already exists in index)"),
711 ce
->name
, alias
->name
);
713 /* Ok, create the new entry using the name of the existing alias */
714 len
= ce_namelen(alias
);
715 new_entry
= make_empty_cache_entry(istate
, len
);
716 memcpy(new_entry
->name
, alias
->name
, len
);
717 copy_cache_entry(new_entry
, ce
);
718 save_or_free_index_entry(istate
, ce
);
722 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
724 struct object_id oid
;
725 if (write_object_file("", 0, blob_type
, &oid
))
726 die(_("cannot create an empty blob in the object database"));
727 oidcpy(&ce
->oid
, &oid
);
730 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
732 int namelen
, was_same
;
733 mode_t st_mode
= st
->st_mode
;
734 struct cache_entry
*ce
, *alias
= NULL
;
735 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
736 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
737 int pretend
= flags
& ADD_CACHE_PRETEND
;
738 int intent_only
= flags
& ADD_CACHE_INTENT
;
739 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
740 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
741 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
742 struct object_id oid
;
744 if (flags
& ADD_CACHE_RENORMALIZE
)
745 hash_flags
|= HASH_RENORMALIZE
;
747 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
748 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
750 namelen
= strlen(path
);
751 if (S_ISDIR(st_mode
)) {
752 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
753 return error(_("'%s' does not have a commit checked out"), path
);
754 while (namelen
&& path
[namelen
-1] == '/')
757 ce
= make_empty_cache_entry(istate
, namelen
);
758 memcpy(ce
->name
, path
, namelen
);
759 ce
->ce_namelen
= namelen
;
761 fill_stat_cache_info(istate
, ce
, st
);
763 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
766 if (trust_executable_bit
&& has_symlinks
) {
767 ce
->ce_mode
= create_ce_mode(st_mode
);
769 /* If there is an existing entry, pick the mode bits and type
770 * from it, otherwise assume unexecutable regular file.
772 struct cache_entry
*ent
;
773 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
775 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
776 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
779 /* When core.ignorecase=true, determine if a directory of the same name but differing
780 * case already exists within the Git repository. If it does, ensure the directory
781 * case of the file being added to the repository matches (is folded into) the existing
782 * entry's directory case.
785 adjust_dirname_case(istate
, ce
->name
);
787 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
788 alias
= index_file_exists(istate
, ce
->name
,
789 ce_namelen(ce
), ignore_case
);
792 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
793 /* Nothing changed, really */
794 if (!S_ISGITLINK(alias
->ce_mode
))
795 ce_mark_uptodate(alias
);
796 alias
->ce_flags
|= CE_ADDED
;
798 discard_cache_entry(ce
);
803 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
804 discard_cache_entry(ce
);
805 return error(_("unable to index file '%s'"), path
);
808 set_object_name_for_intent_to_add_entry(ce
);
810 if (ignore_case
&& alias
&& different_name(ce
, alias
))
811 ce
= create_alias_ce(istate
, ce
, alias
);
812 ce
->ce_flags
|= CE_ADDED
;
814 /* It was suspected to be racily clean, but it turns out to be Ok */
817 oideq(&alias
->oid
, &ce
->oid
) &&
818 ce
->ce_mode
== alias
->ce_mode
);
821 discard_cache_entry(ce
);
822 else if (add_index_entry(istate
, ce
, add_option
)) {
823 discard_cache_entry(ce
);
824 return error(_("unable to add '%s' to index"), path
);
826 if (verbose
&& !was_same
)
827 printf("add '%s'\n", path
);
831 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
834 if (lstat(path
, &st
))
835 die_errno(_("unable to stat '%s'"), path
);
836 return add_to_index(istate
, path
, &st
, flags
);
839 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
841 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
844 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
845 struct mem_pool
*ce_mem_pool
)
848 return mem_pool__ce_calloc(ce_mem_pool
, len
);
849 return xcalloc(1, cache_entry_size(len
));
852 enum verify_path_result
{
858 static enum verify_path_result
verify_path_internal(const char *, unsigned);
860 int verify_path(const char *path
, unsigned mode
)
862 return verify_path_internal(path
, mode
) == PATH_OK
;
865 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
867 const struct object_id
*oid
,
870 unsigned int refresh_options
)
872 struct cache_entry
*ce
, *ret
;
875 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
876 error(_("invalid path '%s'"), path
);
881 ce
= make_empty_cache_entry(istate
, len
);
883 oidcpy(&ce
->oid
, oid
);
884 memcpy(ce
->name
, path
, len
);
885 ce
->ce_flags
= create_ce_flags(stage
);
886 ce
->ce_namelen
= len
;
887 ce
->ce_mode
= create_ce_mode(mode
);
889 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
891 discard_cache_entry(ce
);
895 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
896 const struct object_id
*oid
,
899 struct mem_pool
*ce_mem_pool
)
901 struct cache_entry
*ce
;
904 if (!verify_path(path
, mode
)) {
905 error(_("invalid path '%s'"), path
);
910 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
912 oidcpy(&ce
->oid
, oid
);
913 memcpy(ce
->name
, path
, len
);
914 ce
->ce_flags
= create_ce_flags(stage
);
915 ce
->ce_namelen
= len
;
916 ce
->ce_mode
= create_ce_mode(mode
);
922 * Chmod an index entry with either +x or -x.
924 * Returns -1 if the chmod for the particular cache entry failed (if it's
925 * not a regular file), -2 if an invalid flip argument is passed in, 0
928 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
931 if (!S_ISREG(ce
->ce_mode
))
938 ce
->ce_mode
&= ~0111;
943 cache_tree_invalidate_path(istate
, ce
->name
);
944 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
945 mark_fsmonitor_invalid(istate
, ce
);
946 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
951 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
953 int len
= ce_namelen(a
);
954 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
958 * We fundamentally don't like some paths: we don't want
959 * dot or dot-dot anywhere, and for obvious reasons don't
960 * want to recurse into ".git" either.
962 * Also, we don't want double slashes or slashes at the
963 * end that can make pathnames ambiguous.
965 static int verify_dotfile(const char *rest
, unsigned mode
)
968 * The first character was '.', but that
969 * has already been discarded, we now test
973 /* "." is not allowed */
974 if (*rest
== '\0' || is_dir_sep(*rest
))
979 * ".git" followed by NUL or slash is bad. Note that we match
980 * case-insensitively here, even if ignore_case is not set.
981 * This outlaws ".GIT" everywhere out of an abundance of caution,
982 * since there's really no good reason to allow it.
984 * Once we've seen ".git", we can also find ".gitmodules", etc (also
985 * case-insensitively).
989 if (rest
[1] != 'i' && rest
[1] != 'I')
991 if (rest
[2] != 't' && rest
[2] != 'T')
993 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
997 if (skip_iprefix(rest
, "modules", &rest
) &&
998 (*rest
== '\0' || is_dir_sep(*rest
)))
1003 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
1009 static enum verify_path_result
verify_path_internal(const char *path
,
1014 if (has_dos_drive_prefix(path
))
1015 return PATH_INVALID
;
1017 if (!is_valid_path(path
))
1018 return PATH_INVALID
;
1024 if (is_dir_sep(c
)) {
1028 if (is_hfs_dotgit(path
))
1029 return PATH_INVALID
;
1030 if (S_ISLNK(mode
)) {
1031 if (is_hfs_dotgitmodules(path
))
1032 return PATH_INVALID
;
1036 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1038 return PATH_INVALID
;
1040 if (is_ntfs_dotgit(path
))
1041 return PATH_INVALID
;
1042 if (S_ISLNK(mode
)) {
1043 if (is_ntfs_dotgitmodules(path
))
1044 return PATH_INVALID
;
1049 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1051 return PATH_INVALID
;
1053 * allow terminating directory separators for
1054 * sparse directory entries.
1057 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1059 } else if (c
== '\\' && protect_ntfs
) {
1060 if (is_ntfs_dotgit(path
))
1061 return PATH_INVALID
;
1062 if (S_ISLNK(mode
)) {
1063 if (is_ntfs_dotgitmodules(path
))
1064 return PATH_INVALID
;
1073 * Do we have another file that has the beginning components being a
1074 * proper superset of the name we're trying to add?
1076 static int has_file_name(struct index_state
*istate
,
1077 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1080 int len
= ce_namelen(ce
);
1081 int stage
= ce_stage(ce
);
1082 const char *name
= ce
->name
;
1084 while (pos
< istate
->cache_nr
) {
1085 struct cache_entry
*p
= istate
->cache
[pos
++];
1087 if (len
>= ce_namelen(p
))
1089 if (memcmp(name
, p
->name
, len
))
1091 if (ce_stage(p
) != stage
)
1093 if (p
->name
[len
] != '/')
1095 if (p
->ce_flags
& CE_REMOVE
)
1100 remove_index_entry_at(istate
, --pos
);
1107 * Like strcmp(), but also return the offset of the first change.
1108 * If strings are equal, return the length.
1110 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1115 return strcmp(s1
, s2
);
1117 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1122 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1126 * Do we have another file with a pathname that is a proper
1127 * subset of the name we're trying to add?
1129 * That is, is there another file in the index with a path
1130 * that matches a sub-directory in the given entry?
1132 static int has_dir_name(struct index_state
*istate
,
1133 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1136 int stage
= ce_stage(ce
);
1137 const char *name
= ce
->name
;
1138 const char *slash
= name
+ ce_namelen(ce
);
1143 * We are frequently called during an iteration on a sorted
1144 * list of pathnames and while building a new index. Therefore,
1145 * there is a high probability that this entry will eventually
1146 * be appended to the index, rather than inserted in the middle.
1147 * If we can confirm that, we can avoid binary searches on the
1148 * components of the pathname.
1150 * Compare the entry's full path with the last path in the index.
1152 if (istate
->cache_nr
> 0) {
1153 cmp_last
= strcmp_offset(name
,
1154 istate
->cache
[istate
->cache_nr
- 1]->name
,
1157 if (len_eq_last
== 0) {
1159 * The entry sorts AFTER the last one in the
1160 * index and their paths have no common prefix,
1161 * so there cannot be a F/D conflict.
1166 * The entry sorts AFTER the last one in the
1167 * index, but has a common prefix. Fall through
1168 * to the loop below to disect the entry's path
1169 * and see where the difference is.
1172 } else if (cmp_last
== 0) {
1174 * The entry exactly matches the last one in the
1175 * index, but because of multiple stage and CE_REMOVE
1176 * items, we fall through and let the regular search
1186 if (*--slash
== '/')
1188 if (slash
<= ce
->name
)
1195 * (len + 1) is a directory boundary (including
1196 * the trailing slash). And since the loop is
1197 * decrementing "slash", the first iteration is
1198 * the longest directory prefix; subsequent
1199 * iterations consider parent directories.
1202 if (len
+ 1 <= len_eq_last
) {
1204 * The directory prefix (including the trailing
1205 * slash) also appears as a prefix in the last
1206 * entry, so the remainder cannot collide (because
1207 * strcmp said the whole path was greater).
1212 * LT: last: xxx/file_A
1218 if (len
> len_eq_last
) {
1220 * This part of the directory prefix (excluding
1221 * the trailing slash) is longer than the known
1222 * equal portions, so this sub-directory cannot
1223 * collide with a file.
1232 * This is a possible collision. Fall through and
1233 * let the regular search code handle it.
1240 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
1243 * Found one, but not so fast. This could
1244 * be a marker that says "I was here, but
1245 * I am being removed". Such an entry is
1246 * not a part of the resulting tree, and
1247 * it is Ok to have a directory at the same
1250 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1254 remove_index_entry_at(istate
, pos
);
1262 * Trivial optimization: if we find an entry that
1263 * already matches the sub-directory, then we know
1264 * we're ok, and we can exit.
1266 while (pos
< istate
->cache_nr
) {
1267 struct cache_entry
*p
= istate
->cache
[pos
];
1268 if ((ce_namelen(p
) <= len
) ||
1269 (p
->name
[len
] != '/') ||
1270 memcmp(p
->name
, name
, len
))
1271 break; /* not our subdirectory */
1272 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1274 * p is at the same stage as our entry, and
1275 * is a subdirectory of what we are looking
1276 * at, so we cannot have conflicts at our
1277 * level or anything shorter.
1286 /* We may be in a situation where we already have path/file and path
1287 * is being added, or we already have path and path/file is being
1288 * added. Either one would result in a nonsense tree that has path
1289 * twice when git-write-tree tries to write it out. Prevent it.
1291 * If ok-to-replace is specified, we remove the conflicting entries
1292 * from the cache so the caller should recompute the insert position.
1293 * When this happens, we return non-zero.
1295 static int check_file_directory_conflict(struct index_state
*istate
,
1296 const struct cache_entry
*ce
,
1297 int pos
, int ok_to_replace
)
1302 * When ce is an "I am going away" entry, we allow it to be added
1304 if (ce
->ce_flags
& CE_REMOVE
)
1308 * We check if the path is a sub-path of a subsequent pathname
1309 * first, since removing those will not change the position
1312 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1315 * Then check if the path might have a clashing sub-directory
1318 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1321 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1324 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1325 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1326 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1327 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1329 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1330 cache_tree_invalidate_path(istate
, ce
->name
);
1333 * If this entry's path sorts after the last entry in the index,
1334 * we can avoid searching for it.
1336 if (istate
->cache_nr
> 0 &&
1337 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1338 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1340 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1342 /* existing match? Just replace it. */
1345 replace_index_entry(istate
, pos
, ce
);
1350 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1351 untracked_cache_add_to_index(istate
, ce
->name
);
1354 * Inserting a merged entry ("stage 0") into the index
1355 * will always replace all non-merged entries..
1357 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1358 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1360 if (!remove_index_entry_at(istate
, pos
))
1367 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1368 return error(_("invalid path '%s'"), ce
->name
);
1370 if (!skip_df_check
&&
1371 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1373 return error(_("'%s' appears as both a file and as a directory"),
1375 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1381 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1385 if (option
& ADD_CACHE_JUST_APPEND
)
1386 pos
= istate
->cache_nr
;
1389 ret
= add_index_entry_with_check(istate
, ce
, option
);
1395 /* Make sure the array is big enough .. */
1396 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1400 if (istate
->cache_nr
> pos
+ 1)
1401 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1402 istate
->cache_nr
- pos
- 1);
1403 set_index_entry(istate
, pos
, ce
);
1404 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1409 * "refresh" does not calculate a new sha1 file or bring the
1410 * cache up-to-date for mode/content changes. But what it
1411 * _does_ do is to "re-match" the stat information of a file
1412 * with the cache, so that you can refresh the cache for a
1413 * file that hasn't been changed but where the stat entry is
1416 * For example, you'd want to do this after doing a "git-read-tree",
1417 * to link up the stat cache details with the proper files.
1419 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1420 struct cache_entry
*ce
,
1421 unsigned int options
, int *err
,
1427 struct cache_entry
*updated
;
1429 int refresh
= options
& CE_MATCH_REFRESH
;
1430 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1431 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1432 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1433 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1435 if (!refresh
|| ce_uptodate(ce
))
1438 if (!ignore_fsmonitor
)
1439 refresh_fsmonitor(istate
);
1441 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1442 * that the change to the work tree does not matter and told
1445 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1446 ce_mark_uptodate(ce
);
1449 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1450 ce_mark_uptodate(ce
);
1453 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1454 ce_mark_uptodate(ce
);
1458 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1468 if (lstat(ce
->name
, &st
) < 0) {
1469 if (ignore_missing
&& errno
== ENOENT
)
1476 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1478 *changed_ret
= changed
;
1481 * The path is unchanged. If we were told to ignore
1482 * valid bit, then we did the actual stat check and
1483 * found that the entry is unmodified. If the entry
1484 * is not marked VALID, this is the place to mark it
1485 * valid again, under "assume unchanged" mode.
1487 if (ignore_valid
&& assume_unchanged
&&
1488 !(ce
->ce_flags
& CE_VALID
))
1489 ; /* mark this one VALID again */
1492 * We do not mark the index itself "modified"
1493 * because CE_UPTODATE flag is in-core only;
1494 * we are not going to write this change out.
1496 if (!S_ISGITLINK(ce
->ce_mode
)) {
1497 ce_mark_uptodate(ce
);
1498 mark_fsmonitor_valid(istate
, ce
);
1506 if (ie_modified(istate
, ce
, &st
, options
)) {
1512 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1513 copy_cache_entry(updated
, ce
);
1514 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1515 fill_stat_cache_info(istate
, updated
, &st
);
1517 * If ignore_valid is not set, we should leave CE_VALID bit
1518 * alone. Otherwise, paths marked with --no-assume-unchanged
1519 * (i.e. things to be edited) will reacquire CE_VALID bit
1520 * automatically, which is not really what we want.
1522 if (!ignore_valid
&& assume_unchanged
&&
1523 !(ce
->ce_flags
& CE_VALID
))
1524 updated
->ce_flags
&= ~CE_VALID
;
1526 /* istate->cache_changed is updated in the caller */
1530 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1531 int * first
, const char *header_msg
)
1533 if (in_porcelain
&& *first
&& header_msg
) {
1534 printf("%s\n", header_msg
);
1540 int repo_refresh_and_write_index(struct repository
*repo
,
1541 unsigned int refresh_flags
,
1542 unsigned int write_flags
,
1544 const struct pathspec
*pathspec
,
1545 char *seen
, const char *header_msg
)
1547 struct lock_file lock_file
= LOCK_INIT
;
1550 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1551 if (!gentle
&& fd
< 0)
1553 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1555 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1561 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1562 const struct pathspec
*pathspec
,
1563 char *seen
, const char *header_msg
)
1567 int really
= (flags
& REFRESH_REALLY
) != 0;
1568 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1569 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1570 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1571 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1572 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1574 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1575 unsigned int options
= (CE_MATCH_REFRESH
|
1576 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1577 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1578 const char *modified_fmt
;
1579 const char *deleted_fmt
;
1580 const char *typechange_fmt
;
1581 const char *added_fmt
;
1582 const char *unmerged_fmt
;
1583 struct progress
*progress
= NULL
;
1584 int t2_sum_lstat
= 0;
1585 int t2_sum_scan
= 0;
1587 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1588 progress
= start_delayed_progress(_("Refresh index"),
1591 trace_performance_enter();
1592 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1593 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1594 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1595 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1596 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1598 * Use the multi-threaded preload_index() to refresh most of the
1599 * cache entries quickly then in the single threaded loop below,
1600 * we only have to do the special cases that are left.
1602 preload_index(istate
, pathspec
, 0);
1603 trace2_region_enter("index", "refresh", NULL
);
1605 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1606 struct cache_entry
*ce
, *new_entry
;
1607 int cache_errno
= 0;
1610 int t2_did_lstat
= 0;
1611 int t2_did_scan
= 0;
1613 ce
= istate
->cache
[i
];
1614 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1616 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1620 * If this entry is a sparse directory, then there isn't
1621 * any stat() information to update. Ignore the entry.
1623 if (S_ISSPARSEDIR(ce
->ce_mode
))
1626 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1630 while ((i
< istate
->cache_nr
) &&
1631 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1637 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1638 &first
, header_msg
);
1646 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1647 &cache_errno
, &changed
,
1648 &t2_did_lstat
, &t2_did_scan
);
1649 t2_sum_lstat
+= t2_did_lstat
;
1650 t2_sum_scan
+= t2_did_scan
;
1651 if (new_entry
== ce
)
1653 display_progress(progress
, i
);
1657 if (really
&& cache_errno
== EINVAL
) {
1658 /* If we are doing --really-refresh that
1659 * means the index is not valid anymore.
1661 ce
->ce_flags
&= ~CE_VALID
;
1662 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1663 mark_fsmonitor_invalid(istate
, ce
);
1664 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1669 if (cache_errno
== ENOENT
)
1671 else if (ce_intent_to_add(ce
))
1672 fmt
= added_fmt
; /* must be before other checks */
1673 else if (changed
& TYPE_CHANGED
)
1674 fmt
= typechange_fmt
;
1678 ce
->name
, in_porcelain
, &first
, header_msg
);
1683 replace_index_entry(istate
, i
, new_entry
);
1685 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1686 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1687 trace2_region_leave("index", "refresh", NULL
);
1688 display_progress(progress
, istate
->cache_nr
);
1689 stop_progress(&progress
);
1690 trace_performance_leave("refresh index");
1694 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1695 struct cache_entry
*ce
,
1696 unsigned int options
)
1698 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1702 /*****************************************************************
1704 *****************************************************************/
1706 #define INDEX_FORMAT_DEFAULT 3
1708 static unsigned int get_index_format_default(struct repository
*r
)
1710 char *envversion
= getenv("GIT_INDEX_VERSION");
1712 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1715 prepare_repo_settings(r
);
1717 if (r
->settings
.index_version
>= 0)
1718 version
= r
->settings
.index_version
;
1719 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1720 warning(_("index.version set, but the value is invalid.\n"
1721 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1722 return INDEX_FORMAT_DEFAULT
;
1727 version
= strtoul(envversion
, &endp
, 10);
1729 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1730 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1731 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1732 version
= INDEX_FORMAT_DEFAULT
;
1738 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1739 * Again - this is just a (very strong in practice) heuristic that
1740 * the inode hasn't changed.
1742 * We save the fields in big-endian order to allow using the
1743 * index file over NFS transparently.
1745 struct ondisk_cache_entry
{
1746 struct cache_time ctime
;
1747 struct cache_time mtime
;
1755 * unsigned char hash[hashsz];
1757 * if (flags & CE_EXTENDED)
1760 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1761 char name
[FLEX_ARRAY
];
1764 /* These are only used for v3 or lower */
1765 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1766 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1767 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1768 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1769 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1770 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1771 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1773 /* Allow fsck to force verification of the index checksum. */
1774 int verify_index_checksum
;
1776 /* Allow fsck to force verification of the cache entry order. */
1777 int verify_ce_order
;
1779 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1782 unsigned char hash
[GIT_MAX_RAWSZ
];
1785 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1786 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1787 hdr_version
= ntohl(hdr
->hdr_version
);
1788 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1789 return error(_("bad index version %d"), hdr_version
);
1791 if (!verify_index_checksum
)
1794 the_hash_algo
->init_fn(&c
);
1795 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1796 the_hash_algo
->final_fn(hash
, &c
);
1797 if (!hasheq(hash
, (unsigned char *)hdr
+ size
- the_hash_algo
->rawsz
))
1798 return error(_("bad index file sha1 signature"));
1802 static int read_index_extension(struct index_state
*istate
,
1803 const char *ext
, const char *data
, unsigned long sz
)
1805 switch (CACHE_EXT(ext
)) {
1806 case CACHE_EXT_TREE
:
1807 istate
->cache_tree
= cache_tree_read(data
, sz
);
1809 case CACHE_EXT_RESOLVE_UNDO
:
1810 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1812 case CACHE_EXT_LINK
:
1813 if (read_link_extension(istate
, data
, sz
))
1816 case CACHE_EXT_UNTRACKED
:
1817 istate
->untracked
= read_untracked_extension(data
, sz
);
1819 case CACHE_EXT_FSMONITOR
:
1820 read_fsmonitor_extension(istate
, data
, sz
);
1822 case CACHE_EXT_ENDOFINDEXENTRIES
:
1823 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1824 /* already handled in do_read_index() */
1826 case CACHE_EXT_SPARSE_DIRECTORIES
:
1827 /* no content, only an indicator */
1828 istate
->sparse_index
= 1;
1831 if (*ext
< 'A' || 'Z' < *ext
)
1832 return error(_("index uses %.4s extension, which we do not understand"),
1834 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1840 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1841 unsigned int version
,
1842 struct ondisk_cache_entry
*ondisk
,
1843 unsigned long *ent_size
,
1844 const struct cache_entry
*previous_ce
)
1846 struct cache_entry
*ce
;
1849 const unsigned hashsz
= the_hash_algo
->rawsz
;
1850 const uint16_t *flagsp
= (const uint16_t *)(ondisk
->data
+ hashsz
);
1852 size_t copy_len
= 0;
1854 * Adjacent cache entries tend to share the leading paths, so it makes
1855 * sense to only store the differences in later entries. In the v4
1856 * on-disk format of the index, each on-disk cache entry stores the
1857 * number of bytes to be stripped from the end of the previous name,
1858 * and the bytes to append to the result, to come up with its name.
1860 int expand_name_field
= version
== 4;
1862 /* On-disk flags are just 16 bits */
1863 flags
= get_be16(flagsp
);
1864 len
= flags
& CE_NAMEMASK
;
1866 if (flags
& CE_EXTENDED
) {
1868 extended_flags
= get_be16(flagsp
+ 1) << 16;
1869 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1870 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1871 die(_("unknown index entry format 0x%08x"), extended_flags
);
1872 flags
|= extended_flags
;
1873 name
= (const char *)(flagsp
+ 2);
1876 name
= (const char *)(flagsp
+ 1);
1878 if (expand_name_field
) {
1879 const unsigned char *cp
= (const unsigned char *)name
;
1880 size_t strip_len
, previous_len
;
1882 /* If we're at the beginning of a block, ignore the previous name */
1883 strip_len
= decode_varint(&cp
);
1885 previous_len
= previous_ce
->ce_namelen
;
1886 if (previous_len
< strip_len
)
1887 die(_("malformed name field in the index, near path '%s'"),
1889 copy_len
= previous_len
- strip_len
;
1891 name
= (const char *)cp
;
1894 if (len
== CE_NAMEMASK
) {
1896 if (expand_name_field
)
1900 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1902 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1903 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1904 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1905 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1906 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1907 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1908 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1909 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1910 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1911 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1912 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1913 ce
->ce_namelen
= len
;
1915 oidread(&ce
->oid
, ondisk
->data
);
1916 memcpy(ce
->name
, name
, len
);
1917 ce
->name
[len
] = '\0';
1919 if (expand_name_field
) {
1921 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1922 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1923 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1925 memcpy(ce
->name
, name
, len
+ 1);
1926 *ent_size
= ondisk_ce_size(ce
);
1931 static void check_ce_order(struct index_state
*istate
)
1935 if (!verify_ce_order
)
1938 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1939 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1940 struct cache_entry
*next_ce
= istate
->cache
[i
];
1941 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1943 if (0 < name_compare
)
1944 die(_("unordered stage entries in index"));
1945 if (!name_compare
) {
1947 die(_("multiple stage entries for merged file '%s'"),
1949 if (ce_stage(ce
) > ce_stage(next_ce
))
1950 die(_("unordered stage entries for '%s'"),
1956 static void tweak_untracked_cache(struct index_state
*istate
)
1958 struct repository
*r
= the_repository
;
1960 prepare_repo_settings(r
);
1962 switch (r
->settings
.core_untracked_cache
) {
1963 case UNTRACKED_CACHE_REMOVE
:
1964 remove_untracked_cache(istate
);
1966 case UNTRACKED_CACHE_WRITE
:
1967 add_untracked_cache(istate
);
1969 case UNTRACKED_CACHE_KEEP
:
1971 * Either an explicit "core.untrackedCache=keep", the
1972 * default if "core.untrackedCache" isn't configured,
1973 * or a fallback on an unknown "core.untrackedCache"
1980 static void tweak_split_index(struct index_state
*istate
)
1982 switch (git_config_get_split_index()) {
1983 case -1: /* unset: do nothing */
1986 remove_split_index(istate
);
1989 add_split_index(istate
);
1991 default: /* unknown value: do nothing */
1996 static void post_read_index_from(struct index_state
*istate
)
1998 check_ce_order(istate
);
1999 tweak_untracked_cache(istate
);
2000 tweak_split_index(istate
);
2001 tweak_fsmonitor(istate
);
2004 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
2006 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
2009 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
2011 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
2014 * Account for potential alignment differences.
2016 per_entry
+= align_padding_size(per_entry
, 0);
2017 return ondisk_size
+ entries
* per_entry
;
2020 struct index_entry_offset
2022 /* starting byte offset into index file, count of index entries in this block */
2026 struct index_entry_offset_table
2029 struct index_entry_offset entries
[FLEX_ARRAY
];
2032 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2033 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2035 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2036 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2038 struct load_index_extensions
2041 struct index_state
*istate
;
2044 unsigned long src_offset
;
2047 static void *load_index_extensions(void *_data
)
2049 struct load_index_extensions
*p
= _data
;
2050 unsigned long src_offset
= p
->src_offset
;
2052 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2053 /* After an array of active_nr index entries,
2054 * there can be arbitrary number of extended
2055 * sections, each of which is prefixed with
2056 * extension name (4-byte) and section length
2057 * in 4-byte network byte order.
2059 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2060 if (read_index_extension(p
->istate
,
2061 p
->mmap
+ src_offset
,
2062 p
->mmap
+ src_offset
+ 8,
2064 munmap((void *)p
->mmap
, p
->mmap_size
);
2065 die(_("index file corrupt"));
2068 src_offset
+= extsize
;
2075 * A helper function that will load the specified range of cache entries
2076 * from the memory mapped file and add them to the given index.
2078 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2079 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2080 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2083 unsigned long src_offset
= start_offset
;
2085 for (i
= offset
; i
< offset
+ nr
; i
++) {
2086 struct ondisk_cache_entry
*disk_ce
;
2087 struct cache_entry
*ce
;
2088 unsigned long consumed
;
2090 disk_ce
= (struct ondisk_cache_entry
*)(mmap
+ src_offset
);
2091 ce
= create_from_disk(ce_mem_pool
, istate
->version
, disk_ce
, &consumed
, previous_ce
);
2092 set_index_entry(istate
, i
, ce
);
2094 src_offset
+= consumed
;
2097 return src_offset
- start_offset
;
2100 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2101 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2103 unsigned long consumed
;
2105 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2106 if (istate
->version
== 4) {
2107 mem_pool_init(istate
->ce_mem_pool
,
2108 estimate_cache_size_from_compressed(istate
->cache_nr
));
2110 mem_pool_init(istate
->ce_mem_pool
,
2111 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2114 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2115 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2120 * Mostly randomly chosen maximum thread counts: we
2121 * cap the parallelism to online_cpus() threads, and we want
2122 * to have at least 10000 cache entries per thread for it to
2123 * be worth starting a thread.
2126 #define THREAD_COST (10000)
2128 struct load_cache_entries_thread_data
2131 struct index_state
*istate
;
2132 struct mem_pool
*ce_mem_pool
;
2135 struct index_entry_offset_table
*ieot
;
2136 int ieot_start
; /* starting index into the ieot array */
2137 int ieot_blocks
; /* count of ieot entries to process */
2138 unsigned long consumed
; /* return # of bytes in index file processed */
2142 * A thread proc to run the load_cache_entries() computation
2143 * across multiple background threads.
2145 static void *load_cache_entries_thread(void *_data
)
2147 struct load_cache_entries_thread_data
*p
= _data
;
2150 /* iterate across all ieot blocks assigned to this thread */
2151 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2152 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2153 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2154 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2159 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2160 int nr_threads
, struct index_entry_offset_table
*ieot
)
2162 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2163 struct load_cache_entries_thread_data
*data
;
2164 unsigned long consumed
= 0;
2166 /* a little sanity checking */
2167 if (istate
->name_hash_initialized
)
2168 BUG("the name hash isn't thread safe");
2170 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2171 mem_pool_init(istate
->ce_mem_pool
, 0);
2173 /* ensure we have no more threads than we have blocks to process */
2174 if (nr_threads
> ieot
->nr
)
2175 nr_threads
= ieot
->nr
;
2176 CALLOC_ARRAY(data
, nr_threads
);
2178 offset
= ieot_start
= 0;
2179 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2180 for (i
= 0; i
< nr_threads
; i
++) {
2181 struct load_cache_entries_thread_data
*p
= &data
[i
];
2184 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2185 ieot_blocks
= ieot
->nr
- ieot_start
;
2191 p
->ieot_start
= ieot_start
;
2192 p
->ieot_blocks
= ieot_blocks
;
2194 /* create a mem_pool for each thread */
2196 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2197 nr
+= p
->ieot
->entries
[j
].nr
;
2198 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2199 if (istate
->version
== 4) {
2200 mem_pool_init(p
->ce_mem_pool
,
2201 estimate_cache_size_from_compressed(nr
));
2203 mem_pool_init(p
->ce_mem_pool
,
2204 estimate_cache_size(mmap_size
, nr
));
2207 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2209 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2211 /* increment by the number of cache entries in the ieot block being processed */
2212 for (j
= 0; j
< ieot_blocks
; j
++)
2213 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2214 ieot_start
+= ieot_blocks
;
2217 for (i
= 0; i
< nr_threads
; i
++) {
2218 struct load_cache_entries_thread_data
*p
= &data
[i
];
2220 err
= pthread_join(p
->pthread
, NULL
);
2222 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2223 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2224 consumed
+= p
->consumed
;
2232 /* remember to discard_cache() before reading a different cache! */
2233 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2237 unsigned long src_offset
;
2238 const struct cache_header
*hdr
;
2241 struct load_index_extensions p
;
2242 size_t extension_offset
= 0;
2243 int nr_threads
, cpus
;
2244 struct index_entry_offset_table
*ieot
= NULL
;
2246 if (istate
->initialized
)
2247 return istate
->cache_nr
;
2249 istate
->timestamp
.sec
= 0;
2250 istate
->timestamp
.nsec
= 0;
2251 fd
= open(path
, O_RDONLY
);
2253 if (!must_exist
&& errno
== ENOENT
)
2255 die_errno(_("%s: index file open failed"), path
);
2259 die_errno(_("%s: cannot stat the open index"), path
);
2261 mmap_size
= xsize_t(st
.st_size
);
2262 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2263 die(_("%s: index file smaller than expected"), path
);
2265 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2266 if (mmap
== MAP_FAILED
)
2267 die_errno(_("%s: unable to map index file%s"), path
,
2271 hdr
= (const struct cache_header
*)mmap
;
2272 if (verify_hdr(hdr
, mmap_size
) < 0)
2275 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2276 istate
->version
= ntohl(hdr
->hdr_version
);
2277 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2278 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2279 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2280 istate
->initialized
= 1;
2284 p
.mmap_size
= mmap_size
;
2286 src_offset
= sizeof(*hdr
);
2288 if (git_config_get_index_threads(&nr_threads
))
2291 /* TODO: does creating more threads than cores help? */
2293 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2294 cpus
= online_cpus();
2295 if (nr_threads
> cpus
)
2302 if (nr_threads
> 1) {
2303 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2304 if (extension_offset
) {
2307 p
.src_offset
= extension_offset
;
2308 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2310 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2317 * Locate and read the index entry offset table so that we can use it
2318 * to multi-thread the reading of the cache entries.
2320 if (extension_offset
&& nr_threads
> 1)
2321 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2324 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2327 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2330 istate
->timestamp
.sec
= st
.st_mtime
;
2331 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2333 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2334 if (extension_offset
) {
2335 int ret
= pthread_join(p
.pthread
, NULL
);
2337 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2339 p
.src_offset
= src_offset
;
2340 load_index_extensions(&p
);
2342 munmap((void *)mmap
, mmap_size
);
2345 * TODO trace2: replace "the_repository" with the actual repo instance
2346 * that is associated with the given "istate".
2348 trace2_data_intmax("index", the_repository
, "read/version",
2350 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2354 istate
->repo
= the_repository
;
2355 prepare_repo_settings(istate
->repo
);
2356 if (istate
->repo
->settings
.command_requires_full_index
)
2357 ensure_full_index(istate
);
2359 return istate
->cache_nr
;
2362 munmap((void *)mmap
, mmap_size
);
2363 die(_("index file corrupt"));
2367 * Signal that the shared index is used by updating its mtime.
2369 * This way, shared index can be removed if they have not been used
2372 static void freshen_shared_index(const char *shared_index
, int warn
)
2374 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2375 warning(_("could not freshen shared index '%s'"), shared_index
);
2378 int read_index_from(struct index_state
*istate
, const char *path
,
2381 struct split_index
*split_index
;
2386 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2387 if (istate
->initialized
)
2388 return istate
->cache_nr
;
2391 * TODO trace2: replace "the_repository" with the actual repo instance
2392 * that is associated with the given "istate".
2394 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2396 trace_performance_enter();
2397 ret
= do_read_index(istate
, path
, 0);
2398 trace_performance_leave("read cache %s", path
);
2399 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2402 split_index
= istate
->split_index
;
2403 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2404 post_read_index_from(istate
);
2408 trace_performance_enter();
2409 if (split_index
->base
)
2410 discard_index(split_index
->base
);
2412 CALLOC_ARRAY(split_index
->base
, 1);
2414 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2415 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2416 trace2_region_enter_printf("index", "shared/do_read_index",
2417 the_repository
, "%s", base_path
);
2418 ret
= do_read_index(split_index
->base
, base_path
, 0);
2419 trace2_region_leave_printf("index", "shared/do_read_index",
2420 the_repository
, "%s", base_path
);
2422 char *path_copy
= xstrdup(path
);
2423 const char *base_path2
= xstrfmt("%s/sharedindex.%s",
2427 trace2_region_enter_printf("index", "shared/do_read_index",
2428 the_repository
, "%s", base_path2
);
2429 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2430 trace2_region_leave_printf("index", "shared/do_read_index",
2431 the_repository
, "%s", base_path2
);
2433 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2434 die(_("broken index, expect %s in %s, got %s"),
2435 base_oid_hex
, base_path
,
2436 oid_to_hex(&split_index
->base
->oid
));
2438 freshen_shared_index(base_path
, 0);
2439 merge_base_index(istate
);
2440 post_read_index_from(istate
);
2441 trace_performance_leave("read cache %s", base_path
);
2446 int is_index_unborn(struct index_state
*istate
)
2448 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2451 int discard_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 istate
->cache_nr
= 0;
2464 istate
->cache_changed
= 0;
2465 istate
->timestamp
.sec
= 0;
2466 istate
->timestamp
.nsec
= 0;
2467 free_name_hash(istate
);
2468 cache_tree_free(&(istate
->cache_tree
));
2469 istate
->initialized
= 0;
2470 istate
->fsmonitor_has_run_once
= 0;
2471 FREE_AND_NULL(istate
->fsmonitor_last_update
);
2472 FREE_AND_NULL(istate
->cache
);
2473 istate
->cache_alloc
= 0;
2474 discard_split_index(istate
);
2475 free_untracked_cache(istate
->untracked
);
2476 istate
->untracked
= NULL
;
2478 if (istate
->ce_mem_pool
) {
2479 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2480 FREE_AND_NULL(istate
->ce_mem_pool
);
2487 * Validate the cache entries of this index.
2488 * All cache entries associated with this index
2489 * should have been allocated by the memory pool
2490 * associated with this index, or by a referenced
2493 void validate_cache_entries(const struct index_state
*istate
)
2497 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2500 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2502 BUG("cache entry is not allocated from expected memory pool");
2503 } else if (!istate
->ce_mem_pool
||
2504 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2505 if (!istate
->split_index
||
2506 !istate
->split_index
->base
||
2507 !istate
->split_index
->base
->ce_mem_pool
||
2508 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2509 BUG("cache entry is not allocated from expected memory pool");
2514 if (istate
->split_index
)
2515 validate_cache_entries(istate
->split_index
->base
);
2518 int unmerged_index(const struct index_state
*istate
)
2521 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2522 if (ce_stage(istate
->cache
[i
]))
2528 int repo_index_has_changes(struct repository
*repo
,
2532 struct index_state
*istate
= repo
->index
;
2533 struct object_id cmp
;
2537 cmp
= tree
->object
.oid
;
2538 if (tree
|| !get_oid_tree("HEAD", &cmp
)) {
2539 struct diff_options opt
;
2541 repo_diff_setup(repo
, &opt
);
2542 opt
.flags
.exit_with_status
= 1;
2544 opt
.flags
.quick
= 1;
2545 diff_setup_done(&opt
);
2546 do_diff_cache(&cmp
, &opt
);
2548 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2550 strbuf_addch(sb
, ' ');
2551 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2554 return opt
.flags
.has_changes
!= 0;
2556 /* TODO: audit for interaction with sparse-index. */
2557 ensure_full_index(istate
);
2558 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2560 strbuf_addch(sb
, ' ');
2561 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2563 return !!istate
->cache_nr
;
2567 static int write_index_ext_header(struct hashfile
*f
,
2568 git_hash_ctx
*eoie_f
,
2572 hashwrite_be32(f
, ext
);
2573 hashwrite_be32(f
, sz
);
2578 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2579 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2584 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2585 struct cache_entry
*ce
)
2588 * The only thing we care about in this function is to smudge the
2589 * falsely clean entry due to touch-update-touch race, so we leave
2590 * everything else as they are. We are called for entries whose
2591 * ce_stat_data.sd_mtime match the index file mtime.
2593 * Note that this actually does not do much for gitlinks, for
2594 * which ce_match_stat_basic() always goes to the actual
2595 * contents. The caller checks with is_racy_timestamp() which
2596 * always says "no" for gitlinks, so we are not called for them ;-)
2600 if (lstat(ce
->name
, &st
) < 0)
2602 if (ce_match_stat_basic(ce
, &st
))
2604 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2605 /* This is "racily clean"; smudge it. Note that this
2606 * is a tricky code. At first glance, it may appear
2607 * that it can break with this sequence:
2609 * $ echo xyzzy >frotz
2610 * $ git-update-index --add frotz
2613 * $ echo filfre >nitfol
2614 * $ git-update-index --add nitfol
2616 * but it does not. When the second update-index runs,
2617 * it notices that the entry "frotz" has the same timestamp
2618 * as index, and if we were to smudge it by resetting its
2619 * size to zero here, then the object name recorded
2620 * in index is the 6-byte file but the cached stat information
2621 * becomes zero --- which would then match what we would
2622 * obtain from the filesystem next time we stat("frotz").
2624 * However, the second update-index, before calling
2625 * this function, notices that the cached size is 6
2626 * bytes and what is on the filesystem is an empty
2627 * file, and never calls us, so the cached size information
2628 * for "frotz" stays 6 which does not match the filesystem.
2630 ce
->ce_stat_data
.sd_size
= 0;
2634 /* Copy miscellaneous fields but not the name */
2635 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2636 struct cache_entry
*ce
)
2639 const unsigned hashsz
= the_hash_algo
->rawsz
;
2640 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2642 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2643 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2644 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2645 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2646 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2647 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2648 ondisk
->mode
= htonl(ce
->ce_mode
);
2649 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2650 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2651 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2652 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2654 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2655 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2656 flagsp
[0] = htons(flags
);
2657 if (ce
->ce_flags
& CE_EXTENDED
) {
2658 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2662 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2663 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2666 unsigned int saved_namelen
;
2667 int stripped_name
= 0;
2668 static unsigned char padding
[8] = { 0x00 };
2670 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2671 saved_namelen
= ce_namelen(ce
);
2676 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2678 if (!previous_name
) {
2679 int len
= ce_namelen(ce
);
2680 copy_cache_entry_to_ondisk(ondisk
, ce
);
2681 hashwrite(f
, ondisk
, size
);
2682 hashwrite(f
, ce
->name
, len
);
2683 hashwrite(f
, padding
, align_padding_size(size
, len
));
2685 int common
, to_remove
, prefix_size
;
2686 unsigned char to_remove_vi
[16];
2688 (ce
->name
[common
] &&
2689 common
< previous_name
->len
&&
2690 ce
->name
[common
] == previous_name
->buf
[common
]);
2692 ; /* still matching */
2693 to_remove
= previous_name
->len
- common
;
2694 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2696 copy_cache_entry_to_ondisk(ondisk
, ce
);
2697 hashwrite(f
, ondisk
, size
);
2698 hashwrite(f
, to_remove_vi
, prefix_size
);
2699 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2700 hashwrite(f
, padding
, 1);
2702 strbuf_splice(previous_name
, common
, to_remove
,
2703 ce
->name
+ common
, ce_namelen(ce
) - common
);
2705 if (stripped_name
) {
2706 ce
->ce_namelen
= saved_namelen
;
2707 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2714 * This function verifies if index_state has the correct sha1 of the
2715 * index file. Don't die if we have any other failure, just return 0.
2717 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2722 unsigned char hash
[GIT_MAX_RAWSZ
];
2724 if (!istate
->initialized
)
2727 fd
= open(path
, O_RDONLY
);
2734 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2737 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2738 if (n
!= the_hash_algo
->rawsz
)
2741 if (!hasheq(istate
->oid
.hash
, hash
))
2752 static int repo_verify_index(struct repository
*repo
)
2754 return verify_index_from(repo
->index
, repo
->index_file
);
2757 static int has_racy_timestamp(struct index_state
*istate
)
2759 int entries
= istate
->cache_nr
;
2762 for (i
= 0; i
< entries
; i
++) {
2763 struct cache_entry
*ce
= istate
->cache
[i
];
2764 if (is_racy_timestamp(istate
, ce
))
2770 void repo_update_index_if_able(struct repository
*repo
,
2771 struct lock_file
*lockfile
)
2773 if ((repo
->index
->cache_changed
||
2774 has_racy_timestamp(repo
->index
)) &&
2775 repo_verify_index(repo
))
2776 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2778 rollback_lock_file(lockfile
);
2781 static int record_eoie(void)
2785 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2789 * As a convenience, the end of index entries extension
2790 * used for threading is written by default if the user
2791 * explicitly requested threaded index reads.
2793 return !git_config_get_index_threads(&val
) && val
!= 1;
2796 static int record_ieot(void)
2800 if (!git_config_get_bool("index.recordoffsettable", &val
))
2804 * As a convenience, the offset table used for threading is
2805 * written by default if the user explicitly requested
2806 * threaded index reads.
2808 return !git_config_get_index_threads(&val
) && val
!= 1;
2812 * On success, `tempfile` is closed. If it is the temporary file
2813 * of a `struct lock_file`, we will therefore effectively perform
2814 * a 'close_lock_file_gently()`. Since that is an implementation
2815 * detail of lockfiles, callers of `do_write_index()` should not
2818 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2819 int strip_extensions
)
2821 uint64_t start
= getnanotime();
2823 git_hash_ctx
*eoie_c
= NULL
;
2824 struct cache_header hdr
;
2825 int i
, err
= 0, removed
, extended
, hdr_version
;
2826 struct cache_entry
**cache
= istate
->cache
;
2827 int entries
= istate
->cache_nr
;
2829 struct ondisk_cache_entry ondisk
;
2830 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2831 int drop_cache_tree
= istate
->drop_cache_tree
;
2833 int ieot_entries
= 1;
2834 struct index_entry_offset_table
*ieot
= NULL
;
2837 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2839 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2840 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2843 /* reduce extended entries if possible */
2844 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2845 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2847 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2851 if (!istate
->version
)
2852 istate
->version
= get_index_format_default(the_repository
);
2854 /* demote version 3 to version 2 when the latter suffices */
2855 if (istate
->version
== 3 || istate
->version
== 2)
2856 istate
->version
= extended
? 3 : 2;
2858 hdr_version
= istate
->version
;
2860 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2861 hdr
.hdr_version
= htonl(hdr_version
);
2862 hdr
.hdr_entries
= htonl(entries
- removed
);
2864 hashwrite(f
, &hdr
, sizeof(hdr
));
2866 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2869 if (nr_threads
!= 1 && record_ieot()) {
2870 int ieot_blocks
, cpus
;
2873 * ensure default number of ieot blocks maps evenly to the
2874 * default number of threads that will process them leaving
2875 * room for the thread to load the index extensions.
2878 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2879 cpus
= online_cpus();
2880 if (ieot_blocks
> cpus
- 1)
2881 ieot_blocks
= cpus
- 1;
2883 ieot_blocks
= nr_threads
;
2884 if (ieot_blocks
> istate
->cache_nr
)
2885 ieot_blocks
= istate
->cache_nr
;
2889 * no reason to write out the IEOT extension if we don't
2890 * have enough blocks to utilize multi-threading
2892 if (ieot_blocks
> 1) {
2893 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2894 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2895 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2899 offset
= hashfile_total(f
);
2902 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2904 for (i
= 0; i
< entries
; i
++) {
2905 struct cache_entry
*ce
= cache
[i
];
2906 if (ce
->ce_flags
& CE_REMOVE
)
2908 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2909 ce_smudge_racily_clean_entry(istate
, ce
);
2910 if (is_null_oid(&ce
->oid
)) {
2911 static const char msg
[] = "cache entry has null sha1: %s";
2912 static int allow
= -1;
2915 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2917 warning(msg
, ce
->name
);
2919 err
= error(msg
, ce
->name
);
2921 drop_cache_tree
= 1;
2923 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2924 ieot
->entries
[ieot
->nr
].nr
= nr
;
2925 ieot
->entries
[ieot
->nr
].offset
= offset
;
2928 * If we have a V4 index, set the first byte to an invalid
2929 * character to ensure there is nothing common with the previous
2933 previous_name
->buf
[0] = 0;
2936 offset
= hashfile_total(f
);
2938 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2946 ieot
->entries
[ieot
->nr
].nr
= nr
;
2947 ieot
->entries
[ieot
->nr
].offset
= offset
;
2950 strbuf_release(&previous_name_buf
);
2957 offset
= hashfile_total(f
);
2960 * The extension headers must be hashed on their own for the
2961 * EOIE extension. Create a hashfile here to compute that hash.
2963 if (offset
&& record_eoie()) {
2964 CALLOC_ARRAY(eoie_c
, 1);
2965 the_hash_algo
->init_fn(eoie_c
);
2969 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2970 * can minimize the number of extensions we have to scan through to
2971 * find it during load. Write it out regardless of the
2972 * strip_extensions parameter as we need it when loading the shared
2976 struct strbuf sb
= STRBUF_INIT
;
2978 write_ieot_extension(&sb
, ieot
);
2979 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2980 hashwrite(f
, sb
.buf
, sb
.len
);
2981 strbuf_release(&sb
);
2987 if (!strip_extensions
&& istate
->split_index
&&
2988 !is_null_oid(&istate
->split_index
->base_oid
)) {
2989 struct strbuf sb
= STRBUF_INIT
;
2991 err
= write_link_extension(&sb
, istate
) < 0 ||
2992 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
2994 hashwrite(f
, sb
.buf
, sb
.len
);
2995 strbuf_release(&sb
);
2999 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
3000 struct strbuf sb
= STRBUF_INIT
;
3002 cache_tree_write(&sb
, istate
->cache_tree
);
3003 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3004 hashwrite(f
, sb
.buf
, sb
.len
);
3005 strbuf_release(&sb
);
3009 if (!strip_extensions
&& istate
->resolve_undo
) {
3010 struct strbuf sb
= STRBUF_INIT
;
3012 resolve_undo_write(&sb
, istate
->resolve_undo
);
3013 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3015 hashwrite(f
, sb
.buf
, sb
.len
);
3016 strbuf_release(&sb
);
3020 if (!strip_extensions
&& istate
->untracked
) {
3021 struct strbuf sb
= STRBUF_INIT
;
3023 write_untracked_extension(&sb
, istate
->untracked
);
3024 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3026 hashwrite(f
, sb
.buf
, sb
.len
);
3027 strbuf_release(&sb
);
3031 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
3032 struct strbuf sb
= STRBUF_INIT
;
3034 write_fsmonitor_extension(&sb
, istate
);
3035 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3036 hashwrite(f
, sb
.buf
, sb
.len
);
3037 strbuf_release(&sb
);
3041 if (istate
->sparse_index
) {
3042 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3047 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3048 * so that it can be found and processed before all the index entries are
3049 * read. Write it out regardless of the strip_extensions parameter as we need it
3050 * when loading the shared index.
3053 struct strbuf sb
= STRBUF_INIT
;
3055 write_eoie_extension(&sb
, eoie_c
, offset
);
3056 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3057 hashwrite(f
, sb
.buf
, sb
.len
);
3058 strbuf_release(&sb
);
3063 finalize_hashfile(f
, istate
->oid
.hash
, CSUM_HASH_IN_STREAM
);
3064 if (close_tempfile_gently(tempfile
)) {
3065 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3068 if (stat(get_tempfile_path(tempfile
), &st
))
3070 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3071 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3072 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3075 * TODO trace2: replace "the_repository" with the actual repo instance
3076 * that is associated with the given "istate".
3078 trace2_data_intmax("index", the_repository
, "write/version",
3080 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3086 void set_alternate_index_output(const char *name
)
3088 alternate_index_output
= name
;
3091 static int commit_locked_index(struct lock_file
*lk
)
3093 if (alternate_index_output
)
3094 return commit_lock_file_to(lk
, alternate_index_output
);
3096 return commit_lock_file(lk
);
3099 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3103 int was_full
= !istate
->sparse_index
;
3105 ret
= convert_to_sparse(istate
, 0);
3108 warning(_("failed to convert to a sparse-index"));
3113 * TODO trace2: replace "the_repository" with the actual repo instance
3114 * that is associated with the given "istate".
3116 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3117 "%s", get_lock_file_path(lock
));
3118 ret
= do_write_index(istate
, lock
->tempfile
, 0);
3119 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3120 "%s", get_lock_file_path(lock
));
3123 ensure_full_index(istate
);
3127 if (flags
& COMMIT_LOCK
)
3128 ret
= commit_locked_index(lock
);
3130 ret
= close_lock_file_gently(lock
);
3132 run_hook_le(NULL
, "post-index-change",
3133 istate
->updated_workdir
? "1" : "0",
3134 istate
->updated_skipworktree
? "1" : "0", NULL
);
3135 istate
->updated_workdir
= 0;
3136 istate
->updated_skipworktree
= 0;
3141 static int write_split_index(struct index_state
*istate
,
3142 struct lock_file
*lock
,
3146 prepare_to_write_split_index(istate
);
3147 ret
= do_write_locked_index(istate
, lock
, flags
);
3148 finish_writing_split_index(istate
);
3152 static const char *shared_index_expire
= "2.weeks.ago";
3154 static unsigned long get_shared_index_expire_date(void)
3156 static unsigned long shared_index_expire_date
;
3157 static int shared_index_expire_date_prepared
;
3159 if (!shared_index_expire_date_prepared
) {
3160 git_config_get_expiry("splitindex.sharedindexexpire",
3161 &shared_index_expire
);
3162 shared_index_expire_date
= approxidate(shared_index_expire
);
3163 shared_index_expire_date_prepared
= 1;
3166 return shared_index_expire_date
;
3169 static int should_delete_shared_index(const char *shared_index_path
)
3172 unsigned long expiration
;
3174 /* Check timestamp */
3175 expiration
= get_shared_index_expire_date();
3178 if (stat(shared_index_path
, &st
))
3179 return error_errno(_("could not stat '%s'"), shared_index_path
);
3180 if (st
.st_mtime
> expiration
)
3186 static int clean_shared_index_files(const char *current_hex
)
3189 DIR *dir
= opendir(get_git_dir());
3192 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3194 while ((de
= readdir(dir
)) != NULL
) {
3195 const char *sha1_hex
;
3196 const char *shared_index_path
;
3197 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3199 if (!strcmp(sha1_hex
, current_hex
))
3201 shared_index_path
= git_path("%s", de
->d_name
);
3202 if (should_delete_shared_index(shared_index_path
) > 0 &&
3203 unlink(shared_index_path
))
3204 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3211 static int write_shared_index(struct index_state
*istate
,
3212 struct tempfile
**temp
)
3214 struct split_index
*si
= istate
->split_index
;
3215 int ret
, was_full
= !istate
->sparse_index
;
3217 move_cache_to_base_index(istate
);
3218 convert_to_sparse(istate
, 0);
3220 trace2_region_enter_printf("index", "shared/do_write_index",
3221 the_repository
, "%s", get_tempfile_path(*temp
));
3222 ret
= do_write_index(si
->base
, *temp
, 1);
3223 trace2_region_leave_printf("index", "shared/do_write_index",
3224 the_repository
, "%s", get_tempfile_path(*temp
));
3227 ensure_full_index(istate
);
3231 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3233 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3236 ret
= rename_tempfile(temp
,
3237 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3239 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3240 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3246 static const int default_max_percent_split_change
= 20;
3248 static int too_many_not_shared_entries(struct index_state
*istate
)
3250 int i
, not_shared
= 0;
3251 int max_split
= git_config_get_max_percent_split_change();
3253 switch (max_split
) {
3255 /* not or badly configured: use the default value */
3256 max_split
= default_max_percent_split_change
;
3259 return 1; /* 0% means always write a new shared index */
3261 return 0; /* 100% means never write a new shared index */
3263 break; /* just use the configured value */
3266 /* Count not shared entries */
3267 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3268 struct cache_entry
*ce
= istate
->cache
[i
];
3273 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3276 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3279 int new_shared_index
, ret
, test_split_index_env
;
3280 struct split_index
*si
= istate
->split_index
;
3282 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3283 cache_tree_verify(the_repository
, istate
);
3285 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3286 if (flags
& COMMIT_LOCK
)
3287 rollback_lock_file(lock
);
3291 if (istate
->fsmonitor_last_update
)
3292 fill_fsmonitor_bitmap(istate
);
3294 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3296 if ((!si
&& !test_split_index_env
) ||
3297 alternate_index_output
||
3298 (istate
->cache_changed
& ~EXTMASK
)) {
3300 oidclr(&si
->base_oid
);
3301 ret
= do_write_locked_index(istate
, lock
, flags
);
3305 if (test_split_index_env
) {
3307 si
= init_split_index(istate
);
3308 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3310 int v
= si
->base_oid
.hash
[0];
3312 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3315 if (too_many_not_shared_entries(istate
))
3316 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3318 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3320 if (new_shared_index
) {
3321 struct tempfile
*temp
;
3324 /* Same initial permissions as the main .git/index file */
3325 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3327 oidclr(&si
->base_oid
);
3328 ret
= do_write_locked_index(istate
, lock
, flags
);
3331 ret
= write_shared_index(istate
, &temp
);
3333 saved_errno
= errno
;
3334 if (is_tempfile_active(temp
))
3335 delete_tempfile(&temp
);
3336 errno
= saved_errno
;
3342 ret
= write_split_index(istate
, lock
, flags
);
3344 /* Freshen the shared index only if the split-index was written */
3345 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3346 const char *shared_index
= git_path("sharedindex.%s",
3347 oid_to_hex(&si
->base_oid
));
3348 freshen_shared_index(shared_index
, 1);
3352 if (flags
& COMMIT_LOCK
)
3353 rollback_lock_file(lock
);
3358 * Read the index file that is potentially unmerged into given
3359 * index_state, dropping any unmerged entries to stage #0 (potentially
3360 * resulting in a path appearing as both a file and a directory in the
3361 * index; the caller is responsible to clear out the extra entries
3362 * before writing the index to a tree). Returns true if the index is
3363 * unmerged. Callers who want to refuse to work from an unmerged
3364 * state can call this and check its return value, instead of calling
3367 int repo_read_index_unmerged(struct repository
*repo
)
3369 struct index_state
*istate
;
3373 repo_read_index(repo
);
3374 istate
= repo
->index
;
3375 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3376 struct cache_entry
*ce
= istate
->cache
[i
];
3377 struct cache_entry
*new_ce
;
3383 len
= ce_namelen(ce
);
3384 new_ce
= make_empty_cache_entry(istate
, len
);
3385 memcpy(new_ce
->name
, ce
->name
, len
);
3386 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3387 new_ce
->ce_namelen
= len
;
3388 new_ce
->ce_mode
= ce
->ce_mode
;
3389 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3390 return error(_("%s: cannot drop to stage #0"),
3397 * Returns 1 if the path is an "other" path with respect to
3398 * the index; that is, the path is not mentioned in the index at all,
3399 * either as a file, a directory with some files in the index,
3400 * or as an unmerged entry.
3402 * We helpfully remove a trailing "/" from directories so that
3403 * the output of read_directory can be used as-is.
3405 int index_name_is_other(struct index_state
*istate
, const char *name
,
3409 if (namelen
&& name
[namelen
- 1] == '/')
3411 pos
= index_name_pos(istate
, name
, namelen
);
3413 return 0; /* exact match */
3415 if (pos
< istate
->cache_nr
) {
3416 struct cache_entry
*ce
= istate
->cache
[pos
];
3417 if (ce_namelen(ce
) == namelen
&&
3418 !memcmp(ce
->name
, name
, namelen
))
3419 return 0; /* Yup, this one exists unmerged */
3424 void *read_blob_data_from_index(struct index_state
*istate
,
3425 const char *path
, unsigned long *size
)
3429 enum object_type type
;
3433 pos
= index_name_pos(istate
, path
, len
);
3436 * We might be in the middle of a merge, in which
3437 * case we would read stage #2 (ours).
3441 (pos
< 0 && i
< istate
->cache_nr
&&
3442 !strcmp(istate
->cache
[i
]->name
, path
));
3444 if (ce_stage(istate
->cache
[i
]) == 2)
3449 data
= read_object_file(&istate
->cache
[pos
]->oid
, &type
, &sz
);
3450 if (!data
|| type
!= OBJ_BLOB
) {
3459 void stat_validity_clear(struct stat_validity
*sv
)
3461 FREE_AND_NULL(sv
->sd
);
3464 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
3468 if (stat(path
, &st
) < 0)
3469 return sv
->sd
== NULL
;
3472 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
3475 void stat_validity_update(struct stat_validity
*sv
, int fd
)
3479 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
3480 stat_validity_clear(sv
);
3483 CALLOC_ARRAY(sv
->sd
, 1);
3484 fill_stat_data(sv
->sd
, &st
);
3488 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3490 dst
->untracked
= src
->untracked
;
3491 src
->untracked
= NULL
;
3492 dst
->cache_tree
= src
->cache_tree
;
3493 src
->cache_tree
= NULL
;
3496 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3497 struct index_state
*istate
)
3499 unsigned int size
= ce_size(ce
);
3500 int mem_pool_allocated
;
3501 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3502 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3504 memcpy(new_entry
, ce
, size
);
3505 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3509 void discard_cache_entry(struct cache_entry
*ce
)
3511 if (ce
&& should_validate_cache_entries())
3512 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3514 if (ce
&& ce
->mem_pool_allocated
)
3520 int should_validate_cache_entries(void)
3522 static int validate_index_cache_entries
= -1;
3524 if (validate_index_cache_entries
< 0) {
3525 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3526 validate_index_cache_entries
= 1;
3528 validate_index_cache_entries
= 0;
3531 return validate_index_cache_entries
;
3534 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3535 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3537 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3540 * The end of index entries (EOIE) extension is guaranteed to be last
3541 * so that it can be found by scanning backwards from the EOF.
3548 const char *index
, *eoie
;
3550 size_t offset
, src_offset
;
3551 unsigned char hash
[GIT_MAX_RAWSZ
];
3554 /* ensure we have an index big enough to contain an EOIE extension */
3555 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3558 /* validate the extension signature */
3559 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3560 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3562 index
+= sizeof(uint32_t);
3564 /* validate the extension size */
3565 extsize
= get_be32(index
);
3566 if (extsize
!= EOIE_SIZE
)
3568 index
+= sizeof(uint32_t);
3571 * Validate the offset we're going to look for the first extension
3572 * signature is after the index header and before the eoie extension.
3574 offset
= get_be32(index
);
3575 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3577 if (mmap
+ offset
>= eoie
)
3579 index
+= sizeof(uint32_t);
3582 * The hash is computed over extension types and their sizes (but not
3583 * their contents). E.g. if we have "TREE" extension that is N-bytes
3584 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3585 * then the hash would be:
3587 * SHA-1("TREE" + <binary representation of N> +
3588 * "REUC" + <binary representation of M>)
3590 src_offset
= offset
;
3591 the_hash_algo
->init_fn(&c
);
3592 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3593 /* After an array of active_nr index entries,
3594 * there can be arbitrary number of extended
3595 * sections, each of which is prefixed with
3596 * extension name (4-byte) and section length
3597 * in 4-byte network byte order.
3600 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3601 extsize
= ntohl(extsize
);
3603 /* verify the extension size isn't so large it will wrap around */
3604 if (src_offset
+ 8 + extsize
< src_offset
)
3607 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3610 src_offset
+= extsize
;
3612 the_hash_algo
->final_fn(hash
, &c
);
3613 if (!hasheq(hash
, (const unsigned char *)index
))
3616 /* Validate that the extension offsets returned us back to the eoie extension. */
3617 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3623 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3626 unsigned char hash
[GIT_MAX_RAWSZ
];
3629 put_be32(&buffer
, offset
);
3630 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3633 the_hash_algo
->final_fn(hash
, eoie_context
);
3634 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3637 #define IEOT_VERSION (1)
3639 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3641 const char *index
= NULL
;
3642 uint32_t extsize
, ext_version
;
3643 struct index_entry_offset_table
*ieot
;
3646 /* find the IEOT extension */
3649 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3650 extsize
= get_be32(mmap
+ offset
+ 4);
3651 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3652 index
= mmap
+ offset
+ 4 + 4;
3661 /* validate the version is IEOT_VERSION */
3662 ext_version
= get_be32(index
);
3663 if (ext_version
!= IEOT_VERSION
) {
3664 error("invalid IEOT version %d", ext_version
);
3667 index
+= sizeof(uint32_t);
3669 /* extension size - version bytes / bytes per entry */
3670 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3672 error("invalid number of IEOT entries %d", nr
);
3675 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3676 + (nr
* sizeof(struct index_entry_offset
)));
3678 for (i
= 0; i
< nr
; i
++) {
3679 ieot
->entries
[i
].offset
= get_be32(index
);
3680 index
+= sizeof(uint32_t);
3681 ieot
->entries
[i
].nr
= get_be32(index
);
3682 index
+= sizeof(uint32_t);
3688 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3694 put_be32(&buffer
, IEOT_VERSION
);
3695 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3698 for (i
= 0; i
< ieot
->nr
; i
++) {
3701 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3702 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3705 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3706 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3710 void prefetch_cache_entries(const struct index_state
*istate
,
3711 must_prefetch_predicate must_prefetch
)
3714 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3716 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3717 struct cache_entry
*ce
= istate
->cache
[i
];
3719 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3721 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3723 OBJECT_INFO_FOR_PREFETCH
))
3725 oid_array_append(&to_fetch
, &ce
->oid
);
3727 promisor_remote_get_direct(the_repository
,
3728 to_fetch
.oid
, to_fetch
.nr
);
3729 oid_array_clear(&to_fetch
);