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"
22 #include "split-index.h"
24 #include "fsmonitor.h"
25 #include "thread-utils.h"
28 /* Mask for the name length in ce_flags in the on-disk index */
30 #define CE_NAMEMASK (0x0fff)
34 * The first letter should be 'A'..'Z' for extensions that are not
35 * necessary for a correct operation (i.e. optimization data).
36 * When new extensions are added that _needs_ to be understood in
37 * order to correctly interpret the index file, pick character that
38 * is outside the range, to cause the reader to abort.
41 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
42 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
43 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
44 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
45 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
46 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
47 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
48 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
50 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
51 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
52 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
53 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
57 * This is an estimate of the pathname length in the index. We use
58 * this for V4 index files to guess the un-deltafied size of the index
59 * in memory because of pathname deltafication. This is not required
60 * for V2/V3 index formats because their pathnames are not compressed.
61 * If the initial amount of memory set aside is not sufficient, the
62 * mem pool will allocate extra memory.
64 #define CACHE_ENTRY_PATH_LENGTH 80
66 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
68 struct cache_entry
*ce
;
69 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
70 ce
->mem_pool_allocated
= 1;
74 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
76 struct cache_entry
* ce
;
77 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
78 ce
->mem_pool_allocated
= 1;
82 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
84 struct mem_pool
**pool_ptr
;
86 if (istate
->split_index
&& istate
->split_index
->base
)
87 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
89 pool_ptr
= &istate
->ce_mem_pool
;
92 mem_pool_init(pool_ptr
, 0);
97 static const char *alternate_index_output
;
99 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
101 istate
->cache
[nr
] = ce
;
102 add_name_hash(istate
, ce
);
105 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
107 struct cache_entry
*old
= istate
->cache
[nr
];
109 replace_index_entry_in_base(istate
, old
, ce
);
110 remove_name_hash(istate
, old
);
111 discard_cache_entry(old
);
112 ce
->ce_flags
&= ~CE_HASHED
;
113 set_index_entry(istate
, nr
, ce
);
114 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
115 mark_fsmonitor_invalid(istate
, ce
);
116 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
119 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
121 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
;
122 int namelen
= strlen(new_name
);
124 new_entry
= make_empty_cache_entry(istate
, namelen
);
125 copy_cache_entry(new_entry
, old_entry
);
126 new_entry
->ce_flags
&= ~CE_HASHED
;
127 new_entry
->ce_namelen
= namelen
;
128 new_entry
->index
= 0;
129 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
131 cache_tree_invalidate_path(istate
, old_entry
->name
);
132 untracked_cache_remove_from_index(istate
, old_entry
->name
);
133 remove_index_entry_at(istate
, nr
);
134 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
137 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
139 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
140 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
141 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
142 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
143 sd
->sd_dev
= st
->st_dev
;
144 sd
->sd_ino
= st
->st_ino
;
145 sd
->sd_uid
= st
->st_uid
;
146 sd
->sd_gid
= st
->st_gid
;
147 sd
->sd_size
= st
->st_size
;
150 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
154 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
155 changed
|= MTIME_CHANGED
;
156 if (trust_ctime
&& check_stat
&&
157 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
158 changed
|= CTIME_CHANGED
;
161 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
162 changed
|= MTIME_CHANGED
;
163 if (trust_ctime
&& check_stat
&&
164 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
165 changed
|= CTIME_CHANGED
;
169 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
170 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
171 changed
|= OWNER_CHANGED
;
172 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
173 changed
|= INODE_CHANGED
;
178 * st_dev breaks on network filesystems where different
179 * clients will have different views of what "device"
180 * the filesystem is on
182 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
183 changed
|= INODE_CHANGED
;
186 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
187 changed
|= DATA_CHANGED
;
193 * This only updates the "non-critical" parts of the directory
194 * cache, ie the parts that aren't tracked by GIT, and only used
195 * to validate the cache.
197 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
199 fill_stat_data(&ce
->ce_stat_data
, st
);
201 if (assume_unchanged
)
202 ce
->ce_flags
|= CE_VALID
;
204 if (S_ISREG(st
->st_mode
)) {
205 ce_mark_uptodate(ce
);
206 mark_fsmonitor_valid(ce
);
210 static int ce_compare_data(struct index_state
*istate
,
211 const struct cache_entry
*ce
,
215 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
218 struct object_id oid
;
219 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
220 match
= !oideq(&oid
, &ce
->oid
);
221 /* index_fd() closed the file descriptor already */
226 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
231 enum object_type type
;
232 struct strbuf sb
= STRBUF_INIT
;
234 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
237 buffer
= read_object_file(&ce
->oid
, &type
, &size
);
240 match
= memcmp(buffer
, sb
.buf
, size
);
247 static int ce_compare_gitlink(const struct cache_entry
*ce
)
249 struct object_id oid
;
252 * We don't actually require that the .git directory
253 * under GITLINK directory be a valid git directory. It
254 * might even be missing (in case nobody populated that
257 * If so, we consider it always to match.
259 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
261 return !oideq(&oid
, &ce
->oid
);
264 static int ce_modified_check_fs(struct index_state
*istate
,
265 const struct cache_entry
*ce
,
268 switch (st
->st_mode
& S_IFMT
) {
270 if (ce_compare_data(istate
, ce
, st
))
274 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
278 if (S_ISGITLINK(ce
->ce_mode
))
279 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
280 /* else fallthrough */
287 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
289 unsigned int changed
= 0;
291 if (ce
->ce_flags
& CE_REMOVE
)
292 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
294 switch (ce
->ce_mode
& S_IFMT
) {
296 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
297 /* We consider only the owner x bit to be relevant for
300 if (trust_executable_bit
&&
301 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
302 changed
|= MODE_CHANGED
;
305 if (!S_ISLNK(st
->st_mode
) &&
306 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
307 changed
|= TYPE_CHANGED
;
310 /* We ignore most of the st_xxx fields for gitlinks */
311 if (!S_ISDIR(st
->st_mode
))
312 changed
|= TYPE_CHANGED
;
313 else if (ce_compare_gitlink(ce
))
314 changed
|= DATA_CHANGED
;
317 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
320 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
322 /* Racily smudged entry? */
323 if (!ce
->ce_stat_data
.sd_size
) {
324 if (!is_empty_blob_sha1(ce
->oid
.hash
))
325 changed
|= DATA_CHANGED
;
331 static int is_racy_stat(const struct index_state
*istate
,
332 const struct stat_data
*sd
)
334 return (istate
->timestamp
.sec
&&
336 /* nanosecond timestamped files can also be racy! */
337 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
338 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
339 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
341 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
346 int is_racy_timestamp(const struct index_state
*istate
,
347 const struct cache_entry
*ce
)
349 return (!S_ISGITLINK(ce
->ce_mode
) &&
350 is_racy_stat(istate
, &ce
->ce_stat_data
));
353 int match_stat_data_racy(const struct index_state
*istate
,
354 const struct stat_data
*sd
, struct stat
*st
)
356 if (is_racy_stat(istate
, sd
))
357 return MTIME_CHANGED
;
358 return match_stat_data(sd
, st
);
361 int ie_match_stat(struct index_state
*istate
,
362 const struct cache_entry
*ce
, struct stat
*st
,
363 unsigned int options
)
365 unsigned int changed
;
366 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
367 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
368 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
369 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
371 if (!ignore_fsmonitor
)
372 refresh_fsmonitor(istate
);
374 * If it's marked as always valid in the index, it's
375 * valid whatever the checked-out copy says.
377 * skip-worktree has the same effect with higher precedence
379 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
381 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
383 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
387 * Intent-to-add entries have not been added, so the index entry
388 * by definition never matches what is in the work tree until it
389 * actually gets added.
391 if (ce_intent_to_add(ce
))
392 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
394 changed
= ce_match_stat_basic(ce
, st
);
397 * Within 1 second of this sequence:
398 * echo xyzzy >file && git-update-index --add file
399 * running this command:
401 * would give a falsely clean cache entry. The mtime and
402 * length match the cache, and other stat fields do not change.
404 * We could detect this at update-index time (the cache entry
405 * being registered/updated records the same time as "now")
406 * and delay the return from git-update-index, but that would
407 * effectively mean we can make at most one commit per second,
408 * which is not acceptable. Instead, we check cache entries
409 * whose mtime are the same as the index file timestamp more
410 * carefully than others.
412 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
413 if (assume_racy_is_modified
)
414 changed
|= DATA_CHANGED
;
416 changed
|= ce_modified_check_fs(istate
, ce
, st
);
422 int ie_modified(struct index_state
*istate
,
423 const struct cache_entry
*ce
,
424 struct stat
*st
, unsigned int options
)
426 int changed
, changed_fs
;
428 changed
= ie_match_stat(istate
, ce
, st
, options
);
432 * If the mode or type has changed, there's no point in trying
433 * to refresh the entry - it's not going to match
435 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
439 * Immediately after read-tree or update-index --cacheinfo,
440 * the length field is zero, as we have never even read the
441 * lstat(2) information once, and we cannot trust DATA_CHANGED
442 * returned by ie_match_stat() which in turn was returned by
443 * ce_match_stat_basic() to signal that the filesize of the
444 * blob changed. We have to actually go to the filesystem to
445 * see if the contents match, and if so, should answer "unchanged".
447 * The logic does not apply to gitlinks, as ce_match_stat_basic()
448 * already has checked the actual HEAD from the filesystem in the
449 * subproject. If ie_match_stat() already said it is different,
450 * then we know it is.
452 if ((changed
& DATA_CHANGED
) &&
453 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
456 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
458 return changed
| changed_fs
;
462 int base_name_compare(const char *name1
, int len1
, int mode1
,
463 const char *name2
, int len2
, int mode2
)
465 unsigned char c1
, c2
;
466 int len
= len1
< len2
? len1
: len2
;
469 cmp
= memcmp(name1
, name2
, len
);
474 if (!c1
&& S_ISDIR(mode1
))
476 if (!c2
&& S_ISDIR(mode2
))
478 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
482 * df_name_compare() is identical to base_name_compare(), except it
483 * compares conflicting directory/file entries as equal. Note that
484 * while a directory name compares as equal to a regular file, they
485 * then individually compare _differently_ to a filename that has
486 * a dot after the basename (because '\0' < '.' < '/').
488 * This is used by routines that want to traverse the git namespace
489 * but then handle conflicting entries together when possible.
491 int df_name_compare(const char *name1
, int len1
, int mode1
,
492 const char *name2
, int len2
, int mode2
)
494 int len
= len1
< len2
? len1
: len2
, cmp
;
495 unsigned char c1
, c2
;
497 cmp
= memcmp(name1
, name2
, len
);
500 /* Directories and files compare equal (same length, same name) */
504 if (!c1
&& S_ISDIR(mode1
))
507 if (!c2
&& S_ISDIR(mode2
))
509 if (c1
== '/' && !c2
)
511 if (c2
== '/' && !c1
)
516 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
518 size_t min_len
= (len1
< len2
) ? len1
: len2
;
519 int cmp
= memcmp(name1
, name2
, min_len
);
529 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
533 cmp
= name_compare(name1
, len1
, name2
, len2
);
544 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
549 last
= istate
->cache_nr
;
550 while (last
> first
) {
551 int next
= (last
+ first
) >> 1;
552 struct cache_entry
*ce
= istate
->cache
[next
];
553 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
565 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
567 return index_name_stage_pos(istate
, name
, namelen
, 0);
570 int remove_index_entry_at(struct index_state
*istate
, int pos
)
572 struct cache_entry
*ce
= istate
->cache
[pos
];
574 record_resolve_undo(istate
, ce
);
575 remove_name_hash(istate
, ce
);
576 save_or_free_index_entry(istate
, ce
);
577 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
579 if (pos
>= istate
->cache_nr
)
581 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
582 istate
->cache_nr
- pos
);
587 * Remove all cache entries marked for removal, that is where
588 * CE_REMOVE is set in ce_flags. This is much more effective than
589 * calling remove_index_entry_at() for each entry to be removed.
591 void remove_marked_cache_entries(struct index_state
*istate
)
593 struct cache_entry
**ce_array
= istate
->cache
;
596 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
597 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
598 remove_name_hash(istate
, ce_array
[i
]);
599 save_or_free_index_entry(istate
, ce_array
[i
]);
602 ce_array
[j
++] = ce_array
[i
];
604 if (j
== istate
->cache_nr
)
606 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
607 istate
->cache_nr
= j
;
610 int remove_file_from_index(struct index_state
*istate
, const char *path
)
612 int pos
= index_name_pos(istate
, path
, strlen(path
));
615 cache_tree_invalidate_path(istate
, path
);
616 untracked_cache_remove_from_index(istate
, path
);
617 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
618 remove_index_entry_at(istate
, pos
);
622 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
624 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
627 static int index_name_pos_also_unmerged(struct index_state
*istate
,
628 const char *path
, int namelen
)
630 int pos
= index_name_pos(istate
, path
, namelen
);
631 struct cache_entry
*ce
;
636 /* maybe unmerged? */
638 if (pos
>= istate
->cache_nr
||
639 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
642 /* order of preference: stage 2, 1, 3 */
643 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
644 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
645 !compare_name(ce
, path
, namelen
))
650 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
652 int len
= ce_namelen(ce
);
653 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
657 * If we add a filename that aliases in the cache, we will use the
658 * name that we already have - but we don't want to update the same
659 * alias twice, because that implies that there were actually two
660 * different files with aliasing names!
662 * So we use the CE_ADDED flag to verify that the alias was an old
663 * one before we accept it as
665 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
666 struct cache_entry
*ce
,
667 struct cache_entry
*alias
)
670 struct cache_entry
*new_entry
;
672 if (alias
->ce_flags
& CE_ADDED
)
673 die(_("will not add file alias '%s' ('%s' already exists in index)"),
674 ce
->name
, alias
->name
);
676 /* Ok, create the new entry using the name of the existing alias */
677 len
= ce_namelen(alias
);
678 new_entry
= make_empty_cache_entry(istate
, len
);
679 memcpy(new_entry
->name
, alias
->name
, len
);
680 copy_cache_entry(new_entry
, ce
);
681 save_or_free_index_entry(istate
, ce
);
685 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
687 struct object_id oid
;
688 if (write_object_file("", 0, blob_type
, &oid
))
689 die(_("cannot create an empty blob in the object database"));
690 oidcpy(&ce
->oid
, &oid
);
693 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
695 int namelen
, was_same
;
696 mode_t st_mode
= st
->st_mode
;
697 struct cache_entry
*ce
, *alias
= NULL
;
698 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
699 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
700 int pretend
= flags
& ADD_CACHE_PRETEND
;
701 int intent_only
= flags
& ADD_CACHE_INTENT
;
702 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
703 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
704 int hash_flags
= HASH_WRITE_OBJECT
;
706 if (flags
& ADD_CACHE_RENORMALIZE
)
707 hash_flags
|= HASH_RENORMALIZE
;
709 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
710 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
712 namelen
= strlen(path
);
713 if (S_ISDIR(st_mode
)) {
714 while (namelen
&& path
[namelen
-1] == '/')
717 ce
= make_empty_cache_entry(istate
, namelen
);
718 memcpy(ce
->name
, path
, namelen
);
719 ce
->ce_namelen
= namelen
;
721 fill_stat_cache_info(ce
, st
);
723 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
726 if (trust_executable_bit
&& has_symlinks
) {
727 ce
->ce_mode
= create_ce_mode(st_mode
);
729 /* If there is an existing entry, pick the mode bits and type
730 * from it, otherwise assume unexecutable regular file.
732 struct cache_entry
*ent
;
733 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
735 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
736 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
739 /* When core.ignorecase=true, determine if a directory of the same name but differing
740 * case already exists within the Git repository. If it does, ensure the directory
741 * case of the file being added to the repository matches (is folded into) the existing
742 * entry's directory case.
745 adjust_dirname_case(istate
, ce
->name
);
747 if (!(flags
& HASH_RENORMALIZE
)) {
748 alias
= index_file_exists(istate
, ce
->name
,
749 ce_namelen(ce
), ignore_case
);
752 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
753 /* Nothing changed, really */
754 if (!S_ISGITLINK(alias
->ce_mode
))
755 ce_mark_uptodate(alias
);
756 alias
->ce_flags
|= CE_ADDED
;
758 discard_cache_entry(ce
);
763 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
764 discard_cache_entry(ce
);
765 return error(_("unable to index file '%s'"), path
);
768 set_object_name_for_intent_to_add_entry(ce
);
770 if (ignore_case
&& alias
&& different_name(ce
, alias
))
771 ce
= create_alias_ce(istate
, ce
, alias
);
772 ce
->ce_flags
|= CE_ADDED
;
774 /* It was suspected to be racily clean, but it turns out to be Ok */
777 oideq(&alias
->oid
, &ce
->oid
) &&
778 ce
->ce_mode
== alias
->ce_mode
);
781 discard_cache_entry(ce
);
782 else if (add_index_entry(istate
, ce
, add_option
)) {
783 discard_cache_entry(ce
);
784 return error(_("unable to add '%s' to index"), path
);
786 if (verbose
&& !was_same
)
787 printf("add '%s'\n", path
);
791 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
794 if (lstat(path
, &st
))
795 die_errno(_("unable to stat '%s'"), path
);
796 return add_to_index(istate
, path
, &st
, flags
);
799 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
801 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
804 struct cache_entry
*make_empty_transient_cache_entry(size_t len
)
806 return xcalloc(1, cache_entry_size(len
));
809 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
811 const struct object_id
*oid
,
814 unsigned int refresh_options
)
816 struct cache_entry
*ce
, *ret
;
819 if (!verify_path(path
, mode
)) {
820 error(_("invalid path '%s'"), path
);
825 ce
= make_empty_cache_entry(istate
, len
);
827 oidcpy(&ce
->oid
, oid
);
828 memcpy(ce
->name
, path
, len
);
829 ce
->ce_flags
= create_ce_flags(stage
);
830 ce
->ce_namelen
= len
;
831 ce
->ce_mode
= create_ce_mode(mode
);
833 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
835 discard_cache_entry(ce
);
839 struct cache_entry
*make_transient_cache_entry(unsigned int mode
, const struct object_id
*oid
,
840 const char *path
, int stage
)
842 struct cache_entry
*ce
;
845 if (!verify_path(path
, mode
)) {
846 error(_("invalid path '%s'"), path
);
851 ce
= make_empty_transient_cache_entry(len
);
853 oidcpy(&ce
->oid
, oid
);
854 memcpy(ce
->name
, path
, len
);
855 ce
->ce_flags
= create_ce_flags(stage
);
856 ce
->ce_namelen
= len
;
857 ce
->ce_mode
= create_ce_mode(mode
);
863 * Chmod an index entry with either +x or -x.
865 * Returns -1 if the chmod for the particular cache entry failed (if it's
866 * not a regular file), -2 if an invalid flip argument is passed in, 0
869 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
872 if (!S_ISREG(ce
->ce_mode
))
879 ce
->ce_mode
&= ~0111;
884 cache_tree_invalidate_path(istate
, ce
->name
);
885 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
886 mark_fsmonitor_invalid(istate
, ce
);
887 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
892 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
894 int len
= ce_namelen(a
);
895 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
899 * We fundamentally don't like some paths: we don't want
900 * dot or dot-dot anywhere, and for obvious reasons don't
901 * want to recurse into ".git" either.
903 * Also, we don't want double slashes or slashes at the
904 * end that can make pathnames ambiguous.
906 static int verify_dotfile(const char *rest
, unsigned mode
)
909 * The first character was '.', but that
910 * has already been discarded, we now test
914 /* "." is not allowed */
915 if (*rest
== '\0' || is_dir_sep(*rest
))
920 * ".git" followed by NUL or slash is bad. Note that we match
921 * case-insensitively here, even if ignore_case is not set.
922 * This outlaws ".GIT" everywhere out of an abundance of caution,
923 * since there's really no good reason to allow it.
925 * Once we've seen ".git", we can also find ".gitmodules", etc (also
926 * case-insensitively).
930 if (rest
[1] != 'i' && rest
[1] != 'I')
932 if (rest
[2] != 't' && rest
[2] != 'T')
934 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
938 if (skip_iprefix(rest
, "modules", &rest
) &&
939 (*rest
== '\0' || is_dir_sep(*rest
)))
944 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
950 int verify_path(const char *path
, unsigned mode
)
954 if (has_dos_drive_prefix(path
))
964 if (is_hfs_dotgit(path
))
967 if (is_hfs_dotgitmodules(path
))
972 if (is_ntfs_dotgit(path
))
975 if (is_ntfs_dotgitmodules(path
))
981 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
982 is_dir_sep(c
) || c
== '\0')
990 * Do we have another file that has the beginning components being a
991 * proper superset of the name we're trying to add?
993 static int has_file_name(struct index_state
*istate
,
994 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
997 int len
= ce_namelen(ce
);
998 int stage
= ce_stage(ce
);
999 const char *name
= ce
->name
;
1001 while (pos
< istate
->cache_nr
) {
1002 struct cache_entry
*p
= istate
->cache
[pos
++];
1004 if (len
>= ce_namelen(p
))
1006 if (memcmp(name
, p
->name
, len
))
1008 if (ce_stage(p
) != stage
)
1010 if (p
->name
[len
] != '/')
1012 if (p
->ce_flags
& CE_REMOVE
)
1017 remove_index_entry_at(istate
, --pos
);
1024 * Like strcmp(), but also return the offset of the first change.
1025 * If strings are equal, return the length.
1027 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1032 return strcmp(s1
, s2
);
1034 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1039 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1043 * Do we have another file with a pathname that is a proper
1044 * subset of the name we're trying to add?
1046 * That is, is there another file in the index with a path
1047 * that matches a sub-directory in the given entry?
1049 static int has_dir_name(struct index_state
*istate
,
1050 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1053 int stage
= ce_stage(ce
);
1054 const char *name
= ce
->name
;
1055 const char *slash
= name
+ ce_namelen(ce
);
1060 * We are frequently called during an iteration on a sorted
1061 * list of pathnames and while building a new index. Therefore,
1062 * there is a high probability that this entry will eventually
1063 * be appended to the index, rather than inserted in the middle.
1064 * If we can confirm that, we can avoid binary searches on the
1065 * components of the pathname.
1067 * Compare the entry's full path with the last path in the index.
1069 if (istate
->cache_nr
> 0) {
1070 cmp_last
= strcmp_offset(name
,
1071 istate
->cache
[istate
->cache_nr
- 1]->name
,
1074 if (len_eq_last
== 0) {
1076 * The entry sorts AFTER the last one in the
1077 * index and their paths have no common prefix,
1078 * so there cannot be a F/D conflict.
1083 * The entry sorts AFTER the last one in the
1084 * index, but has a common prefix. Fall through
1085 * to the loop below to disect the entry's path
1086 * and see where the difference is.
1089 } else if (cmp_last
== 0) {
1091 * The entry exactly matches the last one in the
1092 * index, but because of multiple stage and CE_REMOVE
1093 * items, we fall through and let the regular search
1103 if (*--slash
== '/')
1105 if (slash
<= ce
->name
)
1112 * (len + 1) is a directory boundary (including
1113 * the trailing slash). And since the loop is
1114 * decrementing "slash", the first iteration is
1115 * the longest directory prefix; subsequent
1116 * iterations consider parent directories.
1119 if (len
+ 1 <= len_eq_last
) {
1121 * The directory prefix (including the trailing
1122 * slash) also appears as a prefix in the last
1123 * entry, so the remainder cannot collide (because
1124 * strcmp said the whole path was greater).
1129 * LT: last: xxx/file_A
1135 if (len
> len_eq_last
) {
1137 * This part of the directory prefix (excluding
1138 * the trailing slash) is longer than the known
1139 * equal portions, so this sub-directory cannot
1140 * collide with a file.
1148 if (istate
->cache_nr
> 0 &&
1149 ce_namelen(istate
->cache
[istate
->cache_nr
- 1]) > len
) {
1151 * The directory prefix lines up with part of
1152 * a longer file or directory name, but sorts
1153 * after it, so this sub-directory cannot
1154 * collide with a file.
1156 * last: xxx/yy-file (because '-' sorts before '/')
1163 * This is a possible collision. Fall through and
1164 * let the regular search code handle it.
1171 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
1174 * Found one, but not so fast. This could
1175 * be a marker that says "I was here, but
1176 * I am being removed". Such an entry is
1177 * not a part of the resulting tree, and
1178 * it is Ok to have a directory at the same
1181 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1185 remove_index_entry_at(istate
, pos
);
1193 * Trivial optimization: if we find an entry that
1194 * already matches the sub-directory, then we know
1195 * we're ok, and we can exit.
1197 while (pos
< istate
->cache_nr
) {
1198 struct cache_entry
*p
= istate
->cache
[pos
];
1199 if ((ce_namelen(p
) <= len
) ||
1200 (p
->name
[len
] != '/') ||
1201 memcmp(p
->name
, name
, len
))
1202 break; /* not our subdirectory */
1203 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1205 * p is at the same stage as our entry, and
1206 * is a subdirectory of what we are looking
1207 * at, so we cannot have conflicts at our
1208 * level or anything shorter.
1217 /* We may be in a situation where we already have path/file and path
1218 * is being added, or we already have path and path/file is being
1219 * added. Either one would result in a nonsense tree that has path
1220 * twice when git-write-tree tries to write it out. Prevent it.
1222 * If ok-to-replace is specified, we remove the conflicting entries
1223 * from the cache so the caller should recompute the insert position.
1224 * When this happens, we return non-zero.
1226 static int check_file_directory_conflict(struct index_state
*istate
,
1227 const struct cache_entry
*ce
,
1228 int pos
, int ok_to_replace
)
1233 * When ce is an "I am going away" entry, we allow it to be added
1235 if (ce
->ce_flags
& CE_REMOVE
)
1239 * We check if the path is a sub-path of a subsequent pathname
1240 * first, since removing those will not change the position
1243 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1246 * Then check if the path might have a clashing sub-directory
1249 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1252 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1255 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1256 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1257 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1258 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1260 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1261 cache_tree_invalidate_path(istate
, ce
->name
);
1264 * If this entry's path sorts after the last entry in the index,
1265 * we can avoid searching for it.
1267 if (istate
->cache_nr
> 0 &&
1268 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1269 pos
= -istate
->cache_nr
- 1;
1271 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1273 /* existing match? Just replace it. */
1276 replace_index_entry(istate
, pos
, ce
);
1281 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1282 untracked_cache_add_to_index(istate
, ce
->name
);
1285 * Inserting a merged entry ("stage 0") into the index
1286 * will always replace all non-merged entries..
1288 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1289 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1291 if (!remove_index_entry_at(istate
, pos
))
1298 if (!verify_path(ce
->name
, ce
->ce_mode
))
1299 return error(_("invalid path '%s'"), ce
->name
);
1301 if (!skip_df_check
&&
1302 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1304 return error(_("'%s' appears as both a file and as a directory"),
1306 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1312 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1316 if (option
& ADD_CACHE_JUST_APPEND
)
1317 pos
= istate
->cache_nr
;
1320 ret
= add_index_entry_with_check(istate
, ce
, option
);
1326 /* Make sure the array is big enough .. */
1327 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1331 if (istate
->cache_nr
> pos
+ 1)
1332 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1333 istate
->cache_nr
- pos
- 1);
1334 set_index_entry(istate
, pos
, ce
);
1335 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1340 * "refresh" does not calculate a new sha1 file or bring the
1341 * cache up-to-date for mode/content changes. But what it
1342 * _does_ do is to "re-match" the stat information of a file
1343 * with the cache, so that you can refresh the cache for a
1344 * file that hasn't been changed but where the stat entry is
1347 * For example, you'd want to do this after doing a "git-read-tree",
1348 * to link up the stat cache details with the proper files.
1350 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1351 struct cache_entry
*ce
,
1352 unsigned int options
, int *err
,
1356 struct cache_entry
*updated
;
1358 int refresh
= options
& CE_MATCH_REFRESH
;
1359 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1360 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1361 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1362 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1364 if (!refresh
|| ce_uptodate(ce
))
1367 if (!ignore_fsmonitor
)
1368 refresh_fsmonitor(istate
);
1370 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1371 * that the change to the work tree does not matter and told
1374 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1375 ce_mark_uptodate(ce
);
1378 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1379 ce_mark_uptodate(ce
);
1382 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1383 ce_mark_uptodate(ce
);
1387 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1395 if (lstat(ce
->name
, &st
) < 0) {
1396 if (ignore_missing
&& errno
== ENOENT
)
1403 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1405 *changed_ret
= changed
;
1408 * The path is unchanged. If we were told to ignore
1409 * valid bit, then we did the actual stat check and
1410 * found that the entry is unmodified. If the entry
1411 * is not marked VALID, this is the place to mark it
1412 * valid again, under "assume unchanged" mode.
1414 if (ignore_valid
&& assume_unchanged
&&
1415 !(ce
->ce_flags
& CE_VALID
))
1416 ; /* mark this one VALID again */
1419 * We do not mark the index itself "modified"
1420 * because CE_UPTODATE flag is in-core only;
1421 * we are not going to write this change out.
1423 if (!S_ISGITLINK(ce
->ce_mode
)) {
1424 ce_mark_uptodate(ce
);
1425 mark_fsmonitor_valid(ce
);
1431 if (ie_modified(istate
, ce
, &st
, options
)) {
1437 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1438 copy_cache_entry(updated
, ce
);
1439 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1440 fill_stat_cache_info(updated
, &st
);
1442 * If ignore_valid is not set, we should leave CE_VALID bit
1443 * alone. Otherwise, paths marked with --no-assume-unchanged
1444 * (i.e. things to be edited) will reacquire CE_VALID bit
1445 * automatically, which is not really what we want.
1447 if (!ignore_valid
&& assume_unchanged
&&
1448 !(ce
->ce_flags
& CE_VALID
))
1449 updated
->ce_flags
&= ~CE_VALID
;
1451 /* istate->cache_changed is updated in the caller */
1455 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1456 int * first
, const char *header_msg
)
1458 if (in_porcelain
&& *first
&& header_msg
) {
1459 printf("%s\n", header_msg
);
1465 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1466 const struct pathspec
*pathspec
,
1467 char *seen
, const char *header_msg
)
1471 int really
= (flags
& REFRESH_REALLY
) != 0;
1472 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1473 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1474 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1475 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1477 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1478 unsigned int options
= (CE_MATCH_REFRESH
|
1479 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1480 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1481 const char *modified_fmt
;
1482 const char *deleted_fmt
;
1483 const char *typechange_fmt
;
1484 const char *added_fmt
;
1485 const char *unmerged_fmt
;
1486 struct progress
*progress
= NULL
;
1488 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1489 progress
= start_delayed_progress(_("Refresh index"),
1492 trace_performance_enter();
1493 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1494 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1495 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1496 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1497 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1499 * Use the multi-threaded preload_index() to refresh most of the
1500 * cache entries quickly then in the single threaded loop below,
1501 * we only have to do the special cases that are left.
1503 preload_index(istate
, pathspec
, 0);
1504 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1505 struct cache_entry
*ce
, *new_entry
;
1506 int cache_errno
= 0;
1510 ce
= istate
->cache
[i
];
1511 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1514 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1518 while ((i
< istate
->cache_nr
) &&
1519 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1525 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1526 &first
, header_msg
);
1534 new_entry
= refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1535 if (new_entry
== ce
)
1538 display_progress(progress
, i
);
1542 if (really
&& cache_errno
== EINVAL
) {
1543 /* If we are doing --really-refresh that
1544 * means the index is not valid anymore.
1546 ce
->ce_flags
&= ~CE_VALID
;
1547 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1548 mark_fsmonitor_invalid(istate
, ce
);
1549 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1554 if (cache_errno
== ENOENT
)
1556 else if (ce_intent_to_add(ce
))
1557 fmt
= added_fmt
; /* must be before other checks */
1558 else if (changed
& TYPE_CHANGED
)
1559 fmt
= typechange_fmt
;
1563 ce
->name
, in_porcelain
, &first
, header_msg
);
1568 replace_index_entry(istate
, i
, new_entry
);
1571 display_progress(progress
, istate
->cache_nr
);
1572 stop_progress(&progress
);
1574 trace_performance_leave("refresh index");
1578 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1579 struct cache_entry
*ce
,
1580 unsigned int options
)
1582 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
);
1586 /*****************************************************************
1588 *****************************************************************/
1590 #define INDEX_FORMAT_DEFAULT 3
1592 static unsigned int get_index_format_default(void)
1594 char *envversion
= getenv("GIT_INDEX_VERSION");
1597 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1600 if (!git_config_get_int("index.version", &value
))
1602 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1603 warning(_("index.version set, but the value is invalid.\n"
1604 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1605 return INDEX_FORMAT_DEFAULT
;
1610 version
= strtoul(envversion
, &endp
, 10);
1612 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1613 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1614 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1615 version
= INDEX_FORMAT_DEFAULT
;
1621 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1622 * Again - this is just a (very strong in practice) heuristic that
1623 * the inode hasn't changed.
1625 * We save the fields in big-endian order to allow using the
1626 * index file over NFS transparently.
1628 struct ondisk_cache_entry
{
1629 struct cache_time ctime
;
1630 struct cache_time mtime
;
1637 unsigned char sha1
[20];
1639 char name
[FLEX_ARRAY
]; /* more */
1643 * This struct is used when CE_EXTENDED bit is 1
1644 * The struct must match ondisk_cache_entry exactly from
1647 struct ondisk_cache_entry_extended
{
1648 struct cache_time ctime
;
1649 struct cache_time mtime
;
1656 unsigned char sha1
[20];
1659 char name
[FLEX_ARRAY
]; /* more */
1662 /* These are only used for v3 or lower */
1663 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1664 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1665 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1666 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1667 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1668 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1669 ondisk_cache_entry_size(ce_namelen(ce)))
1671 /* Allow fsck to force verification of the index checksum. */
1672 int verify_index_checksum
;
1674 /* Allow fsck to force verification of the cache entry order. */
1675 int verify_ce_order
;
1677 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1680 unsigned char hash
[GIT_MAX_RAWSZ
];
1683 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1684 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1685 hdr_version
= ntohl(hdr
->hdr_version
);
1686 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1687 return error(_("bad index version %d"), hdr_version
);
1689 if (!verify_index_checksum
)
1692 the_hash_algo
->init_fn(&c
);
1693 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1694 the_hash_algo
->final_fn(hash
, &c
);
1695 if (!hasheq(hash
, (unsigned char *)hdr
+ size
- the_hash_algo
->rawsz
))
1696 return error(_("bad index file sha1 signature"));
1700 static int read_index_extension(struct index_state
*istate
,
1701 const char *ext
, const char *data
, unsigned long sz
)
1703 switch (CACHE_EXT(ext
)) {
1704 case CACHE_EXT_TREE
:
1705 istate
->cache_tree
= cache_tree_read(data
, sz
);
1707 case CACHE_EXT_RESOLVE_UNDO
:
1708 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1710 case CACHE_EXT_LINK
:
1711 if (read_link_extension(istate
, data
, sz
))
1714 case CACHE_EXT_UNTRACKED
:
1715 istate
->untracked
= read_untracked_extension(data
, sz
);
1717 case CACHE_EXT_FSMONITOR
:
1718 read_fsmonitor_extension(istate
, data
, sz
);
1720 case CACHE_EXT_ENDOFINDEXENTRIES
:
1721 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1722 /* already handled in do_read_index() */
1725 if (*ext
< 'A' || 'Z' < *ext
)
1726 return error(_("index uses %.4s extension, which we do not understand"),
1728 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1734 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1735 unsigned int version
,
1736 struct ondisk_cache_entry
*ondisk
,
1737 unsigned long *ent_size
,
1738 const struct cache_entry
*previous_ce
)
1740 struct cache_entry
*ce
;
1744 size_t copy_len
= 0;
1746 * Adjacent cache entries tend to share the leading paths, so it makes
1747 * sense to only store the differences in later entries. In the v4
1748 * on-disk format of the index, each on-disk cache entry stores the
1749 * number of bytes to be stripped from the end of the previous name,
1750 * and the bytes to append to the result, to come up with its name.
1752 int expand_name_field
= version
== 4;
1754 /* On-disk flags are just 16 bits */
1755 flags
= get_be16(&ondisk
->flags
);
1756 len
= flags
& CE_NAMEMASK
;
1758 if (flags
& CE_EXTENDED
) {
1759 struct ondisk_cache_entry_extended
*ondisk2
;
1761 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1762 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1763 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1764 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1765 die(_("unknown index entry format 0x%08x"), extended_flags
);
1766 flags
|= extended_flags
;
1767 name
= ondisk2
->name
;
1770 name
= ondisk
->name
;
1772 if (expand_name_field
) {
1773 const unsigned char *cp
= (const unsigned char *)name
;
1774 size_t strip_len
, previous_len
;
1776 /* If we're at the begining of a block, ignore the previous name */
1777 strip_len
= decode_varint(&cp
);
1779 previous_len
= previous_ce
->ce_namelen
;
1780 if (previous_len
< strip_len
)
1781 die(_("malformed name field in the index, near path '%s'"),
1783 copy_len
= previous_len
- strip_len
;
1785 name
= (const char *)cp
;
1788 if (len
== CE_NAMEMASK
) {
1790 if (expand_name_field
)
1794 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1796 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1797 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1798 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1799 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1800 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1801 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1802 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1803 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1804 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1805 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1806 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1807 ce
->ce_namelen
= len
;
1809 hashcpy(ce
->oid
.hash
, ondisk
->sha1
);
1811 if (expand_name_field
) {
1813 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1814 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1815 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1817 memcpy(ce
->name
, name
, len
+ 1);
1818 *ent_size
= ondisk_ce_size(ce
);
1823 static void check_ce_order(struct index_state
*istate
)
1827 if (!verify_ce_order
)
1830 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1831 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1832 struct cache_entry
*next_ce
= istate
->cache
[i
];
1833 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1835 if (0 < name_compare
)
1836 die(_("unordered stage entries in index"));
1837 if (!name_compare
) {
1839 die(_("multiple stage entries for merged file '%s'"),
1841 if (ce_stage(ce
) > ce_stage(next_ce
))
1842 die(_("unordered stage entries for '%s'"),
1848 static void tweak_untracked_cache(struct index_state
*istate
)
1850 switch (git_config_get_untracked_cache()) {
1851 case -1: /* keep: do nothing */
1854 remove_untracked_cache(istate
);
1857 add_untracked_cache(istate
);
1859 default: /* unknown value: do nothing */
1864 static void tweak_split_index(struct index_state
*istate
)
1866 switch (git_config_get_split_index()) {
1867 case -1: /* unset: do nothing */
1870 remove_split_index(istate
);
1873 add_split_index(istate
);
1875 default: /* unknown value: do nothing */
1880 static void post_read_index_from(struct index_state
*istate
)
1882 check_ce_order(istate
);
1883 tweak_untracked_cache(istate
);
1884 tweak_split_index(istate
);
1885 tweak_fsmonitor(istate
);
1888 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1890 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1893 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1895 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1898 * Account for potential alignment differences.
1900 per_entry
+= align_padding_size(sizeof(struct cache_entry
), -sizeof(struct ondisk_cache_entry
));
1901 return ondisk_size
+ entries
* per_entry
;
1904 struct index_entry_offset
1906 /* starting byte offset into index file, count of index entries in this block */
1910 struct index_entry_offset_table
1913 struct index_entry_offset entries
[FLEX_ARRAY
];
1916 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
1917 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
1919 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
1920 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
1922 struct load_index_extensions
1925 struct index_state
*istate
;
1928 unsigned long src_offset
;
1931 static void *load_index_extensions(void *_data
)
1933 struct load_index_extensions
*p
= _data
;
1934 unsigned long src_offset
= p
->src_offset
;
1936 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
1937 /* After an array of active_nr index entries,
1938 * there can be arbitrary number of extended
1939 * sections, each of which is prefixed with
1940 * extension name (4-byte) and section length
1941 * in 4-byte network byte order.
1943 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
1944 if (read_index_extension(p
->istate
,
1945 p
->mmap
+ src_offset
,
1946 p
->mmap
+ src_offset
+ 8,
1948 munmap((void *)p
->mmap
, p
->mmap_size
);
1949 die(_("index file corrupt"));
1952 src_offset
+= extsize
;
1959 * A helper function that will load the specified range of cache entries
1960 * from the memory mapped file and add them to the given index.
1962 static unsigned long load_cache_entry_block(struct index_state
*istate
,
1963 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
1964 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
1967 unsigned long src_offset
= start_offset
;
1969 for (i
= offset
; i
< offset
+ nr
; i
++) {
1970 struct ondisk_cache_entry
*disk_ce
;
1971 struct cache_entry
*ce
;
1972 unsigned long consumed
;
1974 disk_ce
= (struct ondisk_cache_entry
*)(mmap
+ src_offset
);
1975 ce
= create_from_disk(ce_mem_pool
, istate
->version
, disk_ce
, &consumed
, previous_ce
);
1976 set_index_entry(istate
, i
, ce
);
1978 src_offset
+= consumed
;
1981 return src_offset
- start_offset
;
1984 static unsigned long load_all_cache_entries(struct index_state
*istate
,
1985 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
1987 unsigned long consumed
;
1989 if (istate
->version
== 4) {
1990 mem_pool_init(&istate
->ce_mem_pool
,
1991 estimate_cache_size_from_compressed(istate
->cache_nr
));
1993 mem_pool_init(&istate
->ce_mem_pool
,
1994 estimate_cache_size(mmap_size
, istate
->cache_nr
));
1997 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
1998 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2003 * Mostly randomly chosen maximum thread counts: we
2004 * cap the parallelism to online_cpus() threads, and we want
2005 * to have at least 10000 cache entries per thread for it to
2006 * be worth starting a thread.
2009 #define THREAD_COST (10000)
2011 struct load_cache_entries_thread_data
2014 struct index_state
*istate
;
2015 struct mem_pool
*ce_mem_pool
;
2018 struct index_entry_offset_table
*ieot
;
2019 int ieot_start
; /* starting index into the ieot array */
2020 int ieot_blocks
; /* count of ieot entries to process */
2021 unsigned long consumed
; /* return # of bytes in index file processed */
2025 * A thread proc to run the load_cache_entries() computation
2026 * across multiple background threads.
2028 static void *load_cache_entries_thread(void *_data
)
2030 struct load_cache_entries_thread_data
*p
= _data
;
2033 /* iterate across all ieot blocks assigned to this thread */
2034 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2035 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2036 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2037 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2042 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2043 unsigned long src_offset
, int nr_threads
, struct index_entry_offset_table
*ieot
)
2045 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2046 struct load_cache_entries_thread_data
*data
;
2047 unsigned long consumed
= 0;
2049 /* a little sanity checking */
2050 if (istate
->name_hash_initialized
)
2051 BUG("the name hash isn't thread safe");
2053 mem_pool_init(&istate
->ce_mem_pool
, 0);
2055 /* ensure we have no more threads than we have blocks to process */
2056 if (nr_threads
> ieot
->nr
)
2057 nr_threads
= ieot
->nr
;
2058 data
= xcalloc(nr_threads
, sizeof(*data
));
2060 offset
= ieot_start
= 0;
2061 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2062 for (i
= 0; i
< nr_threads
; i
++) {
2063 struct load_cache_entries_thread_data
*p
= &data
[i
];
2066 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2067 ieot_blocks
= ieot
->nr
- ieot_start
;
2073 p
->ieot_start
= ieot_start
;
2074 p
->ieot_blocks
= ieot_blocks
;
2076 /* create a mem_pool for each thread */
2078 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2079 nr
+= p
->ieot
->entries
[j
].nr
;
2080 if (istate
->version
== 4) {
2081 mem_pool_init(&p
->ce_mem_pool
,
2082 estimate_cache_size_from_compressed(nr
));
2084 mem_pool_init(&p
->ce_mem_pool
,
2085 estimate_cache_size(mmap_size
, nr
));
2088 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2090 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2092 /* increment by the number of cache entries in the ieot block being processed */
2093 for (j
= 0; j
< ieot_blocks
; j
++)
2094 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2095 ieot_start
+= ieot_blocks
;
2098 for (i
= 0; i
< nr_threads
; i
++) {
2099 struct load_cache_entries_thread_data
*p
= &data
[i
];
2101 err
= pthread_join(p
->pthread
, NULL
);
2103 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2104 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2105 consumed
+= p
->consumed
;
2113 /* remember to discard_cache() before reading a different cache! */
2114 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2118 unsigned long src_offset
;
2119 const struct cache_header
*hdr
;
2122 struct load_index_extensions p
;
2123 size_t extension_offset
= 0;
2124 int nr_threads
, cpus
;
2125 struct index_entry_offset_table
*ieot
= NULL
;
2127 if (istate
->initialized
)
2128 return istate
->cache_nr
;
2130 istate
->timestamp
.sec
= 0;
2131 istate
->timestamp
.nsec
= 0;
2132 fd
= open(path
, O_RDONLY
);
2134 if (!must_exist
&& errno
== ENOENT
)
2136 die_errno(_("%s: index file open failed"), path
);
2140 die_errno(_("%s: cannot stat the open index"), path
);
2142 mmap_size
= xsize_t(st
.st_size
);
2143 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2144 die(_("%s: index file smaller than expected"), path
);
2146 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2147 if (mmap
== MAP_FAILED
)
2148 die_errno(_("%s: unable to map index file"), path
);
2151 hdr
= (const struct cache_header
*)mmap
;
2152 if (verify_hdr(hdr
, mmap_size
) < 0)
2155 hashcpy(istate
->oid
.hash
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2156 istate
->version
= ntohl(hdr
->hdr_version
);
2157 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2158 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2159 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
2160 istate
->initialized
= 1;
2164 p
.mmap_size
= mmap_size
;
2166 src_offset
= sizeof(*hdr
);
2168 if (git_config_get_index_threads(&nr_threads
))
2171 /* TODO: does creating more threads than cores help? */
2173 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2174 cpus
= online_cpus();
2175 if (nr_threads
> cpus
)
2182 if (nr_threads
> 1) {
2183 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2184 if (extension_offset
) {
2187 p
.src_offset
= extension_offset
;
2188 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2190 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2197 * Locate and read the index entry offset table so that we can use it
2198 * to multi-thread the reading of the cache entries.
2200 if (extension_offset
&& nr_threads
> 1)
2201 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2204 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, src_offset
, nr_threads
, ieot
);
2207 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2210 istate
->timestamp
.sec
= st
.st_mtime
;
2211 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2213 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2214 if (extension_offset
) {
2215 int ret
= pthread_join(p
.pthread
, NULL
);
2217 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2219 p
.src_offset
= src_offset
;
2220 load_index_extensions(&p
);
2222 munmap((void *)mmap
, mmap_size
);
2223 return istate
->cache_nr
;
2226 munmap((void *)mmap
, mmap_size
);
2227 die(_("index file corrupt"));
2231 * Signal that the shared index is used by updating its mtime.
2233 * This way, shared index can be removed if they have not been used
2236 static void freshen_shared_index(const char *shared_index
, int warn
)
2238 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2239 warning(_("could not freshen shared index '%s'"), shared_index
);
2242 int read_index_from(struct index_state
*istate
, const char *path
,
2245 struct split_index
*split_index
;
2250 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2251 if (istate
->initialized
)
2252 return istate
->cache_nr
;
2254 trace_performance_enter();
2255 ret
= do_read_index(istate
, path
, 0);
2256 trace_performance_leave("read cache %s", path
);
2258 split_index
= istate
->split_index
;
2259 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2260 post_read_index_from(istate
);
2264 trace_performance_enter();
2265 if (split_index
->base
)
2266 discard_index(split_index
->base
);
2268 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
2270 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2271 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2272 ret
= do_read_index(split_index
->base
, base_path
, 1);
2273 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2274 die(_("broken index, expect %s in %s, got %s"),
2275 base_oid_hex
, base_path
,
2276 oid_to_hex(&split_index
->base
->oid
));
2278 freshen_shared_index(base_path
, 0);
2279 merge_base_index(istate
);
2280 post_read_index_from(istate
);
2281 trace_performance_leave("read cache %s", base_path
);
2286 int is_index_unborn(struct index_state
*istate
)
2288 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2291 int discard_index(struct index_state
*istate
)
2294 * Cache entries in istate->cache[] should have been allocated
2295 * from the memory pool associated with this index, or from an
2296 * associated split_index. There is no need to free individual
2297 * cache entries. validate_cache_entries can detect when this
2298 * assertion does not hold.
2300 validate_cache_entries(istate
);
2302 resolve_undo_clear_index(istate
);
2303 istate
->cache_nr
= 0;
2304 istate
->cache_changed
= 0;
2305 istate
->timestamp
.sec
= 0;
2306 istate
->timestamp
.nsec
= 0;
2307 free_name_hash(istate
);
2308 cache_tree_free(&(istate
->cache_tree
));
2309 istate
->initialized
= 0;
2310 FREE_AND_NULL(istate
->cache
);
2311 istate
->cache_alloc
= 0;
2312 discard_split_index(istate
);
2313 free_untracked_cache(istate
->untracked
);
2314 istate
->untracked
= NULL
;
2316 if (istate
->ce_mem_pool
) {
2317 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2318 istate
->ce_mem_pool
= NULL
;
2325 * Validate the cache entries of this index.
2326 * All cache entries associated with this index
2327 * should have been allocated by the memory pool
2328 * associated with this index, or by a referenced
2331 void validate_cache_entries(const struct index_state
*istate
)
2335 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2338 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2340 BUG("cache entry is not allocated from expected memory pool");
2341 } else if (!istate
->ce_mem_pool
||
2342 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2343 if (!istate
->split_index
||
2344 !istate
->split_index
->base
||
2345 !istate
->split_index
->base
->ce_mem_pool
||
2346 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2347 BUG("cache entry is not allocated from expected memory pool");
2352 if (istate
->split_index
)
2353 validate_cache_entries(istate
->split_index
->base
);
2356 int unmerged_index(const struct index_state
*istate
)
2359 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2360 if (ce_stage(istate
->cache
[i
]))
2366 int repo_index_has_changes(struct repository
*repo
,
2370 struct index_state
*istate
= repo
->index
;
2371 struct object_id cmp
;
2375 cmp
= tree
->object
.oid
;
2376 if (tree
|| !get_oid_tree("HEAD", &cmp
)) {
2377 struct diff_options opt
;
2379 repo_diff_setup(repo
, &opt
);
2380 opt
.flags
.exit_with_status
= 1;
2382 opt
.flags
.quick
= 1;
2383 do_diff_cache(&cmp
, &opt
);
2385 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2387 strbuf_addch(sb
, ' ');
2388 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2391 return opt
.flags
.has_changes
!= 0;
2393 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2395 strbuf_addch(sb
, ' ');
2396 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2398 return !!istate
->cache_nr
;
2402 #define WRITE_BUFFER_SIZE 8192
2403 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
2404 static unsigned long write_buffer_len
;
2406 static int ce_write_flush(git_hash_ctx
*context
, int fd
)
2408 unsigned int buffered
= write_buffer_len
;
2410 the_hash_algo
->update_fn(context
, write_buffer
, buffered
);
2411 if (write_in_full(fd
, write_buffer
, buffered
) < 0)
2413 write_buffer_len
= 0;
2418 static int ce_write(git_hash_ctx
*context
, int fd
, void *data
, unsigned int len
)
2421 unsigned int buffered
= write_buffer_len
;
2422 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
2425 memcpy(write_buffer
+ buffered
, data
, partial
);
2426 buffered
+= partial
;
2427 if (buffered
== WRITE_BUFFER_SIZE
) {
2428 write_buffer_len
= buffered
;
2429 if (ce_write_flush(context
, fd
))
2433 write_buffer_len
= buffered
;
2435 data
= (char *) data
+ partial
;
2440 static int write_index_ext_header(git_hash_ctx
*context
, git_hash_ctx
*eoie_context
,
2441 int fd
, unsigned int ext
, unsigned int sz
)
2446 the_hash_algo
->update_fn(eoie_context
, &ext
, 4);
2447 the_hash_algo
->update_fn(eoie_context
, &sz
, 4);
2449 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
2450 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
2453 static int ce_flush(git_hash_ctx
*context
, int fd
, unsigned char *hash
)
2455 unsigned int left
= write_buffer_len
;
2458 write_buffer_len
= 0;
2459 the_hash_algo
->update_fn(context
, write_buffer
, left
);
2462 /* Flush first if not enough space for hash signature */
2463 if (left
+ the_hash_algo
->rawsz
> WRITE_BUFFER_SIZE
) {
2464 if (write_in_full(fd
, write_buffer
, left
) < 0)
2469 /* Append the hash signature at the end */
2470 the_hash_algo
->final_fn(write_buffer
+ left
, context
);
2471 hashcpy(hash
, write_buffer
+ left
);
2472 left
+= the_hash_algo
->rawsz
;
2473 return (write_in_full(fd
, write_buffer
, left
) < 0) ? -1 : 0;
2476 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2477 struct cache_entry
*ce
)
2480 * The only thing we care about in this function is to smudge the
2481 * falsely clean entry due to touch-update-touch race, so we leave
2482 * everything else as they are. We are called for entries whose
2483 * ce_stat_data.sd_mtime match the index file mtime.
2485 * Note that this actually does not do much for gitlinks, for
2486 * which ce_match_stat_basic() always goes to the actual
2487 * contents. The caller checks with is_racy_timestamp() which
2488 * always says "no" for gitlinks, so we are not called for them ;-)
2492 if (lstat(ce
->name
, &st
) < 0)
2494 if (ce_match_stat_basic(ce
, &st
))
2496 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2497 /* This is "racily clean"; smudge it. Note that this
2498 * is a tricky code. At first glance, it may appear
2499 * that it can break with this sequence:
2501 * $ echo xyzzy >frotz
2502 * $ git-update-index --add frotz
2505 * $ echo filfre >nitfol
2506 * $ git-update-index --add nitfol
2508 * but it does not. When the second update-index runs,
2509 * it notices that the entry "frotz" has the same timestamp
2510 * as index, and if we were to smudge it by resetting its
2511 * size to zero here, then the object name recorded
2512 * in index is the 6-byte file but the cached stat information
2513 * becomes zero --- which would then match what we would
2514 * obtain from the filesystem next time we stat("frotz").
2516 * However, the second update-index, before calling
2517 * this function, notices that the cached size is 6
2518 * bytes and what is on the filesystem is an empty
2519 * file, and never calls us, so the cached size information
2520 * for "frotz" stays 6 which does not match the filesystem.
2522 ce
->ce_stat_data
.sd_size
= 0;
2526 /* Copy miscellaneous fields but not the name */
2527 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2528 struct cache_entry
*ce
)
2532 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2533 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2534 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2535 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2536 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2537 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2538 ondisk
->mode
= htonl(ce
->ce_mode
);
2539 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2540 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2541 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2542 hashcpy(ondisk
->sha1
, ce
->oid
.hash
);
2544 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2545 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2546 ondisk
->flags
= htons(flags
);
2547 if (ce
->ce_flags
& CE_EXTENDED
) {
2548 struct ondisk_cache_entry_extended
*ondisk2
;
2549 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
2550 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2554 static int ce_write_entry(git_hash_ctx
*c
, int fd
, struct cache_entry
*ce
,
2555 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2559 unsigned int saved_namelen
;
2560 int stripped_name
= 0;
2561 static unsigned char padding
[8] = { 0x00 };
2563 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2564 saved_namelen
= ce_namelen(ce
);
2569 if (ce
->ce_flags
& CE_EXTENDED
)
2570 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
2572 size
= offsetof(struct ondisk_cache_entry
, name
);
2574 if (!previous_name
) {
2575 int len
= ce_namelen(ce
);
2576 copy_cache_entry_to_ondisk(ondisk
, ce
);
2577 result
= ce_write(c
, fd
, ondisk
, size
);
2579 result
= ce_write(c
, fd
, ce
->name
, len
);
2581 result
= ce_write(c
, fd
, padding
, align_padding_size(size
, len
));
2583 int common
, to_remove
, prefix_size
;
2584 unsigned char to_remove_vi
[16];
2586 (ce
->name
[common
] &&
2587 common
< previous_name
->len
&&
2588 ce
->name
[common
] == previous_name
->buf
[common
]);
2590 ; /* still matching */
2591 to_remove
= previous_name
->len
- common
;
2592 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2594 copy_cache_entry_to_ondisk(ondisk
, ce
);
2595 result
= ce_write(c
, fd
, ondisk
, size
);
2597 result
= ce_write(c
, fd
, to_remove_vi
, prefix_size
);
2599 result
= ce_write(c
, fd
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2601 result
= ce_write(c
, fd
, padding
, 1);
2603 strbuf_splice(previous_name
, common
, to_remove
,
2604 ce
->name
+ common
, ce_namelen(ce
) - common
);
2606 if (stripped_name
) {
2607 ce
->ce_namelen
= saved_namelen
;
2608 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2615 * This function verifies if index_state has the correct sha1 of the
2616 * index file. Don't die if we have any other failure, just return 0.
2618 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2623 unsigned char hash
[GIT_MAX_RAWSZ
];
2625 if (!istate
->initialized
)
2628 fd
= open(path
, O_RDONLY
);
2635 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2638 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2639 if (n
!= the_hash_algo
->rawsz
)
2642 if (!hasheq(istate
->oid
.hash
, hash
))
2653 static int repo_verify_index(struct repository
*repo
)
2655 return verify_index_from(repo
->index
, repo
->index_file
);
2658 static int has_racy_timestamp(struct index_state
*istate
)
2660 int entries
= istate
->cache_nr
;
2663 for (i
= 0; i
< entries
; i
++) {
2664 struct cache_entry
*ce
= istate
->cache
[i
];
2665 if (is_racy_timestamp(istate
, ce
))
2671 void repo_update_index_if_able(struct repository
*repo
,
2672 struct lock_file
*lockfile
)
2674 if ((repo
->index
->cache_changed
||
2675 has_racy_timestamp(repo
->index
)) &&
2676 repo_verify_index(repo
))
2677 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2679 rollback_lock_file(lockfile
);
2682 static int record_eoie(void)
2686 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2690 * As a convenience, the end of index entries extension
2691 * used for threading is written by default if the user
2692 * explicitly requested threaded index reads.
2694 return !git_config_get_index_threads(&val
) && val
!= 1;
2697 static int record_ieot(void)
2701 if (!git_config_get_bool("index.recordoffsettable", &val
))
2705 * As a convenience, the offset table used for threading is
2706 * written by default if the user explicitly requested
2707 * threaded index reads.
2709 return !git_config_get_index_threads(&val
) && val
!= 1;
2713 * On success, `tempfile` is closed. If it is the temporary file
2714 * of a `struct lock_file`, we will therefore effectively perform
2715 * a 'close_lock_file_gently()`. Since that is an implementation
2716 * detail of lockfiles, callers of `do_write_index()` should not
2719 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2720 int strip_extensions
)
2722 uint64_t start
= getnanotime();
2723 int newfd
= tempfile
->fd
;
2724 git_hash_ctx c
, eoie_c
;
2725 struct cache_header hdr
;
2726 int i
, err
= 0, removed
, extended
, hdr_version
;
2727 struct cache_entry
**cache
= istate
->cache
;
2728 int entries
= istate
->cache_nr
;
2730 struct ondisk_cache_entry_extended ondisk
;
2731 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2732 int drop_cache_tree
= istate
->drop_cache_tree
;
2734 int ieot_entries
= 1;
2735 struct index_entry_offset_table
*ieot
= NULL
;
2738 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2739 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2742 /* reduce extended entries if possible */
2743 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2744 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2746 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2750 if (!istate
->version
) {
2751 istate
->version
= get_index_format_default();
2752 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
2753 init_split_index(istate
);
2756 /* demote version 3 to version 2 when the latter suffices */
2757 if (istate
->version
== 3 || istate
->version
== 2)
2758 istate
->version
= extended
? 3 : 2;
2760 hdr_version
= istate
->version
;
2762 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2763 hdr
.hdr_version
= htonl(hdr_version
);
2764 hdr
.hdr_entries
= htonl(entries
- removed
);
2766 the_hash_algo
->init_fn(&c
);
2767 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2770 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2773 if (nr_threads
!= 1 && record_ieot()) {
2774 int ieot_blocks
, cpus
;
2777 * ensure default number of ieot blocks maps evenly to the
2778 * default number of threads that will process them leaving
2779 * room for the thread to load the index extensions.
2782 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2783 cpus
= online_cpus();
2784 if (ieot_blocks
> cpus
- 1)
2785 ieot_blocks
= cpus
- 1;
2787 ieot_blocks
= nr_threads
;
2788 if (ieot_blocks
> istate
->cache_nr
)
2789 ieot_blocks
= istate
->cache_nr
;
2793 * no reason to write out the IEOT extension if we don't
2794 * have enough blocks to utilize multi-threading
2796 if (ieot_blocks
> 1) {
2797 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2798 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2799 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2803 offset
= lseek(newfd
, 0, SEEK_CUR
);
2808 offset
+= write_buffer_len
;
2810 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2812 for (i
= 0; i
< entries
; i
++) {
2813 struct cache_entry
*ce
= cache
[i
];
2814 if (ce
->ce_flags
& CE_REMOVE
)
2816 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2817 ce_smudge_racily_clean_entry(istate
, ce
);
2818 if (is_null_oid(&ce
->oid
)) {
2819 static const char msg
[] = "cache entry has null sha1: %s";
2820 static int allow
= -1;
2823 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2825 warning(msg
, ce
->name
);
2827 err
= error(msg
, ce
->name
);
2829 drop_cache_tree
= 1;
2831 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2832 ieot
->entries
[ieot
->nr
].nr
= nr
;
2833 ieot
->entries
[ieot
->nr
].offset
= offset
;
2836 * If we have a V4 index, set the first byte to an invalid
2837 * character to ensure there is nothing common with the previous
2841 previous_name
->buf
[0] = 0;
2843 offset
= lseek(newfd
, 0, SEEK_CUR
);
2848 offset
+= write_buffer_len
;
2850 if (ce_write_entry(&c
, newfd
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2858 ieot
->entries
[ieot
->nr
].nr
= nr
;
2859 ieot
->entries
[ieot
->nr
].offset
= offset
;
2862 strbuf_release(&previous_name_buf
);
2869 /* Write extension data here */
2870 offset
= lseek(newfd
, 0, SEEK_CUR
);
2875 offset
+= write_buffer_len
;
2876 the_hash_algo
->init_fn(&eoie_c
);
2879 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2880 * can minimize the number of extensions we have to scan through to
2881 * find it during load. Write it out regardless of the
2882 * strip_extensions parameter as we need it when loading the shared
2886 struct strbuf sb
= STRBUF_INIT
;
2888 write_ieot_extension(&sb
, ieot
);
2889 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0
2890 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2891 strbuf_release(&sb
);
2897 if (!strip_extensions
&& istate
->split_index
) {
2898 struct strbuf sb
= STRBUF_INIT
;
2900 err
= write_link_extension(&sb
, istate
) < 0 ||
2901 write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_LINK
,
2903 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2904 strbuf_release(&sb
);
2908 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
2909 struct strbuf sb
= STRBUF_INIT
;
2911 cache_tree_write(&sb
, istate
->cache_tree
);
2912 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2913 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2914 strbuf_release(&sb
);
2918 if (!strip_extensions
&& istate
->resolve_undo
) {
2919 struct strbuf sb
= STRBUF_INIT
;
2921 resolve_undo_write(&sb
, istate
->resolve_undo
);
2922 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2924 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2925 strbuf_release(&sb
);
2929 if (!strip_extensions
&& istate
->untracked
) {
2930 struct strbuf sb
= STRBUF_INIT
;
2932 write_untracked_extension(&sb
, istate
->untracked
);
2933 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_UNTRACKED
,
2935 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2936 strbuf_release(&sb
);
2940 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
2941 struct strbuf sb
= STRBUF_INIT
;
2943 write_fsmonitor_extension(&sb
, istate
);
2944 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0
2945 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2946 strbuf_release(&sb
);
2952 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
2953 * so that it can be found and processed before all the index entries are
2954 * read. Write it out regardless of the strip_extensions parameter as we need it
2955 * when loading the shared index.
2957 if (offset
&& record_eoie()) {
2958 struct strbuf sb
= STRBUF_INIT
;
2960 write_eoie_extension(&sb
, &eoie_c
, offset
);
2961 err
= write_index_ext_header(&c
, NULL
, newfd
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0
2962 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2963 strbuf_release(&sb
);
2968 if (ce_flush(&c
, newfd
, istate
->oid
.hash
))
2970 if (close_tempfile_gently(tempfile
)) {
2971 error(_("could not close '%s'"), tempfile
->filename
.buf
);
2974 if (stat(tempfile
->filename
.buf
, &st
))
2976 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2977 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2978 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
2982 void set_alternate_index_output(const char *name
)
2984 alternate_index_output
= name
;
2987 static int commit_locked_index(struct lock_file
*lk
)
2989 if (alternate_index_output
)
2990 return commit_lock_file_to(lk
, alternate_index_output
);
2992 return commit_lock_file(lk
);
2995 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2998 int ret
= do_write_index(istate
, lock
->tempfile
, 0);
3001 if (flags
& COMMIT_LOCK
)
3002 return commit_locked_index(lock
);
3003 return close_lock_file_gently(lock
);
3006 static int write_split_index(struct index_state
*istate
,
3007 struct lock_file
*lock
,
3011 prepare_to_write_split_index(istate
);
3012 ret
= do_write_locked_index(istate
, lock
, flags
);
3013 finish_writing_split_index(istate
);
3017 static const char *shared_index_expire
= "2.weeks.ago";
3019 static unsigned long get_shared_index_expire_date(void)
3021 static unsigned long shared_index_expire_date
;
3022 static int shared_index_expire_date_prepared
;
3024 if (!shared_index_expire_date_prepared
) {
3025 git_config_get_expiry("splitindex.sharedindexexpire",
3026 &shared_index_expire
);
3027 shared_index_expire_date
= approxidate(shared_index_expire
);
3028 shared_index_expire_date_prepared
= 1;
3031 return shared_index_expire_date
;
3034 static int should_delete_shared_index(const char *shared_index_path
)
3037 unsigned long expiration
;
3039 /* Check timestamp */
3040 expiration
= get_shared_index_expire_date();
3043 if (stat(shared_index_path
, &st
))
3044 return error_errno(_("could not stat '%s'"), shared_index_path
);
3045 if (st
.st_mtime
> expiration
)
3051 static int clean_shared_index_files(const char *current_hex
)
3054 DIR *dir
= opendir(get_git_dir());
3057 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3059 while ((de
= readdir(dir
)) != NULL
) {
3060 const char *sha1_hex
;
3061 const char *shared_index_path
;
3062 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3064 if (!strcmp(sha1_hex
, current_hex
))
3066 shared_index_path
= git_path("%s", de
->d_name
);
3067 if (should_delete_shared_index(shared_index_path
) > 0 &&
3068 unlink(shared_index_path
))
3069 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3076 static int write_shared_index(struct index_state
*istate
,
3077 struct tempfile
**temp
)
3079 struct split_index
*si
= istate
->split_index
;
3082 move_cache_to_base_index(istate
);
3083 ret
= do_write_index(si
->base
, *temp
, 1);
3086 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3088 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3091 ret
= rename_tempfile(temp
,
3092 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3094 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3095 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3101 static const int default_max_percent_split_change
= 20;
3103 static int too_many_not_shared_entries(struct index_state
*istate
)
3105 int i
, not_shared
= 0;
3106 int max_split
= git_config_get_max_percent_split_change();
3108 switch (max_split
) {
3110 /* not or badly configured: use the default value */
3111 max_split
= default_max_percent_split_change
;
3114 return 1; /* 0% means always write a new shared index */
3116 return 0; /* 100% means never write a new shared index */
3118 break; /* just use the configured value */
3121 /* Count not shared entries */
3122 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3123 struct cache_entry
*ce
= istate
->cache
[i
];
3128 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3131 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3134 int new_shared_index
, ret
;
3135 struct split_index
*si
= istate
->split_index
;
3137 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3138 cache_tree_verify(the_repository
, istate
);
3140 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3141 if (flags
& COMMIT_LOCK
)
3142 rollback_lock_file(lock
);
3146 if (istate
->fsmonitor_last_update
)
3147 fill_fsmonitor_bitmap(istate
);
3149 if (!si
|| alternate_index_output
||
3150 (istate
->cache_changed
& ~EXTMASK
)) {
3152 oidclr(&si
->base_oid
);
3153 ret
= do_write_locked_index(istate
, lock
, flags
);
3157 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
3158 int v
= si
->base_oid
.hash
[0];
3160 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3162 if (too_many_not_shared_entries(istate
))
3163 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3165 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3167 if (new_shared_index
) {
3168 struct tempfile
*temp
;
3171 /* Same initial permissions as the main .git/index file */
3172 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3174 oidclr(&si
->base_oid
);
3175 ret
= do_write_locked_index(istate
, lock
, flags
);
3178 ret
= write_shared_index(istate
, &temp
);
3180 saved_errno
= errno
;
3181 if (is_tempfile_active(temp
))
3182 delete_tempfile(&temp
);
3183 errno
= saved_errno
;
3189 ret
= write_split_index(istate
, lock
, flags
);
3191 /* Freshen the shared index only if the split-index was written */
3192 if (!ret
&& !new_shared_index
) {
3193 const char *shared_index
= git_path("sharedindex.%s",
3194 oid_to_hex(&si
->base_oid
));
3195 freshen_shared_index(shared_index
, 1);
3199 if (flags
& COMMIT_LOCK
)
3200 rollback_lock_file(lock
);
3205 * Read the index file that is potentially unmerged into given
3206 * index_state, dropping any unmerged entries to stage #0 (potentially
3207 * resulting in a path appearing as both a file and a directory in the
3208 * index; the caller is responsible to clear out the extra entries
3209 * before writing the index to a tree). Returns true if the index is
3210 * unmerged. Callers who want to refuse to work from an unmerged
3211 * state can call this and check its return value, instead of calling
3214 int repo_read_index_unmerged(struct repository
*repo
)
3216 struct index_state
*istate
;
3220 repo_read_index(repo
);
3221 istate
= repo
->index
;
3222 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3223 struct cache_entry
*ce
= istate
->cache
[i
];
3224 struct cache_entry
*new_ce
;
3230 len
= ce_namelen(ce
);
3231 new_ce
= make_empty_cache_entry(istate
, len
);
3232 memcpy(new_ce
->name
, ce
->name
, len
);
3233 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3234 new_ce
->ce_namelen
= len
;
3235 new_ce
->ce_mode
= ce
->ce_mode
;
3236 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3237 return error(_("%s: cannot drop to stage #0"),
3244 * Returns 1 if the path is an "other" path with respect to
3245 * the index; that is, the path is not mentioned in the index at all,
3246 * either as a file, a directory with some files in the index,
3247 * or as an unmerged entry.
3249 * We helpfully remove a trailing "/" from directories so that
3250 * the output of read_directory can be used as-is.
3252 int index_name_is_other(const struct index_state
*istate
, const char *name
,
3256 if (namelen
&& name
[namelen
- 1] == '/')
3258 pos
= index_name_pos(istate
, name
, namelen
);
3260 return 0; /* exact match */
3262 if (pos
< istate
->cache_nr
) {
3263 struct cache_entry
*ce
= istate
->cache
[pos
];
3264 if (ce_namelen(ce
) == namelen
&&
3265 !memcmp(ce
->name
, name
, namelen
))
3266 return 0; /* Yup, this one exists unmerged */
3271 void *read_blob_data_from_index(const struct index_state
*istate
,
3272 const char *path
, unsigned long *size
)
3276 enum object_type type
;
3280 pos
= index_name_pos(istate
, path
, len
);
3283 * We might be in the middle of a merge, in which
3284 * case we would read stage #2 (ours).
3288 (pos
< 0 && i
< istate
->cache_nr
&&
3289 !strcmp(istate
->cache
[i
]->name
, path
));
3291 if (ce_stage(istate
->cache
[i
]) == 2)
3296 data
= read_object_file(&istate
->cache
[pos
]->oid
, &type
, &sz
);
3297 if (!data
|| type
!= OBJ_BLOB
) {
3306 void stat_validity_clear(struct stat_validity
*sv
)
3308 FREE_AND_NULL(sv
->sd
);
3311 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
3315 if (stat(path
, &st
) < 0)
3316 return sv
->sd
== NULL
;
3319 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
3322 void stat_validity_update(struct stat_validity
*sv
, int fd
)
3326 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
3327 stat_validity_clear(sv
);
3330 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
3331 fill_stat_data(sv
->sd
, &st
);
3335 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3337 dst
->untracked
= src
->untracked
;
3338 src
->untracked
= NULL
;
3339 dst
->cache_tree
= src
->cache_tree
;
3340 src
->cache_tree
= NULL
;
3343 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3344 struct index_state
*istate
)
3346 unsigned int size
= ce_size(ce
);
3347 int mem_pool_allocated
;
3348 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3349 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3351 memcpy(new_entry
, ce
, size
);
3352 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3356 void discard_cache_entry(struct cache_entry
*ce
)
3358 if (ce
&& should_validate_cache_entries())
3359 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3361 if (ce
&& ce
->mem_pool_allocated
)
3367 int should_validate_cache_entries(void)
3369 static int validate_index_cache_entries
= -1;
3371 if (validate_index_cache_entries
< 0) {
3372 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3373 validate_index_cache_entries
= 1;
3375 validate_index_cache_entries
= 0;
3378 return validate_index_cache_entries
;
3381 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3382 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3384 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3387 * The end of index entries (EOIE) extension is guaranteed to be last
3388 * so that it can be found by scanning backwards from the EOF.
3395 const char *index
, *eoie
;
3397 size_t offset
, src_offset
;
3398 unsigned char hash
[GIT_MAX_RAWSZ
];
3401 /* ensure we have an index big enough to contain an EOIE extension */
3402 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3405 /* validate the extension signature */
3406 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3407 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3409 index
+= sizeof(uint32_t);
3411 /* validate the extension size */
3412 extsize
= get_be32(index
);
3413 if (extsize
!= EOIE_SIZE
)
3415 index
+= sizeof(uint32_t);
3418 * Validate the offset we're going to look for the first extension
3419 * signature is after the index header and before the eoie extension.
3421 offset
= get_be32(index
);
3422 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3424 if (mmap
+ offset
>= eoie
)
3426 index
+= sizeof(uint32_t);
3429 * The hash is computed over extension types and their sizes (but not
3430 * their contents). E.g. if we have "TREE" extension that is N-bytes
3431 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3432 * then the hash would be:
3434 * SHA-1("TREE" + <binary representation of N> +
3435 * "REUC" + <binary representation of M>)
3437 src_offset
= offset
;
3438 the_hash_algo
->init_fn(&c
);
3439 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3440 /* After an array of active_nr index entries,
3441 * there can be arbitrary number of extended
3442 * sections, each of which is prefixed with
3443 * extension name (4-byte) and section length
3444 * in 4-byte network byte order.
3447 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3448 extsize
= ntohl(extsize
);
3450 /* verify the extension size isn't so large it will wrap around */
3451 if (src_offset
+ 8 + extsize
< src_offset
)
3454 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3457 src_offset
+= extsize
;
3459 the_hash_algo
->final_fn(hash
, &c
);
3460 if (!hasheq(hash
, (const unsigned char *)index
))
3463 /* Validate that the extension offsets returned us back to the eoie extension. */
3464 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3470 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3473 unsigned char hash
[GIT_MAX_RAWSZ
];
3476 put_be32(&buffer
, offset
);
3477 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3480 the_hash_algo
->final_fn(hash
, eoie_context
);
3481 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3484 #define IEOT_VERSION (1)
3486 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3488 const char *index
= NULL
;
3489 uint32_t extsize
, ext_version
;
3490 struct index_entry_offset_table
*ieot
;
3493 /* find the IEOT extension */
3496 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3497 extsize
= get_be32(mmap
+ offset
+ 4);
3498 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3499 index
= mmap
+ offset
+ 4 + 4;
3508 /* validate the version is IEOT_VERSION */
3509 ext_version
= get_be32(index
);
3510 if (ext_version
!= IEOT_VERSION
) {
3511 error("invalid IEOT version %d", ext_version
);
3514 index
+= sizeof(uint32_t);
3516 /* extension size - version bytes / bytes per entry */
3517 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3519 error("invalid number of IEOT entries %d", nr
);
3522 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3523 + (nr
* sizeof(struct index_entry_offset
)));
3525 for (i
= 0; i
< nr
; i
++) {
3526 ieot
->entries
[i
].offset
= get_be32(index
);
3527 index
+= sizeof(uint32_t);
3528 ieot
->entries
[i
].nr
= get_be32(index
);
3529 index
+= sizeof(uint32_t);
3535 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3541 put_be32(&buffer
, IEOT_VERSION
);
3542 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3545 for (i
= 0; i
< ieot
->nr
; i
++) {
3548 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3549 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3552 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3553 strbuf_add(sb
, &buffer
, sizeof(uint32_t));