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
& ADD_CACHE_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
))
957 if (!is_valid_path(path
))
967 if (is_hfs_dotgit(path
))
970 if (is_hfs_dotgitmodules(path
))
975 if (is_ntfs_dotgit(path
))
978 if (is_ntfs_dotgitmodules(path
))
984 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
985 is_dir_sep(c
) || c
== '\0')
987 } else if (c
== '\\' && protect_ntfs
) {
988 if (is_ntfs_dotgit(path
))
991 if (is_ntfs_dotgitmodules(path
))
1001 * Do we have another file that has the beginning components being a
1002 * proper superset of the name we're trying to add?
1004 static int has_file_name(struct index_state
*istate
,
1005 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1008 int len
= ce_namelen(ce
);
1009 int stage
= ce_stage(ce
);
1010 const char *name
= ce
->name
;
1012 while (pos
< istate
->cache_nr
) {
1013 struct cache_entry
*p
= istate
->cache
[pos
++];
1015 if (len
>= ce_namelen(p
))
1017 if (memcmp(name
, p
->name
, len
))
1019 if (ce_stage(p
) != stage
)
1021 if (p
->name
[len
] != '/')
1023 if (p
->ce_flags
& CE_REMOVE
)
1028 remove_index_entry_at(istate
, --pos
);
1035 * Like strcmp(), but also return the offset of the first change.
1036 * If strings are equal, return the length.
1038 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1043 return strcmp(s1
, s2
);
1045 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1050 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1054 * Do we have another file with a pathname that is a proper
1055 * subset of the name we're trying to add?
1057 * That is, is there another file in the index with a path
1058 * that matches a sub-directory in the given entry?
1060 static int has_dir_name(struct index_state
*istate
,
1061 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1064 int stage
= ce_stage(ce
);
1065 const char *name
= ce
->name
;
1066 const char *slash
= name
+ ce_namelen(ce
);
1071 * We are frequently called during an iteration on a sorted
1072 * list of pathnames and while building a new index. Therefore,
1073 * there is a high probability that this entry will eventually
1074 * be appended to the index, rather than inserted in the middle.
1075 * If we can confirm that, we can avoid binary searches on the
1076 * components of the pathname.
1078 * Compare the entry's full path with the last path in the index.
1080 if (istate
->cache_nr
> 0) {
1081 cmp_last
= strcmp_offset(name
,
1082 istate
->cache
[istate
->cache_nr
- 1]->name
,
1085 if (len_eq_last
== 0) {
1087 * The entry sorts AFTER the last one in the
1088 * index and their paths have no common prefix,
1089 * so there cannot be a F/D conflict.
1094 * The entry sorts AFTER the last one in the
1095 * index, but has a common prefix. Fall through
1096 * to the loop below to disect the entry's path
1097 * and see where the difference is.
1100 } else if (cmp_last
== 0) {
1102 * The entry exactly matches the last one in the
1103 * index, but because of multiple stage and CE_REMOVE
1104 * items, we fall through and let the regular search
1114 if (*--slash
== '/')
1116 if (slash
<= ce
->name
)
1123 * (len + 1) is a directory boundary (including
1124 * the trailing slash). And since the loop is
1125 * decrementing "slash", the first iteration is
1126 * the longest directory prefix; subsequent
1127 * iterations consider parent directories.
1130 if (len
+ 1 <= len_eq_last
) {
1132 * The directory prefix (including the trailing
1133 * slash) also appears as a prefix in the last
1134 * entry, so the remainder cannot collide (because
1135 * strcmp said the whole path was greater).
1140 * LT: last: xxx/file_A
1146 if (len
> len_eq_last
) {
1148 * This part of the directory prefix (excluding
1149 * the trailing slash) is longer than the known
1150 * equal portions, so this sub-directory cannot
1151 * collide with a file.
1159 if (istate
->cache_nr
> 0 &&
1160 ce_namelen(istate
->cache
[istate
->cache_nr
- 1]) > len
) {
1162 * The directory prefix lines up with part of
1163 * a longer file or directory name, but sorts
1164 * after it, so this sub-directory cannot
1165 * collide with a file.
1167 * last: xxx/yy-file (because '-' sorts before '/')
1174 * This is a possible collision. Fall through and
1175 * let the regular search code handle it.
1182 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
1185 * Found one, but not so fast. This could
1186 * be a marker that says "I was here, but
1187 * I am being removed". Such an entry is
1188 * not a part of the resulting tree, and
1189 * it is Ok to have a directory at the same
1192 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1196 remove_index_entry_at(istate
, pos
);
1204 * Trivial optimization: if we find an entry that
1205 * already matches the sub-directory, then we know
1206 * we're ok, and we can exit.
1208 while (pos
< istate
->cache_nr
) {
1209 struct cache_entry
*p
= istate
->cache
[pos
];
1210 if ((ce_namelen(p
) <= len
) ||
1211 (p
->name
[len
] != '/') ||
1212 memcmp(p
->name
, name
, len
))
1213 break; /* not our subdirectory */
1214 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1216 * p is at the same stage as our entry, and
1217 * is a subdirectory of what we are looking
1218 * at, so we cannot have conflicts at our
1219 * level or anything shorter.
1228 /* We may be in a situation where we already have path/file and path
1229 * is being added, or we already have path and path/file is being
1230 * added. Either one would result in a nonsense tree that has path
1231 * twice when git-write-tree tries to write it out. Prevent it.
1233 * If ok-to-replace is specified, we remove the conflicting entries
1234 * from the cache so the caller should recompute the insert position.
1235 * When this happens, we return non-zero.
1237 static int check_file_directory_conflict(struct index_state
*istate
,
1238 const struct cache_entry
*ce
,
1239 int pos
, int ok_to_replace
)
1244 * When ce is an "I am going away" entry, we allow it to be added
1246 if (ce
->ce_flags
& CE_REMOVE
)
1250 * We check if the path is a sub-path of a subsequent pathname
1251 * first, since removing those will not change the position
1254 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1257 * Then check if the path might have a clashing sub-directory
1260 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1263 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1266 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1267 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1268 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1269 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1271 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1272 cache_tree_invalidate_path(istate
, ce
->name
);
1275 * If this entry's path sorts after the last entry in the index,
1276 * we can avoid searching for it.
1278 if (istate
->cache_nr
> 0 &&
1279 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1280 pos
= -istate
->cache_nr
- 1;
1282 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1284 /* existing match? Just replace it. */
1287 replace_index_entry(istate
, pos
, ce
);
1292 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1293 untracked_cache_add_to_index(istate
, ce
->name
);
1296 * Inserting a merged entry ("stage 0") into the index
1297 * will always replace all non-merged entries..
1299 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1300 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1302 if (!remove_index_entry_at(istate
, pos
))
1309 if (!verify_path(ce
->name
, ce
->ce_mode
))
1310 return error(_("invalid path '%s'"), ce
->name
);
1312 if (!skip_df_check
&&
1313 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1315 return error(_("'%s' appears as both a file and as a directory"),
1317 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1323 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1327 if (option
& ADD_CACHE_JUST_APPEND
)
1328 pos
= istate
->cache_nr
;
1331 ret
= add_index_entry_with_check(istate
, ce
, option
);
1337 /* Make sure the array is big enough .. */
1338 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1342 if (istate
->cache_nr
> pos
+ 1)
1343 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1344 istate
->cache_nr
- pos
- 1);
1345 set_index_entry(istate
, pos
, ce
);
1346 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1351 * "refresh" does not calculate a new sha1 file or bring the
1352 * cache up-to-date for mode/content changes. But what it
1353 * _does_ do is to "re-match" the stat information of a file
1354 * with the cache, so that you can refresh the cache for a
1355 * file that hasn't been changed but where the stat entry is
1358 * For example, you'd want to do this after doing a "git-read-tree",
1359 * to link up the stat cache details with the proper files.
1361 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1362 struct cache_entry
*ce
,
1363 unsigned int options
, int *err
,
1367 struct cache_entry
*updated
;
1369 int refresh
= options
& CE_MATCH_REFRESH
;
1370 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1371 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1372 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1373 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1375 if (!refresh
|| ce_uptodate(ce
))
1378 if (!ignore_fsmonitor
)
1379 refresh_fsmonitor(istate
);
1381 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1382 * that the change to the work tree does not matter and told
1385 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1386 ce_mark_uptodate(ce
);
1389 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1390 ce_mark_uptodate(ce
);
1393 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1394 ce_mark_uptodate(ce
);
1398 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1406 if (lstat(ce
->name
, &st
) < 0) {
1407 if (ignore_missing
&& errno
== ENOENT
)
1414 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1416 *changed_ret
= changed
;
1419 * The path is unchanged. If we were told to ignore
1420 * valid bit, then we did the actual stat check and
1421 * found that the entry is unmodified. If the entry
1422 * is not marked VALID, this is the place to mark it
1423 * valid again, under "assume unchanged" mode.
1425 if (ignore_valid
&& assume_unchanged
&&
1426 !(ce
->ce_flags
& CE_VALID
))
1427 ; /* mark this one VALID again */
1430 * We do not mark the index itself "modified"
1431 * because CE_UPTODATE flag is in-core only;
1432 * we are not going to write this change out.
1434 if (!S_ISGITLINK(ce
->ce_mode
)) {
1435 ce_mark_uptodate(ce
);
1436 mark_fsmonitor_valid(ce
);
1442 if (ie_modified(istate
, ce
, &st
, options
)) {
1448 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1449 copy_cache_entry(updated
, ce
);
1450 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1451 fill_stat_cache_info(updated
, &st
);
1453 * If ignore_valid is not set, we should leave CE_VALID bit
1454 * alone. Otherwise, paths marked with --no-assume-unchanged
1455 * (i.e. things to be edited) will reacquire CE_VALID bit
1456 * automatically, which is not really what we want.
1458 if (!ignore_valid
&& assume_unchanged
&&
1459 !(ce
->ce_flags
& CE_VALID
))
1460 updated
->ce_flags
&= ~CE_VALID
;
1462 /* istate->cache_changed is updated in the caller */
1466 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1467 int * first
, const char *header_msg
)
1469 if (in_porcelain
&& *first
&& header_msg
) {
1470 printf("%s\n", header_msg
);
1476 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1477 const struct pathspec
*pathspec
,
1478 char *seen
, const char *header_msg
)
1482 int really
= (flags
& REFRESH_REALLY
) != 0;
1483 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1484 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1485 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1486 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1488 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1489 unsigned int options
= (CE_MATCH_REFRESH
|
1490 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1491 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1492 const char *modified_fmt
;
1493 const char *deleted_fmt
;
1494 const char *typechange_fmt
;
1495 const char *added_fmt
;
1496 const char *unmerged_fmt
;
1497 struct progress
*progress
= NULL
;
1499 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1500 progress
= start_delayed_progress(_("Refresh index"),
1503 trace_performance_enter();
1504 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1505 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1506 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1507 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1508 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1510 * Use the multi-threaded preload_index() to refresh most of the
1511 * cache entries quickly then in the single threaded loop below,
1512 * we only have to do the special cases that are left.
1514 preload_index(istate
, pathspec
, 0);
1515 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1516 struct cache_entry
*ce
, *new_entry
;
1517 int cache_errno
= 0;
1521 ce
= istate
->cache
[i
];
1522 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1525 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1529 while ((i
< istate
->cache_nr
) &&
1530 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1536 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1537 &first
, header_msg
);
1545 new_entry
= refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1546 if (new_entry
== ce
)
1549 display_progress(progress
, i
);
1553 if (really
&& cache_errno
== EINVAL
) {
1554 /* If we are doing --really-refresh that
1555 * means the index is not valid anymore.
1557 ce
->ce_flags
&= ~CE_VALID
;
1558 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1559 mark_fsmonitor_invalid(istate
, ce
);
1560 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1565 if (cache_errno
== ENOENT
)
1567 else if (ce_intent_to_add(ce
))
1568 fmt
= added_fmt
; /* must be before other checks */
1569 else if (changed
& TYPE_CHANGED
)
1570 fmt
= typechange_fmt
;
1574 ce
->name
, in_porcelain
, &first
, header_msg
);
1579 replace_index_entry(istate
, i
, new_entry
);
1582 display_progress(progress
, istate
->cache_nr
);
1583 stop_progress(&progress
);
1585 trace_performance_leave("refresh index");
1589 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1590 struct cache_entry
*ce
,
1591 unsigned int options
)
1593 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
);
1597 /*****************************************************************
1599 *****************************************************************/
1601 #define INDEX_FORMAT_DEFAULT 3
1603 static unsigned int get_index_format_default(void)
1605 char *envversion
= getenv("GIT_INDEX_VERSION");
1608 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1611 if (!git_config_get_int("index.version", &value
))
1613 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1614 warning(_("index.version set, but the value is invalid.\n"
1615 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1616 return INDEX_FORMAT_DEFAULT
;
1621 version
= strtoul(envversion
, &endp
, 10);
1623 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1624 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1625 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1626 version
= INDEX_FORMAT_DEFAULT
;
1632 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1633 * Again - this is just a (very strong in practice) heuristic that
1634 * the inode hasn't changed.
1636 * We save the fields in big-endian order to allow using the
1637 * index file over NFS transparently.
1639 struct ondisk_cache_entry
{
1640 struct cache_time ctime
;
1641 struct cache_time mtime
;
1648 unsigned char sha1
[20];
1650 char name
[FLEX_ARRAY
]; /* more */
1654 * This struct is used when CE_EXTENDED bit is 1
1655 * The struct must match ondisk_cache_entry exactly from
1658 struct ondisk_cache_entry_extended
{
1659 struct cache_time ctime
;
1660 struct cache_time mtime
;
1667 unsigned char sha1
[20];
1670 char name
[FLEX_ARRAY
]; /* more */
1673 /* These are only used for v3 or lower */
1674 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1675 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1676 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1677 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1678 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1679 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1680 ondisk_cache_entry_size(ce_namelen(ce)))
1682 /* Allow fsck to force verification of the index checksum. */
1683 int verify_index_checksum
;
1685 /* Allow fsck to force verification of the cache entry order. */
1686 int verify_ce_order
;
1688 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1691 unsigned char hash
[GIT_MAX_RAWSZ
];
1694 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1695 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1696 hdr_version
= ntohl(hdr
->hdr_version
);
1697 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1698 return error(_("bad index version %d"), hdr_version
);
1700 if (!verify_index_checksum
)
1703 the_hash_algo
->init_fn(&c
);
1704 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1705 the_hash_algo
->final_fn(hash
, &c
);
1706 if (!hasheq(hash
, (unsigned char *)hdr
+ size
- the_hash_algo
->rawsz
))
1707 return error(_("bad index file sha1 signature"));
1711 static int read_index_extension(struct index_state
*istate
,
1712 const char *ext
, const char *data
, unsigned long sz
)
1714 switch (CACHE_EXT(ext
)) {
1715 case CACHE_EXT_TREE
:
1716 istate
->cache_tree
= cache_tree_read(data
, sz
);
1718 case CACHE_EXT_RESOLVE_UNDO
:
1719 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1721 case CACHE_EXT_LINK
:
1722 if (read_link_extension(istate
, data
, sz
))
1725 case CACHE_EXT_UNTRACKED
:
1726 istate
->untracked
= read_untracked_extension(data
, sz
);
1728 case CACHE_EXT_FSMONITOR
:
1729 read_fsmonitor_extension(istate
, data
, sz
);
1731 case CACHE_EXT_ENDOFINDEXENTRIES
:
1732 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1733 /* already handled in do_read_index() */
1736 if (*ext
< 'A' || 'Z' < *ext
)
1737 return error(_("index uses %.4s extension, which we do not understand"),
1739 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1745 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1746 unsigned int version
,
1747 struct ondisk_cache_entry
*ondisk
,
1748 unsigned long *ent_size
,
1749 const struct cache_entry
*previous_ce
)
1751 struct cache_entry
*ce
;
1755 size_t copy_len
= 0;
1757 * Adjacent cache entries tend to share the leading paths, so it makes
1758 * sense to only store the differences in later entries. In the v4
1759 * on-disk format of the index, each on-disk cache entry stores the
1760 * number of bytes to be stripped from the end of the previous name,
1761 * and the bytes to append to the result, to come up with its name.
1763 int expand_name_field
= version
== 4;
1765 /* On-disk flags are just 16 bits */
1766 flags
= get_be16(&ondisk
->flags
);
1767 len
= flags
& CE_NAMEMASK
;
1769 if (flags
& CE_EXTENDED
) {
1770 struct ondisk_cache_entry_extended
*ondisk2
;
1772 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1773 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1774 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1775 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1776 die(_("unknown index entry format 0x%08x"), extended_flags
);
1777 flags
|= extended_flags
;
1778 name
= ondisk2
->name
;
1781 name
= ondisk
->name
;
1783 if (expand_name_field
) {
1784 const unsigned char *cp
= (const unsigned char *)name
;
1785 size_t strip_len
, previous_len
;
1787 /* If we're at the begining of a block, ignore the previous name */
1788 strip_len
= decode_varint(&cp
);
1790 previous_len
= previous_ce
->ce_namelen
;
1791 if (previous_len
< strip_len
)
1792 die(_("malformed name field in the index, near path '%s'"),
1794 copy_len
= previous_len
- strip_len
;
1796 name
= (const char *)cp
;
1799 if (len
== CE_NAMEMASK
) {
1801 if (expand_name_field
)
1805 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1807 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1808 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1809 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1810 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1811 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1812 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1813 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1814 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1815 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1816 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1817 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1818 ce
->ce_namelen
= len
;
1820 hashcpy(ce
->oid
.hash
, ondisk
->sha1
);
1822 if (expand_name_field
) {
1824 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1825 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1826 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1828 memcpy(ce
->name
, name
, len
+ 1);
1829 *ent_size
= ondisk_ce_size(ce
);
1834 static void check_ce_order(struct index_state
*istate
)
1838 if (!verify_ce_order
)
1841 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1842 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1843 struct cache_entry
*next_ce
= istate
->cache
[i
];
1844 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1846 if (0 < name_compare
)
1847 die(_("unordered stage entries in index"));
1848 if (!name_compare
) {
1850 die(_("multiple stage entries for merged file '%s'"),
1852 if (ce_stage(ce
) > ce_stage(next_ce
))
1853 die(_("unordered stage entries for '%s'"),
1859 static void tweak_untracked_cache(struct index_state
*istate
)
1861 switch (git_config_get_untracked_cache()) {
1862 case -1: /* keep: do nothing */
1865 remove_untracked_cache(istate
);
1868 add_untracked_cache(istate
);
1870 default: /* unknown value: do nothing */
1875 static void tweak_split_index(struct index_state
*istate
)
1877 switch (git_config_get_split_index()) {
1878 case -1: /* unset: do nothing */
1881 remove_split_index(istate
);
1884 add_split_index(istate
);
1886 default: /* unknown value: do nothing */
1891 static void post_read_index_from(struct index_state
*istate
)
1893 check_ce_order(istate
);
1894 tweak_untracked_cache(istate
);
1895 tweak_split_index(istate
);
1896 tweak_fsmonitor(istate
);
1899 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
1901 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
1904 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1906 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1909 * Account for potential alignment differences.
1911 per_entry
+= align_padding_size(sizeof(struct cache_entry
), -sizeof(struct ondisk_cache_entry
));
1912 return ondisk_size
+ entries
* per_entry
;
1915 struct index_entry_offset
1917 /* starting byte offset into index file, count of index entries in this block */
1921 struct index_entry_offset_table
1924 struct index_entry_offset entries
[FLEX_ARRAY
];
1927 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
1928 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
1930 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
1931 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
1933 struct load_index_extensions
1936 struct index_state
*istate
;
1939 unsigned long src_offset
;
1942 static void *load_index_extensions(void *_data
)
1944 struct load_index_extensions
*p
= _data
;
1945 unsigned long src_offset
= p
->src_offset
;
1947 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
1948 /* After an array of active_nr index entries,
1949 * there can be arbitrary number of extended
1950 * sections, each of which is prefixed with
1951 * extension name (4-byte) and section length
1952 * in 4-byte network byte order.
1954 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
1955 if (read_index_extension(p
->istate
,
1956 p
->mmap
+ src_offset
,
1957 p
->mmap
+ src_offset
+ 8,
1959 munmap((void *)p
->mmap
, p
->mmap_size
);
1960 die(_("index file corrupt"));
1963 src_offset
+= extsize
;
1970 * A helper function that will load the specified range of cache entries
1971 * from the memory mapped file and add them to the given index.
1973 static unsigned long load_cache_entry_block(struct index_state
*istate
,
1974 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
1975 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
1978 unsigned long src_offset
= start_offset
;
1980 for (i
= offset
; i
< offset
+ nr
; i
++) {
1981 struct ondisk_cache_entry
*disk_ce
;
1982 struct cache_entry
*ce
;
1983 unsigned long consumed
;
1985 disk_ce
= (struct ondisk_cache_entry
*)(mmap
+ src_offset
);
1986 ce
= create_from_disk(ce_mem_pool
, istate
->version
, disk_ce
, &consumed
, previous_ce
);
1987 set_index_entry(istate
, i
, ce
);
1989 src_offset
+= consumed
;
1992 return src_offset
- start_offset
;
1995 static unsigned long load_all_cache_entries(struct index_state
*istate
,
1996 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
1998 unsigned long consumed
;
2000 if (istate
->version
== 4) {
2001 mem_pool_init(&istate
->ce_mem_pool
,
2002 estimate_cache_size_from_compressed(istate
->cache_nr
));
2004 mem_pool_init(&istate
->ce_mem_pool
,
2005 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2008 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2009 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2014 * Mostly randomly chosen maximum thread counts: we
2015 * cap the parallelism to online_cpus() threads, and we want
2016 * to have at least 10000 cache entries per thread for it to
2017 * be worth starting a thread.
2020 #define THREAD_COST (10000)
2022 struct load_cache_entries_thread_data
2025 struct index_state
*istate
;
2026 struct mem_pool
*ce_mem_pool
;
2029 struct index_entry_offset_table
*ieot
;
2030 int ieot_start
; /* starting index into the ieot array */
2031 int ieot_blocks
; /* count of ieot entries to process */
2032 unsigned long consumed
; /* return # of bytes in index file processed */
2036 * A thread proc to run the load_cache_entries() computation
2037 * across multiple background threads.
2039 static void *load_cache_entries_thread(void *_data
)
2041 struct load_cache_entries_thread_data
*p
= _data
;
2044 /* iterate across all ieot blocks assigned to this thread */
2045 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2046 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2047 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2048 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2053 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2054 unsigned long src_offset
, int nr_threads
, struct index_entry_offset_table
*ieot
)
2056 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2057 struct load_cache_entries_thread_data
*data
;
2058 unsigned long consumed
= 0;
2060 /* a little sanity checking */
2061 if (istate
->name_hash_initialized
)
2062 BUG("the name hash isn't thread safe");
2064 mem_pool_init(&istate
->ce_mem_pool
, 0);
2066 /* ensure we have no more threads than we have blocks to process */
2067 if (nr_threads
> ieot
->nr
)
2068 nr_threads
= ieot
->nr
;
2069 data
= xcalloc(nr_threads
, sizeof(*data
));
2071 offset
= ieot_start
= 0;
2072 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2073 for (i
= 0; i
< nr_threads
; i
++) {
2074 struct load_cache_entries_thread_data
*p
= &data
[i
];
2077 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2078 ieot_blocks
= ieot
->nr
- ieot_start
;
2084 p
->ieot_start
= ieot_start
;
2085 p
->ieot_blocks
= ieot_blocks
;
2087 /* create a mem_pool for each thread */
2089 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2090 nr
+= p
->ieot
->entries
[j
].nr
;
2091 if (istate
->version
== 4) {
2092 mem_pool_init(&p
->ce_mem_pool
,
2093 estimate_cache_size_from_compressed(nr
));
2095 mem_pool_init(&p
->ce_mem_pool
,
2096 estimate_cache_size(mmap_size
, nr
));
2099 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2101 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2103 /* increment by the number of cache entries in the ieot block being processed */
2104 for (j
= 0; j
< ieot_blocks
; j
++)
2105 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2106 ieot_start
+= ieot_blocks
;
2109 for (i
= 0; i
< nr_threads
; i
++) {
2110 struct load_cache_entries_thread_data
*p
= &data
[i
];
2112 err
= pthread_join(p
->pthread
, NULL
);
2114 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2115 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2116 consumed
+= p
->consumed
;
2124 /* remember to discard_cache() before reading a different cache! */
2125 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2129 unsigned long src_offset
;
2130 const struct cache_header
*hdr
;
2133 struct load_index_extensions p
;
2134 size_t extension_offset
= 0;
2135 int nr_threads
, cpus
;
2136 struct index_entry_offset_table
*ieot
= NULL
;
2138 if (istate
->initialized
)
2139 return istate
->cache_nr
;
2141 istate
->timestamp
.sec
= 0;
2142 istate
->timestamp
.nsec
= 0;
2143 fd
= open(path
, O_RDONLY
);
2145 if (!must_exist
&& errno
== ENOENT
)
2147 die_errno(_("%s: index file open failed"), path
);
2151 die_errno(_("%s: cannot stat the open index"), path
);
2153 mmap_size
= xsize_t(st
.st_size
);
2154 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2155 die(_("%s: index file smaller than expected"), path
);
2157 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2158 if (mmap
== MAP_FAILED
)
2159 die_errno(_("%s: unable to map index file"), path
);
2162 hdr
= (const struct cache_header
*)mmap
;
2163 if (verify_hdr(hdr
, mmap_size
) < 0)
2166 hashcpy(istate
->oid
.hash
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2167 istate
->version
= ntohl(hdr
->hdr_version
);
2168 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2169 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2170 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
2171 istate
->initialized
= 1;
2175 p
.mmap_size
= mmap_size
;
2177 src_offset
= sizeof(*hdr
);
2179 if (git_config_get_index_threads(&nr_threads
))
2182 /* TODO: does creating more threads than cores help? */
2184 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2185 cpus
= online_cpus();
2186 if (nr_threads
> cpus
)
2193 if (nr_threads
> 1) {
2194 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2195 if (extension_offset
) {
2198 p
.src_offset
= extension_offset
;
2199 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2201 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2208 * Locate and read the index entry offset table so that we can use it
2209 * to multi-thread the reading of the cache entries.
2211 if (extension_offset
&& nr_threads
> 1)
2212 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2215 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, src_offset
, nr_threads
, ieot
);
2218 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2221 istate
->timestamp
.sec
= st
.st_mtime
;
2222 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2224 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2225 if (extension_offset
) {
2226 int ret
= pthread_join(p
.pthread
, NULL
);
2228 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2230 p
.src_offset
= src_offset
;
2231 load_index_extensions(&p
);
2233 munmap((void *)mmap
, mmap_size
);
2234 return istate
->cache_nr
;
2237 munmap((void *)mmap
, mmap_size
);
2238 die(_("index file corrupt"));
2242 * Signal that the shared index is used by updating its mtime.
2244 * This way, shared index can be removed if they have not been used
2247 static void freshen_shared_index(const char *shared_index
, int warn
)
2249 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2250 warning(_("could not freshen shared index '%s'"), shared_index
);
2253 int read_index_from(struct index_state
*istate
, const char *path
,
2256 struct split_index
*split_index
;
2261 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2262 if (istate
->initialized
)
2263 return istate
->cache_nr
;
2265 trace_performance_enter();
2266 ret
= do_read_index(istate
, path
, 0);
2267 trace_performance_leave("read cache %s", path
);
2269 split_index
= istate
->split_index
;
2270 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2271 post_read_index_from(istate
);
2275 trace_performance_enter();
2276 if (split_index
->base
)
2277 discard_index(split_index
->base
);
2279 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
2281 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2282 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2283 ret
= do_read_index(split_index
->base
, base_path
, 1);
2284 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2285 die(_("broken index, expect %s in %s, got %s"),
2286 base_oid_hex
, base_path
,
2287 oid_to_hex(&split_index
->base
->oid
));
2289 freshen_shared_index(base_path
, 0);
2290 merge_base_index(istate
);
2291 post_read_index_from(istate
);
2292 trace_performance_leave("read cache %s", base_path
);
2297 int is_index_unborn(struct index_state
*istate
)
2299 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2302 int discard_index(struct index_state
*istate
)
2305 * Cache entries in istate->cache[] should have been allocated
2306 * from the memory pool associated with this index, or from an
2307 * associated split_index. There is no need to free individual
2308 * cache entries. validate_cache_entries can detect when this
2309 * assertion does not hold.
2311 validate_cache_entries(istate
);
2313 resolve_undo_clear_index(istate
);
2314 istate
->cache_nr
= 0;
2315 istate
->cache_changed
= 0;
2316 istate
->timestamp
.sec
= 0;
2317 istate
->timestamp
.nsec
= 0;
2318 free_name_hash(istate
);
2319 cache_tree_free(&(istate
->cache_tree
));
2320 istate
->initialized
= 0;
2321 FREE_AND_NULL(istate
->cache
);
2322 istate
->cache_alloc
= 0;
2323 discard_split_index(istate
);
2324 free_untracked_cache(istate
->untracked
);
2325 istate
->untracked
= NULL
;
2327 if (istate
->ce_mem_pool
) {
2328 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2329 istate
->ce_mem_pool
= NULL
;
2336 * Validate the cache entries of this index.
2337 * All cache entries associated with this index
2338 * should have been allocated by the memory pool
2339 * associated with this index, or by a referenced
2342 void validate_cache_entries(const struct index_state
*istate
)
2346 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2349 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2351 BUG("cache entry is not allocated from expected memory pool");
2352 } else if (!istate
->ce_mem_pool
||
2353 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2354 if (!istate
->split_index
||
2355 !istate
->split_index
->base
||
2356 !istate
->split_index
->base
->ce_mem_pool
||
2357 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2358 BUG("cache entry is not allocated from expected memory pool");
2363 if (istate
->split_index
)
2364 validate_cache_entries(istate
->split_index
->base
);
2367 int unmerged_index(const struct index_state
*istate
)
2370 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2371 if (ce_stage(istate
->cache
[i
]))
2377 int repo_index_has_changes(struct repository
*repo
,
2381 struct index_state
*istate
= repo
->index
;
2382 struct object_id cmp
;
2386 cmp
= tree
->object
.oid
;
2387 if (tree
|| !get_oid_tree("HEAD", &cmp
)) {
2388 struct diff_options opt
;
2390 repo_diff_setup(repo
, &opt
);
2391 opt
.flags
.exit_with_status
= 1;
2393 opt
.flags
.quick
= 1;
2394 do_diff_cache(&cmp
, &opt
);
2396 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2398 strbuf_addch(sb
, ' ');
2399 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2402 return opt
.flags
.has_changes
!= 0;
2404 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2406 strbuf_addch(sb
, ' ');
2407 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2409 return !!istate
->cache_nr
;
2413 #define WRITE_BUFFER_SIZE 8192
2414 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
2415 static unsigned long write_buffer_len
;
2417 static int ce_write_flush(git_hash_ctx
*context
, int fd
)
2419 unsigned int buffered
= write_buffer_len
;
2421 the_hash_algo
->update_fn(context
, write_buffer
, buffered
);
2422 if (write_in_full(fd
, write_buffer
, buffered
) < 0)
2424 write_buffer_len
= 0;
2429 static int ce_write(git_hash_ctx
*context
, int fd
, void *data
, unsigned int len
)
2432 unsigned int buffered
= write_buffer_len
;
2433 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
2436 memcpy(write_buffer
+ buffered
, data
, partial
);
2437 buffered
+= partial
;
2438 if (buffered
== WRITE_BUFFER_SIZE
) {
2439 write_buffer_len
= buffered
;
2440 if (ce_write_flush(context
, fd
))
2444 write_buffer_len
= buffered
;
2446 data
= (char *) data
+ partial
;
2451 static int write_index_ext_header(git_hash_ctx
*context
, git_hash_ctx
*eoie_context
,
2452 int fd
, unsigned int ext
, unsigned int sz
)
2457 the_hash_algo
->update_fn(eoie_context
, &ext
, 4);
2458 the_hash_algo
->update_fn(eoie_context
, &sz
, 4);
2460 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
2461 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
2464 static int ce_flush(git_hash_ctx
*context
, int fd
, unsigned char *hash
)
2466 unsigned int left
= write_buffer_len
;
2469 write_buffer_len
= 0;
2470 the_hash_algo
->update_fn(context
, write_buffer
, left
);
2473 /* Flush first if not enough space for hash signature */
2474 if (left
+ the_hash_algo
->rawsz
> WRITE_BUFFER_SIZE
) {
2475 if (write_in_full(fd
, write_buffer
, left
) < 0)
2480 /* Append the hash signature at the end */
2481 the_hash_algo
->final_fn(write_buffer
+ left
, context
);
2482 hashcpy(hash
, write_buffer
+ left
);
2483 left
+= the_hash_algo
->rawsz
;
2484 return (write_in_full(fd
, write_buffer
, left
) < 0) ? -1 : 0;
2487 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2488 struct cache_entry
*ce
)
2491 * The only thing we care about in this function is to smudge the
2492 * falsely clean entry due to touch-update-touch race, so we leave
2493 * everything else as they are. We are called for entries whose
2494 * ce_stat_data.sd_mtime match the index file mtime.
2496 * Note that this actually does not do much for gitlinks, for
2497 * which ce_match_stat_basic() always goes to the actual
2498 * contents. The caller checks with is_racy_timestamp() which
2499 * always says "no" for gitlinks, so we are not called for them ;-)
2503 if (lstat(ce
->name
, &st
) < 0)
2505 if (ce_match_stat_basic(ce
, &st
))
2507 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2508 /* This is "racily clean"; smudge it. Note that this
2509 * is a tricky code. At first glance, it may appear
2510 * that it can break with this sequence:
2512 * $ echo xyzzy >frotz
2513 * $ git-update-index --add frotz
2516 * $ echo filfre >nitfol
2517 * $ git-update-index --add nitfol
2519 * but it does not. When the second update-index runs,
2520 * it notices that the entry "frotz" has the same timestamp
2521 * as index, and if we were to smudge it by resetting its
2522 * size to zero here, then the object name recorded
2523 * in index is the 6-byte file but the cached stat information
2524 * becomes zero --- which would then match what we would
2525 * obtain from the filesystem next time we stat("frotz").
2527 * However, the second update-index, before calling
2528 * this function, notices that the cached size is 6
2529 * bytes and what is on the filesystem is an empty
2530 * file, and never calls us, so the cached size information
2531 * for "frotz" stays 6 which does not match the filesystem.
2533 ce
->ce_stat_data
.sd_size
= 0;
2537 /* Copy miscellaneous fields but not the name */
2538 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2539 struct cache_entry
*ce
)
2543 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2544 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2545 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2546 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2547 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2548 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2549 ondisk
->mode
= htonl(ce
->ce_mode
);
2550 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2551 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2552 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2553 hashcpy(ondisk
->sha1
, ce
->oid
.hash
);
2555 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2556 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2557 ondisk
->flags
= htons(flags
);
2558 if (ce
->ce_flags
& CE_EXTENDED
) {
2559 struct ondisk_cache_entry_extended
*ondisk2
;
2560 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
2561 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2565 static int ce_write_entry(git_hash_ctx
*c
, int fd
, struct cache_entry
*ce
,
2566 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2570 unsigned int saved_namelen
;
2571 int stripped_name
= 0;
2572 static unsigned char padding
[8] = { 0x00 };
2574 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2575 saved_namelen
= ce_namelen(ce
);
2580 if (ce
->ce_flags
& CE_EXTENDED
)
2581 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
2583 size
= offsetof(struct ondisk_cache_entry
, name
);
2585 if (!previous_name
) {
2586 int len
= ce_namelen(ce
);
2587 copy_cache_entry_to_ondisk(ondisk
, ce
);
2588 result
= ce_write(c
, fd
, ondisk
, size
);
2590 result
= ce_write(c
, fd
, ce
->name
, len
);
2592 result
= ce_write(c
, fd
, padding
, align_padding_size(size
, len
));
2594 int common
, to_remove
, prefix_size
;
2595 unsigned char to_remove_vi
[16];
2597 (ce
->name
[common
] &&
2598 common
< previous_name
->len
&&
2599 ce
->name
[common
] == previous_name
->buf
[common
]);
2601 ; /* still matching */
2602 to_remove
= previous_name
->len
- common
;
2603 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2605 copy_cache_entry_to_ondisk(ondisk
, ce
);
2606 result
= ce_write(c
, fd
, ondisk
, size
);
2608 result
= ce_write(c
, fd
, to_remove_vi
, prefix_size
);
2610 result
= ce_write(c
, fd
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2612 result
= ce_write(c
, fd
, padding
, 1);
2614 strbuf_splice(previous_name
, common
, to_remove
,
2615 ce
->name
+ common
, ce_namelen(ce
) - common
);
2617 if (stripped_name
) {
2618 ce
->ce_namelen
= saved_namelen
;
2619 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2626 * This function verifies if index_state has the correct sha1 of the
2627 * index file. Don't die if we have any other failure, just return 0.
2629 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2634 unsigned char hash
[GIT_MAX_RAWSZ
];
2636 if (!istate
->initialized
)
2639 fd
= open(path
, O_RDONLY
);
2646 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2649 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2650 if (n
!= the_hash_algo
->rawsz
)
2653 if (!hasheq(istate
->oid
.hash
, hash
))
2664 static int repo_verify_index(struct repository
*repo
)
2666 return verify_index_from(repo
->index
, repo
->index_file
);
2669 static int has_racy_timestamp(struct index_state
*istate
)
2671 int entries
= istate
->cache_nr
;
2674 for (i
= 0; i
< entries
; i
++) {
2675 struct cache_entry
*ce
= istate
->cache
[i
];
2676 if (is_racy_timestamp(istate
, ce
))
2682 void repo_update_index_if_able(struct repository
*repo
,
2683 struct lock_file
*lockfile
)
2685 if ((repo
->index
->cache_changed
||
2686 has_racy_timestamp(repo
->index
)) &&
2687 repo_verify_index(repo
))
2688 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2690 rollback_lock_file(lockfile
);
2693 static int record_eoie(void)
2697 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2701 * As a convenience, the end of index entries extension
2702 * used for threading is written by default if the user
2703 * explicitly requested threaded index reads.
2705 return !git_config_get_index_threads(&val
) && val
!= 1;
2708 static int record_ieot(void)
2712 if (!git_config_get_bool("index.recordoffsettable", &val
))
2716 * As a convenience, the offset table used for threading is
2717 * written by default if the user explicitly requested
2718 * threaded index reads.
2720 return !git_config_get_index_threads(&val
) && val
!= 1;
2724 * On success, `tempfile` is closed. If it is the temporary file
2725 * of a `struct lock_file`, we will therefore effectively perform
2726 * a 'close_lock_file_gently()`. Since that is an implementation
2727 * detail of lockfiles, callers of `do_write_index()` should not
2730 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2731 int strip_extensions
)
2733 uint64_t start
= getnanotime();
2734 int newfd
= tempfile
->fd
;
2735 git_hash_ctx c
, eoie_c
;
2736 struct cache_header hdr
;
2737 int i
, err
= 0, removed
, extended
, hdr_version
;
2738 struct cache_entry
**cache
= istate
->cache
;
2739 int entries
= istate
->cache_nr
;
2741 struct ondisk_cache_entry_extended ondisk
;
2742 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2743 int drop_cache_tree
= istate
->drop_cache_tree
;
2745 int ieot_entries
= 1;
2746 struct index_entry_offset_table
*ieot
= NULL
;
2749 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2750 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2753 /* reduce extended entries if possible */
2754 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2755 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2757 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2761 if (!istate
->version
) {
2762 istate
->version
= get_index_format_default();
2763 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
2764 init_split_index(istate
);
2767 /* demote version 3 to version 2 when the latter suffices */
2768 if (istate
->version
== 3 || istate
->version
== 2)
2769 istate
->version
= extended
? 3 : 2;
2771 hdr_version
= istate
->version
;
2773 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2774 hdr
.hdr_version
= htonl(hdr_version
);
2775 hdr
.hdr_entries
= htonl(entries
- removed
);
2777 the_hash_algo
->init_fn(&c
);
2778 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2781 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2784 if (nr_threads
!= 1 && record_ieot()) {
2785 int ieot_blocks
, cpus
;
2788 * ensure default number of ieot blocks maps evenly to the
2789 * default number of threads that will process them leaving
2790 * room for the thread to load the index extensions.
2793 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2794 cpus
= online_cpus();
2795 if (ieot_blocks
> cpus
- 1)
2796 ieot_blocks
= cpus
- 1;
2798 ieot_blocks
= nr_threads
;
2799 if (ieot_blocks
> istate
->cache_nr
)
2800 ieot_blocks
= istate
->cache_nr
;
2804 * no reason to write out the IEOT extension if we don't
2805 * have enough blocks to utilize multi-threading
2807 if (ieot_blocks
> 1) {
2808 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2809 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2810 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
2814 offset
= lseek(newfd
, 0, SEEK_CUR
);
2819 offset
+= write_buffer_len
;
2821 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2823 for (i
= 0; i
< entries
; i
++) {
2824 struct cache_entry
*ce
= cache
[i
];
2825 if (ce
->ce_flags
& CE_REMOVE
)
2827 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2828 ce_smudge_racily_clean_entry(istate
, ce
);
2829 if (is_null_oid(&ce
->oid
)) {
2830 static const char msg
[] = "cache entry has null sha1: %s";
2831 static int allow
= -1;
2834 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2836 warning(msg
, ce
->name
);
2838 err
= error(msg
, ce
->name
);
2840 drop_cache_tree
= 1;
2842 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
2843 ieot
->entries
[ieot
->nr
].nr
= nr
;
2844 ieot
->entries
[ieot
->nr
].offset
= offset
;
2847 * If we have a V4 index, set the first byte to an invalid
2848 * character to ensure there is nothing common with the previous
2852 previous_name
->buf
[0] = 0;
2854 offset
= lseek(newfd
, 0, SEEK_CUR
);
2859 offset
+= write_buffer_len
;
2861 if (ce_write_entry(&c
, newfd
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2869 ieot
->entries
[ieot
->nr
].nr
= nr
;
2870 ieot
->entries
[ieot
->nr
].offset
= offset
;
2873 strbuf_release(&previous_name_buf
);
2880 /* Write extension data here */
2881 offset
= lseek(newfd
, 0, SEEK_CUR
);
2886 offset
+= write_buffer_len
;
2887 the_hash_algo
->init_fn(&eoie_c
);
2890 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
2891 * can minimize the number of extensions we have to scan through to
2892 * find it during load. Write it out regardless of the
2893 * strip_extensions parameter as we need it when loading the shared
2897 struct strbuf sb
= STRBUF_INIT
;
2899 write_ieot_extension(&sb
, ieot
);
2900 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0
2901 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2902 strbuf_release(&sb
);
2908 if (!strip_extensions
&& istate
->split_index
) {
2909 struct strbuf sb
= STRBUF_INIT
;
2911 err
= write_link_extension(&sb
, istate
) < 0 ||
2912 write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_LINK
,
2914 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2915 strbuf_release(&sb
);
2919 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
2920 struct strbuf sb
= STRBUF_INIT
;
2922 cache_tree_write(&sb
, istate
->cache_tree
);
2923 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2924 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2925 strbuf_release(&sb
);
2929 if (!strip_extensions
&& istate
->resolve_undo
) {
2930 struct strbuf sb
= STRBUF_INIT
;
2932 resolve_undo_write(&sb
, istate
->resolve_undo
);
2933 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2935 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2936 strbuf_release(&sb
);
2940 if (!strip_extensions
&& istate
->untracked
) {
2941 struct strbuf sb
= STRBUF_INIT
;
2943 write_untracked_extension(&sb
, istate
->untracked
);
2944 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_UNTRACKED
,
2946 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2947 strbuf_release(&sb
);
2951 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
2952 struct strbuf sb
= STRBUF_INIT
;
2954 write_fsmonitor_extension(&sb
, istate
);
2955 err
= write_index_ext_header(&c
, &eoie_c
, newfd
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0
2956 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2957 strbuf_release(&sb
);
2963 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
2964 * so that it can be found and processed before all the index entries are
2965 * read. Write it out regardless of the strip_extensions parameter as we need it
2966 * when loading the shared index.
2968 if (offset
&& record_eoie()) {
2969 struct strbuf sb
= STRBUF_INIT
;
2971 write_eoie_extension(&sb
, &eoie_c
, offset
);
2972 err
= write_index_ext_header(&c
, NULL
, newfd
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0
2973 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2974 strbuf_release(&sb
);
2979 if (ce_flush(&c
, newfd
, istate
->oid
.hash
))
2981 if (close_tempfile_gently(tempfile
)) {
2982 error(_("could not close '%s'"), tempfile
->filename
.buf
);
2985 if (stat(tempfile
->filename
.buf
, &st
))
2987 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2988 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2989 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
2993 void set_alternate_index_output(const char *name
)
2995 alternate_index_output
= name
;
2998 static int commit_locked_index(struct lock_file
*lk
)
3000 if (alternate_index_output
)
3001 return commit_lock_file_to(lk
, alternate_index_output
);
3003 return commit_lock_file(lk
);
3006 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3009 int ret
= do_write_index(istate
, lock
->tempfile
, 0);
3012 if (flags
& COMMIT_LOCK
)
3013 return commit_locked_index(lock
);
3014 return close_lock_file_gently(lock
);
3017 static int write_split_index(struct index_state
*istate
,
3018 struct lock_file
*lock
,
3022 prepare_to_write_split_index(istate
);
3023 ret
= do_write_locked_index(istate
, lock
, flags
);
3024 finish_writing_split_index(istate
);
3028 static const char *shared_index_expire
= "2.weeks.ago";
3030 static unsigned long get_shared_index_expire_date(void)
3032 static unsigned long shared_index_expire_date
;
3033 static int shared_index_expire_date_prepared
;
3035 if (!shared_index_expire_date_prepared
) {
3036 git_config_get_expiry("splitindex.sharedindexexpire",
3037 &shared_index_expire
);
3038 shared_index_expire_date
= approxidate(shared_index_expire
);
3039 shared_index_expire_date_prepared
= 1;
3042 return shared_index_expire_date
;
3045 static int should_delete_shared_index(const char *shared_index_path
)
3048 unsigned long expiration
;
3050 /* Check timestamp */
3051 expiration
= get_shared_index_expire_date();
3054 if (stat(shared_index_path
, &st
))
3055 return error_errno(_("could not stat '%s'"), shared_index_path
);
3056 if (st
.st_mtime
> expiration
)
3062 static int clean_shared_index_files(const char *current_hex
)
3065 DIR *dir
= opendir(get_git_dir());
3068 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3070 while ((de
= readdir(dir
)) != NULL
) {
3071 const char *sha1_hex
;
3072 const char *shared_index_path
;
3073 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3075 if (!strcmp(sha1_hex
, current_hex
))
3077 shared_index_path
= git_path("%s", de
->d_name
);
3078 if (should_delete_shared_index(shared_index_path
) > 0 &&
3079 unlink(shared_index_path
))
3080 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3087 static int write_shared_index(struct index_state
*istate
,
3088 struct tempfile
**temp
)
3090 struct split_index
*si
= istate
->split_index
;
3093 move_cache_to_base_index(istate
);
3094 ret
= do_write_index(si
->base
, *temp
, 1);
3097 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3099 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3102 ret
= rename_tempfile(temp
,
3103 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3105 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3106 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3112 static const int default_max_percent_split_change
= 20;
3114 static int too_many_not_shared_entries(struct index_state
*istate
)
3116 int i
, not_shared
= 0;
3117 int max_split
= git_config_get_max_percent_split_change();
3119 switch (max_split
) {
3121 /* not or badly configured: use the default value */
3122 max_split
= default_max_percent_split_change
;
3125 return 1; /* 0% means always write a new shared index */
3127 return 0; /* 100% means never write a new shared index */
3129 break; /* just use the configured value */
3132 /* Count not shared entries */
3133 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3134 struct cache_entry
*ce
= istate
->cache
[i
];
3139 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3142 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3145 int new_shared_index
, ret
;
3146 struct split_index
*si
= istate
->split_index
;
3148 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3149 cache_tree_verify(the_repository
, istate
);
3151 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3152 if (flags
& COMMIT_LOCK
)
3153 rollback_lock_file(lock
);
3157 if (istate
->fsmonitor_last_update
)
3158 fill_fsmonitor_bitmap(istate
);
3160 if (!si
|| alternate_index_output
||
3161 (istate
->cache_changed
& ~EXTMASK
)) {
3163 oidclr(&si
->base_oid
);
3164 ret
= do_write_locked_index(istate
, lock
, flags
);
3168 if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
3169 int v
= si
->base_oid
.hash
[0];
3171 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3173 if (too_many_not_shared_entries(istate
))
3174 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3176 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3178 if (new_shared_index
) {
3179 struct tempfile
*temp
;
3182 /* Same initial permissions as the main .git/index file */
3183 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3185 oidclr(&si
->base_oid
);
3186 ret
= do_write_locked_index(istate
, lock
, flags
);
3189 ret
= write_shared_index(istate
, &temp
);
3191 saved_errno
= errno
;
3192 if (is_tempfile_active(temp
))
3193 delete_tempfile(&temp
);
3194 errno
= saved_errno
;
3200 ret
= write_split_index(istate
, lock
, flags
);
3202 /* Freshen the shared index only if the split-index was written */
3203 if (!ret
&& !new_shared_index
) {
3204 const char *shared_index
= git_path("sharedindex.%s",
3205 oid_to_hex(&si
->base_oid
));
3206 freshen_shared_index(shared_index
, 1);
3210 if (flags
& COMMIT_LOCK
)
3211 rollback_lock_file(lock
);
3216 * Read the index file that is potentially unmerged into given
3217 * index_state, dropping any unmerged entries to stage #0 (potentially
3218 * resulting in a path appearing as both a file and a directory in the
3219 * index; the caller is responsible to clear out the extra entries
3220 * before writing the index to a tree). Returns true if the index is
3221 * unmerged. Callers who want to refuse to work from an unmerged
3222 * state can call this and check its return value, instead of calling
3225 int repo_read_index_unmerged(struct repository
*repo
)
3227 struct index_state
*istate
;
3231 repo_read_index(repo
);
3232 istate
= repo
->index
;
3233 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3234 struct cache_entry
*ce
= istate
->cache
[i
];
3235 struct cache_entry
*new_ce
;
3241 len
= ce_namelen(ce
);
3242 new_ce
= make_empty_cache_entry(istate
, len
);
3243 memcpy(new_ce
->name
, ce
->name
, len
);
3244 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3245 new_ce
->ce_namelen
= len
;
3246 new_ce
->ce_mode
= ce
->ce_mode
;
3247 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3248 return error(_("%s: cannot drop to stage #0"),
3255 * Returns 1 if the path is an "other" path with respect to
3256 * the index; that is, the path is not mentioned in the index at all,
3257 * either as a file, a directory with some files in the index,
3258 * or as an unmerged entry.
3260 * We helpfully remove a trailing "/" from directories so that
3261 * the output of read_directory can be used as-is.
3263 int index_name_is_other(const struct index_state
*istate
, const char *name
,
3267 if (namelen
&& name
[namelen
- 1] == '/')
3269 pos
= index_name_pos(istate
, name
, namelen
);
3271 return 0; /* exact match */
3273 if (pos
< istate
->cache_nr
) {
3274 struct cache_entry
*ce
= istate
->cache
[pos
];
3275 if (ce_namelen(ce
) == namelen
&&
3276 !memcmp(ce
->name
, name
, namelen
))
3277 return 0; /* Yup, this one exists unmerged */
3282 void *read_blob_data_from_index(const struct index_state
*istate
,
3283 const char *path
, unsigned long *size
)
3287 enum object_type type
;
3291 pos
= index_name_pos(istate
, path
, len
);
3294 * We might be in the middle of a merge, in which
3295 * case we would read stage #2 (ours).
3299 (pos
< 0 && i
< istate
->cache_nr
&&
3300 !strcmp(istate
->cache
[i
]->name
, path
));
3302 if (ce_stage(istate
->cache
[i
]) == 2)
3307 data
= read_object_file(&istate
->cache
[pos
]->oid
, &type
, &sz
);
3308 if (!data
|| type
!= OBJ_BLOB
) {
3317 void stat_validity_clear(struct stat_validity
*sv
)
3319 FREE_AND_NULL(sv
->sd
);
3322 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
3326 if (stat(path
, &st
) < 0)
3327 return sv
->sd
== NULL
;
3330 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
3333 void stat_validity_update(struct stat_validity
*sv
, int fd
)
3337 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
3338 stat_validity_clear(sv
);
3341 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
3342 fill_stat_data(sv
->sd
, &st
);
3346 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3348 dst
->untracked
= src
->untracked
;
3349 src
->untracked
= NULL
;
3350 dst
->cache_tree
= src
->cache_tree
;
3351 src
->cache_tree
= NULL
;
3354 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3355 struct index_state
*istate
)
3357 unsigned int size
= ce_size(ce
);
3358 int mem_pool_allocated
;
3359 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3360 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3362 memcpy(new_entry
, ce
, size
);
3363 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3367 void discard_cache_entry(struct cache_entry
*ce
)
3369 if (ce
&& should_validate_cache_entries())
3370 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3372 if (ce
&& ce
->mem_pool_allocated
)
3378 int should_validate_cache_entries(void)
3380 static int validate_index_cache_entries
= -1;
3382 if (validate_index_cache_entries
< 0) {
3383 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3384 validate_index_cache_entries
= 1;
3386 validate_index_cache_entries
= 0;
3389 return validate_index_cache_entries
;
3392 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3393 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3395 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3398 * The end of index entries (EOIE) extension is guaranteed to be last
3399 * so that it can be found by scanning backwards from the EOF.
3406 const char *index
, *eoie
;
3408 size_t offset
, src_offset
;
3409 unsigned char hash
[GIT_MAX_RAWSZ
];
3412 /* ensure we have an index big enough to contain an EOIE extension */
3413 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3416 /* validate the extension signature */
3417 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3418 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3420 index
+= sizeof(uint32_t);
3422 /* validate the extension size */
3423 extsize
= get_be32(index
);
3424 if (extsize
!= EOIE_SIZE
)
3426 index
+= sizeof(uint32_t);
3429 * Validate the offset we're going to look for the first extension
3430 * signature is after the index header and before the eoie extension.
3432 offset
= get_be32(index
);
3433 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3435 if (mmap
+ offset
>= eoie
)
3437 index
+= sizeof(uint32_t);
3440 * The hash is computed over extension types and their sizes (but not
3441 * their contents). E.g. if we have "TREE" extension that is N-bytes
3442 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3443 * then the hash would be:
3445 * SHA-1("TREE" + <binary representation of N> +
3446 * "REUC" + <binary representation of M>)
3448 src_offset
= offset
;
3449 the_hash_algo
->init_fn(&c
);
3450 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3451 /* After an array of active_nr index entries,
3452 * there can be arbitrary number of extended
3453 * sections, each of which is prefixed with
3454 * extension name (4-byte) and section length
3455 * in 4-byte network byte order.
3458 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3459 extsize
= ntohl(extsize
);
3461 /* verify the extension size isn't so large it will wrap around */
3462 if (src_offset
+ 8 + extsize
< src_offset
)
3465 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3468 src_offset
+= extsize
;
3470 the_hash_algo
->final_fn(hash
, &c
);
3471 if (!hasheq(hash
, (const unsigned char *)index
))
3474 /* Validate that the extension offsets returned us back to the eoie extension. */
3475 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3481 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3484 unsigned char hash
[GIT_MAX_RAWSZ
];
3487 put_be32(&buffer
, offset
);
3488 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3491 the_hash_algo
->final_fn(hash
, eoie_context
);
3492 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3495 #define IEOT_VERSION (1)
3497 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3499 const char *index
= NULL
;
3500 uint32_t extsize
, ext_version
;
3501 struct index_entry_offset_table
*ieot
;
3504 /* find the IEOT extension */
3507 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3508 extsize
= get_be32(mmap
+ offset
+ 4);
3509 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3510 index
= mmap
+ offset
+ 4 + 4;
3519 /* validate the version is IEOT_VERSION */
3520 ext_version
= get_be32(index
);
3521 if (ext_version
!= IEOT_VERSION
) {
3522 error("invalid IEOT version %d", ext_version
);
3525 index
+= sizeof(uint32_t);
3527 /* extension size - version bytes / bytes per entry */
3528 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3530 error("invalid number of IEOT entries %d", nr
);
3533 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3534 + (nr
* sizeof(struct index_entry_offset
)));
3536 for (i
= 0; i
< nr
; i
++) {
3537 ieot
->entries
[i
].offset
= get_be32(index
);
3538 index
+= sizeof(uint32_t);
3539 ieot
->entries
[i
].nr
= get_be32(index
);
3540 index
+= sizeof(uint32_t);
3546 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3552 put_be32(&buffer
, IEOT_VERSION
);
3553 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3556 for (i
= 0; i
< ieot
->nr
; i
++) {
3559 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3560 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3563 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3564 strbuf_add(sb
, &buffer
, sizeof(uint32_t));