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"
31 /* Mask for the name length in ce_flags in the on-disk index */
33 #define CE_NAMEMASK (0x0fff)
37 * The first letter should be 'A'..'Z' for extensions that are not
38 * necessary for a correct operation (i.e. optimization data).
39 * When new extensions are added that _needs_ to be understood in
40 * order to correctly interpret the index file, pick character that
41 * is outside the range, to cause the reader to abort.
44 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
45 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
46 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
47 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
48 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
49 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
50 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
51 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
52 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
54 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
55 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
56 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
57 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
61 * This is an estimate of the pathname length in the index. We use
62 * this for V4 index files to guess the un-deltafied size of the index
63 * in memory because of pathname deltafication. This is not required
64 * for V2/V3 index formats because their pathnames are not compressed.
65 * If the initial amount of memory set aside is not sufficient, the
66 * mem pool will allocate extra memory.
68 #define CACHE_ENTRY_PATH_LENGTH 80
70 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
72 struct cache_entry
*ce
;
73 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
74 ce
->mem_pool_allocated
= 1;
78 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
80 struct cache_entry
* ce
;
81 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
82 ce
->mem_pool_allocated
= 1;
86 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
88 struct mem_pool
**pool_ptr
;
90 if (istate
->split_index
&& istate
->split_index
->base
)
91 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
93 pool_ptr
= &istate
->ce_mem_pool
;
96 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
97 mem_pool_init(*pool_ptr
, 0);
103 static const char *alternate_index_output
;
105 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
107 if (S_ISSPARSEDIR(ce
->ce_mode
))
108 istate
->sparse_index
= 1;
110 istate
->cache
[nr
] = ce
;
111 add_name_hash(istate
, ce
);
114 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
116 struct cache_entry
*old
= istate
->cache
[nr
];
118 replace_index_entry_in_base(istate
, old
, ce
);
119 remove_name_hash(istate
, old
);
120 discard_cache_entry(old
);
121 ce
->ce_flags
&= ~CE_HASHED
;
122 set_index_entry(istate
, nr
, ce
);
123 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
124 mark_fsmonitor_invalid(istate
, ce
);
125 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
128 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
130 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
;
131 int namelen
= strlen(new_name
);
133 new_entry
= make_empty_cache_entry(istate
, namelen
);
134 copy_cache_entry(new_entry
, old_entry
);
135 new_entry
->ce_flags
&= ~CE_HASHED
;
136 new_entry
->ce_namelen
= namelen
;
137 new_entry
->index
= 0;
138 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
140 cache_tree_invalidate_path(istate
, old_entry
->name
);
141 untracked_cache_remove_from_index(istate
, old_entry
->name
);
142 remove_index_entry_at(istate
, nr
);
143 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
146 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
148 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
149 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
150 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
151 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
152 sd
->sd_dev
= st
->st_dev
;
153 sd
->sd_ino
= st
->st_ino
;
154 sd
->sd_uid
= st
->st_uid
;
155 sd
->sd_gid
= st
->st_gid
;
156 sd
->sd_size
= st
->st_size
;
159 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
163 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
164 changed
|= MTIME_CHANGED
;
165 if (trust_ctime
&& check_stat
&&
166 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
167 changed
|= CTIME_CHANGED
;
170 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
171 changed
|= MTIME_CHANGED
;
172 if (trust_ctime
&& check_stat
&&
173 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
174 changed
|= CTIME_CHANGED
;
178 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
179 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
180 changed
|= OWNER_CHANGED
;
181 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
182 changed
|= INODE_CHANGED
;
187 * st_dev breaks on network filesystems where different
188 * clients will have different views of what "device"
189 * the filesystem is on
191 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
192 changed
|= INODE_CHANGED
;
195 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
196 changed
|= DATA_CHANGED
;
202 * This only updates the "non-critical" parts of the directory
203 * cache, ie the parts that aren't tracked by GIT, and only used
204 * to validate the cache.
206 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
208 fill_stat_data(&ce
->ce_stat_data
, st
);
210 if (assume_unchanged
)
211 ce
->ce_flags
|= CE_VALID
;
213 if (S_ISREG(st
->st_mode
)) {
214 ce_mark_uptodate(ce
);
215 mark_fsmonitor_valid(istate
, ce
);
219 static int ce_compare_data(struct index_state
*istate
,
220 const struct cache_entry
*ce
,
224 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
227 struct object_id oid
;
228 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
229 match
= !oideq(&oid
, &ce
->oid
);
230 /* index_fd() closed the file descriptor already */
235 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
240 enum object_type type
;
241 struct strbuf sb
= STRBUF_INIT
;
243 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
246 buffer
= read_object_file(&ce
->oid
, &type
, &size
);
249 match
= memcmp(buffer
, sb
.buf
, size
);
256 static int ce_compare_gitlink(const struct cache_entry
*ce
)
258 struct object_id oid
;
261 * We don't actually require that the .git directory
262 * under GITLINK directory be a valid git directory. It
263 * might even be missing (in case nobody populated that
266 * If so, we consider it always to match.
268 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
270 return !oideq(&oid
, &ce
->oid
);
273 static int ce_modified_check_fs(struct index_state
*istate
,
274 const struct cache_entry
*ce
,
277 switch (st
->st_mode
& S_IFMT
) {
279 if (ce_compare_data(istate
, ce
, st
))
283 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
287 if (S_ISGITLINK(ce
->ce_mode
))
288 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
289 /* else fallthrough */
296 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
298 unsigned int changed
= 0;
300 if (ce
->ce_flags
& CE_REMOVE
)
301 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
303 switch (ce
->ce_mode
& S_IFMT
) {
305 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
306 /* We consider only the owner x bit to be relevant for
309 if (trust_executable_bit
&&
310 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
311 changed
|= MODE_CHANGED
;
314 if (!S_ISLNK(st
->st_mode
) &&
315 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
316 changed
|= TYPE_CHANGED
;
319 /* We ignore most of the st_xxx fields for gitlinks */
320 if (!S_ISDIR(st
->st_mode
))
321 changed
|= TYPE_CHANGED
;
322 else if (ce_compare_gitlink(ce
))
323 changed
|= DATA_CHANGED
;
326 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
329 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
331 /* Racily smudged entry? */
332 if (!ce
->ce_stat_data
.sd_size
) {
333 if (!is_empty_blob_sha1(ce
->oid
.hash
))
334 changed
|= DATA_CHANGED
;
340 static int is_racy_stat(const struct index_state
*istate
,
341 const struct stat_data
*sd
)
343 return (istate
->timestamp
.sec
&&
345 /* nanosecond timestamped files can also be racy! */
346 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
347 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
348 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
350 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
355 int is_racy_timestamp(const struct index_state
*istate
,
356 const struct cache_entry
*ce
)
358 return (!S_ISGITLINK(ce
->ce_mode
) &&
359 is_racy_stat(istate
, &ce
->ce_stat_data
));
362 int match_stat_data_racy(const struct index_state
*istate
,
363 const struct stat_data
*sd
, struct stat
*st
)
365 if (is_racy_stat(istate
, sd
))
366 return MTIME_CHANGED
;
367 return match_stat_data(sd
, st
);
370 int ie_match_stat(struct index_state
*istate
,
371 const struct cache_entry
*ce
, struct stat
*st
,
372 unsigned int options
)
374 unsigned int changed
;
375 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
376 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
377 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
378 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
380 if (!ignore_fsmonitor
)
381 refresh_fsmonitor(istate
);
383 * If it's marked as always valid in the index, it's
384 * valid whatever the checked-out copy says.
386 * skip-worktree has the same effect with higher precedence
388 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
390 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
392 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
396 * Intent-to-add entries have not been added, so the index entry
397 * by definition never matches what is in the work tree until it
398 * actually gets added.
400 if (ce_intent_to_add(ce
))
401 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
403 changed
= ce_match_stat_basic(ce
, st
);
406 * Within 1 second of this sequence:
407 * echo xyzzy >file && git-update-index --add file
408 * running this command:
410 * would give a falsely clean cache entry. The mtime and
411 * length match the cache, and other stat fields do not change.
413 * We could detect this at update-index time (the cache entry
414 * being registered/updated records the same time as "now")
415 * and delay the return from git-update-index, but that would
416 * effectively mean we can make at most one commit per second,
417 * which is not acceptable. Instead, we check cache entries
418 * whose mtime are the same as the index file timestamp more
419 * carefully than others.
421 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
422 if (assume_racy_is_modified
)
423 changed
|= DATA_CHANGED
;
425 changed
|= ce_modified_check_fs(istate
, ce
, st
);
431 int ie_modified(struct index_state
*istate
,
432 const struct cache_entry
*ce
,
433 struct stat
*st
, unsigned int options
)
435 int changed
, changed_fs
;
437 changed
= ie_match_stat(istate
, ce
, st
, options
);
441 * If the mode or type has changed, there's no point in trying
442 * to refresh the entry - it's not going to match
444 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
448 * Immediately after read-tree or update-index --cacheinfo,
449 * the length field is zero, as we have never even read the
450 * lstat(2) information once, and we cannot trust DATA_CHANGED
451 * returned by ie_match_stat() which in turn was returned by
452 * ce_match_stat_basic() to signal that the filesize of the
453 * blob changed. We have to actually go to the filesystem to
454 * see if the contents match, and if so, should answer "unchanged".
456 * The logic does not apply to gitlinks, as ce_match_stat_basic()
457 * already has checked the actual HEAD from the filesystem in the
458 * subproject. If ie_match_stat() already said it is different,
459 * then we know it is.
461 if ((changed
& DATA_CHANGED
) &&
462 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
465 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
467 return changed
| changed_fs
;
471 int base_name_compare(const char *name1
, int len1
, int mode1
,
472 const char *name2
, int len2
, int mode2
)
474 unsigned char c1
, c2
;
475 int len
= len1
< len2
? len1
: len2
;
478 cmp
= memcmp(name1
, name2
, len
);
483 if (!c1
&& S_ISDIR(mode1
))
485 if (!c2
&& S_ISDIR(mode2
))
487 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
491 * df_name_compare() is identical to base_name_compare(), except it
492 * compares conflicting directory/file entries as equal. Note that
493 * while a directory name compares as equal to a regular file, they
494 * then individually compare _differently_ to a filename that has
495 * a dot after the basename (because '\0' < '.' < '/').
497 * This is used by routines that want to traverse the git namespace
498 * but then handle conflicting entries together when possible.
500 int df_name_compare(const char *name1
, int len1
, int mode1
,
501 const char *name2
, int len2
, int mode2
)
503 int len
= len1
< len2
? len1
: len2
, cmp
;
504 unsigned char c1
, c2
;
506 cmp
= memcmp(name1
, name2
, len
);
509 /* Directories and files compare equal (same length, same name) */
513 if (!c1
&& S_ISDIR(mode1
))
516 if (!c2
&& S_ISDIR(mode2
))
518 if (c1
== '/' && !c2
)
520 if (c2
== '/' && !c1
)
525 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
527 size_t min_len
= (len1
< len2
) ? len1
: len2
;
528 int cmp
= memcmp(name1
, name2
, min_len
);
538 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
542 cmp
= name_compare(name1
, len1
, name2
, len2
);
553 static int index_name_stage_pos(struct index_state
*istate
, const char *name
, int namelen
, int stage
)
558 last
= istate
->cache_nr
;
559 while (last
> first
) {
560 int next
= first
+ ((last
- first
) >> 1);
561 struct cache_entry
*ce
= istate
->cache
[next
];
562 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
572 if (istate
->sparse_index
&&
574 /* Note: first <= istate->cache_nr */
575 struct cache_entry
*ce
= istate
->cache
[first
- 1];
578 * If we are in a sparse-index _and_ the entry before the
579 * insertion position is a sparse-directory entry that is
580 * an ancestor of 'name', then we need to expand the index
581 * and search again. This will only trigger once, because
582 * thereafter the index is fully expanded.
584 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
585 ce_namelen(ce
) < namelen
&&
586 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
587 ensure_full_index(istate
);
588 return index_name_stage_pos(istate
, name
, namelen
, stage
);
595 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
597 return index_name_stage_pos(istate
, name
, namelen
, 0);
600 int remove_index_entry_at(struct index_state
*istate
, int pos
)
602 struct cache_entry
*ce
= istate
->cache
[pos
];
604 record_resolve_undo(istate
, ce
);
605 remove_name_hash(istate
, ce
);
606 save_or_free_index_entry(istate
, ce
);
607 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
609 if (pos
>= istate
->cache_nr
)
611 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
612 istate
->cache_nr
- pos
);
617 * Remove all cache entries marked for removal, that is where
618 * CE_REMOVE is set in ce_flags. This is much more effective than
619 * calling remove_index_entry_at() for each entry to be removed.
621 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
623 struct cache_entry
**ce_array
= istate
->cache
;
626 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
627 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
629 cache_tree_invalidate_path(istate
,
631 untracked_cache_remove_from_index(istate
,
634 remove_name_hash(istate
, ce_array
[i
]);
635 save_or_free_index_entry(istate
, ce_array
[i
]);
638 ce_array
[j
++] = ce_array
[i
];
640 if (j
== istate
->cache_nr
)
642 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
643 istate
->cache_nr
= j
;
646 int remove_file_from_index(struct index_state
*istate
, const char *path
)
648 int pos
= index_name_pos(istate
, path
, strlen(path
));
651 cache_tree_invalidate_path(istate
, path
);
652 untracked_cache_remove_from_index(istate
, path
);
653 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
654 remove_index_entry_at(istate
, pos
);
658 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
660 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
663 static int index_name_pos_also_unmerged(struct index_state
*istate
,
664 const char *path
, int namelen
)
666 int pos
= index_name_pos(istate
, path
, namelen
);
667 struct cache_entry
*ce
;
672 /* maybe unmerged? */
674 if (pos
>= istate
->cache_nr
||
675 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
678 /* order of preference: stage 2, 1, 3 */
679 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
680 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
681 !compare_name(ce
, path
, namelen
))
686 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
688 int len
= ce_namelen(ce
);
689 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
693 * If we add a filename that aliases in the cache, we will use the
694 * name that we already have - but we don't want to update the same
695 * alias twice, because that implies that there were actually two
696 * different files with aliasing names!
698 * So we use the CE_ADDED flag to verify that the alias was an old
699 * one before we accept it as
701 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
702 struct cache_entry
*ce
,
703 struct cache_entry
*alias
)
706 struct cache_entry
*new_entry
;
708 if (alias
->ce_flags
& CE_ADDED
)
709 die(_("will not add file alias '%s' ('%s' already exists in index)"),
710 ce
->name
, alias
->name
);
712 /* Ok, create the new entry using the name of the existing alias */
713 len
= ce_namelen(alias
);
714 new_entry
= make_empty_cache_entry(istate
, len
);
715 memcpy(new_entry
->name
, alias
->name
, len
);
716 copy_cache_entry(new_entry
, ce
);
717 save_or_free_index_entry(istate
, ce
);
721 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
723 struct object_id oid
;
724 if (write_object_file("", 0, blob_type
, &oid
))
725 die(_("cannot create an empty blob in the object database"));
726 oidcpy(&ce
->oid
, &oid
);
729 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
731 int namelen
, was_same
;
732 mode_t st_mode
= st
->st_mode
;
733 struct cache_entry
*ce
, *alias
= NULL
;
734 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
735 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
736 int pretend
= flags
& ADD_CACHE_PRETEND
;
737 int intent_only
= flags
& ADD_CACHE_INTENT
;
738 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
739 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
740 int hash_flags
= HASH_WRITE_OBJECT
;
741 struct object_id oid
;
743 if (flags
& ADD_CACHE_RENORMALIZE
)
744 hash_flags
|= HASH_RENORMALIZE
;
746 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
747 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
749 namelen
= strlen(path
);
750 if (S_ISDIR(st_mode
)) {
751 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
752 return error(_("'%s' does not have a commit checked out"), path
);
753 while (namelen
&& path
[namelen
-1] == '/')
756 ce
= make_empty_cache_entry(istate
, namelen
);
757 memcpy(ce
->name
, path
, namelen
);
758 ce
->ce_namelen
= namelen
;
760 fill_stat_cache_info(istate
, ce
, st
);
762 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
765 if (trust_executable_bit
&& has_symlinks
) {
766 ce
->ce_mode
= create_ce_mode(st_mode
);
768 /* If there is an existing entry, pick the mode bits and type
769 * from it, otherwise assume unexecutable regular file.
771 struct cache_entry
*ent
;
772 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
774 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
775 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
778 /* When core.ignorecase=true, determine if a directory of the same name but differing
779 * case already exists within the Git repository. If it does, ensure the directory
780 * case of the file being added to the repository matches (is folded into) the existing
781 * entry's directory case.
784 adjust_dirname_case(istate
, ce
->name
);
786 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
787 alias
= index_file_exists(istate
, ce
->name
,
788 ce_namelen(ce
), ignore_case
);
791 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
792 /* Nothing changed, really */
793 if (!S_ISGITLINK(alias
->ce_mode
))
794 ce_mark_uptodate(alias
);
795 alias
->ce_flags
|= CE_ADDED
;
797 discard_cache_entry(ce
);
802 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
803 discard_cache_entry(ce
);
804 return error(_("unable to index file '%s'"), path
);
807 set_object_name_for_intent_to_add_entry(ce
);
809 if (ignore_case
&& alias
&& different_name(ce
, alias
))
810 ce
= create_alias_ce(istate
, ce
, alias
);
811 ce
->ce_flags
|= CE_ADDED
;
813 /* It was suspected to be racily clean, but it turns out to be Ok */
816 oideq(&alias
->oid
, &ce
->oid
) &&
817 ce
->ce_mode
== alias
->ce_mode
);
820 discard_cache_entry(ce
);
821 else if (add_index_entry(istate
, ce
, add_option
)) {
822 discard_cache_entry(ce
);
823 return error(_("unable to add '%s' to index"), path
);
825 if (verbose
&& !was_same
)
826 printf("add '%s'\n", path
);
830 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
833 if (lstat(path
, &st
))
834 die_errno(_("unable to stat '%s'"), path
);
835 return add_to_index(istate
, path
, &st
, flags
);
838 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
840 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
843 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
844 struct mem_pool
*ce_mem_pool
)
847 return mem_pool__ce_calloc(ce_mem_pool
, len
);
848 return xcalloc(1, cache_entry_size(len
));
851 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
853 const struct object_id
*oid
,
856 unsigned int refresh_options
)
858 struct cache_entry
*ce
, *ret
;
861 if (!verify_path(path
, mode
)) {
862 error(_("invalid path '%s'"), path
);
867 ce
= make_empty_cache_entry(istate
, len
);
869 oidcpy(&ce
->oid
, oid
);
870 memcpy(ce
->name
, path
, len
);
871 ce
->ce_flags
= create_ce_flags(stage
);
872 ce
->ce_namelen
= len
;
873 ce
->ce_mode
= create_ce_mode(mode
);
875 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
877 discard_cache_entry(ce
);
881 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
882 const struct object_id
*oid
,
885 struct mem_pool
*ce_mem_pool
)
887 struct cache_entry
*ce
;
890 if (!verify_path(path
, mode
)) {
891 error(_("invalid path '%s'"), path
);
896 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
898 oidcpy(&ce
->oid
, oid
);
899 memcpy(ce
->name
, path
, len
);
900 ce
->ce_flags
= create_ce_flags(stage
);
901 ce
->ce_namelen
= len
;
902 ce
->ce_mode
= create_ce_mode(mode
);
908 * Chmod an index entry with either +x or -x.
910 * Returns -1 if the chmod for the particular cache entry failed (if it's
911 * not a regular file), -2 if an invalid flip argument is passed in, 0
914 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
917 if (!S_ISREG(ce
->ce_mode
))
924 ce
->ce_mode
&= ~0111;
929 cache_tree_invalidate_path(istate
, ce
->name
);
930 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
931 mark_fsmonitor_invalid(istate
, ce
);
932 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
937 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
939 int len
= ce_namelen(a
);
940 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
944 * We fundamentally don't like some paths: we don't want
945 * dot or dot-dot anywhere, and for obvious reasons don't
946 * want to recurse into ".git" either.
948 * Also, we don't want double slashes or slashes at the
949 * end that can make pathnames ambiguous.
951 static int verify_dotfile(const char *rest
, unsigned mode
)
954 * The first character was '.', but that
955 * has already been discarded, we now test
959 /* "." is not allowed */
960 if (*rest
== '\0' || is_dir_sep(*rest
))
965 * ".git" followed by NUL or slash is bad. Note that we match
966 * case-insensitively here, even if ignore_case is not set.
967 * This outlaws ".GIT" everywhere out of an abundance of caution,
968 * since there's really no good reason to allow it.
970 * Once we've seen ".git", we can also find ".gitmodules", etc (also
971 * case-insensitively).
975 if (rest
[1] != 'i' && rest
[1] != 'I')
977 if (rest
[2] != 't' && rest
[2] != 'T')
979 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
983 if (skip_iprefix(rest
, "modules", &rest
) &&
984 (*rest
== '\0' || is_dir_sep(*rest
)))
989 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
995 int verify_path(const char *path
, unsigned mode
)
999 if (has_dos_drive_prefix(path
))
1002 if (!is_valid_path(path
))
1009 if (is_dir_sep(c
)) {
1013 if (is_hfs_dotgit(path
))
1015 if (S_ISLNK(mode
)) {
1016 if (is_hfs_dotgitmodules(path
))
1021 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1025 if (is_ntfs_dotgit(path
))
1027 if (S_ISLNK(mode
)) {
1028 if (is_ntfs_dotgitmodules(path
))
1034 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1038 * allow terminating directory separators for
1039 * sparse directory entries.
1042 return S_ISDIR(mode
);
1043 } else if (c
== '\\' && protect_ntfs
) {
1044 if (is_ntfs_dotgit(path
))
1046 if (S_ISLNK(mode
)) {
1047 if (is_ntfs_dotgitmodules(path
))
1057 * Do we have another file that has the beginning components being a
1058 * proper superset of the name we're trying to add?
1060 static int has_file_name(struct index_state
*istate
,
1061 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1064 int len
= ce_namelen(ce
);
1065 int stage
= ce_stage(ce
);
1066 const char *name
= ce
->name
;
1068 while (pos
< istate
->cache_nr
) {
1069 struct cache_entry
*p
= istate
->cache
[pos
++];
1071 if (len
>= ce_namelen(p
))
1073 if (memcmp(name
, p
->name
, len
))
1075 if (ce_stage(p
) != stage
)
1077 if (p
->name
[len
] != '/')
1079 if (p
->ce_flags
& CE_REMOVE
)
1084 remove_index_entry_at(istate
, --pos
);
1091 * Like strcmp(), but also return the offset of the first change.
1092 * If strings are equal, return the length.
1094 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1099 return strcmp(s1
, s2
);
1101 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1106 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1110 * Do we have another file with a pathname that is a proper
1111 * subset of the name we're trying to add?
1113 * That is, is there another file in the index with a path
1114 * that matches a sub-directory in the given entry?
1116 static int has_dir_name(struct index_state
*istate
,
1117 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1120 int stage
= ce_stage(ce
);
1121 const char *name
= ce
->name
;
1122 const char *slash
= name
+ ce_namelen(ce
);
1127 * We are frequently called during an iteration on a sorted
1128 * list of pathnames and while building a new index. Therefore,
1129 * there is a high probability that this entry will eventually
1130 * be appended to the index, rather than inserted in the middle.
1131 * If we can confirm that, we can avoid binary searches on the
1132 * components of the pathname.
1134 * Compare the entry's full path with the last path in the index.
1136 if (istate
->cache_nr
> 0) {
1137 cmp_last
= strcmp_offset(name
,
1138 istate
->cache
[istate
->cache_nr
- 1]->name
,
1141 if (len_eq_last
== 0) {
1143 * The entry sorts AFTER the last one in the
1144 * index and their paths have no common prefix,
1145 * so there cannot be a F/D conflict.
1150 * The entry sorts AFTER the last one in the
1151 * index, but has a common prefix. Fall through
1152 * to the loop below to disect the entry's path
1153 * and see where the difference is.
1156 } else if (cmp_last
== 0) {
1158 * The entry exactly matches the last one in the
1159 * index, but because of multiple stage and CE_REMOVE
1160 * items, we fall through and let the regular search
1170 if (*--slash
== '/')
1172 if (slash
<= ce
->name
)
1179 * (len + 1) is a directory boundary (including
1180 * the trailing slash). And since the loop is
1181 * decrementing "slash", the first iteration is
1182 * the longest directory prefix; subsequent
1183 * iterations consider parent directories.
1186 if (len
+ 1 <= len_eq_last
) {
1188 * The directory prefix (including the trailing
1189 * slash) also appears as a prefix in the last
1190 * entry, so the remainder cannot collide (because
1191 * strcmp said the whole path was greater).
1196 * LT: last: xxx/file_A
1202 if (len
> len_eq_last
) {
1204 * This part of the directory prefix (excluding
1205 * the trailing slash) is longer than the known
1206 * equal portions, so this sub-directory cannot
1207 * collide with a file.
1216 * This is a possible collision. Fall through and
1217 * let the regular search code handle it.
1224 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
1227 * Found one, but not so fast. This could
1228 * be a marker that says "I was here, but
1229 * I am being removed". Such an entry is
1230 * not a part of the resulting tree, and
1231 * it is Ok to have a directory at the same
1234 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1238 remove_index_entry_at(istate
, pos
);
1246 * Trivial optimization: if we find an entry that
1247 * already matches the sub-directory, then we know
1248 * we're ok, and we can exit.
1250 while (pos
< istate
->cache_nr
) {
1251 struct cache_entry
*p
= istate
->cache
[pos
];
1252 if ((ce_namelen(p
) <= len
) ||
1253 (p
->name
[len
] != '/') ||
1254 memcmp(p
->name
, name
, len
))
1255 break; /* not our subdirectory */
1256 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1258 * p is at the same stage as our entry, and
1259 * is a subdirectory of what we are looking
1260 * at, so we cannot have conflicts at our
1261 * level or anything shorter.
1270 /* We may be in a situation where we already have path/file and path
1271 * is being added, or we already have path and path/file is being
1272 * added. Either one would result in a nonsense tree that has path
1273 * twice when git-write-tree tries to write it out. Prevent it.
1275 * If ok-to-replace is specified, we remove the conflicting entries
1276 * from the cache so the caller should recompute the insert position.
1277 * When this happens, we return non-zero.
1279 static int check_file_directory_conflict(struct index_state
*istate
,
1280 const struct cache_entry
*ce
,
1281 int pos
, int ok_to_replace
)
1286 * When ce is an "I am going away" entry, we allow it to be added
1288 if (ce
->ce_flags
& CE_REMOVE
)
1292 * We check if the path is a sub-path of a subsequent pathname
1293 * first, since removing those will not change the position
1296 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1299 * Then check if the path might have a clashing sub-directory
1302 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1305 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1308 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1309 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1310 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1311 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1313 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1314 cache_tree_invalidate_path(istate
, ce
->name
);
1317 * If this entry's path sorts after the last entry in the index,
1318 * we can avoid searching for it.
1320 if (istate
->cache_nr
> 0 &&
1321 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1322 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1324 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1326 /* existing match? Just replace it. */
1329 replace_index_entry(istate
, pos
, ce
);
1334 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1335 untracked_cache_add_to_index(istate
, ce
->name
);
1338 * Inserting a merged entry ("stage 0") into the index
1339 * will always replace all non-merged entries..
1341 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1342 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1344 if (!remove_index_entry_at(istate
, pos
))
1351 if (!verify_path(ce
->name
, ce
->ce_mode
))
1352 return error(_("invalid path '%s'"), ce
->name
);
1354 if (!skip_df_check
&&
1355 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1357 return error(_("'%s' appears as both a file and as a directory"),
1359 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1365 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1369 if (option
& ADD_CACHE_JUST_APPEND
)
1370 pos
= istate
->cache_nr
;
1373 ret
= add_index_entry_with_check(istate
, ce
, option
);
1379 /* Make sure the array is big enough .. */
1380 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1384 if (istate
->cache_nr
> pos
+ 1)
1385 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1386 istate
->cache_nr
- pos
- 1);
1387 set_index_entry(istate
, pos
, ce
);
1388 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1393 * "refresh" does not calculate a new sha1 file or bring the
1394 * cache up-to-date for mode/content changes. But what it
1395 * _does_ do is to "re-match" the stat information of a file
1396 * with the cache, so that you can refresh the cache for a
1397 * file that hasn't been changed but where the stat entry is
1400 * For example, you'd want to do this after doing a "git-read-tree",
1401 * to link up the stat cache details with the proper files.
1403 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1404 struct cache_entry
*ce
,
1405 unsigned int options
, int *err
,
1411 struct cache_entry
*updated
;
1413 int refresh
= options
& CE_MATCH_REFRESH
;
1414 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1415 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1416 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1417 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1419 if (!refresh
|| ce_uptodate(ce
))
1422 if (!ignore_fsmonitor
)
1423 refresh_fsmonitor(istate
);
1425 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1426 * that the change to the work tree does not matter and told
1429 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1430 ce_mark_uptodate(ce
);
1433 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1434 ce_mark_uptodate(ce
);
1437 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1438 ce_mark_uptodate(ce
);
1442 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1452 if (lstat(ce
->name
, &st
) < 0) {
1453 if (ignore_missing
&& errno
== ENOENT
)
1460 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1462 *changed_ret
= changed
;
1465 * The path is unchanged. If we were told to ignore
1466 * valid bit, then we did the actual stat check and
1467 * found that the entry is unmodified. If the entry
1468 * is not marked VALID, this is the place to mark it
1469 * valid again, under "assume unchanged" mode.
1471 if (ignore_valid
&& assume_unchanged
&&
1472 !(ce
->ce_flags
& CE_VALID
))
1473 ; /* mark this one VALID again */
1476 * We do not mark the index itself "modified"
1477 * because CE_UPTODATE flag is in-core only;
1478 * we are not going to write this change out.
1480 if (!S_ISGITLINK(ce
->ce_mode
)) {
1481 ce_mark_uptodate(ce
);
1482 mark_fsmonitor_valid(istate
, ce
);
1490 if (ie_modified(istate
, ce
, &st
, options
)) {
1496 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1497 copy_cache_entry(updated
, ce
);
1498 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1499 fill_stat_cache_info(istate
, updated
, &st
);
1501 * If ignore_valid is not set, we should leave CE_VALID bit
1502 * alone. Otherwise, paths marked with --no-assume-unchanged
1503 * (i.e. things to be edited) will reacquire CE_VALID bit
1504 * automatically, which is not really what we want.
1506 if (!ignore_valid
&& assume_unchanged
&&
1507 !(ce
->ce_flags
& CE_VALID
))
1508 updated
->ce_flags
&= ~CE_VALID
;
1510 /* istate->cache_changed is updated in the caller */
1514 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1515 int * first
, const char *header_msg
)
1517 if (in_porcelain
&& *first
&& header_msg
) {
1518 printf("%s\n", header_msg
);
1524 int repo_refresh_and_write_index(struct repository
*repo
,
1525 unsigned int refresh_flags
,
1526 unsigned int write_flags
,
1528 const struct pathspec
*pathspec
,
1529 char *seen
, const char *header_msg
)
1531 struct lock_file lock_file
= LOCK_INIT
;
1534 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1535 if (!gentle
&& fd
< 0)
1537 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1539 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1545 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1546 const struct pathspec
*pathspec
,
1547 char *seen
, const char *header_msg
)
1551 int really
= (flags
& REFRESH_REALLY
) != 0;
1552 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1553 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1554 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1555 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1556 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1558 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1559 unsigned int options
= (CE_MATCH_REFRESH
|
1560 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1561 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1562 const char *modified_fmt
;
1563 const char *deleted_fmt
;
1564 const char *typechange_fmt
;
1565 const char *added_fmt
;
1566 const char *unmerged_fmt
;
1567 struct progress
*progress
= NULL
;
1568 int t2_sum_lstat
= 0;
1569 int t2_sum_scan
= 0;
1571 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1572 progress
= start_delayed_progress(_("Refresh index"),
1575 trace_performance_enter();
1576 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1577 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1578 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1579 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1580 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1582 * Use the multi-threaded preload_index() to refresh most of the
1583 * cache entries quickly then in the single threaded loop below,
1584 * we only have to do the special cases that are left.
1586 preload_index(istate
, pathspec
, 0);
1587 trace2_region_enter("index", "refresh", NULL
);
1588 /* TODO: audit for interaction with sparse-index. */
1589 ensure_full_index(istate
);
1590 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1591 struct cache_entry
*ce
, *new_entry
;
1592 int cache_errno
= 0;
1595 int t2_did_lstat
= 0;
1596 int t2_did_scan
= 0;
1598 ce
= istate
->cache
[i
];
1599 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1601 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1604 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1608 while ((i
< istate
->cache_nr
) &&
1609 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1615 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1616 &first
, header_msg
);
1624 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1625 &cache_errno
, &changed
,
1626 &t2_did_lstat
, &t2_did_scan
);
1627 t2_sum_lstat
+= t2_did_lstat
;
1628 t2_sum_scan
+= t2_did_scan
;
1629 if (new_entry
== ce
)
1632 display_progress(progress
, i
);
1636 if (really
&& cache_errno
== EINVAL
) {
1637 /* If we are doing --really-refresh that
1638 * means the index is not valid anymore.
1640 ce
->ce_flags
&= ~CE_VALID
;
1641 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1642 mark_fsmonitor_invalid(istate
, ce
);
1643 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1648 if (cache_errno
== ENOENT
)
1650 else if (ce_intent_to_add(ce
))
1651 fmt
= added_fmt
; /* must be before other checks */
1652 else if (changed
& TYPE_CHANGED
)
1653 fmt
= typechange_fmt
;
1657 ce
->name
, in_porcelain
, &first
, header_msg
);
1662 replace_index_entry(istate
, i
, new_entry
);
1664 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1665 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1666 trace2_region_leave("index", "refresh", NULL
);
1668 display_progress(progress
, istate
->cache_nr
);
1669 stop_progress(&progress
);
1671 trace_performance_leave("refresh index");
1675 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1676 struct cache_entry
*ce
,
1677 unsigned int options
)
1679 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1683 /*****************************************************************
1685 *****************************************************************/
1687 #define INDEX_FORMAT_DEFAULT 3
1689 static unsigned int get_index_format_default(struct repository
*r
)
1691 char *envversion
= getenv("GIT_INDEX_VERSION");
1693 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1696 prepare_repo_settings(r
);
1698 if (r
->settings
.index_version
>= 0)
1699 version
= r
->settings
.index_version
;
1700 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1701 warning(_("index.version set, but the value is invalid.\n"
1702 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1703 return INDEX_FORMAT_DEFAULT
;
1708 version
= strtoul(envversion
, &endp
, 10);
1710 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1711 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1712 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1713 version
= INDEX_FORMAT_DEFAULT
;
1719 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1720 * Again - this is just a (very strong in practice) heuristic that
1721 * the inode hasn't changed.
1723 * We save the fields in big-endian order to allow using the
1724 * index file over NFS transparently.
1726 struct ondisk_cache_entry
{
1727 struct cache_time ctime
;
1728 struct cache_time mtime
;
1736 * unsigned char hash[hashsz];
1738 * if (flags & CE_EXTENDED)
1741 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1742 char name
[FLEX_ARRAY
];
1745 /* These are only used for v3 or lower */
1746 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1747 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1748 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1749 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1750 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1751 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1752 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1754 /* Allow fsck to force verification of the index checksum. */
1755 int verify_index_checksum
;
1757 /* Allow fsck to force verification of the cache entry order. */
1758 int verify_ce_order
;
1760 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1763 unsigned char hash
[GIT_MAX_RAWSZ
];
1766 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1767 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1768 hdr_version
= ntohl(hdr
->hdr_version
);
1769 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1770 return error(_("bad index version %d"), hdr_version
);
1772 if (!verify_index_checksum
)
1775 the_hash_algo
->init_fn(&c
);
1776 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1777 the_hash_algo
->final_fn(hash
, &c
);
1778 if (!hasheq(hash
, (unsigned char *)hdr
+ size
- the_hash_algo
->rawsz
))
1779 return error(_("bad index file sha1 signature"));
1783 static int read_index_extension(struct index_state
*istate
,
1784 const char *ext
, const char *data
, unsigned long sz
)
1786 switch (CACHE_EXT(ext
)) {
1787 case CACHE_EXT_TREE
:
1788 istate
->cache_tree
= cache_tree_read(data
, sz
);
1790 case CACHE_EXT_RESOLVE_UNDO
:
1791 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1793 case CACHE_EXT_LINK
:
1794 if (read_link_extension(istate
, data
, sz
))
1797 case CACHE_EXT_UNTRACKED
:
1798 istate
->untracked
= read_untracked_extension(data
, sz
);
1800 case CACHE_EXT_FSMONITOR
:
1801 read_fsmonitor_extension(istate
, data
, sz
);
1803 case CACHE_EXT_ENDOFINDEXENTRIES
:
1804 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1805 /* already handled in do_read_index() */
1807 case CACHE_EXT_SPARSE_DIRECTORIES
:
1808 /* no content, only an indicator */
1809 istate
->sparse_index
= 1;
1812 if (*ext
< 'A' || 'Z' < *ext
)
1813 return error(_("index uses %.4s extension, which we do not understand"),
1815 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1821 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1822 unsigned int version
,
1823 struct ondisk_cache_entry
*ondisk
,
1824 unsigned long *ent_size
,
1825 const struct cache_entry
*previous_ce
)
1827 struct cache_entry
*ce
;
1830 const unsigned hashsz
= the_hash_algo
->rawsz
;
1831 const uint16_t *flagsp
= (const uint16_t *)(ondisk
->data
+ hashsz
);
1833 size_t copy_len
= 0;
1835 * Adjacent cache entries tend to share the leading paths, so it makes
1836 * sense to only store the differences in later entries. In the v4
1837 * on-disk format of the index, each on-disk cache entry stores the
1838 * number of bytes to be stripped from the end of the previous name,
1839 * and the bytes to append to the result, to come up with its name.
1841 int expand_name_field
= version
== 4;
1843 /* On-disk flags are just 16 bits */
1844 flags
= get_be16(flagsp
);
1845 len
= flags
& CE_NAMEMASK
;
1847 if (flags
& CE_EXTENDED
) {
1849 extended_flags
= get_be16(flagsp
+ 1) << 16;
1850 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1851 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1852 die(_("unknown index entry format 0x%08x"), extended_flags
);
1853 flags
|= extended_flags
;
1854 name
= (const char *)(flagsp
+ 2);
1857 name
= (const char *)(flagsp
+ 1);
1859 if (expand_name_field
) {
1860 const unsigned char *cp
= (const unsigned char *)name
;
1861 size_t strip_len
, previous_len
;
1863 /* If we're at the beginning of a block, ignore the previous name */
1864 strip_len
= decode_varint(&cp
);
1866 previous_len
= previous_ce
->ce_namelen
;
1867 if (previous_len
< strip_len
)
1868 die(_("malformed name field in the index, near path '%s'"),
1870 copy_len
= previous_len
- strip_len
;
1872 name
= (const char *)cp
;
1875 if (len
== CE_NAMEMASK
) {
1877 if (expand_name_field
)
1881 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1883 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1884 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1885 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1886 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1887 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1888 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1889 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1890 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1891 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1892 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1893 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1894 ce
->ce_namelen
= len
;
1896 oidread(&ce
->oid
, ondisk
->data
);
1897 memcpy(ce
->name
, name
, len
);
1898 ce
->name
[len
] = '\0';
1900 if (expand_name_field
) {
1902 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1903 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1904 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1906 memcpy(ce
->name
, name
, len
+ 1);
1907 *ent_size
= ondisk_ce_size(ce
);
1912 static void check_ce_order(struct index_state
*istate
)
1916 if (!verify_ce_order
)
1919 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1920 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1921 struct cache_entry
*next_ce
= istate
->cache
[i
];
1922 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1924 if (0 < name_compare
)
1925 die(_("unordered stage entries in index"));
1926 if (!name_compare
) {
1928 die(_("multiple stage entries for merged file '%s'"),
1930 if (ce_stage(ce
) > ce_stage(next_ce
))
1931 die(_("unordered stage entries for '%s'"),
1937 static void tweak_untracked_cache(struct index_state
*istate
)
1939 struct repository
*r
= the_repository
;
1941 prepare_repo_settings(r
);
1943 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
) {
1944 remove_untracked_cache(istate
);
1948 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1949 add_untracked_cache(istate
);
1952 static void tweak_split_index(struct index_state
*istate
)
1954 switch (git_config_get_split_index()) {
1955 case -1: /* unset: do nothing */
1958 remove_split_index(istate
);
1961 add_split_index(istate
);
1963 default: /* unknown value: do nothing */
1968 static void post_read_index_from(struct index_state
*istate
)
1970 check_ce_order(istate
);
1971 tweak_untracked_cache(istate
);
1972 tweak_split_index(istate
);
1973 tweak_fsmonitor(istate
);
1976 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1978 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1981 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1983 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1986 * Account for potential alignment differences.
1988 per_entry
+= align_padding_size(per_entry
, 0);
1989 return ondisk_size
+ entries
* per_entry
;
1992 struct index_entry_offset
1994 /* starting byte offset into index file, count of index entries in this block */
1998 struct index_entry_offset_table
2001 struct index_entry_offset entries
[FLEX_ARRAY
];
2004 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2005 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2007 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2008 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2010 struct load_index_extensions
2013 struct index_state
*istate
;
2016 unsigned long src_offset
;
2019 static void *load_index_extensions(void *_data
)
2021 struct load_index_extensions
*p
= _data
;
2022 unsigned long src_offset
= p
->src_offset
;
2024 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2025 /* After an array of active_nr index entries,
2026 * there can be arbitrary number of extended
2027 * sections, each of which is prefixed with
2028 * extension name (4-byte) and section length
2029 * in 4-byte network byte order.
2031 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2032 if (read_index_extension(p
->istate
,
2033 p
->mmap
+ src_offset
,
2034 p
->mmap
+ src_offset
+ 8,
2036 munmap((void *)p
->mmap
, p
->mmap_size
);
2037 die(_("index file corrupt"));
2040 src_offset
+= extsize
;
2047 * A helper function that will load the specified range of cache entries
2048 * from the memory mapped file and add them to the given index.
2050 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2051 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2052 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2055 unsigned long src_offset
= start_offset
;
2057 for (i
= offset
; i
< offset
+ nr
; i
++) {
2058 struct ondisk_cache_entry
*disk_ce
;
2059 struct cache_entry
*ce
;
2060 unsigned long consumed
;
2062 disk_ce
= (struct ondisk_cache_entry
*)(mmap
+ src_offset
);
2063 ce
= create_from_disk(ce_mem_pool
, istate
->version
, disk_ce
, &consumed
, previous_ce
);
2064 set_index_entry(istate
, i
, ce
);
2066 src_offset
+= consumed
;
2069 return src_offset
- start_offset
;
2072 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2073 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2075 unsigned long consumed
;
2077 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2078 if (istate
->version
== 4) {
2079 mem_pool_init(istate
->ce_mem_pool
,
2080 estimate_cache_size_from_compressed(istate
->cache_nr
));
2082 mem_pool_init(istate
->ce_mem_pool
,
2083 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2086 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2087 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2092 * Mostly randomly chosen maximum thread counts: we
2093 * cap the parallelism to online_cpus() threads, and we want
2094 * to have at least 10000 cache entries per thread for it to
2095 * be worth starting a thread.
2098 #define THREAD_COST (10000)
2100 struct load_cache_entries_thread_data
2103 struct index_state
*istate
;
2104 struct mem_pool
*ce_mem_pool
;
2107 struct index_entry_offset_table
*ieot
;
2108 int ieot_start
; /* starting index into the ieot array */
2109 int ieot_blocks
; /* count of ieot entries to process */
2110 unsigned long consumed
; /* return # of bytes in index file processed */
2114 * A thread proc to run the load_cache_entries() computation
2115 * across multiple background threads.
2117 static void *load_cache_entries_thread(void *_data
)
2119 struct load_cache_entries_thread_data
*p
= _data
;
2122 /* iterate across all ieot blocks assigned to this thread */
2123 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2124 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2125 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2126 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2131 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2132 int nr_threads
, struct index_entry_offset_table
*ieot
)
2134 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2135 struct load_cache_entries_thread_data
*data
;
2136 unsigned long consumed
= 0;
2138 /* a little sanity checking */
2139 if (istate
->name_hash_initialized
)
2140 BUG("the name hash isn't thread safe");
2142 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2143 mem_pool_init(istate
->ce_mem_pool
, 0);
2145 /* ensure we have no more threads than we have blocks to process */
2146 if (nr_threads
> ieot
->nr
)
2147 nr_threads
= ieot
->nr
;
2148 CALLOC_ARRAY(data
, nr_threads
);
2150 offset
= ieot_start
= 0;
2151 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2152 for (i
= 0; i
< nr_threads
; i
++) {
2153 struct load_cache_entries_thread_data
*p
= &data
[i
];
2156 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2157 ieot_blocks
= ieot
->nr
- ieot_start
;
2163 p
->ieot_start
= ieot_start
;
2164 p
->ieot_blocks
= ieot_blocks
;
2166 /* create a mem_pool for each thread */
2168 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2169 nr
+= p
->ieot
->entries
[j
].nr
;
2170 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2171 if (istate
->version
== 4) {
2172 mem_pool_init(p
->ce_mem_pool
,
2173 estimate_cache_size_from_compressed(nr
));
2175 mem_pool_init(p
->ce_mem_pool
,
2176 estimate_cache_size(mmap_size
, nr
));
2179 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2181 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2183 /* increment by the number of cache entries in the ieot block being processed */
2184 for (j
= 0; j
< ieot_blocks
; j
++)
2185 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2186 ieot_start
+= ieot_blocks
;
2189 for (i
= 0; i
< nr_threads
; i
++) {
2190 struct load_cache_entries_thread_data
*p
= &data
[i
];
2192 err
= pthread_join(p
->pthread
, NULL
);
2194 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2195 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2196 consumed
+= p
->consumed
;
2204 /* remember to discard_cache() before reading a different cache! */
2205 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2209 unsigned long src_offset
;
2210 const struct cache_header
*hdr
;
2213 struct load_index_extensions p
;
2214 size_t extension_offset
= 0;
2215 int nr_threads
, cpus
;
2216 struct index_entry_offset_table
*ieot
= NULL
;
2218 if (istate
->initialized
)
2219 return istate
->cache_nr
;
2221 istate
->timestamp
.sec
= 0;
2222 istate
->timestamp
.nsec
= 0;
2223 fd
= open(path
, O_RDONLY
);
2225 if (!must_exist
&& errno
== ENOENT
)
2227 die_errno(_("%s: index file open failed"), path
);
2231 die_errno(_("%s: cannot stat the open index"), path
);
2233 mmap_size
= xsize_t(st
.st_size
);
2234 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2235 die(_("%s: index file smaller than expected"), path
);
2237 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2238 if (mmap
== MAP_FAILED
)
2239 die_errno(_("%s: unable to map index file"), path
);
2242 hdr
= (const struct cache_header
*)mmap
;
2243 if (verify_hdr(hdr
, mmap_size
) < 0)
2246 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2247 istate
->version
= ntohl(hdr
->hdr_version
);
2248 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2249 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2250 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2251 istate
->initialized
= 1;
2255 p
.mmap_size
= mmap_size
;
2257 src_offset
= sizeof(*hdr
);
2259 if (git_config_get_index_threads(&nr_threads
))
2262 /* TODO: does creating more threads than cores help? */
2264 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2265 cpus
= online_cpus();
2266 if (nr_threads
> cpus
)
2273 if (nr_threads
> 1) {
2274 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2275 if (extension_offset
) {
2278 p
.src_offset
= extension_offset
;
2279 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2281 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2288 * Locate and read the index entry offset table so that we can use it
2289 * to multi-thread the reading of the cache entries.
2291 if (extension_offset
&& nr_threads
> 1)
2292 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2295 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2298 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2301 istate
->timestamp
.sec
= st
.st_mtime
;
2302 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2304 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2305 if (extension_offset
) {
2306 int ret
= pthread_join(p
.pthread
, NULL
);
2308 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2310 p
.src_offset
= src_offset
;
2311 load_index_extensions(&p
);
2313 munmap((void *)mmap
, mmap_size
);
2316 * TODO trace2: replace "the_repository" with the actual repo instance
2317 * that is associated with the given "istate".
2319 trace2_data_intmax("index", the_repository
, "read/version",
2321 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2325 istate
->repo
= the_repository
;
2326 prepare_repo_settings(istate
->repo
);
2327 if (istate
->repo
->settings
.command_requires_full_index
)
2328 ensure_full_index(istate
);
2330 return istate
->cache_nr
;
2333 munmap((void *)mmap
, mmap_size
);
2334 die(_("index file corrupt"));
2338 * Signal that the shared index is used by updating its mtime.
2340 * This way, shared index can be removed if they have not been used
2343 static void freshen_shared_index(const char *shared_index
, int warn
)
2345 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2346 warning(_("could not freshen shared index '%s'"), shared_index
);
2349 int read_index_from(struct index_state
*istate
, const char *path
,
2352 struct split_index
*split_index
;
2357 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2358 if (istate
->initialized
)
2359 return istate
->cache_nr
;
2362 * TODO trace2: replace "the_repository" with the actual repo instance
2363 * that is associated with the given "istate".
2365 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2367 trace_performance_enter();
2368 ret
= do_read_index(istate
, path
, 0);
2369 trace_performance_leave("read cache %s", path
);
2370 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2373 split_index
= istate
->split_index
;
2374 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2375 post_read_index_from(istate
);
2379 trace_performance_enter();
2380 if (split_index
->base
)
2381 discard_index(split_index
->base
);
2383 CALLOC_ARRAY(split_index
->base
, 1);
2385 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2386 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2387 trace2_region_enter_printf("index", "shared/do_read_index",
2388 the_repository
, "%s", base_path
);
2389 ret
= do_read_index(split_index
->base
, base_path
, 1);
2390 trace2_region_leave_printf("index", "shared/do_read_index",
2391 the_repository
, "%s", base_path
);
2392 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2393 die(_("broken index, expect %s in %s, got %s"),
2394 base_oid_hex
, base_path
,
2395 oid_to_hex(&split_index
->base
->oid
));
2397 freshen_shared_index(base_path
, 0);
2398 merge_base_index(istate
);
2399 post_read_index_from(istate
);
2400 trace_performance_leave("read cache %s", base_path
);
2405 int is_index_unborn(struct index_state
*istate
)
2407 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2410 int discard_index(struct index_state
*istate
)
2413 * Cache entries in istate->cache[] should have been allocated
2414 * from the memory pool associated with this index, or from an
2415 * associated split_index. There is no need to free individual
2416 * cache entries. validate_cache_entries can detect when this
2417 * assertion does not hold.
2419 validate_cache_entries(istate
);
2421 resolve_undo_clear_index(istate
);
2422 istate
->cache_nr
= 0;
2423 istate
->cache_changed
= 0;
2424 istate
->timestamp
.sec
= 0;
2425 istate
->timestamp
.nsec
= 0;
2426 free_name_hash(istate
);
2427 cache_tree_free(&(istate
->cache_tree
));
2428 istate
->initialized
= 0;
2429 istate
->fsmonitor_has_run_once
= 0;
2430 FREE_AND_NULL(istate
->fsmonitor_last_update
);
2431 FREE_AND_NULL(istate
->cache
);
2432 istate
->cache_alloc
= 0;
2433 discard_split_index(istate
);
2434 free_untracked_cache(istate
->untracked
);
2435 istate
->untracked
= NULL
;
2437 if (istate
->ce_mem_pool
) {
2438 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2439 FREE_AND_NULL(istate
->ce_mem_pool
);
2446 * Validate the cache entries of this index.
2447 * All cache entries associated with this index
2448 * should have been allocated by the memory pool
2449 * associated with this index, or by a referenced
2452 void validate_cache_entries(const struct index_state
*istate
)
2456 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2459 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2461 BUG("cache entry is not allocated from expected memory pool");
2462 } else if (!istate
->ce_mem_pool
||
2463 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2464 if (!istate
->split_index
||
2465 !istate
->split_index
->base
||
2466 !istate
->split_index
->base
->ce_mem_pool
||
2467 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2468 BUG("cache entry is not allocated from expected memory pool");
2473 if (istate
->split_index
)
2474 validate_cache_entries(istate
->split_index
->base
);
2477 int unmerged_index(const struct index_state
*istate
)
2480 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2481 if (ce_stage(istate
->cache
[i
]))
2487 int repo_index_has_changes(struct repository
*repo
,
2491 struct index_state
*istate
= repo
->index
;
2492 struct object_id cmp
;
2496 cmp
= tree
->object
.oid
;
2497 if (tree
|| !get_oid_tree("HEAD", &cmp
)) {
2498 struct diff_options opt
;
2500 repo_diff_setup(repo
, &opt
);
2501 opt
.flags
.exit_with_status
= 1;
2503 opt
.flags
.quick
= 1;
2504 do_diff_cache(&cmp
, &opt
);
2506 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2508 strbuf_addch(sb
, ' ');
2509 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2512 return opt
.flags
.has_changes
!= 0;
2514 /* TODO: audit for interaction with sparse-index. */
2515 ensure_full_index(istate
);
2516 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2518 strbuf_addch(sb
, ' ');
2519 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2521 return !!istate
->cache_nr
;
2525 static int write_index_ext_header(struct hashfile
*f
,
2526 git_hash_ctx
*eoie_f
,
2530 hashwrite_be32(f
, ext
);
2531 hashwrite_be32(f
, sz
);
2536 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2537 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2542 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2543 struct cache_entry
*ce
)
2546 * The only thing we care about in this function is to smudge the
2547 * falsely clean entry due to touch-update-touch race, so we leave
2548 * everything else as they are. We are called for entries whose
2549 * ce_stat_data.sd_mtime match the index file mtime.
2551 * Note that this actually does not do much for gitlinks, for
2552 * which ce_match_stat_basic() always goes to the actual
2553 * contents. The caller checks with is_racy_timestamp() which
2554 * always says "no" for gitlinks, so we are not called for them ;-)
2558 if (lstat(ce
->name
, &st
) < 0)
2560 if (ce_match_stat_basic(ce
, &st
))
2562 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2563 /* This is "racily clean"; smudge it. Note that this
2564 * is a tricky code. At first glance, it may appear
2565 * that it can break with this sequence:
2567 * $ echo xyzzy >frotz
2568 * $ git-update-index --add frotz
2571 * $ echo filfre >nitfol
2572 * $ git-update-index --add nitfol
2574 * but it does not. When the second update-index runs,
2575 * it notices that the entry "frotz" has the same timestamp
2576 * as index, and if we were to smudge it by resetting its
2577 * size to zero here, then the object name recorded
2578 * in index is the 6-byte file but the cached stat information
2579 * becomes zero --- which would then match what we would
2580 * obtain from the filesystem next time we stat("frotz").
2582 * However, the second update-index, before calling
2583 * this function, notices that the cached size is 6
2584 * bytes and what is on the filesystem is an empty
2585 * file, and never calls us, so the cached size information
2586 * for "frotz" stays 6 which does not match the filesystem.
2588 ce
->ce_stat_data
.sd_size
= 0;
2592 /* Copy miscellaneous fields but not the name */
2593 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2594 struct cache_entry
*ce
)
2597 const unsigned hashsz
= the_hash_algo
->rawsz
;
2598 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2600 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2601 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2602 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2603 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2604 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2605 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2606 ondisk
->mode
= htonl(ce
->ce_mode
);
2607 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2608 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2609 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2610 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2612 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2613 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2614 flagsp
[0] = htons(flags
);
2615 if (ce
->ce_flags
& CE_EXTENDED
) {
2616 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2620 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2621 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2624 unsigned int saved_namelen
;
2625 int stripped_name
= 0;
2626 static unsigned char padding
[8] = { 0x00 };
2628 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2629 saved_namelen
= ce_namelen(ce
);
2634 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2636 if (!previous_name
) {
2637 int len
= ce_namelen(ce
);
2638 copy_cache_entry_to_ondisk(ondisk
, ce
);
2639 hashwrite(f
, ondisk
, size
);
2640 hashwrite(f
, ce
->name
, len
);
2641 hashwrite(f
, padding
, align_padding_size(size
, len
));
2643 int common
, to_remove
, prefix_size
;
2644 unsigned char to_remove_vi
[16];
2646 (ce
->name
[common
] &&
2647 common
< previous_name
->len
&&
2648 ce
->name
[common
] == previous_name
->buf
[common
]);
2650 ; /* still matching */
2651 to_remove
= previous_name
->len
- common
;
2652 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2654 copy_cache_entry_to_ondisk(ondisk
, ce
);
2655 hashwrite(f
, ondisk
, size
);
2656 hashwrite(f
, to_remove_vi
, prefix_size
);
2657 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2658 hashwrite(f
, padding
, 1);
2660 strbuf_splice(previous_name
, common
, to_remove
,
2661 ce
->name
+ common
, ce_namelen(ce
) - common
);
2663 if (stripped_name
) {
2664 ce
->ce_namelen
= saved_namelen
;
2665 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2672 * This function verifies if index_state has the correct sha1 of the
2673 * index file. Don't die if we have any other failure, just return 0.
2675 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2680 unsigned char hash
[GIT_MAX_RAWSZ
];
2682 if (!istate
->initialized
)
2685 fd
= open(path
, O_RDONLY
);
2692 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2695 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2696 if (n
!= the_hash_algo
->rawsz
)
2699 if (!hasheq(istate
->oid
.hash
, hash
))
2710 static int repo_verify_index(struct repository
*repo
)
2712 return verify_index_from(repo
->index
, repo
->index_file
);
2715 static int has_racy_timestamp(struct index_state
*istate
)
2717 int entries
= istate
->cache_nr
;
2720 for (i
= 0; i
< entries
; i
++) {
2721 struct cache_entry
*ce
= istate
->cache
[i
];
2722 if (is_racy_timestamp(istate
, ce
))
2728 void repo_update_index_if_able(struct repository
*repo
,
2729 struct lock_file
*lockfile
)
2731 if ((repo
->index
->cache_changed
||
2732 has_racy_timestamp(repo
->index
)) &&
2733 repo_verify_index(repo
))
2734 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2736 rollback_lock_file(lockfile
);
2739 static int record_eoie(void)
2743 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2747 * As a convenience, the end of index entries extension
2748 * used for threading is written by default if the user
2749 * explicitly requested threaded index reads.
2751 return !git_config_get_index_threads(&val
) && val
!= 1;
2754 static int record_ieot(void)
2758 if (!git_config_get_bool("index.recordoffsettable", &val
))
2762 * As a convenience, the offset table used for threading is
2763 * written by default if the user explicitly requested
2764 * threaded index reads.
2766 return !git_config_get_index_threads(&val
) && val
!= 1;
2770 * On success, `tempfile` is closed. If it is the temporary file
2771 * of a `struct lock_file`, we will therefore effectively perform
2772 * a 'close_lock_file_gently()`. Since that is an implementation
2773 * detail of lockfiles, callers of `do_write_index()` should not
2776 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2777 int strip_extensions
)
2779 uint64_t start
= getnanotime();
2781 git_hash_ctx
*eoie_c
= NULL
;
2782 struct cache_header hdr
;
2783 int i
, err
= 0, removed
, extended
, hdr_version
;
2784 struct cache_entry
**cache
= istate
->cache
;
2785 int entries
= istate
->cache_nr
;
2787 struct ondisk_cache_entry ondisk
;
2788 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2789 int drop_cache_tree
= istate
->drop_cache_tree
;
2791 int ieot_entries
= 1;
2792 struct index_entry_offset_table
*ieot
= NULL
;
2795 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2797 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2798 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2801 /* reduce extended entries if possible */
2802 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2803 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2805 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2809 if (!istate
->version
) {
2810 istate
->version
= get_index_format_default(the_repository
);
2811 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
2812 init_split_index(istate
);
2815 /* demote version 3 to version 2 when the latter suffices */
2816 if (istate
->version
== 3 || istate
->version
== 2)
2817 istate
->version
= extended
? 3 : 2;
2819 hdr_version
= istate
->version
;
2821 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2822 hdr
.hdr_version
= htonl(hdr_version
);
2823 hdr
.hdr_entries
= htonl(entries
- removed
);
2825 hashwrite(f
, &hdr
, sizeof(hdr
));
2827 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2830 if (nr_threads
!= 1 && record_ieot()) {
2831 int ieot_blocks
, cpus
;
2834 * ensure default number of ieot blocks maps evenly to the
2835 * default number of threads that will process them leaving
2836 * room for the thread to load the index extensions.
2839 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2840 cpus
= online_cpus();
2841 if (ieot_blocks
> cpus
- 1)
2842 ieot_blocks
= cpus
- 1;
2844 ieot_blocks
= nr_threads
;
2845 if (ieot_blocks
> istate
->cache_nr
)
2846 ieot_blocks
= istate
->cache_nr
;
2850 * no reason to write out the IEOT extension if we don't
2851 * have enough blocks to utilize multi-threading
2853 if (ieot_blocks
> 1) {
2854 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2855 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2856 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2860 offset
= hashfile_total(f
);
2863 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2865 for (i
= 0; i
< entries
; i
++) {
2866 struct cache_entry
*ce
= cache
[i
];
2867 if (ce
->ce_flags
& CE_REMOVE
)
2869 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2870 ce_smudge_racily_clean_entry(istate
, ce
);
2871 if (is_null_oid(&ce
->oid
)) {
2872 static const char msg
[] = "cache entry has null sha1: %s";
2873 static int allow
= -1;
2876 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2878 warning(msg
, ce
->name
);
2880 err
= error(msg
, ce
->name
);
2882 drop_cache_tree
= 1;
2884 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2885 ieot
->entries
[ieot
->nr
].nr
= nr
;
2886 ieot
->entries
[ieot
->nr
].offset
= offset
;
2889 * If we have a V4 index, set the first byte to an invalid
2890 * character to ensure there is nothing common with the previous
2894 previous_name
->buf
[0] = 0;
2897 offset
= hashfile_total(f
);
2899 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2907 ieot
->entries
[ieot
->nr
].nr
= nr
;
2908 ieot
->entries
[ieot
->nr
].offset
= offset
;
2911 strbuf_release(&previous_name_buf
);
2918 offset
= hashfile_total(f
);
2921 * The extension headers must be hashed on their own for the
2922 * EOIE extension. Create a hashfile here to compute that hash.
2924 if (offset
&& record_eoie()) {
2925 CALLOC_ARRAY(eoie_c
, 1);
2926 the_hash_algo
->init_fn(eoie_c
);
2930 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2931 * can minimize the number of extensions we have to scan through to
2932 * find it during load. Write it out regardless of the
2933 * strip_extensions parameter as we need it when loading the shared
2937 struct strbuf sb
= STRBUF_INIT
;
2939 write_ieot_extension(&sb
, ieot
);
2940 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
2941 hashwrite(f
, sb
.buf
, sb
.len
);
2942 strbuf_release(&sb
);
2948 if (!strip_extensions
&& istate
->split_index
&&
2949 !is_null_oid(&istate
->split_index
->base_oid
)) {
2950 struct strbuf sb
= STRBUF_INIT
;
2952 err
= write_link_extension(&sb
, istate
) < 0 ||
2953 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
2955 hashwrite(f
, sb
.buf
, sb
.len
);
2956 strbuf_release(&sb
);
2960 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
2961 struct strbuf sb
= STRBUF_INIT
;
2963 cache_tree_write(&sb
, istate
->cache_tree
);
2964 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
2965 hashwrite(f
, sb
.buf
, sb
.len
);
2966 strbuf_release(&sb
);
2970 if (!strip_extensions
&& istate
->resolve_undo
) {
2971 struct strbuf sb
= STRBUF_INIT
;
2973 resolve_undo_write(&sb
, istate
->resolve_undo
);
2974 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
2976 hashwrite(f
, sb
.buf
, sb
.len
);
2977 strbuf_release(&sb
);
2981 if (!strip_extensions
&& istate
->untracked
) {
2982 struct strbuf sb
= STRBUF_INIT
;
2984 write_untracked_extension(&sb
, istate
->untracked
);
2985 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
2987 hashwrite(f
, sb
.buf
, sb
.len
);
2988 strbuf_release(&sb
);
2992 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
2993 struct strbuf sb
= STRBUF_INIT
;
2995 write_fsmonitor_extension(&sb
, istate
);
2996 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
2997 hashwrite(f
, sb
.buf
, sb
.len
);
2998 strbuf_release(&sb
);
3002 if (istate
->sparse_index
) {
3003 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3008 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3009 * so that it can be found and processed before all the index entries are
3010 * read. Write it out regardless of the strip_extensions parameter as we need it
3011 * when loading the shared index.
3014 struct strbuf sb
= STRBUF_INIT
;
3016 write_eoie_extension(&sb
, eoie_c
, offset
);
3017 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3018 hashwrite(f
, sb
.buf
, sb
.len
);
3019 strbuf_release(&sb
);
3024 finalize_hashfile(f
, istate
->oid
.hash
, CSUM_HASH_IN_STREAM
);
3025 if (close_tempfile_gently(tempfile
)) {
3026 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3029 if (stat(get_tempfile_path(tempfile
), &st
))
3031 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3032 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3033 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3036 * TODO trace2: replace "the_repository" with the actual repo instance
3037 * that is associated with the given "istate".
3039 trace2_data_intmax("index", the_repository
, "write/version",
3041 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3047 void set_alternate_index_output(const char *name
)
3049 alternate_index_output
= name
;
3052 static int commit_locked_index(struct lock_file
*lk
)
3054 if (alternate_index_output
)
3055 return commit_lock_file_to(lk
, alternate_index_output
);
3057 return commit_lock_file(lk
);
3060 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3064 int was_full
= !istate
->sparse_index
;
3066 ret
= convert_to_sparse(istate
);
3069 warning(_("failed to convert to a sparse-index"));
3074 * TODO trace2: replace "the_repository" with the actual repo instance
3075 * that is associated with the given "istate".
3077 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3078 "%s", get_lock_file_path(lock
));
3079 ret
= do_write_index(istate
, lock
->tempfile
, 0);
3080 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3081 "%s", get_lock_file_path(lock
));
3084 ensure_full_index(istate
);
3088 if (flags
& COMMIT_LOCK
)
3089 ret
= commit_locked_index(lock
);
3091 ret
= close_lock_file_gently(lock
);
3093 run_hook_le(NULL
, "post-index-change",
3094 istate
->updated_workdir
? "1" : "0",
3095 istate
->updated_skipworktree
? "1" : "0", NULL
);
3096 istate
->updated_workdir
= 0;
3097 istate
->updated_skipworktree
= 0;
3102 static int write_split_index(struct index_state
*istate
,
3103 struct lock_file
*lock
,
3107 prepare_to_write_split_index(istate
);
3108 ret
= do_write_locked_index(istate
, lock
, flags
);
3109 finish_writing_split_index(istate
);
3113 static const char *shared_index_expire
= "2.weeks.ago";
3115 static unsigned long get_shared_index_expire_date(void)
3117 static unsigned long shared_index_expire_date
;
3118 static int shared_index_expire_date_prepared
;
3120 if (!shared_index_expire_date_prepared
) {
3121 git_config_get_expiry("splitindex.sharedindexexpire",
3122 &shared_index_expire
);
3123 shared_index_expire_date
= approxidate(shared_index_expire
);
3124 shared_index_expire_date_prepared
= 1;
3127 return shared_index_expire_date
;
3130 static int should_delete_shared_index(const char *shared_index_path
)
3133 unsigned long expiration
;
3135 /* Check timestamp */
3136 expiration
= get_shared_index_expire_date();
3139 if (stat(shared_index_path
, &st
))
3140 return error_errno(_("could not stat '%s'"), shared_index_path
);
3141 if (st
.st_mtime
> expiration
)
3147 static int clean_shared_index_files(const char *current_hex
)
3150 DIR *dir
= opendir(get_git_dir());
3153 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3155 while ((de
= readdir(dir
)) != NULL
) {
3156 const char *sha1_hex
;
3157 const char *shared_index_path
;
3158 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3160 if (!strcmp(sha1_hex
, current_hex
))
3162 shared_index_path
= git_path("%s", de
->d_name
);
3163 if (should_delete_shared_index(shared_index_path
) > 0 &&
3164 unlink(shared_index_path
))
3165 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3172 static int write_shared_index(struct index_state
*istate
,
3173 struct tempfile
**temp
)
3175 struct split_index
*si
= istate
->split_index
;
3176 int ret
, was_full
= !istate
->sparse_index
;
3178 move_cache_to_base_index(istate
);
3179 convert_to_sparse(istate
);
3181 trace2_region_enter_printf("index", "shared/do_write_index",
3182 the_repository
, "%s", get_tempfile_path(*temp
));
3183 ret
= do_write_index(si
->base
, *temp
, 1);
3184 trace2_region_leave_printf("index", "shared/do_write_index",
3185 the_repository
, "%s", get_tempfile_path(*temp
));
3188 ensure_full_index(istate
);
3192 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3194 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3197 ret
= rename_tempfile(temp
,
3198 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3200 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3201 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3207 static const int default_max_percent_split_change
= 20;
3209 static int too_many_not_shared_entries(struct index_state
*istate
)
3211 int i
, not_shared
= 0;
3212 int max_split
= git_config_get_max_percent_split_change();
3214 switch (max_split
) {
3216 /* not or badly configured: use the default value */
3217 max_split
= default_max_percent_split_change
;
3220 return 1; /* 0% means always write a new shared index */
3222 return 0; /* 100% means never write a new shared index */
3224 break; /* just use the configured value */
3227 /* Count not shared entries */
3228 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3229 struct cache_entry
*ce
= istate
->cache
[i
];
3234 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3237 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3240 int new_shared_index
, ret
;
3241 struct split_index
*si
= istate
->split_index
;
3243 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3244 cache_tree_verify(the_repository
, istate
);
3246 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3247 if (flags
& COMMIT_LOCK
)
3248 rollback_lock_file(lock
);
3252 if (istate
->fsmonitor_last_update
)
3253 fill_fsmonitor_bitmap(istate
);
3255 if (!si
|| alternate_index_output
||
3256 (istate
->cache_changed
& ~EXTMASK
)) {
3258 oidclr(&si
->base_oid
);
3259 ret
= do_write_locked_index(istate
, lock
, flags
);
3263 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
3264 int v
= si
->base_oid
.hash
[0];
3266 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3268 if (too_many_not_shared_entries(istate
))
3269 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3271 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3273 if (new_shared_index
) {
3274 struct tempfile
*temp
;
3277 /* Same initial permissions as the main .git/index file */
3278 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3280 oidclr(&si
->base_oid
);
3281 ret
= do_write_locked_index(istate
, lock
, flags
);
3284 ret
= write_shared_index(istate
, &temp
);
3286 saved_errno
= errno
;
3287 if (is_tempfile_active(temp
))
3288 delete_tempfile(&temp
);
3289 errno
= saved_errno
;
3295 ret
= write_split_index(istate
, lock
, flags
);
3297 /* Freshen the shared index only if the split-index was written */
3298 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3299 const char *shared_index
= git_path("sharedindex.%s",
3300 oid_to_hex(&si
->base_oid
));
3301 freshen_shared_index(shared_index
, 1);
3305 if (flags
& COMMIT_LOCK
)
3306 rollback_lock_file(lock
);
3311 * Read the index file that is potentially unmerged into given
3312 * index_state, dropping any unmerged entries to stage #0 (potentially
3313 * resulting in a path appearing as both a file and a directory in the
3314 * index; the caller is responsible to clear out the extra entries
3315 * before writing the index to a tree). Returns true if the index is
3316 * unmerged. Callers who want to refuse to work from an unmerged
3317 * state can call this and check its return value, instead of calling
3320 int repo_read_index_unmerged(struct repository
*repo
)
3322 struct index_state
*istate
;
3326 repo_read_index(repo
);
3327 istate
= repo
->index
;
3328 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3329 struct cache_entry
*ce
= istate
->cache
[i
];
3330 struct cache_entry
*new_ce
;
3336 len
= ce_namelen(ce
);
3337 new_ce
= make_empty_cache_entry(istate
, len
);
3338 memcpy(new_ce
->name
, ce
->name
, len
);
3339 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3340 new_ce
->ce_namelen
= len
;
3341 new_ce
->ce_mode
= ce
->ce_mode
;
3342 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3343 return error(_("%s: cannot drop to stage #0"),
3350 * Returns 1 if the path is an "other" path with respect to
3351 * the index; that is, the path is not mentioned in the index at all,
3352 * either as a file, a directory with some files in the index,
3353 * or as an unmerged entry.
3355 * We helpfully remove a trailing "/" from directories so that
3356 * the output of read_directory can be used as-is.
3358 int index_name_is_other(struct index_state
*istate
, const char *name
,
3362 if (namelen
&& name
[namelen
- 1] == '/')
3364 pos
= index_name_pos(istate
, name
, namelen
);
3366 return 0; /* exact match */
3368 if (pos
< istate
->cache_nr
) {
3369 struct cache_entry
*ce
= istate
->cache
[pos
];
3370 if (ce_namelen(ce
) == namelen
&&
3371 !memcmp(ce
->name
, name
, namelen
))
3372 return 0; /* Yup, this one exists unmerged */
3377 void *read_blob_data_from_index(struct index_state
*istate
,
3378 const char *path
, unsigned long *size
)
3382 enum object_type type
;
3386 pos
= index_name_pos(istate
, path
, len
);
3389 * We might be in the middle of a merge, in which
3390 * case we would read stage #2 (ours).
3394 (pos
< 0 && i
< istate
->cache_nr
&&
3395 !strcmp(istate
->cache
[i
]->name
, path
));
3397 if (ce_stage(istate
->cache
[i
]) == 2)
3402 data
= read_object_file(&istate
->cache
[pos
]->oid
, &type
, &sz
);
3403 if (!data
|| type
!= OBJ_BLOB
) {
3412 void stat_validity_clear(struct stat_validity
*sv
)
3414 FREE_AND_NULL(sv
->sd
);
3417 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
3421 if (stat(path
, &st
) < 0)
3422 return sv
->sd
== NULL
;
3425 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
3428 void stat_validity_update(struct stat_validity
*sv
, int fd
)
3432 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
3433 stat_validity_clear(sv
);
3436 CALLOC_ARRAY(sv
->sd
, 1);
3437 fill_stat_data(sv
->sd
, &st
);
3441 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3443 dst
->untracked
= src
->untracked
;
3444 src
->untracked
= NULL
;
3445 dst
->cache_tree
= src
->cache_tree
;
3446 src
->cache_tree
= NULL
;
3449 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3450 struct index_state
*istate
)
3452 unsigned int size
= ce_size(ce
);
3453 int mem_pool_allocated
;
3454 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3455 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3457 memcpy(new_entry
, ce
, size
);
3458 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3462 void discard_cache_entry(struct cache_entry
*ce
)
3464 if (ce
&& should_validate_cache_entries())
3465 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3467 if (ce
&& ce
->mem_pool_allocated
)
3473 int should_validate_cache_entries(void)
3475 static int validate_index_cache_entries
= -1;
3477 if (validate_index_cache_entries
< 0) {
3478 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3479 validate_index_cache_entries
= 1;
3481 validate_index_cache_entries
= 0;
3484 return validate_index_cache_entries
;
3487 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3488 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3490 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3493 * The end of index entries (EOIE) extension is guaranteed to be last
3494 * so that it can be found by scanning backwards from the EOF.
3501 const char *index
, *eoie
;
3503 size_t offset
, src_offset
;
3504 unsigned char hash
[GIT_MAX_RAWSZ
];
3507 /* ensure we have an index big enough to contain an EOIE extension */
3508 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3511 /* validate the extension signature */
3512 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3513 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3515 index
+= sizeof(uint32_t);
3517 /* validate the extension size */
3518 extsize
= get_be32(index
);
3519 if (extsize
!= EOIE_SIZE
)
3521 index
+= sizeof(uint32_t);
3524 * Validate the offset we're going to look for the first extension
3525 * signature is after the index header and before the eoie extension.
3527 offset
= get_be32(index
);
3528 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3530 if (mmap
+ offset
>= eoie
)
3532 index
+= sizeof(uint32_t);
3535 * The hash is computed over extension types and their sizes (but not
3536 * their contents). E.g. if we have "TREE" extension that is N-bytes
3537 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3538 * then the hash would be:
3540 * SHA-1("TREE" + <binary representation of N> +
3541 * "REUC" + <binary representation of M>)
3543 src_offset
= offset
;
3544 the_hash_algo
->init_fn(&c
);
3545 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3546 /* After an array of active_nr index entries,
3547 * there can be arbitrary number of extended
3548 * sections, each of which is prefixed with
3549 * extension name (4-byte) and section length
3550 * in 4-byte network byte order.
3553 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3554 extsize
= ntohl(extsize
);
3556 /* verify the extension size isn't so large it will wrap around */
3557 if (src_offset
+ 8 + extsize
< src_offset
)
3560 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3563 src_offset
+= extsize
;
3565 the_hash_algo
->final_fn(hash
, &c
);
3566 if (!hasheq(hash
, (const unsigned char *)index
))
3569 /* Validate that the extension offsets returned us back to the eoie extension. */
3570 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3576 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3579 unsigned char hash
[GIT_MAX_RAWSZ
];
3582 put_be32(&buffer
, offset
);
3583 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3586 the_hash_algo
->final_fn(hash
, eoie_context
);
3587 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3590 #define IEOT_VERSION (1)
3592 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3594 const char *index
= NULL
;
3595 uint32_t extsize
, ext_version
;
3596 struct index_entry_offset_table
*ieot
;
3599 /* find the IEOT extension */
3602 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3603 extsize
= get_be32(mmap
+ offset
+ 4);
3604 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3605 index
= mmap
+ offset
+ 4 + 4;
3614 /* validate the version is IEOT_VERSION */
3615 ext_version
= get_be32(index
);
3616 if (ext_version
!= IEOT_VERSION
) {
3617 error("invalid IEOT version %d", ext_version
);
3620 index
+= sizeof(uint32_t);
3622 /* extension size - version bytes / bytes per entry */
3623 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3625 error("invalid number of IEOT entries %d", nr
);
3628 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3629 + (nr
* sizeof(struct index_entry_offset
)));
3631 for (i
= 0; i
< nr
; i
++) {
3632 ieot
->entries
[i
].offset
= get_be32(index
);
3633 index
+= sizeof(uint32_t);
3634 ieot
->entries
[i
].nr
= get_be32(index
);
3635 index
+= sizeof(uint32_t);
3641 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3647 put_be32(&buffer
, IEOT_VERSION
);
3648 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3651 for (i
= 0; i
< ieot
->nr
; i
++) {
3654 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3655 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3658 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3659 strbuf_add(sb
, &buffer
, sizeof(uint32_t));