2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 #include "cache-tree.h"
15 #include "object-store.h"
19 #include "resolve-undo.h"
20 #include "run-command.h"
23 #include "split-index.h"
25 #include "fsmonitor.h"
26 #include "thread-utils.h"
28 #include "sparse-index.h"
29 #include "csum-file.h"
30 #include "promisor-remote.h"
33 /* Mask for the name length in ce_flags in the on-disk index */
35 #define CE_NAMEMASK (0x0fff)
39 * The first letter should be 'A'..'Z' for extensions that are not
40 * necessary for a correct operation (i.e. optimization data).
41 * When new extensions are added that _needs_ to be understood in
42 * order to correctly interpret the index file, pick character that
43 * is outside the range, to cause the reader to abort.
46 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
47 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
48 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
49 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
50 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
51 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
52 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */
53 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
54 #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
56 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
57 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
58 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
59 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
63 * This is an estimate of the pathname length in the index. We use
64 * this for V4 index files to guess the un-deltafied size of the index
65 * in memory because of pathname deltafication. This is not required
66 * for V2/V3 index formats because their pathnames are not compressed.
67 * If the initial amount of memory set aside is not sufficient, the
68 * mem pool will allocate extra memory.
70 #define CACHE_ENTRY_PATH_LENGTH 80
72 enum index_search_mode
{
77 static inline struct cache_entry
*mem_pool__ce_alloc(struct mem_pool
*mem_pool
, size_t len
)
79 struct cache_entry
*ce
;
80 ce
= mem_pool_alloc(mem_pool
, cache_entry_size(len
));
81 ce
->mem_pool_allocated
= 1;
85 static inline struct cache_entry
*mem_pool__ce_calloc(struct mem_pool
*mem_pool
, size_t len
)
87 struct cache_entry
* ce
;
88 ce
= mem_pool_calloc(mem_pool
, 1, cache_entry_size(len
));
89 ce
->mem_pool_allocated
= 1;
93 static struct mem_pool
*find_mem_pool(struct index_state
*istate
)
95 struct mem_pool
**pool_ptr
;
97 if (istate
->split_index
&& istate
->split_index
->base
)
98 pool_ptr
= &istate
->split_index
->base
->ce_mem_pool
;
100 pool_ptr
= &istate
->ce_mem_pool
;
103 *pool_ptr
= xmalloc(sizeof(**pool_ptr
));
104 mem_pool_init(*pool_ptr
, 0);
110 static const char *alternate_index_output
;
112 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
114 if (S_ISSPARSEDIR(ce
->ce_mode
))
115 istate
->sparse_index
= INDEX_COLLAPSED
;
117 istate
->cache
[nr
] = ce
;
118 add_name_hash(istate
, ce
);
121 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
123 struct cache_entry
*old
= istate
->cache
[nr
];
125 replace_index_entry_in_base(istate
, old
, ce
);
126 remove_name_hash(istate
, old
);
127 discard_cache_entry(old
);
128 ce
->ce_flags
&= ~CE_HASHED
;
129 set_index_entry(istate
, nr
, ce
);
130 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
131 mark_fsmonitor_invalid(istate
, ce
);
132 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
135 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
137 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
, *refreshed
;
138 int namelen
= strlen(new_name
);
140 new_entry
= make_empty_cache_entry(istate
, namelen
);
141 copy_cache_entry(new_entry
, old_entry
);
142 new_entry
->ce_flags
&= ~CE_HASHED
;
143 new_entry
->ce_namelen
= namelen
;
144 new_entry
->index
= 0;
145 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
147 cache_tree_invalidate_path(istate
, old_entry
->name
);
148 untracked_cache_remove_from_index(istate
, old_entry
->name
);
149 remove_index_entry_at(istate
, nr
);
152 * Refresh the new index entry. Using 'refresh_cache_entry' ensures
153 * we only update stat info if the entry is otherwise up-to-date (i.e.,
154 * the contents/mode haven't changed). This ensures that we reflect the
155 * 'ctime' of the rename in the index without (incorrectly) updating
156 * the cached stat info to reflect unstaged changes on disk.
158 refreshed
= refresh_cache_entry(istate
, new_entry
, CE_MATCH_REFRESH
);
159 if (refreshed
&& refreshed
!= new_entry
) {
160 add_index_entry(istate
, refreshed
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
161 discard_cache_entry(new_entry
);
163 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
166 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
168 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
169 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
170 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
171 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
172 sd
->sd_dev
= st
->st_dev
;
173 sd
->sd_ino
= st
->st_ino
;
174 sd
->sd_uid
= st
->st_uid
;
175 sd
->sd_gid
= st
->st_gid
;
176 sd
->sd_size
= st
->st_size
;
179 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
183 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
184 changed
|= MTIME_CHANGED
;
185 if (trust_ctime
&& check_stat
&&
186 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
187 changed
|= CTIME_CHANGED
;
190 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
191 changed
|= MTIME_CHANGED
;
192 if (trust_ctime
&& check_stat
&&
193 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
194 changed
|= CTIME_CHANGED
;
198 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
199 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
200 changed
|= OWNER_CHANGED
;
201 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
202 changed
|= INODE_CHANGED
;
207 * st_dev breaks on network filesystems where different
208 * clients will have different views of what "device"
209 * the filesystem is on
211 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
212 changed
|= INODE_CHANGED
;
215 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
216 changed
|= DATA_CHANGED
;
222 * This only updates the "non-critical" parts of the directory
223 * cache, ie the parts that aren't tracked by GIT, and only used
224 * to validate the cache.
226 void fill_stat_cache_info(struct index_state
*istate
, struct cache_entry
*ce
, struct stat
*st
)
228 fill_stat_data(&ce
->ce_stat_data
, st
);
230 if (assume_unchanged
)
231 ce
->ce_flags
|= CE_VALID
;
233 if (S_ISREG(st
->st_mode
)) {
234 ce_mark_uptodate(ce
);
235 mark_fsmonitor_valid(istate
, ce
);
239 static int ce_compare_data(struct index_state
*istate
,
240 const struct cache_entry
*ce
,
244 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
247 struct object_id oid
;
248 if (!index_fd(istate
, &oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
249 match
= !oideq(&oid
, &ce
->oid
);
250 /* index_fd() closed the file descriptor already */
255 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
260 enum object_type type
;
261 struct strbuf sb
= STRBUF_INIT
;
263 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
266 buffer
= read_object_file(&ce
->oid
, &type
, &size
);
269 match
= memcmp(buffer
, sb
.buf
, size
);
276 static int ce_compare_gitlink(const struct cache_entry
*ce
)
278 struct object_id oid
;
281 * We don't actually require that the .git directory
282 * under GITLINK directory be a valid git directory. It
283 * might even be missing (in case nobody populated that
286 * If so, we consider it always to match.
288 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
290 return !oideq(&oid
, &ce
->oid
);
293 static int ce_modified_check_fs(struct index_state
*istate
,
294 const struct cache_entry
*ce
,
297 switch (st
->st_mode
& S_IFMT
) {
299 if (ce_compare_data(istate
, ce
, st
))
303 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
307 if (S_ISGITLINK(ce
->ce_mode
))
308 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
309 /* else fallthrough */
316 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
318 unsigned int changed
= 0;
320 if (ce
->ce_flags
& CE_REMOVE
)
321 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
323 switch (ce
->ce_mode
& S_IFMT
) {
325 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
326 /* We consider only the owner x bit to be relevant for
329 if (trust_executable_bit
&&
330 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
331 changed
|= MODE_CHANGED
;
334 if (!S_ISLNK(st
->st_mode
) &&
335 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
336 changed
|= TYPE_CHANGED
;
339 /* We ignore most of the st_xxx fields for gitlinks */
340 if (!S_ISDIR(st
->st_mode
))
341 changed
|= TYPE_CHANGED
;
342 else if (ce_compare_gitlink(ce
))
343 changed
|= DATA_CHANGED
;
346 BUG("unsupported ce_mode: %o", ce
->ce_mode
);
349 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
351 /* Racily smudged entry? */
352 if (!ce
->ce_stat_data
.sd_size
) {
353 if (!is_empty_blob_sha1(ce
->oid
.hash
))
354 changed
|= DATA_CHANGED
;
360 static int is_racy_stat(const struct index_state
*istate
,
361 const struct stat_data
*sd
)
363 return (istate
->timestamp
.sec
&&
365 /* nanosecond timestamped files can also be racy! */
366 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
367 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
368 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
370 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
375 int is_racy_timestamp(const struct index_state
*istate
,
376 const struct cache_entry
*ce
)
378 return (!S_ISGITLINK(ce
->ce_mode
) &&
379 is_racy_stat(istate
, &ce
->ce_stat_data
));
382 int match_stat_data_racy(const struct index_state
*istate
,
383 const struct stat_data
*sd
, struct stat
*st
)
385 if (is_racy_stat(istate
, sd
))
386 return MTIME_CHANGED
;
387 return match_stat_data(sd
, st
);
390 int ie_match_stat(struct index_state
*istate
,
391 const struct cache_entry
*ce
, struct stat
*st
,
392 unsigned int options
)
394 unsigned int changed
;
395 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
396 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
397 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
398 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
400 if (!ignore_fsmonitor
)
401 refresh_fsmonitor(istate
);
403 * If it's marked as always valid in the index, it's
404 * valid whatever the checked-out copy says.
406 * skip-worktree has the same effect with higher precedence
408 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
410 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
412 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
416 * Intent-to-add entries have not been added, so the index entry
417 * by definition never matches what is in the work tree until it
418 * actually gets added.
420 if (ce_intent_to_add(ce
))
421 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
423 changed
= ce_match_stat_basic(ce
, st
);
426 * Within 1 second of this sequence:
427 * echo xyzzy >file && git-update-index --add file
428 * running this command:
430 * would give a falsely clean cache entry. The mtime and
431 * length match the cache, and other stat fields do not change.
433 * We could detect this at update-index time (the cache entry
434 * being registered/updated records the same time as "now")
435 * and delay the return from git-update-index, but that would
436 * effectively mean we can make at most one commit per second,
437 * which is not acceptable. Instead, we check cache entries
438 * whose mtime are the same as the index file timestamp more
439 * carefully than others.
441 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
442 if (assume_racy_is_modified
)
443 changed
|= DATA_CHANGED
;
445 changed
|= ce_modified_check_fs(istate
, ce
, st
);
451 int ie_modified(struct index_state
*istate
,
452 const struct cache_entry
*ce
,
453 struct stat
*st
, unsigned int options
)
455 int changed
, changed_fs
;
457 changed
= ie_match_stat(istate
, ce
, st
, options
);
461 * If the mode or type has changed, there's no point in trying
462 * to refresh the entry - it's not going to match
464 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
468 * Immediately after read-tree or update-index --cacheinfo,
469 * the length field is zero, as we have never even read the
470 * lstat(2) information once, and we cannot trust DATA_CHANGED
471 * returned by ie_match_stat() which in turn was returned by
472 * ce_match_stat_basic() to signal that the filesize of the
473 * blob changed. We have to actually go to the filesystem to
474 * see if the contents match, and if so, should answer "unchanged".
476 * The logic does not apply to gitlinks, as ce_match_stat_basic()
477 * already has checked the actual HEAD from the filesystem in the
478 * subproject. If ie_match_stat() already said it is different,
479 * then we know it is.
481 if ((changed
& DATA_CHANGED
) &&
482 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
485 changed_fs
= ce_modified_check_fs(istate
, ce
, st
);
487 return changed
| changed_fs
;
491 int base_name_compare(const char *name1
, int len1
, int mode1
,
492 const char *name2
, int len2
, int mode2
)
494 unsigned char c1
, c2
;
495 int len
= len1
< len2
? len1
: len2
;
498 cmp
= memcmp(name1
, name2
, len
);
503 if (!c1
&& S_ISDIR(mode1
))
505 if (!c2
&& S_ISDIR(mode2
))
507 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
511 * df_name_compare() is identical to base_name_compare(), except it
512 * compares conflicting directory/file entries as equal. Note that
513 * while a directory name compares as equal to a regular file, they
514 * then individually compare _differently_ to a filename that has
515 * a dot after the basename (because '\0' < '.' < '/').
517 * This is used by routines that want to traverse the git namespace
518 * but then handle conflicting entries together when possible.
520 int df_name_compare(const char *name1
, int len1
, int mode1
,
521 const char *name2
, int len2
, int mode2
)
523 int len
= len1
< len2
? len1
: len2
, cmp
;
524 unsigned char c1
, c2
;
526 cmp
= memcmp(name1
, name2
, len
);
529 /* Directories and files compare equal (same length, same name) */
533 if (!c1
&& S_ISDIR(mode1
))
536 if (!c2
&& S_ISDIR(mode2
))
538 if (c1
== '/' && !c2
)
540 if (c2
== '/' && !c1
)
545 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
547 size_t min_len
= (len1
< len2
) ? len1
: len2
;
548 int cmp
= memcmp(name1
, name2
, min_len
);
558 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
562 cmp
= name_compare(name1
, len1
, name2
, len2
);
573 static int index_name_stage_pos(struct index_state
*istate
,
574 const char *name
, int namelen
,
576 enum index_search_mode search_mode
)
581 last
= istate
->cache_nr
;
582 while (last
> first
) {
583 int next
= first
+ ((last
- first
) >> 1);
584 struct cache_entry
*ce
= istate
->cache
[next
];
585 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
595 if (search_mode
== EXPAND_SPARSE
&& istate
->sparse_index
&&
597 /* Note: first <= istate->cache_nr */
598 struct cache_entry
*ce
= istate
->cache
[first
- 1];
601 * If we are in a sparse-index _and_ the entry before the
602 * insertion position is a sparse-directory entry that is
603 * an ancestor of 'name', then we need to expand the index
604 * and search again. This will only trigger once, because
605 * thereafter the index is fully expanded.
607 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
608 ce_namelen(ce
) < namelen
&&
609 !strncmp(name
, ce
->name
, ce_namelen(ce
))) {
610 ensure_full_index(istate
);
611 return index_name_stage_pos(istate
, name
, namelen
, stage
, search_mode
);
618 int index_name_pos(struct index_state
*istate
, const char *name
, int namelen
)
620 return index_name_stage_pos(istate
, name
, namelen
, 0, EXPAND_SPARSE
);
623 int index_name_pos_sparse(struct index_state
*istate
, const char *name
, int namelen
)
625 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
);
628 int index_entry_exists(struct index_state
*istate
, const char *name
, int namelen
)
630 return index_name_stage_pos(istate
, name
, namelen
, 0, NO_EXPAND_SPARSE
) >= 0;
633 int remove_index_entry_at(struct index_state
*istate
, int pos
)
635 struct cache_entry
*ce
= istate
->cache
[pos
];
637 record_resolve_undo(istate
, ce
);
638 remove_name_hash(istate
, ce
);
639 save_or_free_index_entry(istate
, ce
);
640 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
642 if (pos
>= istate
->cache_nr
)
644 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
645 istate
->cache_nr
- pos
);
650 * Remove all cache entries marked for removal, that is where
651 * CE_REMOVE is set in ce_flags. This is much more effective than
652 * calling remove_index_entry_at() for each entry to be removed.
654 void remove_marked_cache_entries(struct index_state
*istate
, int invalidate
)
656 struct cache_entry
**ce_array
= istate
->cache
;
659 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
660 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
662 cache_tree_invalidate_path(istate
,
664 untracked_cache_remove_from_index(istate
,
667 remove_name_hash(istate
, ce_array
[i
]);
668 save_or_free_index_entry(istate
, ce_array
[i
]);
671 ce_array
[j
++] = ce_array
[i
];
673 if (j
== istate
->cache_nr
)
675 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
676 istate
->cache_nr
= j
;
679 int remove_file_from_index(struct index_state
*istate
, const char *path
)
681 int pos
= index_name_pos(istate
, path
, strlen(path
));
684 cache_tree_invalidate_path(istate
, path
);
685 untracked_cache_remove_from_index(istate
, path
);
686 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
687 remove_index_entry_at(istate
, pos
);
691 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
693 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
696 static int index_name_pos_also_unmerged(struct index_state
*istate
,
697 const char *path
, int namelen
)
699 int pos
= index_name_pos(istate
, path
, namelen
);
700 struct cache_entry
*ce
;
705 /* maybe unmerged? */
707 if (pos
>= istate
->cache_nr
||
708 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
711 /* order of preference: stage 2, 1, 3 */
712 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
713 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
714 !compare_name(ce
, path
, namelen
))
719 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
721 int len
= ce_namelen(ce
);
722 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
726 * If we add a filename that aliases in the cache, we will use the
727 * name that we already have - but we don't want to update the same
728 * alias twice, because that implies that there were actually two
729 * different files with aliasing names!
731 * So we use the CE_ADDED flag to verify that the alias was an old
732 * one before we accept it as
734 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
735 struct cache_entry
*ce
,
736 struct cache_entry
*alias
)
739 struct cache_entry
*new_entry
;
741 if (alias
->ce_flags
& CE_ADDED
)
742 die(_("will not add file alias '%s' ('%s' already exists in index)"),
743 ce
->name
, alias
->name
);
745 /* Ok, create the new entry using the name of the existing alias */
746 len
= ce_namelen(alias
);
747 new_entry
= make_empty_cache_entry(istate
, len
);
748 memcpy(new_entry
->name
, alias
->name
, len
);
749 copy_cache_entry(new_entry
, ce
);
750 save_or_free_index_entry(istate
, ce
);
754 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
756 struct object_id oid
;
757 if (write_object_file("", 0, OBJ_BLOB
, &oid
))
758 die(_("cannot create an empty blob in the object database"));
759 oidcpy(&ce
->oid
, &oid
);
762 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
764 int namelen
, was_same
;
765 mode_t st_mode
= st
->st_mode
;
766 struct cache_entry
*ce
, *alias
= NULL
;
767 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
768 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
769 int pretend
= flags
& ADD_CACHE_PRETEND
;
770 int intent_only
= flags
& ADD_CACHE_INTENT
;
771 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
772 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
773 unsigned hash_flags
= pretend
? 0 : HASH_WRITE_OBJECT
;
774 struct object_id oid
;
776 if (flags
& ADD_CACHE_RENORMALIZE
)
777 hash_flags
|= HASH_RENORMALIZE
;
779 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
780 return error(_("%s: can only add regular files, symbolic links or git-directories"), path
);
782 namelen
= strlen(path
);
783 if (S_ISDIR(st_mode
)) {
784 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
785 return error(_("'%s' does not have a commit checked out"), path
);
786 while (namelen
&& path
[namelen
-1] == '/')
789 ce
= make_empty_cache_entry(istate
, namelen
);
790 memcpy(ce
->name
, path
, namelen
);
791 ce
->ce_namelen
= namelen
;
793 fill_stat_cache_info(istate
, ce
, st
);
795 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
798 if (trust_executable_bit
&& has_symlinks
) {
799 ce
->ce_mode
= create_ce_mode(st_mode
);
801 /* If there is an existing entry, pick the mode bits and type
802 * from it, otherwise assume unexecutable regular file.
804 struct cache_entry
*ent
;
805 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
807 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
808 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
811 /* When core.ignorecase=true, determine if a directory of the same name but differing
812 * case already exists within the Git repository. If it does, ensure the directory
813 * case of the file being added to the repository matches (is folded into) the existing
814 * entry's directory case.
817 adjust_dirname_case(istate
, ce
->name
);
819 if (!(flags
& ADD_CACHE_RENORMALIZE
)) {
820 alias
= index_file_exists(istate
, ce
->name
,
821 ce_namelen(ce
), ignore_case
);
824 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
825 /* Nothing changed, really */
826 if (!S_ISGITLINK(alias
->ce_mode
))
827 ce_mark_uptodate(alias
);
828 alias
->ce_flags
|= CE_ADDED
;
830 discard_cache_entry(ce
);
835 if (index_path(istate
, &ce
->oid
, path
, st
, hash_flags
)) {
836 discard_cache_entry(ce
);
837 return error(_("unable to index file '%s'"), path
);
840 set_object_name_for_intent_to_add_entry(ce
);
842 if (ignore_case
&& alias
&& different_name(ce
, alias
))
843 ce
= create_alias_ce(istate
, ce
, alias
);
844 ce
->ce_flags
|= CE_ADDED
;
846 /* It was suspected to be racily clean, but it turns out to be Ok */
849 oideq(&alias
->oid
, &ce
->oid
) &&
850 ce
->ce_mode
== alias
->ce_mode
);
853 discard_cache_entry(ce
);
854 else if (add_index_entry(istate
, ce
, add_option
)) {
855 discard_cache_entry(ce
);
856 return error(_("unable to add '%s' to index"), path
);
858 if (verbose
&& !was_same
)
859 printf("add '%s'\n", path
);
863 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
866 if (lstat(path
, &st
))
867 die_errno(_("unable to stat '%s'"), path
);
868 return add_to_index(istate
, path
, &st
, flags
);
871 struct cache_entry
*make_empty_cache_entry(struct index_state
*istate
, size_t len
)
873 return mem_pool__ce_calloc(find_mem_pool(istate
), len
);
876 struct cache_entry
*make_empty_transient_cache_entry(size_t len
,
877 struct mem_pool
*ce_mem_pool
)
880 return mem_pool__ce_calloc(ce_mem_pool
, len
);
881 return xcalloc(1, cache_entry_size(len
));
884 enum verify_path_result
{
890 static enum verify_path_result
verify_path_internal(const char *, unsigned);
892 int verify_path(const char *path
, unsigned mode
)
894 return verify_path_internal(path
, mode
) == PATH_OK
;
897 struct cache_entry
*make_cache_entry(struct index_state
*istate
,
899 const struct object_id
*oid
,
902 unsigned int refresh_options
)
904 struct cache_entry
*ce
, *ret
;
907 if (verify_path_internal(path
, mode
) == PATH_INVALID
) {
908 error(_("invalid path '%s'"), path
);
913 ce
= make_empty_cache_entry(istate
, len
);
915 oidcpy(&ce
->oid
, oid
);
916 memcpy(ce
->name
, path
, len
);
917 ce
->ce_flags
= create_ce_flags(stage
);
918 ce
->ce_namelen
= len
;
919 ce
->ce_mode
= create_ce_mode(mode
);
921 ret
= refresh_cache_entry(istate
, ce
, refresh_options
);
923 discard_cache_entry(ce
);
927 struct cache_entry
*make_transient_cache_entry(unsigned int mode
,
928 const struct object_id
*oid
,
931 struct mem_pool
*ce_mem_pool
)
933 struct cache_entry
*ce
;
936 if (!verify_path(path
, mode
)) {
937 error(_("invalid path '%s'"), path
);
942 ce
= make_empty_transient_cache_entry(len
, ce_mem_pool
);
944 oidcpy(&ce
->oid
, oid
);
945 memcpy(ce
->name
, path
, len
);
946 ce
->ce_flags
= create_ce_flags(stage
);
947 ce
->ce_namelen
= len
;
948 ce
->ce_mode
= create_ce_mode(mode
);
954 * Chmod an index entry with either +x or -x.
956 * Returns -1 if the chmod for the particular cache entry failed (if it's
957 * not a regular file), -2 if an invalid flip argument is passed in, 0
960 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
963 if (!S_ISREG(ce
->ce_mode
))
970 ce
->ce_mode
&= ~0111;
975 cache_tree_invalidate_path(istate
, ce
->name
);
976 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
977 mark_fsmonitor_invalid(istate
, ce
);
978 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
983 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
985 int len
= ce_namelen(a
);
986 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
990 * We fundamentally don't like some paths: we don't want
991 * dot or dot-dot anywhere, and for obvious reasons don't
992 * want to recurse into ".git" either.
994 * Also, we don't want double slashes or slashes at the
995 * end that can make pathnames ambiguous.
997 static int verify_dotfile(const char *rest
, unsigned mode
)
1000 * The first character was '.', but that
1001 * has already been discarded, we now test
1005 /* "." is not allowed */
1006 if (*rest
== '\0' || is_dir_sep(*rest
))
1011 * ".git" followed by NUL or slash is bad. Note that we match
1012 * case-insensitively here, even if ignore_case is not set.
1013 * This outlaws ".GIT" everywhere out of an abundance of caution,
1014 * since there's really no good reason to allow it.
1016 * Once we've seen ".git", we can also find ".gitmodules", etc (also
1017 * case-insensitively).
1021 if (rest
[1] != 'i' && rest
[1] != 'I')
1023 if (rest
[2] != 't' && rest
[2] != 'T')
1025 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
1027 if (S_ISLNK(mode
)) {
1029 if (skip_iprefix(rest
, "modules", &rest
) &&
1030 (*rest
== '\0' || is_dir_sep(*rest
)))
1035 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
1041 static enum verify_path_result
verify_path_internal(const char *path
,
1046 if (has_dos_drive_prefix(path
))
1047 return PATH_INVALID
;
1049 if (!is_valid_path(path
))
1050 return PATH_INVALID
;
1056 if (is_dir_sep(c
)) {
1060 if (is_hfs_dotgit(path
))
1061 return PATH_INVALID
;
1062 if (S_ISLNK(mode
)) {
1063 if (is_hfs_dotgitmodules(path
))
1064 return PATH_INVALID
;
1068 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
1070 return PATH_INVALID
;
1072 if (is_ntfs_dotgit(path
))
1073 return PATH_INVALID
;
1074 if (S_ISLNK(mode
)) {
1075 if (is_ntfs_dotgitmodules(path
))
1076 return PATH_INVALID
;
1081 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
1083 return PATH_INVALID
;
1085 * allow terminating directory separators for
1086 * sparse directory entries.
1089 return S_ISDIR(mode
) ? PATH_DIR_WITH_SEP
:
1091 } else if (c
== '\\' && protect_ntfs
) {
1092 if (is_ntfs_dotgit(path
))
1093 return PATH_INVALID
;
1094 if (S_ISLNK(mode
)) {
1095 if (is_ntfs_dotgitmodules(path
))
1096 return PATH_INVALID
;
1105 * Do we have another file that has the beginning components being a
1106 * proper superset of the name we're trying to add?
1108 static int has_file_name(struct index_state
*istate
,
1109 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1112 int len
= ce_namelen(ce
);
1113 int stage
= ce_stage(ce
);
1114 const char *name
= ce
->name
;
1116 while (pos
< istate
->cache_nr
) {
1117 struct cache_entry
*p
= istate
->cache
[pos
++];
1119 if (len
>= ce_namelen(p
))
1121 if (memcmp(name
, p
->name
, len
))
1123 if (ce_stage(p
) != stage
)
1125 if (p
->name
[len
] != '/')
1127 if (p
->ce_flags
& CE_REMOVE
)
1132 remove_index_entry_at(istate
, --pos
);
1139 * Like strcmp(), but also return the offset of the first change.
1140 * If strings are equal, return the length.
1142 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
1147 return strcmp(s1
, s2
);
1149 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
1154 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
1158 * Do we have another file with a pathname that is a proper
1159 * subset of the name we're trying to add?
1161 * That is, is there another file in the index with a path
1162 * that matches a sub-directory in the given entry?
1164 static int has_dir_name(struct index_state
*istate
,
1165 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
1168 int stage
= ce_stage(ce
);
1169 const char *name
= ce
->name
;
1170 const char *slash
= name
+ ce_namelen(ce
);
1175 * We are frequently called during an iteration on a sorted
1176 * list of pathnames and while building a new index. Therefore,
1177 * there is a high probability that this entry will eventually
1178 * be appended to the index, rather than inserted in the middle.
1179 * If we can confirm that, we can avoid binary searches on the
1180 * components of the pathname.
1182 * Compare the entry's full path with the last path in the index.
1184 if (istate
->cache_nr
> 0) {
1185 cmp_last
= strcmp_offset(name
,
1186 istate
->cache
[istate
->cache_nr
- 1]->name
,
1189 if (len_eq_last
== 0) {
1191 * The entry sorts AFTER the last one in the
1192 * index and their paths have no common prefix,
1193 * so there cannot be a F/D conflict.
1198 * The entry sorts AFTER the last one in the
1199 * index, but has a common prefix. Fall through
1200 * to the loop below to disect the entry's path
1201 * and see where the difference is.
1204 } else if (cmp_last
== 0) {
1206 * The entry exactly matches the last one in the
1207 * index, but because of multiple stage and CE_REMOVE
1208 * items, we fall through and let the regular search
1218 if (*--slash
== '/')
1220 if (slash
<= ce
->name
)
1227 * (len + 1) is a directory boundary (including
1228 * the trailing slash). And since the loop is
1229 * decrementing "slash", the first iteration is
1230 * the longest directory prefix; subsequent
1231 * iterations consider parent directories.
1234 if (len
+ 1 <= len_eq_last
) {
1236 * The directory prefix (including the trailing
1237 * slash) also appears as a prefix in the last
1238 * entry, so the remainder cannot collide (because
1239 * strcmp said the whole path was greater).
1244 * LT: last: xxx/file_A
1250 if (len
> len_eq_last
) {
1252 * This part of the directory prefix (excluding
1253 * the trailing slash) is longer than the known
1254 * equal portions, so this sub-directory cannot
1255 * collide with a file.
1264 * This is a possible collision. Fall through and
1265 * let the regular search code handle it.
1272 pos
= index_name_stage_pos(istate
, name
, len
, stage
, EXPAND_SPARSE
);
1275 * Found one, but not so fast. This could
1276 * be a marker that says "I was here, but
1277 * I am being removed". Such an entry is
1278 * not a part of the resulting tree, and
1279 * it is Ok to have a directory at the same
1282 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1286 remove_index_entry_at(istate
, pos
);
1294 * Trivial optimization: if we find an entry that
1295 * already matches the sub-directory, then we know
1296 * we're ok, and we can exit.
1298 while (pos
< istate
->cache_nr
) {
1299 struct cache_entry
*p
= istate
->cache
[pos
];
1300 if ((ce_namelen(p
) <= len
) ||
1301 (p
->name
[len
] != '/') ||
1302 memcmp(p
->name
, name
, len
))
1303 break; /* not our subdirectory */
1304 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1306 * p is at the same stage as our entry, and
1307 * is a subdirectory of what we are looking
1308 * at, so we cannot have conflicts at our
1309 * level or anything shorter.
1318 /* We may be in a situation where we already have path/file and path
1319 * is being added, or we already have path and path/file is being
1320 * added. Either one would result in a nonsense tree that has path
1321 * twice when git-write-tree tries to write it out. Prevent it.
1323 * If ok-to-replace is specified, we remove the conflicting entries
1324 * from the cache so the caller should recompute the insert position.
1325 * When this happens, we return non-zero.
1327 static int check_file_directory_conflict(struct index_state
*istate
,
1328 const struct cache_entry
*ce
,
1329 int pos
, int ok_to_replace
)
1334 * When ce is an "I am going away" entry, we allow it to be added
1336 if (ce
->ce_flags
& CE_REMOVE
)
1340 * We check if the path is a sub-path of a subsequent pathname
1341 * first, since removing those will not change the position
1344 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1347 * Then check if the path might have a clashing sub-directory
1350 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1353 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1356 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1357 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1358 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1359 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1362 * If this entry's path sorts after the last entry in the index,
1363 * we can avoid searching for it.
1365 if (istate
->cache_nr
> 0 &&
1366 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1367 pos
= index_pos_to_insert_pos(istate
->cache_nr
);
1369 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1372 * Cache tree path should be invalidated only after index_name_stage_pos,
1373 * in case it expands a sparse index.
1375 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1376 cache_tree_invalidate_path(istate
, ce
->name
);
1378 /* existing match? Just replace it. */
1381 replace_index_entry(istate
, pos
, ce
);
1386 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1387 untracked_cache_add_to_index(istate
, ce
->name
);
1390 * Inserting a merged entry ("stage 0") into the index
1391 * will always replace all non-merged entries..
1393 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1394 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1396 if (!remove_index_entry_at(istate
, pos
))
1403 if (verify_path_internal(ce
->name
, ce
->ce_mode
) == PATH_INVALID
)
1404 return error(_("invalid path '%s'"), ce
->name
);
1406 if (!skip_df_check
&&
1407 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1409 return error(_("'%s' appears as both a file and as a directory"),
1411 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
), EXPAND_SPARSE
);
1417 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1421 if (option
& ADD_CACHE_JUST_APPEND
)
1422 pos
= istate
->cache_nr
;
1425 ret
= add_index_entry_with_check(istate
, ce
, option
);
1431 /* Make sure the array is big enough .. */
1432 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1436 if (istate
->cache_nr
> pos
+ 1)
1437 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1438 istate
->cache_nr
- pos
- 1);
1439 set_index_entry(istate
, pos
, ce
);
1440 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1445 * "refresh" does not calculate a new sha1 file or bring the
1446 * cache up-to-date for mode/content changes. But what it
1447 * _does_ do is to "re-match" the stat information of a file
1448 * with the cache, so that you can refresh the cache for a
1449 * file that hasn't been changed but where the stat entry is
1452 * For example, you'd want to do this after doing a "git-read-tree",
1453 * to link up the stat cache details with the proper files.
1455 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1456 struct cache_entry
*ce
,
1457 unsigned int options
, int *err
,
1463 struct cache_entry
*updated
;
1465 int refresh
= options
& CE_MATCH_REFRESH
;
1466 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1467 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1468 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1469 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1471 if (!refresh
|| ce_uptodate(ce
))
1474 if (!ignore_fsmonitor
)
1475 refresh_fsmonitor(istate
);
1477 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1478 * that the change to the work tree does not matter and told
1481 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1482 ce_mark_uptodate(ce
);
1485 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1486 ce_mark_uptodate(ce
);
1489 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1490 ce_mark_uptodate(ce
);
1494 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1504 if (lstat(ce
->name
, &st
) < 0) {
1505 if (ignore_missing
&& errno
== ENOENT
)
1512 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1514 *changed_ret
= changed
;
1517 * The path is unchanged. If we were told to ignore
1518 * valid bit, then we did the actual stat check and
1519 * found that the entry is unmodified. If the entry
1520 * is not marked VALID, this is the place to mark it
1521 * valid again, under "assume unchanged" mode.
1523 if (ignore_valid
&& assume_unchanged
&&
1524 !(ce
->ce_flags
& CE_VALID
))
1525 ; /* mark this one VALID again */
1528 * We do not mark the index itself "modified"
1529 * because CE_UPTODATE flag is in-core only;
1530 * we are not going to write this change out.
1532 if (!S_ISGITLINK(ce
->ce_mode
)) {
1533 ce_mark_uptodate(ce
);
1534 mark_fsmonitor_valid(istate
, ce
);
1542 if (ie_modified(istate
, ce
, &st
, options
)) {
1548 updated
= make_empty_cache_entry(istate
, ce_namelen(ce
));
1549 copy_cache_entry(updated
, ce
);
1550 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1551 fill_stat_cache_info(istate
, updated
, &st
);
1553 * If ignore_valid is not set, we should leave CE_VALID bit
1554 * alone. Otherwise, paths marked with --no-assume-unchanged
1555 * (i.e. things to be edited) will reacquire CE_VALID bit
1556 * automatically, which is not really what we want.
1558 if (!ignore_valid
&& assume_unchanged
&&
1559 !(ce
->ce_flags
& CE_VALID
))
1560 updated
->ce_flags
&= ~CE_VALID
;
1562 /* istate->cache_changed is updated in the caller */
1566 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1567 int * first
, const char *header_msg
)
1569 if (in_porcelain
&& *first
&& header_msg
) {
1570 printf("%s\n", header_msg
);
1576 int repo_refresh_and_write_index(struct repository
*repo
,
1577 unsigned int refresh_flags
,
1578 unsigned int write_flags
,
1580 const struct pathspec
*pathspec
,
1581 char *seen
, const char *header_msg
)
1583 struct lock_file lock_file
= LOCK_INIT
;
1586 fd
= repo_hold_locked_index(repo
, &lock_file
, 0);
1587 if (!gentle
&& fd
< 0)
1589 if (refresh_index(repo
->index
, refresh_flags
, pathspec
, seen
, header_msg
))
1591 if (0 <= fd
&& write_locked_index(repo
->index
, &lock_file
, COMMIT_LOCK
| write_flags
))
1597 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1598 const struct pathspec
*pathspec
,
1599 char *seen
, const char *header_msg
)
1603 int really
= (flags
& REFRESH_REALLY
) != 0;
1604 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1605 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1606 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1607 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1608 int ignore_skip_worktree
= (flags
& REFRESH_IGNORE_SKIP_WORKTREE
) != 0;
1610 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1611 unsigned int options
= (CE_MATCH_REFRESH
|
1612 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1613 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1614 const char *modified_fmt
;
1615 const char *deleted_fmt
;
1616 const char *typechange_fmt
;
1617 const char *added_fmt
;
1618 const char *unmerged_fmt
;
1619 struct progress
*progress
= NULL
;
1620 int t2_sum_lstat
= 0;
1621 int t2_sum_scan
= 0;
1623 if (flags
& REFRESH_PROGRESS
&& isatty(2))
1624 progress
= start_delayed_progress(_("Refresh index"),
1627 trace_performance_enter();
1628 modified_fmt
= in_porcelain
? "M\t%s\n" : "%s: needs update\n";
1629 deleted_fmt
= in_porcelain
? "D\t%s\n" : "%s: needs update\n";
1630 typechange_fmt
= in_porcelain
? "T\t%s\n" : "%s: needs update\n";
1631 added_fmt
= in_porcelain
? "A\t%s\n" : "%s: needs update\n";
1632 unmerged_fmt
= in_porcelain
? "U\t%s\n" : "%s: needs merge\n";
1634 * Use the multi-threaded preload_index() to refresh most of the
1635 * cache entries quickly then in the single threaded loop below,
1636 * we only have to do the special cases that are left.
1638 preload_index(istate
, pathspec
, 0);
1639 trace2_region_enter("index", "refresh", NULL
);
1641 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1642 struct cache_entry
*ce
, *new_entry
;
1643 int cache_errno
= 0;
1646 int t2_did_lstat
= 0;
1647 int t2_did_scan
= 0;
1649 ce
= istate
->cache
[i
];
1650 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1652 if (ignore_skip_worktree
&& ce_skip_worktree(ce
))
1656 * If this entry is a sparse directory, then there isn't
1657 * any stat() information to update. Ignore the entry.
1659 if (S_ISSPARSEDIR(ce
->ce_mode
))
1662 if (pathspec
&& !ce_path_match(istate
, ce
, pathspec
, seen
))
1666 while ((i
< istate
->cache_nr
) &&
1667 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1673 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1674 &first
, header_msg
);
1682 new_entry
= refresh_cache_ent(istate
, ce
, options
,
1683 &cache_errno
, &changed
,
1684 &t2_did_lstat
, &t2_did_scan
);
1685 t2_sum_lstat
+= t2_did_lstat
;
1686 t2_sum_scan
+= t2_did_scan
;
1687 if (new_entry
== ce
)
1689 display_progress(progress
, i
);
1693 if (really
&& cache_errno
== EINVAL
) {
1694 /* If we are doing --really-refresh that
1695 * means the index is not valid anymore.
1697 ce
->ce_flags
&= ~CE_VALID
;
1698 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1699 mark_fsmonitor_invalid(istate
, ce
);
1700 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1705 if (cache_errno
== ENOENT
)
1707 else if (ce_intent_to_add(ce
))
1708 fmt
= added_fmt
; /* must be before other checks */
1709 else if (changed
& TYPE_CHANGED
)
1710 fmt
= typechange_fmt
;
1714 ce
->name
, in_porcelain
, &first
, header_msg
);
1719 replace_index_entry(istate
, i
, new_entry
);
1721 trace2_data_intmax("index", NULL
, "refresh/sum_lstat", t2_sum_lstat
);
1722 trace2_data_intmax("index", NULL
, "refresh/sum_scan", t2_sum_scan
);
1723 trace2_region_leave("index", "refresh", NULL
);
1724 display_progress(progress
, istate
->cache_nr
);
1725 stop_progress(&progress
);
1726 trace_performance_leave("refresh index");
1730 struct cache_entry
*refresh_cache_entry(struct index_state
*istate
,
1731 struct cache_entry
*ce
,
1732 unsigned int options
)
1734 return refresh_cache_ent(istate
, ce
, options
, NULL
, NULL
, NULL
, NULL
);
1738 /*****************************************************************
1740 *****************************************************************/
1742 #define INDEX_FORMAT_DEFAULT 3
1744 static unsigned int get_index_format_default(struct repository
*r
)
1746 char *envversion
= getenv("GIT_INDEX_VERSION");
1748 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1751 prepare_repo_settings(r
);
1753 if (r
->settings
.index_version
>= 0)
1754 version
= r
->settings
.index_version
;
1755 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1756 warning(_("index.version set, but the value is invalid.\n"
1757 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1758 return INDEX_FORMAT_DEFAULT
;
1763 version
= strtoul(envversion
, &endp
, 10);
1765 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1766 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1767 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1768 version
= INDEX_FORMAT_DEFAULT
;
1774 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1775 * Again - this is just a (very strong in practice) heuristic that
1776 * the inode hasn't changed.
1778 * We save the fields in big-endian order to allow using the
1779 * index file over NFS transparently.
1781 struct ondisk_cache_entry
{
1782 struct cache_time ctime
;
1783 struct cache_time mtime
;
1791 * unsigned char hash[hashsz];
1793 * if (flags & CE_EXTENDED)
1796 unsigned char data
[GIT_MAX_RAWSZ
+ 2 * sizeof(uint16_t)];
1797 char name
[FLEX_ARRAY
];
1800 /* These are only used for v3 or lower */
1801 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1802 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
1803 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1804 #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
1805 ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
1806 #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
1807 #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
1809 /* Allow fsck to force verification of the index checksum. */
1810 int verify_index_checksum
;
1812 /* Allow fsck to force verification of the cache entry order. */
1813 int verify_ce_order
;
1815 static int verify_hdr(const struct cache_header
*hdr
, unsigned long size
)
1818 unsigned char hash
[GIT_MAX_RAWSZ
];
1820 unsigned char *start
, *end
;
1821 struct object_id oid
;
1823 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1824 return error(_("bad signature 0x%08x"), hdr
->hdr_signature
);
1825 hdr_version
= ntohl(hdr
->hdr_version
);
1826 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1827 return error(_("bad index version %d"), hdr_version
);
1829 if (!verify_index_checksum
)
1832 end
= (unsigned char *)hdr
+ size
;
1833 start
= end
- the_hash_algo
->rawsz
;
1834 oidread(&oid
, start
);
1835 if (oideq(&oid
, null_oid()))
1838 the_hash_algo
->init_fn(&c
);
1839 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1840 the_hash_algo
->final_fn(hash
, &c
);
1841 if (!hasheq(hash
, start
))
1842 return error(_("bad index file sha1 signature"));
1846 static int read_index_extension(struct index_state
*istate
,
1847 const char *ext
, const char *data
, unsigned long sz
)
1849 switch (CACHE_EXT(ext
)) {
1850 case CACHE_EXT_TREE
:
1851 istate
->cache_tree
= cache_tree_read(data
, sz
);
1853 case CACHE_EXT_RESOLVE_UNDO
:
1854 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1856 case CACHE_EXT_LINK
:
1857 if (read_link_extension(istate
, data
, sz
))
1860 case CACHE_EXT_UNTRACKED
:
1861 istate
->untracked
= read_untracked_extension(data
, sz
);
1863 case CACHE_EXT_FSMONITOR
:
1864 read_fsmonitor_extension(istate
, data
, sz
);
1866 case CACHE_EXT_ENDOFINDEXENTRIES
:
1867 case CACHE_EXT_INDEXENTRYOFFSETTABLE
:
1868 /* already handled in do_read_index() */
1870 case CACHE_EXT_SPARSE_DIRECTORIES
:
1871 /* no content, only an indicator */
1872 istate
->sparse_index
= INDEX_COLLAPSED
;
1875 if (*ext
< 'A' || 'Z' < *ext
)
1876 return error(_("index uses %.4s extension, which we do not understand"),
1878 fprintf_ln(stderr
, _("ignoring %.4s extension"), ext
);
1885 * Parses the contents of the cache entry contained within the 'ondisk' buffer
1886 * into a new incore 'cache_entry'.
1888 * Note that 'char *ondisk' may not be aligned to a 4-byte address interval in
1889 * index v4, so we cannot cast it to 'struct ondisk_cache_entry *' and access
1890 * its members. Instead, we use the byte offsets of members within the struct to
1891 * identify where 'get_be16()', 'get_be32()', and 'oidread()' (which can all
1892 * read from an unaligned memory buffer) should read from the 'ondisk' buffer
1893 * into the corresponding incore 'cache_entry' members.
1895 static struct cache_entry
*create_from_disk(struct mem_pool
*ce_mem_pool
,
1896 unsigned int version
,
1898 unsigned long *ent_size
,
1899 const struct cache_entry
*previous_ce
)
1901 struct cache_entry
*ce
;
1904 const unsigned hashsz
= the_hash_algo
->rawsz
;
1905 const char *flagsp
= ondisk
+ offsetof(struct ondisk_cache_entry
, data
) + hashsz
;
1907 size_t copy_len
= 0;
1909 * Adjacent cache entries tend to share the leading paths, so it makes
1910 * sense to only store the differences in later entries. In the v4
1911 * on-disk format of the index, each on-disk cache entry stores the
1912 * number of bytes to be stripped from the end of the previous name,
1913 * and the bytes to append to the result, to come up with its name.
1915 int expand_name_field
= version
== 4;
1917 /* On-disk flags are just 16 bits */
1918 flags
= get_be16(flagsp
);
1919 len
= flags
& CE_NAMEMASK
;
1921 if (flags
& CE_EXTENDED
) {
1923 extended_flags
= get_be16(flagsp
+ sizeof(uint16_t)) << 16;
1924 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1925 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1926 die(_("unknown index entry format 0x%08x"), extended_flags
);
1927 flags
|= extended_flags
;
1928 name
= (const char *)(flagsp
+ 2 * sizeof(uint16_t));
1931 name
= (const char *)(flagsp
+ sizeof(uint16_t));
1933 if (expand_name_field
) {
1934 const unsigned char *cp
= (const unsigned char *)name
;
1935 size_t strip_len
, previous_len
;
1937 /* If we're at the beginning of a block, ignore the previous name */
1938 strip_len
= decode_varint(&cp
);
1940 previous_len
= previous_ce
->ce_namelen
;
1941 if (previous_len
< strip_len
)
1942 die(_("malformed name field in the index, near path '%s'"),
1944 copy_len
= previous_len
- strip_len
;
1946 name
= (const char *)cp
;
1949 if (len
== CE_NAMEMASK
) {
1951 if (expand_name_field
)
1955 ce
= mem_pool__ce_alloc(ce_mem_pool
, len
);
1958 * NEEDSWORK: using 'offsetof()' is cumbersome and should be replaced
1959 * with something more akin to 'load_bitmap_entries_v1()'s use of
1960 * 'read_be16'/'read_be32'. For consistency with the corresponding
1961 * ondisk entry write function ('copy_cache_entry_to_ondisk()'), this
1962 * should be done at the same time as removing references to
1963 * 'ondisk_cache_entry' there.
1965 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1966 + offsetof(struct cache_time
, sec
));
1967 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1968 + offsetof(struct cache_time
, sec
));
1969 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ctime
)
1970 + offsetof(struct cache_time
, nsec
));
1971 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mtime
)
1972 + offsetof(struct cache_time
, nsec
));
1973 ce
->ce_stat_data
.sd_dev
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, dev
));
1974 ce
->ce_stat_data
.sd_ino
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, ino
));
1975 ce
->ce_mode
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, mode
));
1976 ce
->ce_stat_data
.sd_uid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, uid
));
1977 ce
->ce_stat_data
.sd_gid
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, gid
));
1978 ce
->ce_stat_data
.sd_size
= get_be32(ondisk
+ offsetof(struct ondisk_cache_entry
, size
));
1979 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1980 ce
->ce_namelen
= len
;
1982 oidread(&ce
->oid
, (const unsigned char *)ondisk
+ offsetof(struct ondisk_cache_entry
, data
));
1984 if (expand_name_field
) {
1986 memcpy(ce
->name
, previous_ce
->name
, copy_len
);
1987 memcpy(ce
->name
+ copy_len
, name
, len
+ 1 - copy_len
);
1988 *ent_size
= (name
- ((char *)ondisk
)) + len
+ 1 - copy_len
;
1990 memcpy(ce
->name
, name
, len
+ 1);
1991 *ent_size
= ondisk_ce_size(ce
);
1996 static void check_ce_order(struct index_state
*istate
)
2000 if (!verify_ce_order
)
2003 for (i
= 1; i
< istate
->cache_nr
; i
++) {
2004 struct cache_entry
*ce
= istate
->cache
[i
- 1];
2005 struct cache_entry
*next_ce
= istate
->cache
[i
];
2006 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
2008 if (0 < name_compare
)
2009 die(_("unordered stage entries in index"));
2010 if (!name_compare
) {
2012 die(_("multiple stage entries for merged file '%s'"),
2014 if (ce_stage(ce
) > ce_stage(next_ce
))
2015 die(_("unordered stage entries for '%s'"),
2021 static void tweak_untracked_cache(struct index_state
*istate
)
2023 struct repository
*r
= the_repository
;
2025 prepare_repo_settings(r
);
2027 switch (r
->settings
.core_untracked_cache
) {
2028 case UNTRACKED_CACHE_REMOVE
:
2029 remove_untracked_cache(istate
);
2031 case UNTRACKED_CACHE_WRITE
:
2032 add_untracked_cache(istate
);
2034 case UNTRACKED_CACHE_KEEP
:
2036 * Either an explicit "core.untrackedCache=keep", the
2037 * default if "core.untrackedCache" isn't configured,
2038 * or a fallback on an unknown "core.untrackedCache"
2045 static void tweak_split_index(struct index_state
*istate
)
2047 switch (git_config_get_split_index()) {
2048 case -1: /* unset: do nothing */
2051 remove_split_index(istate
);
2054 add_split_index(istate
);
2056 default: /* unknown value: do nothing */
2061 static void post_read_index_from(struct index_state
*istate
)
2063 check_ce_order(istate
);
2064 tweak_untracked_cache(istate
);
2065 tweak_split_index(istate
);
2066 tweak_fsmonitor(istate
);
2069 static size_t estimate_cache_size_from_compressed(unsigned int entries
)
2071 return entries
* (sizeof(struct cache_entry
) + CACHE_ENTRY_PATH_LENGTH
);
2074 static size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
2076 long per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
2079 * Account for potential alignment differences.
2081 per_entry
+= align_padding_size(per_entry
, 0);
2082 return ondisk_size
+ entries
* per_entry
;
2085 struct index_entry_offset
2087 /* starting byte offset into index file, count of index entries in this block */
2091 struct index_entry_offset_table
2094 struct index_entry_offset entries
[FLEX_ARRAY
];
2097 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
);
2098 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
);
2100 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
);
2101 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
);
2103 struct load_index_extensions
2106 struct index_state
*istate
;
2109 unsigned long src_offset
;
2112 static void *load_index_extensions(void *_data
)
2114 struct load_index_extensions
*p
= _data
;
2115 unsigned long src_offset
= p
->src_offset
;
2117 while (src_offset
<= p
->mmap_size
- the_hash_algo
->rawsz
- 8) {
2118 /* After an array of active_nr index entries,
2119 * there can be arbitrary number of extended
2120 * sections, each of which is prefixed with
2121 * extension name (4-byte) and section length
2122 * in 4-byte network byte order.
2124 uint32_t extsize
= get_be32(p
->mmap
+ src_offset
+ 4);
2125 if (read_index_extension(p
->istate
,
2126 p
->mmap
+ src_offset
,
2127 p
->mmap
+ src_offset
+ 8,
2129 munmap((void *)p
->mmap
, p
->mmap_size
);
2130 die(_("index file corrupt"));
2133 src_offset
+= extsize
;
2140 * A helper function that will load the specified range of cache entries
2141 * from the memory mapped file and add them to the given index.
2143 static unsigned long load_cache_entry_block(struct index_state
*istate
,
2144 struct mem_pool
*ce_mem_pool
, int offset
, int nr
, const char *mmap
,
2145 unsigned long start_offset
, const struct cache_entry
*previous_ce
)
2148 unsigned long src_offset
= start_offset
;
2150 for (i
= offset
; i
< offset
+ nr
; i
++) {
2151 struct cache_entry
*ce
;
2152 unsigned long consumed
;
2154 ce
= create_from_disk(ce_mem_pool
, istate
->version
,
2156 &consumed
, previous_ce
);
2157 set_index_entry(istate
, i
, ce
);
2159 src_offset
+= consumed
;
2162 return src_offset
- start_offset
;
2165 static unsigned long load_all_cache_entries(struct index_state
*istate
,
2166 const char *mmap
, size_t mmap_size
, unsigned long src_offset
)
2168 unsigned long consumed
;
2170 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2171 if (istate
->version
== 4) {
2172 mem_pool_init(istate
->ce_mem_pool
,
2173 estimate_cache_size_from_compressed(istate
->cache_nr
));
2175 mem_pool_init(istate
->ce_mem_pool
,
2176 estimate_cache_size(mmap_size
, istate
->cache_nr
));
2179 consumed
= load_cache_entry_block(istate
, istate
->ce_mem_pool
,
2180 0, istate
->cache_nr
, mmap
, src_offset
, NULL
);
2185 * Mostly randomly chosen maximum thread counts: we
2186 * cap the parallelism to online_cpus() threads, and we want
2187 * to have at least 10000 cache entries per thread for it to
2188 * be worth starting a thread.
2191 #define THREAD_COST (10000)
2193 struct load_cache_entries_thread_data
2196 struct index_state
*istate
;
2197 struct mem_pool
*ce_mem_pool
;
2200 struct index_entry_offset_table
*ieot
;
2201 int ieot_start
; /* starting index into the ieot array */
2202 int ieot_blocks
; /* count of ieot entries to process */
2203 unsigned long consumed
; /* return # of bytes in index file processed */
2207 * A thread proc to run the load_cache_entries() computation
2208 * across multiple background threads.
2210 static void *load_cache_entries_thread(void *_data
)
2212 struct load_cache_entries_thread_data
*p
= _data
;
2215 /* iterate across all ieot blocks assigned to this thread */
2216 for (i
= p
->ieot_start
; i
< p
->ieot_start
+ p
->ieot_blocks
; i
++) {
2217 p
->consumed
+= load_cache_entry_block(p
->istate
, p
->ce_mem_pool
,
2218 p
->offset
, p
->ieot
->entries
[i
].nr
, p
->mmap
, p
->ieot
->entries
[i
].offset
, NULL
);
2219 p
->offset
+= p
->ieot
->entries
[i
].nr
;
2224 static unsigned long load_cache_entries_threaded(struct index_state
*istate
, const char *mmap
, size_t mmap_size
,
2225 int nr_threads
, struct index_entry_offset_table
*ieot
)
2227 int i
, offset
, ieot_blocks
, ieot_start
, err
;
2228 struct load_cache_entries_thread_data
*data
;
2229 unsigned long consumed
= 0;
2231 /* a little sanity checking */
2232 if (istate
->name_hash_initialized
)
2233 BUG("the name hash isn't thread safe");
2235 istate
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2236 mem_pool_init(istate
->ce_mem_pool
, 0);
2238 /* ensure we have no more threads than we have blocks to process */
2239 if (nr_threads
> ieot
->nr
)
2240 nr_threads
= ieot
->nr
;
2241 CALLOC_ARRAY(data
, nr_threads
);
2243 offset
= ieot_start
= 0;
2244 ieot_blocks
= DIV_ROUND_UP(ieot
->nr
, nr_threads
);
2245 for (i
= 0; i
< nr_threads
; i
++) {
2246 struct load_cache_entries_thread_data
*p
= &data
[i
];
2249 if (ieot_start
+ ieot_blocks
> ieot
->nr
)
2250 ieot_blocks
= ieot
->nr
- ieot_start
;
2256 p
->ieot_start
= ieot_start
;
2257 p
->ieot_blocks
= ieot_blocks
;
2259 /* create a mem_pool for each thread */
2261 for (j
= p
->ieot_start
; j
< p
->ieot_start
+ p
->ieot_blocks
; j
++)
2262 nr
+= p
->ieot
->entries
[j
].nr
;
2263 p
->ce_mem_pool
= xmalloc(sizeof(*istate
->ce_mem_pool
));
2264 if (istate
->version
== 4) {
2265 mem_pool_init(p
->ce_mem_pool
,
2266 estimate_cache_size_from_compressed(nr
));
2268 mem_pool_init(p
->ce_mem_pool
,
2269 estimate_cache_size(mmap_size
, nr
));
2272 err
= pthread_create(&p
->pthread
, NULL
, load_cache_entries_thread
, p
);
2274 die(_("unable to create load_cache_entries thread: %s"), strerror(err
));
2276 /* increment by the number of cache entries in the ieot block being processed */
2277 for (j
= 0; j
< ieot_blocks
; j
++)
2278 offset
+= ieot
->entries
[ieot_start
+ j
].nr
;
2279 ieot_start
+= ieot_blocks
;
2282 for (i
= 0; i
< nr_threads
; i
++) {
2283 struct load_cache_entries_thread_data
*p
= &data
[i
];
2285 err
= pthread_join(p
->pthread
, NULL
);
2287 die(_("unable to join load_cache_entries thread: %s"), strerror(err
));
2288 mem_pool_combine(istate
->ce_mem_pool
, p
->ce_mem_pool
);
2289 consumed
+= p
->consumed
;
2297 static void set_new_index_sparsity(struct index_state
*istate
)
2300 * If the index's repo exists, mark it sparse according to
2305 prepare_repo_settings(istate
->repo
);
2306 if (!istate
->repo
->settings
.command_requires_full_index
&&
2307 is_sparse_index_allowed(istate
, 0))
2308 istate
->sparse_index
= 1;
2311 /* remember to discard_cache() before reading a different cache! */
2312 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
2316 unsigned long src_offset
;
2317 const struct cache_header
*hdr
;
2320 struct load_index_extensions p
;
2321 size_t extension_offset
= 0;
2322 int nr_threads
, cpus
;
2323 struct index_entry_offset_table
*ieot
= NULL
;
2325 if (istate
->initialized
)
2326 return istate
->cache_nr
;
2328 istate
->timestamp
.sec
= 0;
2329 istate
->timestamp
.nsec
= 0;
2330 fd
= open(path
, O_RDONLY
);
2332 if (!must_exist
&& errno
== ENOENT
) {
2334 istate
->repo
= the_repository
;
2335 set_new_index_sparsity(istate
);
2338 die_errno(_("%s: index file open failed"), path
);
2342 die_errno(_("%s: cannot stat the open index"), path
);
2344 mmap_size
= xsize_t(st
.st_size
);
2345 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2346 die(_("%s: index file smaller than expected"), path
);
2348 mmap
= xmmap_gently(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2349 if (mmap
== MAP_FAILED
)
2350 die_errno(_("%s: unable to map index file%s"), path
,
2354 hdr
= (const struct cache_header
*)mmap
;
2355 if (verify_hdr(hdr
, mmap_size
) < 0)
2358 oidread(&istate
->oid
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
2359 istate
->version
= ntohl(hdr
->hdr_version
);
2360 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
2361 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
2362 CALLOC_ARRAY(istate
->cache
, istate
->cache_alloc
);
2363 istate
->initialized
= 1;
2367 p
.mmap_size
= mmap_size
;
2369 src_offset
= sizeof(*hdr
);
2371 if (git_config_get_index_threads(&nr_threads
))
2374 /* TODO: does creating more threads than cores help? */
2376 nr_threads
= istate
->cache_nr
/ THREAD_COST
;
2377 cpus
= online_cpus();
2378 if (nr_threads
> cpus
)
2385 if (nr_threads
> 1) {
2386 extension_offset
= read_eoie_extension(mmap
, mmap_size
);
2387 if (extension_offset
) {
2390 p
.src_offset
= extension_offset
;
2391 err
= pthread_create(&p
.pthread
, NULL
, load_index_extensions
, &p
);
2393 die(_("unable to create load_index_extensions thread: %s"), strerror(err
));
2400 * Locate and read the index entry offset table so that we can use it
2401 * to multi-thread the reading of the cache entries.
2403 if (extension_offset
&& nr_threads
> 1)
2404 ieot
= read_ieot_extension(mmap
, mmap_size
, extension_offset
);
2407 src_offset
+= load_cache_entries_threaded(istate
, mmap
, mmap_size
, nr_threads
, ieot
);
2410 src_offset
+= load_all_cache_entries(istate
, mmap
, mmap_size
, src_offset
);
2413 istate
->timestamp
.sec
= st
.st_mtime
;
2414 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2416 /* if we created a thread, join it otherwise load the extensions on the primary thread */
2417 if (extension_offset
) {
2418 int ret
= pthread_join(p
.pthread
, NULL
);
2420 die(_("unable to join load_index_extensions thread: %s"), strerror(ret
));
2422 p
.src_offset
= src_offset
;
2423 load_index_extensions(&p
);
2425 munmap((void *)mmap
, mmap_size
);
2428 * TODO trace2: replace "the_repository" with the actual repo instance
2429 * that is associated with the given "istate".
2431 trace2_data_intmax("index", the_repository
, "read/version",
2433 trace2_data_intmax("index", the_repository
, "read/cache_nr",
2437 istate
->repo
= the_repository
;
2440 * If the command explicitly requires a full index, force it
2441 * to be full. Otherwise, correct the sparsity based on repository
2442 * settings and other properties of the index (if necessary).
2444 prepare_repo_settings(istate
->repo
);
2445 if (istate
->repo
->settings
.command_requires_full_index
)
2446 ensure_full_index(istate
);
2448 ensure_correct_sparsity(istate
);
2450 return istate
->cache_nr
;
2453 munmap((void *)mmap
, mmap_size
);
2454 die(_("index file corrupt"));
2458 * Signal that the shared index is used by updating its mtime.
2460 * This way, shared index can be removed if they have not been used
2463 static void freshen_shared_index(const char *shared_index
, int warn
)
2465 if (!check_and_freshen_file(shared_index
, 1) && warn
)
2466 warning(_("could not freshen shared index '%s'"), shared_index
);
2469 int read_index_from(struct index_state
*istate
, const char *path
,
2472 struct split_index
*split_index
;
2477 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
2478 if (istate
->initialized
)
2479 return istate
->cache_nr
;
2482 * TODO trace2: replace "the_repository" with the actual repo instance
2483 * that is associated with the given "istate".
2485 trace2_region_enter_printf("index", "do_read_index", the_repository
,
2487 trace_performance_enter();
2488 ret
= do_read_index(istate
, path
, 0);
2489 trace_performance_leave("read cache %s", path
);
2490 trace2_region_leave_printf("index", "do_read_index", the_repository
,
2493 split_index
= istate
->split_index
;
2494 if (!split_index
|| is_null_oid(&split_index
->base_oid
)) {
2495 post_read_index_from(istate
);
2499 trace_performance_enter();
2500 if (split_index
->base
)
2501 release_index(split_index
->base
);
2503 ALLOC_ARRAY(split_index
->base
, 1);
2504 index_state_init(split_index
->base
);
2506 base_oid_hex
= oid_to_hex(&split_index
->base_oid
);
2507 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_oid_hex
);
2508 trace2_region_enter_printf("index", "shared/do_read_index",
2509 the_repository
, "%s", base_path
);
2510 ret
= do_read_index(split_index
->base
, base_path
, 0);
2511 trace2_region_leave_printf("index", "shared/do_read_index",
2512 the_repository
, "%s", base_path
);
2514 char *path_copy
= xstrdup(path
);
2515 char *base_path2
= xstrfmt("%s/sharedindex.%s",
2516 dirname(path_copy
), base_oid_hex
);
2518 trace2_region_enter_printf("index", "shared/do_read_index",
2519 the_repository
, "%s", base_path2
);
2520 ret
= do_read_index(split_index
->base
, base_path2
, 1);
2521 trace2_region_leave_printf("index", "shared/do_read_index",
2522 the_repository
, "%s", base_path2
);
2525 if (!oideq(&split_index
->base_oid
, &split_index
->base
->oid
))
2526 die(_("broken index, expect %s in %s, got %s"),
2527 base_oid_hex
, base_path
,
2528 oid_to_hex(&split_index
->base
->oid
));
2530 freshen_shared_index(base_path
, 0);
2531 merge_base_index(istate
);
2532 post_read_index_from(istate
);
2533 trace_performance_leave("read cache %s", base_path
);
2538 int is_index_unborn(struct index_state
*istate
)
2540 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
2543 void index_state_init(struct index_state
*istate
)
2545 struct index_state blank
= INDEX_STATE_INIT
;
2546 memcpy(istate
, &blank
, sizeof(*istate
));
2549 void release_index(struct index_state
*istate
)
2552 * Cache entries in istate->cache[] should have been allocated
2553 * from the memory pool associated with this index, or from an
2554 * associated split_index. There is no need to free individual
2555 * cache entries. validate_cache_entries can detect when this
2556 * assertion does not hold.
2558 validate_cache_entries(istate
);
2560 resolve_undo_clear_index(istate
);
2561 free_name_hash(istate
);
2562 cache_tree_free(&(istate
->cache_tree
));
2563 free(istate
->fsmonitor_last_update
);
2564 free(istate
->cache
);
2565 discard_split_index(istate
);
2566 free_untracked_cache(istate
->untracked
);
2568 if (istate
->sparse_checkout_patterns
) {
2569 clear_pattern_list(istate
->sparse_checkout_patterns
);
2570 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
2573 if (istate
->ce_mem_pool
) {
2574 mem_pool_discard(istate
->ce_mem_pool
, should_validate_cache_entries());
2575 FREE_AND_NULL(istate
->ce_mem_pool
);
2579 void discard_index(struct index_state
*istate
)
2581 release_index(istate
);
2582 index_state_init(istate
);
2586 * Validate the cache entries of this index.
2587 * All cache entries associated with this index
2588 * should have been allocated by the memory pool
2589 * associated with this index, or by a referenced
2592 void validate_cache_entries(const struct index_state
*istate
)
2596 if (!should_validate_cache_entries() ||!istate
|| !istate
->initialized
)
2599 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2601 BUG("cache entry is not allocated from expected memory pool");
2602 } else if (!istate
->ce_mem_pool
||
2603 !mem_pool_contains(istate
->ce_mem_pool
, istate
->cache
[i
])) {
2604 if (!istate
->split_index
||
2605 !istate
->split_index
->base
||
2606 !istate
->split_index
->base
->ce_mem_pool
||
2607 !mem_pool_contains(istate
->split_index
->base
->ce_mem_pool
, istate
->cache
[i
])) {
2608 BUG("cache entry is not allocated from expected memory pool");
2613 if (istate
->split_index
)
2614 validate_cache_entries(istate
->split_index
->base
);
2617 int unmerged_index(const struct index_state
*istate
)
2620 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2621 if (ce_stage(istate
->cache
[i
]))
2627 int repo_index_has_changes(struct repository
*repo
,
2631 struct index_state
*istate
= repo
->index
;
2632 struct object_id cmp
;
2636 cmp
= tree
->object
.oid
;
2637 if (tree
|| !get_oid_tree("HEAD", &cmp
)) {
2638 struct diff_options opt
;
2640 repo_diff_setup(repo
, &opt
);
2641 opt
.flags
.exit_with_status
= 1;
2643 opt
.flags
.quick
= 1;
2644 diff_setup_done(&opt
);
2645 do_diff_cache(&cmp
, &opt
);
2647 for (i
= 0; sb
&& i
< diff_queued_diff
.nr
; i
++) {
2649 strbuf_addch(sb
, ' ');
2650 strbuf_addstr(sb
, diff_queued_diff
.queue
[i
]->two
->path
);
2653 return opt
.flags
.has_changes
!= 0;
2655 /* TODO: audit for interaction with sparse-index. */
2656 ensure_full_index(istate
);
2657 for (i
= 0; sb
&& i
< istate
->cache_nr
; i
++) {
2659 strbuf_addch(sb
, ' ');
2660 strbuf_addstr(sb
, istate
->cache
[i
]->name
);
2662 return !!istate
->cache_nr
;
2666 static int write_index_ext_header(struct hashfile
*f
,
2667 git_hash_ctx
*eoie_f
,
2671 hashwrite_be32(f
, ext
);
2672 hashwrite_be32(f
, sz
);
2677 the_hash_algo
->update_fn(eoie_f
, &ext
, sizeof(ext
));
2678 the_hash_algo
->update_fn(eoie_f
, &sz
, sizeof(sz
));
2683 static void ce_smudge_racily_clean_entry(struct index_state
*istate
,
2684 struct cache_entry
*ce
)
2687 * The only thing we care about in this function is to smudge the
2688 * falsely clean entry due to touch-update-touch race, so we leave
2689 * everything else as they are. We are called for entries whose
2690 * ce_stat_data.sd_mtime match the index file mtime.
2692 * Note that this actually does not do much for gitlinks, for
2693 * which ce_match_stat_basic() always goes to the actual
2694 * contents. The caller checks with is_racy_timestamp() which
2695 * always says "no" for gitlinks, so we are not called for them ;-)
2699 if (lstat(ce
->name
, &st
) < 0)
2701 if (ce_match_stat_basic(ce
, &st
))
2703 if (ce_modified_check_fs(istate
, ce
, &st
)) {
2704 /* This is "racily clean"; smudge it. Note that this
2705 * is a tricky code. At first glance, it may appear
2706 * that it can break with this sequence:
2708 * $ echo xyzzy >frotz
2709 * $ git-update-index --add frotz
2712 * $ echo filfre >nitfol
2713 * $ git-update-index --add nitfol
2715 * but it does not. When the second update-index runs,
2716 * it notices that the entry "frotz" has the same timestamp
2717 * as index, and if we were to smudge it by resetting its
2718 * size to zero here, then the object name recorded
2719 * in index is the 6-byte file but the cached stat information
2720 * becomes zero --- which would then match what we would
2721 * obtain from the filesystem next time we stat("frotz").
2723 * However, the second update-index, before calling
2724 * this function, notices that the cached size is 6
2725 * bytes and what is on the filesystem is an empty
2726 * file, and never calls us, so the cached size information
2727 * for "frotz" stays 6 which does not match the filesystem.
2729 ce
->ce_stat_data
.sd_size
= 0;
2733 /* Copy miscellaneous fields but not the name */
2734 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2735 struct cache_entry
*ce
)
2738 const unsigned hashsz
= the_hash_algo
->rawsz
;
2739 uint16_t *flagsp
= (uint16_t *)(ondisk
->data
+ hashsz
);
2741 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2742 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2743 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2744 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2745 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2746 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2747 ondisk
->mode
= htonl(ce
->ce_mode
);
2748 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2749 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2750 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2751 hashcpy(ondisk
->data
, ce
->oid
.hash
);
2753 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2754 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2755 flagsp
[0] = htons(flags
);
2756 if (ce
->ce_flags
& CE_EXTENDED
) {
2757 flagsp
[1] = htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2761 static int ce_write_entry(struct hashfile
*f
, struct cache_entry
*ce
,
2762 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2765 unsigned int saved_namelen
;
2766 int stripped_name
= 0;
2767 static unsigned char padding
[8] = { 0x00 };
2769 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2770 saved_namelen
= ce_namelen(ce
);
2775 size
= offsetof(struct ondisk_cache_entry
,data
) + ondisk_data_size(ce
->ce_flags
, 0);
2777 if (!previous_name
) {
2778 int len
= ce_namelen(ce
);
2779 copy_cache_entry_to_ondisk(ondisk
, ce
);
2780 hashwrite(f
, ondisk
, size
);
2781 hashwrite(f
, ce
->name
, len
);
2782 hashwrite(f
, padding
, align_padding_size(size
, len
));
2784 int common
, to_remove
, prefix_size
;
2785 unsigned char to_remove_vi
[16];
2787 (ce
->name
[common
] &&
2788 common
< previous_name
->len
&&
2789 ce
->name
[common
] == previous_name
->buf
[common
]);
2791 ; /* still matching */
2792 to_remove
= previous_name
->len
- common
;
2793 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2795 copy_cache_entry_to_ondisk(ondisk
, ce
);
2796 hashwrite(f
, ondisk
, size
);
2797 hashwrite(f
, to_remove_vi
, prefix_size
);
2798 hashwrite(f
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2799 hashwrite(f
, padding
, 1);
2801 strbuf_splice(previous_name
, common
, to_remove
,
2802 ce
->name
+ common
, ce_namelen(ce
) - common
);
2804 if (stripped_name
) {
2805 ce
->ce_namelen
= saved_namelen
;
2806 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2813 * This function verifies if index_state has the correct sha1 of the
2814 * index file. Don't die if we have any other failure, just return 0.
2816 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2821 unsigned char hash
[GIT_MAX_RAWSZ
];
2823 if (!istate
->initialized
)
2826 fd
= open(path
, O_RDONLY
);
2833 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2836 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2837 if (n
!= the_hash_algo
->rawsz
)
2840 if (!hasheq(istate
->oid
.hash
, hash
))
2851 static int repo_verify_index(struct repository
*repo
)
2853 return verify_index_from(repo
->index
, repo
->index_file
);
2856 int has_racy_timestamp(struct index_state
*istate
)
2858 int entries
= istate
->cache_nr
;
2861 for (i
= 0; i
< entries
; i
++) {
2862 struct cache_entry
*ce
= istate
->cache
[i
];
2863 if (is_racy_timestamp(istate
, ce
))
2869 void repo_update_index_if_able(struct repository
*repo
,
2870 struct lock_file
*lockfile
)
2872 if ((repo
->index
->cache_changed
||
2873 has_racy_timestamp(repo
->index
)) &&
2874 repo_verify_index(repo
))
2875 write_locked_index(repo
->index
, lockfile
, COMMIT_LOCK
);
2877 rollback_lock_file(lockfile
);
2880 static int record_eoie(void)
2884 if (!git_config_get_bool("index.recordendofindexentries", &val
))
2888 * As a convenience, the end of index entries extension
2889 * used for threading is written by default if the user
2890 * explicitly requested threaded index reads.
2892 return !git_config_get_index_threads(&val
) && val
!= 1;
2895 static int record_ieot(void)
2899 if (!git_config_get_bool("index.recordoffsettable", &val
))
2903 * As a convenience, the offset table used for threading is
2904 * written by default if the user explicitly requested
2905 * threaded index reads.
2907 return !git_config_get_index_threads(&val
) && val
!= 1;
2911 * On success, `tempfile` is closed. If it is the temporary file
2912 * of a `struct lock_file`, we will therefore effectively perform
2913 * a 'close_lock_file_gently()`. Since that is an implementation
2914 * detail of lockfiles, callers of `do_write_index()` should not
2917 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2918 int strip_extensions
, unsigned flags
)
2920 uint64_t start
= getnanotime();
2922 git_hash_ctx
*eoie_c
= NULL
;
2923 struct cache_header hdr
;
2924 int i
, err
= 0, removed
, extended
, hdr_version
;
2925 struct cache_entry
**cache
= istate
->cache
;
2926 int entries
= istate
->cache_nr
;
2928 struct ondisk_cache_entry ondisk
;
2929 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2930 int drop_cache_tree
= istate
->drop_cache_tree
;
2932 int csum_fsync_flag
;
2933 int ieot_entries
= 1;
2934 struct index_entry_offset_table
*ieot
= NULL
;
2936 struct repository
*r
= istate
->repo
? istate
->repo
: the_repository
;
2938 f
= hashfd(tempfile
->fd
, tempfile
->filename
.buf
);
2940 prepare_repo_settings(r
);
2941 f
->skip_hash
= r
->settings
.index_skip_hash
;
2943 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2944 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2947 /* reduce extended entries if possible */
2948 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2949 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2951 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2955 if (!istate
->version
)
2956 istate
->version
= get_index_format_default(the_repository
);
2958 /* demote version 3 to version 2 when the latter suffices */
2959 if (istate
->version
== 3 || istate
->version
== 2)
2960 istate
->version
= extended
? 3 : 2;
2962 hdr_version
= istate
->version
;
2964 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2965 hdr
.hdr_version
= htonl(hdr_version
);
2966 hdr
.hdr_entries
= htonl(entries
- removed
);
2968 hashwrite(f
, &hdr
, sizeof(hdr
));
2970 if (!HAVE_THREADS
|| git_config_get_index_threads(&nr_threads
))
2973 if (nr_threads
!= 1 && record_ieot()) {
2974 int ieot_blocks
, cpus
;
2977 * ensure default number of ieot blocks maps evenly to the
2978 * default number of threads that will process them leaving
2979 * room for the thread to load the index extensions.
2982 ieot_blocks
= istate
->cache_nr
/ THREAD_COST
;
2983 cpus
= online_cpus();
2984 if (ieot_blocks
> cpus
- 1)
2985 ieot_blocks
= cpus
- 1;
2987 ieot_blocks
= nr_threads
;
2988 if (ieot_blocks
> istate
->cache_nr
)
2989 ieot_blocks
= istate
->cache_nr
;
2993 * no reason to write out the IEOT extension if we don't
2994 * have enough blocks to utilize multi-threading
2996 if (ieot_blocks
> 1) {
2997 ieot
= xcalloc(1, sizeof(struct index_entry_offset_table
)
2998 + (ieot_blocks
* sizeof(struct index_entry_offset
)));
2999 ieot_entries
= DIV_ROUND_UP(entries
, ieot_blocks
);
3003 offset
= hashfile_total(f
);
3006 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
3008 for (i
= 0; i
< entries
; i
++) {
3009 struct cache_entry
*ce
= cache
[i
];
3010 if (ce
->ce_flags
& CE_REMOVE
)
3012 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
3013 ce_smudge_racily_clean_entry(istate
, ce
);
3014 if (is_null_oid(&ce
->oid
)) {
3015 static const char msg
[] = "cache entry has null sha1: %s";
3016 static int allow
= -1;
3019 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
3021 warning(msg
, ce
->name
);
3023 err
= error(msg
, ce
->name
);
3025 drop_cache_tree
= 1;
3027 if (ieot
&& i
&& (i
% ieot_entries
== 0)) {
3028 ieot
->entries
[ieot
->nr
].nr
= nr
;
3029 ieot
->entries
[ieot
->nr
].offset
= offset
;
3032 * If we have a V4 index, set the first byte to an invalid
3033 * character to ensure there is nothing common with the previous
3037 previous_name
->buf
[0] = 0;
3040 offset
= hashfile_total(f
);
3042 if (ce_write_entry(f
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
3050 ieot
->entries
[ieot
->nr
].nr
= nr
;
3051 ieot
->entries
[ieot
->nr
].offset
= offset
;
3054 strbuf_release(&previous_name_buf
);
3061 offset
= hashfile_total(f
);
3064 * The extension headers must be hashed on their own for the
3065 * EOIE extension. Create a hashfile here to compute that hash.
3067 if (offset
&& record_eoie()) {
3068 CALLOC_ARRAY(eoie_c
, 1);
3069 the_hash_algo
->init_fn(eoie_c
);
3073 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
3074 * can minimize the number of extensions we have to scan through to
3075 * find it during load. Write it out regardless of the
3076 * strip_extensions parameter as we need it when loading the shared
3080 struct strbuf sb
= STRBUF_INIT
;
3082 write_ieot_extension(&sb
, ieot
);
3083 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_INDEXENTRYOFFSETTABLE
, sb
.len
) < 0;
3084 hashwrite(f
, sb
.buf
, sb
.len
);
3085 strbuf_release(&sb
);
3091 if (!strip_extensions
&& istate
->split_index
&&
3092 !is_null_oid(&istate
->split_index
->base_oid
)) {
3093 struct strbuf sb
= STRBUF_INIT
;
3095 if (istate
->sparse_index
)
3096 die(_("cannot write split index for a sparse index"));
3098 err
= write_link_extension(&sb
, istate
) < 0 ||
3099 write_index_ext_header(f
, eoie_c
, CACHE_EXT_LINK
,
3101 hashwrite(f
, sb
.buf
, sb
.len
);
3102 strbuf_release(&sb
);
3106 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
3107 struct strbuf sb
= STRBUF_INIT
;
3109 cache_tree_write(&sb
, istate
->cache_tree
);
3110 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_TREE
, sb
.len
) < 0;
3111 hashwrite(f
, sb
.buf
, sb
.len
);
3112 strbuf_release(&sb
);
3116 if (!strip_extensions
&& istate
->resolve_undo
) {
3117 struct strbuf sb
= STRBUF_INIT
;
3119 resolve_undo_write(&sb
, istate
->resolve_undo
);
3120 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_RESOLVE_UNDO
,
3122 hashwrite(f
, sb
.buf
, sb
.len
);
3123 strbuf_release(&sb
);
3127 if (!strip_extensions
&& istate
->untracked
) {
3128 struct strbuf sb
= STRBUF_INIT
;
3130 write_untracked_extension(&sb
, istate
->untracked
);
3131 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_UNTRACKED
,
3133 hashwrite(f
, sb
.buf
, sb
.len
);
3134 strbuf_release(&sb
);
3138 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
3139 struct strbuf sb
= STRBUF_INIT
;
3141 write_fsmonitor_extension(&sb
, istate
);
3142 err
= write_index_ext_header(f
, eoie_c
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0;
3143 hashwrite(f
, sb
.buf
, sb
.len
);
3144 strbuf_release(&sb
);
3148 if (istate
->sparse_index
) {
3149 if (write_index_ext_header(f
, eoie_c
, CACHE_EXT_SPARSE_DIRECTORIES
, 0) < 0)
3154 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
3155 * so that it can be found and processed before all the index entries are
3156 * read. Write it out regardless of the strip_extensions parameter as we need it
3157 * when loading the shared index.
3160 struct strbuf sb
= STRBUF_INIT
;
3162 write_eoie_extension(&sb
, eoie_c
, offset
);
3163 err
= write_index_ext_header(f
, NULL
, CACHE_EXT_ENDOFINDEXENTRIES
, sb
.len
) < 0;
3164 hashwrite(f
, sb
.buf
, sb
.len
);
3165 strbuf_release(&sb
);
3170 csum_fsync_flag
= 0;
3171 if (!alternate_index_output
&& (flags
& COMMIT_LOCK
))
3172 csum_fsync_flag
= CSUM_FSYNC
;
3174 finalize_hashfile(f
, istate
->oid
.hash
, FSYNC_COMPONENT_INDEX
,
3175 CSUM_HASH_IN_STREAM
| csum_fsync_flag
);
3177 if (close_tempfile_gently(tempfile
)) {
3178 error(_("could not close '%s'"), get_tempfile_path(tempfile
));
3181 if (stat(get_tempfile_path(tempfile
), &st
))
3183 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
3184 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
3185 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
3188 * TODO trace2: replace "the_repository" with the actual repo instance
3189 * that is associated with the given "istate".
3191 trace2_data_intmax("index", the_repository
, "write/version",
3193 trace2_data_intmax("index", the_repository
, "write/cache_nr",
3199 void set_alternate_index_output(const char *name
)
3201 alternate_index_output
= name
;
3204 static int commit_locked_index(struct lock_file
*lk
)
3206 if (alternate_index_output
)
3207 return commit_lock_file_to(lk
, alternate_index_output
);
3209 return commit_lock_file(lk
);
3212 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3216 int was_full
= istate
->sparse_index
== INDEX_EXPANDED
;
3218 ret
= convert_to_sparse(istate
, 0);
3221 warning(_("failed to convert to a sparse-index"));
3226 * TODO trace2: replace "the_repository" with the actual repo instance
3227 * that is associated with the given "istate".
3229 trace2_region_enter_printf("index", "do_write_index", the_repository
,
3230 "%s", get_lock_file_path(lock
));
3231 ret
= do_write_index(istate
, lock
->tempfile
, 0, flags
);
3232 trace2_region_leave_printf("index", "do_write_index", the_repository
,
3233 "%s", get_lock_file_path(lock
));
3236 ensure_full_index(istate
);
3240 if (flags
& COMMIT_LOCK
)
3241 ret
= commit_locked_index(lock
);
3243 ret
= close_lock_file_gently(lock
);
3245 run_hooks_l("post-index-change",
3246 istate
->updated_workdir
? "1" : "0",
3247 istate
->updated_skipworktree
? "1" : "0", NULL
);
3248 istate
->updated_workdir
= 0;
3249 istate
->updated_skipworktree
= 0;
3254 static int write_split_index(struct index_state
*istate
,
3255 struct lock_file
*lock
,
3259 prepare_to_write_split_index(istate
);
3260 ret
= do_write_locked_index(istate
, lock
, flags
);
3261 finish_writing_split_index(istate
);
3265 static const char *shared_index_expire
= "2.weeks.ago";
3267 static unsigned long get_shared_index_expire_date(void)
3269 static unsigned long shared_index_expire_date
;
3270 static int shared_index_expire_date_prepared
;
3272 if (!shared_index_expire_date_prepared
) {
3273 git_config_get_expiry("splitindex.sharedindexexpire",
3274 &shared_index_expire
);
3275 shared_index_expire_date
= approxidate(shared_index_expire
);
3276 shared_index_expire_date_prepared
= 1;
3279 return shared_index_expire_date
;
3282 static int should_delete_shared_index(const char *shared_index_path
)
3285 unsigned long expiration
;
3287 /* Check timestamp */
3288 expiration
= get_shared_index_expire_date();
3291 if (stat(shared_index_path
, &st
))
3292 return error_errno(_("could not stat '%s'"), shared_index_path
);
3293 if (st
.st_mtime
> expiration
)
3299 static int clean_shared_index_files(const char *current_hex
)
3302 DIR *dir
= opendir(get_git_dir());
3305 return error_errno(_("unable to open git dir: %s"), get_git_dir());
3307 while ((de
= readdir(dir
)) != NULL
) {
3308 const char *sha1_hex
;
3309 const char *shared_index_path
;
3310 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
3312 if (!strcmp(sha1_hex
, current_hex
))
3314 shared_index_path
= git_path("%s", de
->d_name
);
3315 if (should_delete_shared_index(shared_index_path
) > 0 &&
3316 unlink(shared_index_path
))
3317 warning_errno(_("unable to unlink: %s"), shared_index_path
);
3324 static int write_shared_index(struct index_state
*istate
,
3325 struct tempfile
**temp
, unsigned flags
)
3327 struct split_index
*si
= istate
->split_index
;
3328 int ret
, was_full
= !istate
->sparse_index
;
3330 move_cache_to_base_index(istate
);
3331 convert_to_sparse(istate
, 0);
3333 trace2_region_enter_printf("index", "shared/do_write_index",
3334 the_repository
, "%s", get_tempfile_path(*temp
));
3335 ret
= do_write_index(si
->base
, *temp
, 1, flags
);
3336 trace2_region_leave_printf("index", "shared/do_write_index",
3337 the_repository
, "%s", get_tempfile_path(*temp
));
3340 ensure_full_index(istate
);
3344 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
3346 error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp
));
3349 ret
= rename_tempfile(temp
,
3350 git_path("sharedindex.%s", oid_to_hex(&si
->base
->oid
)));
3352 oidcpy(&si
->base_oid
, &si
->base
->oid
);
3353 clean_shared_index_files(oid_to_hex(&si
->base
->oid
));
3359 static const int default_max_percent_split_change
= 20;
3361 static int too_many_not_shared_entries(struct index_state
*istate
)
3363 int i
, not_shared
= 0;
3364 int max_split
= git_config_get_max_percent_split_change();
3366 switch (max_split
) {
3368 /* not or badly configured: use the default value */
3369 max_split
= default_max_percent_split_change
;
3372 return 1; /* 0% means always write a new shared index */
3374 return 0; /* 100% means never write a new shared index */
3376 break; /* just use the configured value */
3379 /* Count not shared entries */
3380 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3381 struct cache_entry
*ce
= istate
->cache
[i
];
3386 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
3389 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
3392 int new_shared_index
, ret
, test_split_index_env
;
3393 struct split_index
*si
= istate
->split_index
;
3395 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
3396 cache_tree_verify(the_repository
, istate
);
3398 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
3399 if (flags
& COMMIT_LOCK
)
3400 rollback_lock_file(lock
);
3404 if (istate
->fsmonitor_last_update
)
3405 fill_fsmonitor_bitmap(istate
);
3407 test_split_index_env
= git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
3409 if ((!si
&& !test_split_index_env
) ||
3410 alternate_index_output
||
3411 (istate
->cache_changed
& ~EXTMASK
)) {
3413 oidclr(&si
->base_oid
);
3414 ret
= do_write_locked_index(istate
, lock
, flags
);
3418 if (test_split_index_env
) {
3420 si
= init_split_index(istate
);
3421 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3423 int v
= si
->base_oid
.hash
[0];
3425 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3428 if (too_many_not_shared_entries(istate
))
3429 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
3431 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
3433 if (new_shared_index
) {
3434 struct tempfile
*temp
;
3437 /* Same initial permissions as the main .git/index file */
3438 temp
= mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666);
3440 oidclr(&si
->base_oid
);
3441 ret
= do_write_locked_index(istate
, lock
, flags
);
3444 ret
= write_shared_index(istate
, &temp
, flags
);
3446 saved_errno
= errno
;
3447 if (is_tempfile_active(temp
))
3448 delete_tempfile(&temp
);
3449 errno
= saved_errno
;
3455 ret
= write_split_index(istate
, lock
, flags
);
3457 /* Freshen the shared index only if the split-index was written */
3458 if (!ret
&& !new_shared_index
&& !is_null_oid(&si
->base_oid
)) {
3459 const char *shared_index
= git_path("sharedindex.%s",
3460 oid_to_hex(&si
->base_oid
));
3461 freshen_shared_index(shared_index
, 1);
3465 if (flags
& COMMIT_LOCK
)
3466 rollback_lock_file(lock
);
3471 * Read the index file that is potentially unmerged into given
3472 * index_state, dropping any unmerged entries to stage #0 (potentially
3473 * resulting in a path appearing as both a file and a directory in the
3474 * index; the caller is responsible to clear out the extra entries
3475 * before writing the index to a tree). Returns true if the index is
3476 * unmerged. Callers who want to refuse to work from an unmerged
3477 * state can call this and check its return value, instead of calling
3480 int repo_read_index_unmerged(struct repository
*repo
)
3482 struct index_state
*istate
;
3486 repo_read_index(repo
);
3487 istate
= repo
->index
;
3488 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3489 struct cache_entry
*ce
= istate
->cache
[i
];
3490 struct cache_entry
*new_ce
;
3496 len
= ce_namelen(ce
);
3497 new_ce
= make_empty_cache_entry(istate
, len
);
3498 memcpy(new_ce
->name
, ce
->name
, len
);
3499 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
3500 new_ce
->ce_namelen
= len
;
3501 new_ce
->ce_mode
= ce
->ce_mode
;
3502 if (add_index_entry(istate
, new_ce
, ADD_CACHE_SKIP_DFCHECK
))
3503 return error(_("%s: cannot drop to stage #0"),
3510 * Returns 1 if the path is an "other" path with respect to
3511 * the index; that is, the path is not mentioned in the index at all,
3512 * either as a file, a directory with some files in the index,
3513 * or as an unmerged entry.
3515 * We helpfully remove a trailing "/" from directories so that
3516 * the output of read_directory can be used as-is.
3518 int index_name_is_other(struct index_state
*istate
, const char *name
,
3522 if (namelen
&& name
[namelen
- 1] == '/')
3524 pos
= index_name_pos(istate
, name
, namelen
);
3526 return 0; /* exact match */
3528 if (pos
< istate
->cache_nr
) {
3529 struct cache_entry
*ce
= istate
->cache
[pos
];
3530 if (ce_namelen(ce
) == namelen
&&
3531 !memcmp(ce
->name
, name
, namelen
))
3532 return 0; /* Yup, this one exists unmerged */
3537 void *read_blob_data_from_index(struct index_state
*istate
,
3538 const char *path
, unsigned long *size
)
3542 enum object_type type
;
3546 pos
= index_name_pos(istate
, path
, len
);
3549 * We might be in the middle of a merge, in which
3550 * case we would read stage #2 (ours).
3554 (pos
< 0 && i
< istate
->cache_nr
&&
3555 !strcmp(istate
->cache
[i
]->name
, path
));
3557 if (ce_stage(istate
->cache
[i
]) == 2)
3562 data
= read_object_file(&istate
->cache
[pos
]->oid
, &type
, &sz
);
3563 if (!data
|| type
!= OBJ_BLOB
) {
3572 void stat_validity_clear(struct stat_validity
*sv
)
3574 FREE_AND_NULL(sv
->sd
);
3577 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
3581 if (stat(path
, &st
) < 0)
3582 return sv
->sd
== NULL
;
3585 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
3588 void stat_validity_update(struct stat_validity
*sv
, int fd
)
3592 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
3593 stat_validity_clear(sv
);
3596 CALLOC_ARRAY(sv
->sd
, 1);
3597 fill_stat_data(sv
->sd
, &st
);
3601 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
3603 dst
->untracked
= src
->untracked
;
3604 src
->untracked
= NULL
;
3605 dst
->cache_tree
= src
->cache_tree
;
3606 src
->cache_tree
= NULL
;
3609 struct cache_entry
*dup_cache_entry(const struct cache_entry
*ce
,
3610 struct index_state
*istate
)
3612 unsigned int size
= ce_size(ce
);
3613 int mem_pool_allocated
;
3614 struct cache_entry
*new_entry
= make_empty_cache_entry(istate
, ce_namelen(ce
));
3615 mem_pool_allocated
= new_entry
->mem_pool_allocated
;
3617 memcpy(new_entry
, ce
, size
);
3618 new_entry
->mem_pool_allocated
= mem_pool_allocated
;
3622 void discard_cache_entry(struct cache_entry
*ce
)
3624 if (ce
&& should_validate_cache_entries())
3625 memset(ce
, 0xCD, cache_entry_size(ce
->ce_namelen
));
3627 if (ce
&& ce
->mem_pool_allocated
)
3633 int should_validate_cache_entries(void)
3635 static int validate_index_cache_entries
= -1;
3637 if (validate_index_cache_entries
< 0) {
3638 if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES"))
3639 validate_index_cache_entries
= 1;
3641 validate_index_cache_entries
= 0;
3644 return validate_index_cache_entries
;
3647 #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */
3648 #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */
3650 static size_t read_eoie_extension(const char *mmap
, size_t mmap_size
)
3653 * The end of index entries (EOIE) extension is guaranteed to be last
3654 * so that it can be found by scanning backwards from the EOF.
3661 const char *index
, *eoie
;
3663 size_t offset
, src_offset
;
3664 unsigned char hash
[GIT_MAX_RAWSZ
];
3667 /* ensure we have an index big enough to contain an EOIE extension */
3668 if (mmap_size
< sizeof(struct cache_header
) + EOIE_SIZE_WITH_HEADER
+ the_hash_algo
->rawsz
)
3671 /* validate the extension signature */
3672 index
= eoie
= mmap
+ mmap_size
- EOIE_SIZE_WITH_HEADER
- the_hash_algo
->rawsz
;
3673 if (CACHE_EXT(index
) != CACHE_EXT_ENDOFINDEXENTRIES
)
3675 index
+= sizeof(uint32_t);
3677 /* validate the extension size */
3678 extsize
= get_be32(index
);
3679 if (extsize
!= EOIE_SIZE
)
3681 index
+= sizeof(uint32_t);
3684 * Validate the offset we're going to look for the first extension
3685 * signature is after the index header and before the eoie extension.
3687 offset
= get_be32(index
);
3688 if (mmap
+ offset
< mmap
+ sizeof(struct cache_header
))
3690 if (mmap
+ offset
>= eoie
)
3692 index
+= sizeof(uint32_t);
3695 * The hash is computed over extension types and their sizes (but not
3696 * their contents). E.g. if we have "TREE" extension that is N-bytes
3697 * long, "REUC" extension that is M-bytes long, followed by "EOIE",
3698 * then the hash would be:
3700 * SHA-1("TREE" + <binary representation of N> +
3701 * "REUC" + <binary representation of M>)
3703 src_offset
= offset
;
3704 the_hash_algo
->init_fn(&c
);
3705 while (src_offset
< mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
) {
3706 /* After an array of active_nr index entries,
3707 * there can be arbitrary number of extended
3708 * sections, each of which is prefixed with
3709 * extension name (4-byte) and section length
3710 * in 4-byte network byte order.
3713 memcpy(&extsize
, mmap
+ src_offset
+ 4, 4);
3714 extsize
= ntohl(extsize
);
3716 /* verify the extension size isn't so large it will wrap around */
3717 if (src_offset
+ 8 + extsize
< src_offset
)
3720 the_hash_algo
->update_fn(&c
, mmap
+ src_offset
, 8);
3723 src_offset
+= extsize
;
3725 the_hash_algo
->final_fn(hash
, &c
);
3726 if (!hasheq(hash
, (const unsigned char *)index
))
3729 /* Validate that the extension offsets returned us back to the eoie extension. */
3730 if (src_offset
!= mmap_size
- the_hash_algo
->rawsz
- EOIE_SIZE_WITH_HEADER
)
3736 static void write_eoie_extension(struct strbuf
*sb
, git_hash_ctx
*eoie_context
, size_t offset
)
3739 unsigned char hash
[GIT_MAX_RAWSZ
];
3742 put_be32(&buffer
, offset
);
3743 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3746 the_hash_algo
->final_fn(hash
, eoie_context
);
3747 strbuf_add(sb
, hash
, the_hash_algo
->rawsz
);
3750 #define IEOT_VERSION (1)
3752 static struct index_entry_offset_table
*read_ieot_extension(const char *mmap
, size_t mmap_size
, size_t offset
)
3754 const char *index
= NULL
;
3755 uint32_t extsize
, ext_version
;
3756 struct index_entry_offset_table
*ieot
;
3759 /* find the IEOT extension */
3762 while (offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
3763 extsize
= get_be32(mmap
+ offset
+ 4);
3764 if (CACHE_EXT((mmap
+ offset
)) == CACHE_EXT_INDEXENTRYOFFSETTABLE
) {
3765 index
= mmap
+ offset
+ 4 + 4;
3774 /* validate the version is IEOT_VERSION */
3775 ext_version
= get_be32(index
);
3776 if (ext_version
!= IEOT_VERSION
) {
3777 error("invalid IEOT version %d", ext_version
);
3780 index
+= sizeof(uint32_t);
3782 /* extension size - version bytes / bytes per entry */
3783 nr
= (extsize
- sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t));
3785 error("invalid number of IEOT entries %d", nr
);
3788 ieot
= xmalloc(sizeof(struct index_entry_offset_table
)
3789 + (nr
* sizeof(struct index_entry_offset
)));
3791 for (i
= 0; i
< nr
; i
++) {
3792 ieot
->entries
[i
].offset
= get_be32(index
);
3793 index
+= sizeof(uint32_t);
3794 ieot
->entries
[i
].nr
= get_be32(index
);
3795 index
+= sizeof(uint32_t);
3801 static void write_ieot_extension(struct strbuf
*sb
, struct index_entry_offset_table
*ieot
)
3807 put_be32(&buffer
, IEOT_VERSION
);
3808 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3811 for (i
= 0; i
< ieot
->nr
; i
++) {
3814 put_be32(&buffer
, ieot
->entries
[i
].offset
);
3815 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3818 put_be32(&buffer
, ieot
->entries
[i
].nr
);
3819 strbuf_add(sb
, &buffer
, sizeof(uint32_t));
3823 void prefetch_cache_entries(const struct index_state
*istate
,
3824 must_prefetch_predicate must_prefetch
)
3827 struct oid_array to_fetch
= OID_ARRAY_INIT
;
3829 for (i
= 0; i
< istate
->cache_nr
; i
++) {
3830 struct cache_entry
*ce
= istate
->cache
[i
];
3832 if (S_ISGITLINK(ce
->ce_mode
) || !must_prefetch(ce
))
3834 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
3836 OBJECT_INFO_FOR_PREFETCH
))
3838 oid_array_append(&to_fetch
, &ce
->oid
);
3840 promisor_remote_get_direct(the_repository
,
3841 to_fetch
.oid
, to_fetch
.nr
);
3842 oid_array_clear(&to_fetch
);