2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
11 #include "cache-tree.h"
17 #include "resolve-undo.h"
20 #include "split-index.h"
22 #include "fsmonitor.h"
24 /* Mask for the name length in ce_flags in the on-disk index */
26 #define CE_NAMEMASK (0x0fff)
30 * The first letter should be 'A'..'Z' for extensions that are not
31 * necessary for a correct operation (i.e. optimization data).
32 * When new extensions are added that _needs_ to be understood in
33 * order to correctly interpret the index file, pick character that
34 * is outside the range, to cause the reader to abort.
37 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
38 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
39 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
40 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
41 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
42 #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
44 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
45 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
46 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
47 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
49 struct index_state the_index
;
50 static const char *alternate_index_output
;
52 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
54 istate
->cache
[nr
] = ce
;
55 add_name_hash(istate
, ce
);
58 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
60 struct cache_entry
*old
= istate
->cache
[nr
];
62 replace_index_entry_in_base(istate
, old
, ce
);
63 remove_name_hash(istate
, old
);
65 ce
->ce_flags
&= ~CE_HASHED
;
66 set_index_entry(istate
, nr
, ce
);
67 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
68 mark_fsmonitor_invalid(istate
, ce
);
69 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
72 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
74 struct cache_entry
*old_entry
= istate
->cache
[nr
], *new_entry
;
75 int namelen
= strlen(new_name
);
77 new_entry
= xmalloc(cache_entry_size(namelen
));
78 copy_cache_entry(new_entry
, old_entry
);
79 new_entry
->ce_flags
&= ~CE_HASHED
;
80 new_entry
->ce_namelen
= namelen
;
82 memcpy(new_entry
->name
, new_name
, namelen
+ 1);
84 cache_tree_invalidate_path(istate
, old_entry
->name
);
85 untracked_cache_remove_from_index(istate
, old_entry
->name
);
86 remove_index_entry_at(istate
, nr
);
87 add_index_entry(istate
, new_entry
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
90 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
92 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
93 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
94 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
95 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
96 sd
->sd_dev
= st
->st_dev
;
97 sd
->sd_ino
= st
->st_ino
;
98 sd
->sd_uid
= st
->st_uid
;
99 sd
->sd_gid
= st
->st_gid
;
100 sd
->sd_size
= st
->st_size
;
103 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
107 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
108 changed
|= MTIME_CHANGED
;
109 if (trust_ctime
&& check_stat
&&
110 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
111 changed
|= CTIME_CHANGED
;
114 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
115 changed
|= MTIME_CHANGED
;
116 if (trust_ctime
&& check_stat
&&
117 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
118 changed
|= CTIME_CHANGED
;
122 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
123 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
124 changed
|= OWNER_CHANGED
;
125 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
126 changed
|= INODE_CHANGED
;
131 * st_dev breaks on network filesystems where different
132 * clients will have different views of what "device"
133 * the filesystem is on
135 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
136 changed
|= INODE_CHANGED
;
139 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
140 changed
|= DATA_CHANGED
;
146 * This only updates the "non-critical" parts of the directory
147 * cache, ie the parts that aren't tracked by GIT, and only used
148 * to validate the cache.
150 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
152 fill_stat_data(&ce
->ce_stat_data
, st
);
154 if (assume_unchanged
)
155 ce
->ce_flags
|= CE_VALID
;
157 if (S_ISREG(st
->st_mode
)) {
158 ce_mark_uptodate(ce
);
159 mark_fsmonitor_valid(ce
);
163 static int ce_compare_data(const struct cache_entry
*ce
, struct stat
*st
)
166 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
169 struct object_id oid
;
170 if (!index_fd(&oid
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
171 match
= oidcmp(&oid
, &ce
->oid
);
172 /* index_fd() closed the file descriptor already */
177 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
182 enum object_type type
;
183 struct strbuf sb
= STRBUF_INIT
;
185 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
188 buffer
= read_sha1_file(ce
->oid
.hash
, &type
, &size
);
191 match
= memcmp(buffer
, sb
.buf
, size
);
198 static int ce_compare_gitlink(const struct cache_entry
*ce
)
200 struct object_id oid
;
203 * We don't actually require that the .git directory
204 * under GITLINK directory be a valid git directory. It
205 * might even be missing (in case nobody populated that
208 * If so, we consider it always to match.
210 if (resolve_gitlink_ref(ce
->name
, "HEAD", &oid
) < 0)
212 return oidcmp(&oid
, &ce
->oid
);
215 static int ce_modified_check_fs(const struct cache_entry
*ce
, struct stat
*st
)
217 switch (st
->st_mode
& S_IFMT
) {
219 if (ce_compare_data(ce
, st
))
223 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
227 if (S_ISGITLINK(ce
->ce_mode
))
228 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
229 /* else fallthrough */
236 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
238 unsigned int changed
= 0;
240 if (ce
->ce_flags
& CE_REMOVE
)
241 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
243 switch (ce
->ce_mode
& S_IFMT
) {
245 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
246 /* We consider only the owner x bit to be relevant for
249 if (trust_executable_bit
&&
250 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
251 changed
|= MODE_CHANGED
;
254 if (!S_ISLNK(st
->st_mode
) &&
255 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
256 changed
|= TYPE_CHANGED
;
259 /* We ignore most of the st_xxx fields for gitlinks */
260 if (!S_ISDIR(st
->st_mode
))
261 changed
|= TYPE_CHANGED
;
262 else if (ce_compare_gitlink(ce
))
263 changed
|= DATA_CHANGED
;
266 die("internal error: ce_mode is %o", ce
->ce_mode
);
269 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
271 /* Racily smudged entry? */
272 if (!ce
->ce_stat_data
.sd_size
) {
273 if (!is_empty_blob_sha1(ce
->oid
.hash
))
274 changed
|= DATA_CHANGED
;
280 static int is_racy_stat(const struct index_state
*istate
,
281 const struct stat_data
*sd
)
283 return (istate
->timestamp
.sec
&&
285 /* nanosecond timestamped files can also be racy! */
286 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
287 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
288 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
290 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
295 static int is_racy_timestamp(const struct index_state
*istate
,
296 const struct cache_entry
*ce
)
298 return (!S_ISGITLINK(ce
->ce_mode
) &&
299 is_racy_stat(istate
, &ce
->ce_stat_data
));
302 int match_stat_data_racy(const struct index_state
*istate
,
303 const struct stat_data
*sd
, struct stat
*st
)
305 if (is_racy_stat(istate
, sd
))
306 return MTIME_CHANGED
;
307 return match_stat_data(sd
, st
);
310 int ie_match_stat(struct index_state
*istate
,
311 const struct cache_entry
*ce
, struct stat
*st
,
312 unsigned int options
)
314 unsigned int changed
;
315 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
316 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
317 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
318 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
320 if (!ignore_fsmonitor
)
321 refresh_fsmonitor(istate
);
323 * If it's marked as always valid in the index, it's
324 * valid whatever the checked-out copy says.
326 * skip-worktree has the same effect with higher precedence
328 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
330 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
332 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
))
336 * Intent-to-add entries have not been added, so the index entry
337 * by definition never matches what is in the work tree until it
338 * actually gets added.
340 if (ce_intent_to_add(ce
))
341 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
343 changed
= ce_match_stat_basic(ce
, st
);
346 * Within 1 second of this sequence:
347 * echo xyzzy >file && git-update-index --add file
348 * running this command:
350 * would give a falsely clean cache entry. The mtime and
351 * length match the cache, and other stat fields do not change.
353 * We could detect this at update-index time (the cache entry
354 * being registered/updated records the same time as "now")
355 * and delay the return from git-update-index, but that would
356 * effectively mean we can make at most one commit per second,
357 * which is not acceptable. Instead, we check cache entries
358 * whose mtime are the same as the index file timestamp more
359 * carefully than others.
361 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
362 if (assume_racy_is_modified
)
363 changed
|= DATA_CHANGED
;
365 changed
|= ce_modified_check_fs(ce
, st
);
371 int ie_modified(struct index_state
*istate
,
372 const struct cache_entry
*ce
,
373 struct stat
*st
, unsigned int options
)
375 int changed
, changed_fs
;
377 changed
= ie_match_stat(istate
, ce
, st
, options
);
381 * If the mode or type has changed, there's no point in trying
382 * to refresh the entry - it's not going to match
384 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
388 * Immediately after read-tree or update-index --cacheinfo,
389 * the length field is zero, as we have never even read the
390 * lstat(2) information once, and we cannot trust DATA_CHANGED
391 * returned by ie_match_stat() which in turn was returned by
392 * ce_match_stat_basic() to signal that the filesize of the
393 * blob changed. We have to actually go to the filesystem to
394 * see if the contents match, and if so, should answer "unchanged".
396 * The logic does not apply to gitlinks, as ce_match_stat_basic()
397 * already has checked the actual HEAD from the filesystem in the
398 * subproject. If ie_match_stat() already said it is different,
399 * then we know it is.
401 if ((changed
& DATA_CHANGED
) &&
402 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
405 changed_fs
= ce_modified_check_fs(ce
, st
);
407 return changed
| changed_fs
;
411 int base_name_compare(const char *name1
, int len1
, int mode1
,
412 const char *name2
, int len2
, int mode2
)
414 unsigned char c1
, c2
;
415 int len
= len1
< len2
? len1
: len2
;
418 cmp
= memcmp(name1
, name2
, len
);
423 if (!c1
&& S_ISDIR(mode1
))
425 if (!c2
&& S_ISDIR(mode2
))
427 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
431 * df_name_compare() is identical to base_name_compare(), except it
432 * compares conflicting directory/file entries as equal. Note that
433 * while a directory name compares as equal to a regular file, they
434 * then individually compare _differently_ to a filename that has
435 * a dot after the basename (because '\0' < '.' < '/').
437 * This is used by routines that want to traverse the git namespace
438 * but then handle conflicting entries together when possible.
440 int df_name_compare(const char *name1
, int len1
, int mode1
,
441 const char *name2
, int len2
, int mode2
)
443 int len
= len1
< len2
? len1
: len2
, cmp
;
444 unsigned char c1
, c2
;
446 cmp
= memcmp(name1
, name2
, len
);
449 /* Directories and files compare equal (same length, same name) */
453 if (!c1
&& S_ISDIR(mode1
))
456 if (!c2
&& S_ISDIR(mode2
))
458 if (c1
== '/' && !c2
)
460 if (c2
== '/' && !c1
)
465 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
467 size_t min_len
= (len1
< len2
) ? len1
: len2
;
468 int cmp
= memcmp(name1
, name2
, min_len
);
478 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
482 cmp
= name_compare(name1
, len1
, name2
, len2
);
493 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
498 last
= istate
->cache_nr
;
499 while (last
> first
) {
500 int next
= (last
+ first
) >> 1;
501 struct cache_entry
*ce
= istate
->cache
[next
];
502 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
514 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
516 return index_name_stage_pos(istate
, name
, namelen
, 0);
519 int remove_index_entry_at(struct index_state
*istate
, int pos
)
521 struct cache_entry
*ce
= istate
->cache
[pos
];
523 record_resolve_undo(istate
, ce
);
524 remove_name_hash(istate
, ce
);
525 save_or_free_index_entry(istate
, ce
);
526 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
528 if (pos
>= istate
->cache_nr
)
530 MOVE_ARRAY(istate
->cache
+ pos
, istate
->cache
+ pos
+ 1,
531 istate
->cache_nr
- pos
);
536 * Remove all cache entries marked for removal, that is where
537 * CE_REMOVE is set in ce_flags. This is much more effective than
538 * calling remove_index_entry_at() for each entry to be removed.
540 void remove_marked_cache_entries(struct index_state
*istate
)
542 struct cache_entry
**ce_array
= istate
->cache
;
545 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
546 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
547 remove_name_hash(istate
, ce_array
[i
]);
548 save_or_free_index_entry(istate
, ce_array
[i
]);
551 ce_array
[j
++] = ce_array
[i
];
553 if (j
== istate
->cache_nr
)
555 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
556 istate
->cache_nr
= j
;
559 int remove_file_from_index(struct index_state
*istate
, const char *path
)
561 int pos
= index_name_pos(istate
, path
, strlen(path
));
564 cache_tree_invalidate_path(istate
, path
);
565 untracked_cache_remove_from_index(istate
, path
);
566 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
567 remove_index_entry_at(istate
, pos
);
571 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
573 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
576 static int index_name_pos_also_unmerged(struct index_state
*istate
,
577 const char *path
, int namelen
)
579 int pos
= index_name_pos(istate
, path
, namelen
);
580 struct cache_entry
*ce
;
585 /* maybe unmerged? */
587 if (pos
>= istate
->cache_nr
||
588 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
591 /* order of preference: stage 2, 1, 3 */
592 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
593 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
594 !compare_name(ce
, path
, namelen
))
599 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
601 int len
= ce_namelen(ce
);
602 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
606 * If we add a filename that aliases in the cache, we will use the
607 * name that we already have - but we don't want to update the same
608 * alias twice, because that implies that there were actually two
609 * different files with aliasing names!
611 * So we use the CE_ADDED flag to verify that the alias was an old
612 * one before we accept it as
614 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
615 struct cache_entry
*ce
,
616 struct cache_entry
*alias
)
619 struct cache_entry
*new_entry
;
621 if (alias
->ce_flags
& CE_ADDED
)
622 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
624 /* Ok, create the new entry using the name of the existing alias */
625 len
= ce_namelen(alias
);
626 new_entry
= xcalloc(1, cache_entry_size(len
));
627 memcpy(new_entry
->name
, alias
->name
, len
);
628 copy_cache_entry(new_entry
, ce
);
629 save_or_free_index_entry(istate
, ce
);
633 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
635 struct object_id oid
;
636 if (write_object_file("", 0, blob_type
, &oid
))
637 die("cannot create an empty blob in the object database");
638 oidcpy(&ce
->oid
, &oid
);
641 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
643 int size
, namelen
, was_same
;
644 mode_t st_mode
= st
->st_mode
;
645 struct cache_entry
*ce
, *alias
= NULL
;
646 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
647 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
648 int pretend
= flags
& ADD_CACHE_PRETEND
;
649 int intent_only
= flags
& ADD_CACHE_INTENT
;
650 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
651 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
652 int newflags
= HASH_WRITE_OBJECT
;
654 if (flags
& HASH_RENORMALIZE
)
655 newflags
|= HASH_RENORMALIZE
;
657 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
658 return error("%s: can only add regular files, symbolic links or git-directories", path
);
660 namelen
= strlen(path
);
661 if (S_ISDIR(st_mode
)) {
662 while (namelen
&& path
[namelen
-1] == '/')
665 size
= cache_entry_size(namelen
);
666 ce
= xcalloc(1, size
);
667 memcpy(ce
->name
, path
, namelen
);
668 ce
->ce_namelen
= namelen
;
670 fill_stat_cache_info(ce
, st
);
672 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
675 if (trust_executable_bit
&& has_symlinks
) {
676 ce
->ce_mode
= create_ce_mode(st_mode
);
678 /* If there is an existing entry, pick the mode bits and type
679 * from it, otherwise assume unexecutable regular file.
681 struct cache_entry
*ent
;
682 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
684 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
685 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
688 /* When core.ignorecase=true, determine if a directory of the same name but differing
689 * case already exists within the Git repository. If it does, ensure the directory
690 * case of the file being added to the repository matches (is folded into) the existing
691 * entry's directory case.
694 adjust_dirname_case(istate
, ce
->name
);
696 if (!(flags
& HASH_RENORMALIZE
)) {
697 alias
= index_file_exists(istate
, ce
->name
,
698 ce_namelen(ce
), ignore_case
);
701 !ie_match_stat(istate
, alias
, st
, ce_option
)) {
702 /* Nothing changed, really */
703 if (!S_ISGITLINK(alias
->ce_mode
))
704 ce_mark_uptodate(alias
);
705 alias
->ce_flags
|= CE_ADDED
;
712 if (index_path(&ce
->oid
, path
, st
, newflags
)) {
714 return error("unable to index file %s", path
);
717 set_object_name_for_intent_to_add_entry(ce
);
719 if (ignore_case
&& alias
&& different_name(ce
, alias
))
720 ce
= create_alias_ce(istate
, ce
, alias
);
721 ce
->ce_flags
|= CE_ADDED
;
723 /* It was suspected to be racily clean, but it turns out to be Ok */
726 !oidcmp(&alias
->oid
, &ce
->oid
) &&
727 ce
->ce_mode
== alias
->ce_mode
);
731 else if (add_index_entry(istate
, ce
, add_option
)) {
733 return error("unable to add %s to index", path
);
735 if (verbose
&& !was_same
)
736 printf("add '%s'\n", path
);
740 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
743 if (lstat(path
, &st
))
744 die_errno("unable to stat '%s'", path
);
745 return add_to_index(istate
, path
, &st
, flags
);
748 struct cache_entry
*make_cache_entry(unsigned int mode
,
749 const unsigned char *sha1
, const char *path
, int stage
,
750 unsigned int refresh_options
)
753 struct cache_entry
*ce
, *ret
;
755 if (!verify_path(path
, mode
)) {
756 error("Invalid path '%s'", path
);
761 size
= cache_entry_size(len
);
762 ce
= xcalloc(1, size
);
764 hashcpy(ce
->oid
.hash
, sha1
);
765 memcpy(ce
->name
, path
, len
);
766 ce
->ce_flags
= create_ce_flags(stage
);
767 ce
->ce_namelen
= len
;
768 ce
->ce_mode
= create_ce_mode(mode
);
770 ret
= refresh_cache_entry(ce
, refresh_options
);
777 * Chmod an index entry with either +x or -x.
779 * Returns -1 if the chmod for the particular cache entry failed (if it's
780 * not a regular file), -2 if an invalid flip argument is passed in, 0
783 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
786 if (!S_ISREG(ce
->ce_mode
))
793 ce
->ce_mode
&= ~0111;
798 cache_tree_invalidate_path(istate
, ce
->name
);
799 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
800 mark_fsmonitor_invalid(istate
, ce
);
801 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
806 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
808 int len
= ce_namelen(a
);
809 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
813 * We fundamentally don't like some paths: we don't want
814 * dot or dot-dot anywhere, and for obvious reasons don't
815 * want to recurse into ".git" either.
817 * Also, we don't want double slashes or slashes at the
818 * end that can make pathnames ambiguous.
820 static int verify_dotfile(const char *rest
, unsigned mode
)
823 * The first character was '.', but that
824 * has already been discarded, we now test
828 /* "." is not allowed */
829 if (*rest
== '\0' || is_dir_sep(*rest
))
834 * ".git" followed by NUL or slash is bad. Note that we match
835 * case-insensitively here, even if ignore_case is not set.
836 * This outlaws ".GIT" everywhere out of an abundance of caution,
837 * since there's really no good reason to allow it.
839 * Once we've seen ".git", we can also find ".gitmodules", etc (also
840 * case-insensitively).
844 if (rest
[1] != 'i' && rest
[1] != 'I')
846 if (rest
[2] != 't' && rest
[2] != 'T')
848 if (rest
[3] == '\0' || is_dir_sep(rest
[3]))
852 if (skip_iprefix(rest
, "modules", &rest
) &&
853 (*rest
== '\0' || is_dir_sep(*rest
)))
858 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
864 int verify_path(const char *path
, unsigned mode
)
868 if (has_dos_drive_prefix(path
))
871 if (!is_valid_path(path
))
881 if (is_hfs_dotgit(path
))
884 if (is_hfs_dotgitmodules(path
))
889 if (is_ntfs_dotgit(path
))
892 if (is_ntfs_dotgitmodules(path
))
898 if ((c
== '.' && !verify_dotfile(path
, mode
)) ||
899 is_dir_sep(c
) || c
== '\0')
901 } else if (c
== '\\' && protect_ntfs
) {
902 if (is_ntfs_dotgit(path
))
905 if (is_ntfs_dotgitmodules(path
))
915 * Do we have another file that has the beginning components being a
916 * proper superset of the name we're trying to add?
918 static int has_file_name(struct index_state
*istate
,
919 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
922 int len
= ce_namelen(ce
);
923 int stage
= ce_stage(ce
);
924 const char *name
= ce
->name
;
926 while (pos
< istate
->cache_nr
) {
927 struct cache_entry
*p
= istate
->cache
[pos
++];
929 if (len
>= ce_namelen(p
))
931 if (memcmp(name
, p
->name
, len
))
933 if (ce_stage(p
) != stage
)
935 if (p
->name
[len
] != '/')
937 if (p
->ce_flags
& CE_REMOVE
)
942 remove_index_entry_at(istate
, --pos
);
949 * Like strcmp(), but also return the offset of the first change.
950 * If strings are equal, return the length.
952 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
957 return strcmp(s1
, s2
);
959 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
964 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
968 * Do we have another file with a pathname that is a proper
969 * subset of the name we're trying to add?
971 * That is, is there another file in the index with a path
972 * that matches a sub-directory in the given entry?
974 static int has_dir_name(struct index_state
*istate
,
975 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
978 int stage
= ce_stage(ce
);
979 const char *name
= ce
->name
;
980 const char *slash
= name
+ ce_namelen(ce
);
985 * We are frequently called during an iteration on a sorted
986 * list of pathnames and while building a new index. Therefore,
987 * there is a high probability that this entry will eventually
988 * be appended to the index, rather than inserted in the middle.
989 * If we can confirm that, we can avoid binary searches on the
990 * components of the pathname.
992 * Compare the entry's full path with the last path in the index.
994 if (istate
->cache_nr
> 0) {
995 cmp_last
= strcmp_offset(name
,
996 istate
->cache
[istate
->cache_nr
- 1]->name
,
999 if (len_eq_last
== 0) {
1001 * The entry sorts AFTER the last one in the
1002 * index and their paths have no common prefix,
1003 * so there cannot be a F/D conflict.
1008 * The entry sorts AFTER the last one in the
1009 * index, but has a common prefix. Fall through
1010 * to the loop below to disect the entry's path
1011 * and see where the difference is.
1014 } else if (cmp_last
== 0) {
1016 * The entry exactly matches the last one in the
1017 * index, but because of multiple stage and CE_REMOVE
1018 * items, we fall through and let the regular search
1028 if (*--slash
== '/')
1030 if (slash
<= ce
->name
)
1037 * (len + 1) is a directory boundary (including
1038 * the trailing slash). And since the loop is
1039 * decrementing "slash", the first iteration is
1040 * the longest directory prefix; subsequent
1041 * iterations consider parent directories.
1044 if (len
+ 1 <= len_eq_last
) {
1046 * The directory prefix (including the trailing
1047 * slash) also appears as a prefix in the last
1048 * entry, so the remainder cannot collide (because
1049 * strcmp said the whole path was greater).
1054 * LT: last: xxx/file_A
1060 if (len
> len_eq_last
) {
1062 * This part of the directory prefix (excluding
1063 * the trailing slash) is longer than the known
1064 * equal portions, so this sub-directory cannot
1065 * collide with a file.
1073 if (istate
->cache_nr
> 0 &&
1074 ce_namelen(istate
->cache
[istate
->cache_nr
- 1]) > len
) {
1076 * The directory prefix lines up with part of
1077 * a longer file or directory name, but sorts
1078 * after it, so this sub-directory cannot
1079 * collide with a file.
1081 * last: xxx/yy-file (because '-' sorts before '/')
1088 * This is a possible collision. Fall through and
1089 * let the regular search code handle it.
1096 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
1099 * Found one, but not so fast. This could
1100 * be a marker that says "I was here, but
1101 * I am being removed". Such an entry is
1102 * not a part of the resulting tree, and
1103 * it is Ok to have a directory at the same
1106 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
1110 remove_index_entry_at(istate
, pos
);
1118 * Trivial optimization: if we find an entry that
1119 * already matches the sub-directory, then we know
1120 * we're ok, and we can exit.
1122 while (pos
< istate
->cache_nr
) {
1123 struct cache_entry
*p
= istate
->cache
[pos
];
1124 if ((ce_namelen(p
) <= len
) ||
1125 (p
->name
[len
] != '/') ||
1126 memcmp(p
->name
, name
, len
))
1127 break; /* not our subdirectory */
1128 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1130 * p is at the same stage as our entry, and
1131 * is a subdirectory of what we are looking
1132 * at, so we cannot have conflicts at our
1133 * level or anything shorter.
1142 /* We may be in a situation where we already have path/file and path
1143 * is being added, or we already have path and path/file is being
1144 * added. Either one would result in a nonsense tree that has path
1145 * twice when git-write-tree tries to write it out. Prevent it.
1147 * If ok-to-replace is specified, we remove the conflicting entries
1148 * from the cache so the caller should recompute the insert position.
1149 * When this happens, we return non-zero.
1151 static int check_file_directory_conflict(struct index_state
*istate
,
1152 const struct cache_entry
*ce
,
1153 int pos
, int ok_to_replace
)
1158 * When ce is an "I am going away" entry, we allow it to be added
1160 if (ce
->ce_flags
& CE_REMOVE
)
1164 * We check if the path is a sub-path of a subsequent pathname
1165 * first, since removing those will not change the position
1168 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1171 * Then check if the path might have a clashing sub-directory
1174 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1177 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1180 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1181 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1182 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1183 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1185 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1186 cache_tree_invalidate_path(istate
, ce
->name
);
1189 * If this entry's path sorts after the last entry in the index,
1190 * we can avoid searching for it.
1192 if (istate
->cache_nr
> 0 &&
1193 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1194 pos
= -istate
->cache_nr
- 1;
1196 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1198 /* existing match? Just replace it. */
1201 replace_index_entry(istate
, pos
, ce
);
1206 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1207 untracked_cache_add_to_index(istate
, ce
->name
);
1210 * Inserting a merged entry ("stage 0") into the index
1211 * will always replace all non-merged entries..
1213 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1214 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1216 if (!remove_index_entry_at(istate
, pos
))
1223 if (!verify_path(ce
->name
, ce
->ce_mode
))
1224 return error("Invalid path '%s'", ce
->name
);
1226 if (!skip_df_check
&&
1227 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1229 return error("'%s' appears as both a file and as a directory",
1231 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1237 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1241 if (option
& ADD_CACHE_JUST_APPEND
)
1242 pos
= istate
->cache_nr
;
1245 ret
= add_index_entry_with_check(istate
, ce
, option
);
1251 /* Make sure the array is big enough .. */
1252 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1256 if (istate
->cache_nr
> pos
+ 1)
1257 MOVE_ARRAY(istate
->cache
+ pos
+ 1, istate
->cache
+ pos
,
1258 istate
->cache_nr
- pos
- 1);
1259 set_index_entry(istate
, pos
, ce
);
1260 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1265 * "refresh" does not calculate a new sha1 file or bring the
1266 * cache up-to-date for mode/content changes. But what it
1267 * _does_ do is to "re-match" the stat information of a file
1268 * with the cache, so that you can refresh the cache for a
1269 * file that hasn't been changed but where the stat entry is
1272 * For example, you'd want to do this after doing a "git-read-tree",
1273 * to link up the stat cache details with the proper files.
1275 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1276 struct cache_entry
*ce
,
1277 unsigned int options
, int *err
,
1281 struct cache_entry
*updated
;
1283 int refresh
= options
& CE_MATCH_REFRESH
;
1284 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1285 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1286 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1287 int ignore_fsmonitor
= options
& CE_MATCH_IGNORE_FSMONITOR
;
1289 if (!refresh
|| ce_uptodate(ce
))
1292 if (!ignore_fsmonitor
)
1293 refresh_fsmonitor(istate
);
1295 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1296 * that the change to the work tree does not matter and told
1299 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1300 ce_mark_uptodate(ce
);
1303 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1304 ce_mark_uptodate(ce
);
1307 if (!ignore_fsmonitor
&& (ce
->ce_flags
& CE_FSMONITOR_VALID
)) {
1308 ce_mark_uptodate(ce
);
1312 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1320 if (lstat(ce
->name
, &st
) < 0) {
1321 if (ignore_missing
&& errno
== ENOENT
)
1328 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1330 *changed_ret
= changed
;
1333 * The path is unchanged. If we were told to ignore
1334 * valid bit, then we did the actual stat check and
1335 * found that the entry is unmodified. If the entry
1336 * is not marked VALID, this is the place to mark it
1337 * valid again, under "assume unchanged" mode.
1339 if (ignore_valid
&& assume_unchanged
&&
1340 !(ce
->ce_flags
& CE_VALID
))
1341 ; /* mark this one VALID again */
1344 * We do not mark the index itself "modified"
1345 * because CE_UPTODATE flag is in-core only;
1346 * we are not going to write this change out.
1348 if (!S_ISGITLINK(ce
->ce_mode
)) {
1349 ce_mark_uptodate(ce
);
1350 mark_fsmonitor_valid(ce
);
1356 if (ie_modified(istate
, ce
, &st
, options
)) {
1363 updated
= xmalloc(size
);
1364 copy_cache_entry(updated
, ce
);
1365 memcpy(updated
->name
, ce
->name
, ce
->ce_namelen
+ 1);
1366 fill_stat_cache_info(updated
, &st
);
1368 * If ignore_valid is not set, we should leave CE_VALID bit
1369 * alone. Otherwise, paths marked with --no-assume-unchanged
1370 * (i.e. things to be edited) will reacquire CE_VALID bit
1371 * automatically, which is not really what we want.
1373 if (!ignore_valid
&& assume_unchanged
&&
1374 !(ce
->ce_flags
& CE_VALID
))
1375 updated
->ce_flags
&= ~CE_VALID
;
1377 /* istate->cache_changed is updated in the caller */
1381 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1382 int * first
, const char *header_msg
)
1384 if (in_porcelain
&& *first
&& header_msg
) {
1385 printf("%s\n", header_msg
);
1391 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1392 const struct pathspec
*pathspec
,
1393 char *seen
, const char *header_msg
)
1397 int really
= (flags
& REFRESH_REALLY
) != 0;
1398 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1399 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1400 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1401 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1403 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1404 unsigned int options
= (CE_MATCH_REFRESH
|
1405 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1406 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1407 const char *modified_fmt
;
1408 const char *deleted_fmt
;
1409 const char *typechange_fmt
;
1410 const char *added_fmt
;
1411 const char *unmerged_fmt
;
1412 uint64_t start
= getnanotime();
1414 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1415 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1416 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1417 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1418 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1419 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1420 struct cache_entry
*ce
, *new_entry
;
1421 int cache_errno
= 0;
1425 ce
= istate
->cache
[i
];
1426 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1429 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1433 while ((i
< istate
->cache_nr
) &&
1434 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1440 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1441 &first
, header_msg
);
1449 new_entry
= refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1450 if (new_entry
== ce
)
1455 if (really
&& cache_errno
== EINVAL
) {
1456 /* If we are doing --really-refresh that
1457 * means the index is not valid anymore.
1459 ce
->ce_flags
&= ~CE_VALID
;
1460 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1461 mark_fsmonitor_invalid(istate
, ce
);
1462 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1467 if (cache_errno
== ENOENT
)
1469 else if (ce_intent_to_add(ce
))
1470 fmt
= added_fmt
; /* must be before other checks */
1471 else if (changed
& TYPE_CHANGED
)
1472 fmt
= typechange_fmt
;
1476 ce
->name
, in_porcelain
, &first
, header_msg
);
1481 replace_index_entry(istate
, i
, new_entry
);
1483 trace_performance_since(start
, "refresh index");
1487 struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1488 unsigned int options
)
1490 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1494 /*****************************************************************
1496 *****************************************************************/
1498 #define INDEX_FORMAT_DEFAULT 3
1500 static unsigned int get_index_format_default(void)
1502 char *envversion
= getenv("GIT_INDEX_VERSION");
1505 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1508 if (!git_config_get_int("index.version", &value
))
1510 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1511 warning(_("index.version set, but the value is invalid.\n"
1512 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1513 return INDEX_FORMAT_DEFAULT
;
1518 version
= strtoul(envversion
, &endp
, 10);
1520 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1521 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1522 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1523 version
= INDEX_FORMAT_DEFAULT
;
1529 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1530 * Again - this is just a (very strong in practice) heuristic that
1531 * the inode hasn't changed.
1533 * We save the fields in big-endian order to allow using the
1534 * index file over NFS transparently.
1536 struct ondisk_cache_entry
{
1537 struct cache_time ctime
;
1538 struct cache_time mtime
;
1545 unsigned char sha1
[20];
1547 char name
[FLEX_ARRAY
]; /* more */
1551 * This struct is used when CE_EXTENDED bit is 1
1552 * The struct must match ondisk_cache_entry exactly from
1555 struct ondisk_cache_entry_extended
{
1556 struct cache_time ctime
;
1557 struct cache_time mtime
;
1564 unsigned char sha1
[20];
1567 char name
[FLEX_ARRAY
]; /* more */
1570 /* These are only used for v3 or lower */
1571 #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
1572 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1573 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1574 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1575 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1576 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1577 ondisk_cache_entry_size(ce_namelen(ce)))
1579 /* Allow fsck to force verification of the index checksum. */
1580 int verify_index_checksum
;
1582 /* Allow fsck to force verification of the cache entry order. */
1583 int verify_ce_order
;
1585 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1588 unsigned char hash
[GIT_MAX_RAWSZ
];
1591 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1592 return error("bad signature");
1593 hdr_version
= ntohl(hdr
->hdr_version
);
1594 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1595 return error("bad index version %d", hdr_version
);
1597 if (!verify_index_checksum
)
1600 the_hash_algo
->init_fn(&c
);
1601 the_hash_algo
->update_fn(&c
, hdr
, size
- the_hash_algo
->rawsz
);
1602 the_hash_algo
->final_fn(hash
, &c
);
1603 if (hashcmp(hash
, (unsigned char *)hdr
+ size
- the_hash_algo
->rawsz
))
1604 return error("bad index file sha1 signature");
1608 static int read_index_extension(struct index_state
*istate
,
1609 const char *ext
, void *data
, unsigned long sz
)
1611 switch (CACHE_EXT(ext
)) {
1612 case CACHE_EXT_TREE
:
1613 istate
->cache_tree
= cache_tree_read(data
, sz
);
1615 case CACHE_EXT_RESOLVE_UNDO
:
1616 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1618 case CACHE_EXT_LINK
:
1619 if (read_link_extension(istate
, data
, sz
))
1622 case CACHE_EXT_UNTRACKED
:
1623 istate
->untracked
= read_untracked_extension(data
, sz
);
1625 case CACHE_EXT_FSMONITOR
:
1626 read_fsmonitor_extension(istate
, data
, sz
);
1629 if (*ext
< 'A' || 'Z' < *ext
)
1630 return error("index uses %.4s extension, which we do not understand",
1632 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1638 int hold_locked_index(struct lock_file
*lk
, int lock_flags
)
1640 return hold_lock_file_for_update(lk
, get_index_file(), lock_flags
);
1643 int read_index(struct index_state
*istate
)
1645 return read_index_from(istate
, get_index_file(), get_git_dir());
1648 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1653 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1655 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1656 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1657 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1658 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1659 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1660 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1661 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1662 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1663 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1664 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1665 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1666 ce
->ce_namelen
= len
;
1668 hashcpy(ce
->oid
.hash
, ondisk
->sha1
);
1669 memcpy(ce
->name
, name
, len
);
1670 ce
->name
[len
] = '\0';
1675 * Adjacent cache entries tend to share the leading paths, so it makes
1676 * sense to only store the differences in later entries. In the v4
1677 * on-disk format of the index, each on-disk cache entry stores the
1678 * number of bytes to be stripped from the end of the previous name,
1679 * and the bytes to append to the result, to come up with its name.
1681 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1683 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1684 size_t len
= decode_varint(&cp
);
1686 if (name
->len
< len
)
1687 die("malformed name field in the index");
1688 strbuf_remove(name
, name
->len
- len
, len
);
1689 for (ep
= cp
; *ep
; ep
++)
1690 ; /* find the end */
1691 strbuf_add(name
, cp
, ep
- cp
);
1692 return (const char *)ep
+ 1 - cp_
;
1695 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1696 unsigned long *ent_size
,
1697 struct strbuf
*previous_name
)
1699 struct cache_entry
*ce
;
1704 /* On-disk flags are just 16 bits */
1705 flags
= get_be16(&ondisk
->flags
);
1706 len
= flags
& CE_NAMEMASK
;
1708 if (flags
& CE_EXTENDED
) {
1709 struct ondisk_cache_entry_extended
*ondisk2
;
1711 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1712 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1713 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1714 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1715 die("Unknown index entry format %08x", extended_flags
);
1716 flags
|= extended_flags
;
1717 name
= ondisk2
->name
;
1720 name
= ondisk
->name
;
1722 if (!previous_name
) {
1723 /* v3 and earlier */
1724 if (len
== CE_NAMEMASK
)
1726 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1728 *ent_size
= ondisk_ce_size(ce
);
1730 unsigned long consumed
;
1731 consumed
= expand_name_field(previous_name
, name
);
1732 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1734 previous_name
->len
);
1736 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1741 static void check_ce_order(struct index_state
*istate
)
1745 if (!verify_ce_order
)
1748 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1749 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1750 struct cache_entry
*next_ce
= istate
->cache
[i
];
1751 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1753 if (0 < name_compare
)
1754 die("unordered stage entries in index");
1755 if (!name_compare
) {
1757 die("multiple stage entries for merged file '%s'",
1759 if (ce_stage(ce
) > ce_stage(next_ce
))
1760 die("unordered stage entries for '%s'",
1766 static void tweak_untracked_cache(struct index_state
*istate
)
1768 switch (git_config_get_untracked_cache()) {
1769 case -1: /* keep: do nothing */
1772 remove_untracked_cache(istate
);
1775 add_untracked_cache(istate
);
1777 default: /* unknown value: do nothing */
1782 static void tweak_split_index(struct index_state
*istate
)
1784 switch (git_config_get_split_index()) {
1785 case -1: /* unset: do nothing */
1788 remove_split_index(istate
);
1791 add_split_index(istate
);
1793 default: /* unknown value: do nothing */
1798 static void post_read_index_from(struct index_state
*istate
)
1800 check_ce_order(istate
);
1801 tweak_untracked_cache(istate
);
1802 tweak_split_index(istate
);
1803 tweak_fsmonitor(istate
);
1806 /* remember to discard_cache() before reading a different cache! */
1807 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1811 unsigned long src_offset
;
1812 struct cache_header
*hdr
;
1815 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1817 if (istate
->initialized
)
1818 return istate
->cache_nr
;
1820 istate
->timestamp
.sec
= 0;
1821 istate
->timestamp
.nsec
= 0;
1822 fd
= open(path
, O_RDONLY
);
1824 if (!must_exist
&& errno
== ENOENT
)
1826 die_errno("%s: index file open failed", path
);
1830 die_errno("cannot stat the open index");
1832 mmap_size
= xsize_t(st
.st_size
);
1833 if (mmap_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
1834 die("index file smaller than expected");
1836 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1837 if (mmap
== MAP_FAILED
)
1838 die_errno("unable to map index file");
1842 if (verify_hdr(hdr
, mmap_size
) < 0)
1845 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- the_hash_algo
->rawsz
);
1846 istate
->version
= ntohl(hdr
->hdr_version
);
1847 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1848 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1849 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1850 istate
->initialized
= 1;
1852 if (istate
->version
== 4)
1853 previous_name
= &previous_name_buf
;
1855 previous_name
= NULL
;
1857 src_offset
= sizeof(*hdr
);
1858 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1859 struct ondisk_cache_entry
*disk_ce
;
1860 struct cache_entry
*ce
;
1861 unsigned long consumed
;
1863 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1864 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1865 set_index_entry(istate
, i
, ce
);
1867 src_offset
+= consumed
;
1869 strbuf_release(&previous_name_buf
);
1870 istate
->timestamp
.sec
= st
.st_mtime
;
1871 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1873 while (src_offset
<= mmap_size
- the_hash_algo
->rawsz
- 8) {
1874 /* After an array of active_nr index entries,
1875 * there can be arbitrary number of extended
1876 * sections, each of which is prefixed with
1877 * extension name (4-byte) and section length
1878 * in 4-byte network byte order.
1881 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1882 extsize
= ntohl(extsize
);
1883 if (read_index_extension(istate
,
1884 (const char *) mmap
+ src_offset
,
1885 (char *) mmap
+ src_offset
+ 8,
1889 src_offset
+= extsize
;
1891 munmap(mmap
, mmap_size
);
1892 return istate
->cache_nr
;
1895 munmap(mmap
, mmap_size
);
1896 die("index file corrupt");
1900 * Signal that the shared index is used by updating its mtime.
1902 * This way, shared index can be removed if they have not been used
1905 static void freshen_shared_index(const char *shared_index
, int warn
)
1907 if (!check_and_freshen_file(shared_index
, 1) && warn
)
1908 warning("could not freshen shared index '%s'", shared_index
);
1911 int read_index_from(struct index_state
*istate
, const char *path
,
1914 uint64_t start
= getnanotime();
1915 struct split_index
*split_index
;
1917 char *base_sha1_hex
;
1920 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1921 if (istate
->initialized
)
1922 return istate
->cache_nr
;
1924 ret
= do_read_index(istate
, path
, 0);
1925 trace_performance_since(start
, "read cache %s", path
);
1927 split_index
= istate
->split_index
;
1928 if (!split_index
|| is_null_sha1(split_index
->base_sha1
)) {
1929 post_read_index_from(istate
);
1933 if (split_index
->base
)
1934 discard_index(split_index
->base
);
1936 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1938 base_sha1_hex
= sha1_to_hex(split_index
->base_sha1
);
1939 base_path
= xstrfmt("%s/sharedindex.%s", gitdir
, base_sha1_hex
);
1940 ret
= do_read_index(split_index
->base
, base_path
, 1);
1941 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1942 die("broken index, expect %s in %s, got %s",
1943 base_sha1_hex
, base_path
,
1944 sha1_to_hex(split_index
->base
->sha1
));
1946 freshen_shared_index(base_path
, 0);
1947 merge_base_index(istate
);
1948 post_read_index_from(istate
);
1949 trace_performance_since(start
, "read cache %s", base_path
);
1954 int is_index_unborn(struct index_state
*istate
)
1956 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1959 int discard_index(struct index_state
*istate
)
1963 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1964 if (istate
->cache
[i
]->index
&&
1965 istate
->split_index
&&
1966 istate
->split_index
->base
&&
1967 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1968 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1970 free(istate
->cache
[i
]);
1972 resolve_undo_clear_index(istate
);
1973 istate
->cache_nr
= 0;
1974 istate
->cache_changed
= 0;
1975 istate
->timestamp
.sec
= 0;
1976 istate
->timestamp
.nsec
= 0;
1977 free_name_hash(istate
);
1978 cache_tree_free(&(istate
->cache_tree
));
1979 istate
->initialized
= 0;
1980 FREE_AND_NULL(istate
->cache
);
1981 istate
->cache_alloc
= 0;
1982 discard_split_index(istate
);
1983 free_untracked_cache(istate
->untracked
);
1984 istate
->untracked
= NULL
;
1988 int unmerged_index(const struct index_state
*istate
)
1991 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1992 if (ce_stage(istate
->cache
[i
]))
1998 #define WRITE_BUFFER_SIZE 8192
1999 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
2000 static unsigned long write_buffer_len
;
2002 static int ce_write_flush(git_hash_ctx
*context
, int fd
)
2004 unsigned int buffered
= write_buffer_len
;
2006 the_hash_algo
->update_fn(context
, write_buffer
, buffered
);
2007 if (write_in_full(fd
, write_buffer
, buffered
) < 0)
2009 write_buffer_len
= 0;
2014 static int ce_write(git_hash_ctx
*context
, int fd
, void *data
, unsigned int len
)
2017 unsigned int buffered
= write_buffer_len
;
2018 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
2021 memcpy(write_buffer
+ buffered
, data
, partial
);
2022 buffered
+= partial
;
2023 if (buffered
== WRITE_BUFFER_SIZE
) {
2024 write_buffer_len
= buffered
;
2025 if (ce_write_flush(context
, fd
))
2029 write_buffer_len
= buffered
;
2031 data
= (char *) data
+ partial
;
2036 static int write_index_ext_header(git_hash_ctx
*context
, int fd
,
2037 unsigned int ext
, unsigned int sz
)
2041 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
2042 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
2045 static int ce_flush(git_hash_ctx
*context
, int fd
, unsigned char *hash
)
2047 unsigned int left
= write_buffer_len
;
2050 write_buffer_len
= 0;
2051 the_hash_algo
->update_fn(context
, write_buffer
, left
);
2054 /* Flush first if not enough space for hash signature */
2055 if (left
+ the_hash_algo
->rawsz
> WRITE_BUFFER_SIZE
) {
2056 if (write_in_full(fd
, write_buffer
, left
) < 0)
2061 /* Append the hash signature at the end */
2062 the_hash_algo
->final_fn(write_buffer
+ left
, context
);
2063 hashcpy(hash
, write_buffer
+ left
);
2064 left
+= the_hash_algo
->rawsz
;
2065 return (write_in_full(fd
, write_buffer
, left
) < 0) ? -1 : 0;
2068 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
2071 * The only thing we care about in this function is to smudge the
2072 * falsely clean entry due to touch-update-touch race, so we leave
2073 * everything else as they are. We are called for entries whose
2074 * ce_stat_data.sd_mtime match the index file mtime.
2076 * Note that this actually does not do much for gitlinks, for
2077 * which ce_match_stat_basic() always goes to the actual
2078 * contents. The caller checks with is_racy_timestamp() which
2079 * always says "no" for gitlinks, so we are not called for them ;-)
2083 if (lstat(ce
->name
, &st
) < 0)
2085 if (ce_match_stat_basic(ce
, &st
))
2087 if (ce_modified_check_fs(ce
, &st
)) {
2088 /* This is "racily clean"; smudge it. Note that this
2089 * is a tricky code. At first glance, it may appear
2090 * that it can break with this sequence:
2092 * $ echo xyzzy >frotz
2093 * $ git-update-index --add frotz
2096 * $ echo filfre >nitfol
2097 * $ git-update-index --add nitfol
2099 * but it does not. When the second update-index runs,
2100 * it notices that the entry "frotz" has the same timestamp
2101 * as index, and if we were to smudge it by resetting its
2102 * size to zero here, then the object name recorded
2103 * in index is the 6-byte file but the cached stat information
2104 * becomes zero --- which would then match what we would
2105 * obtain from the filesystem next time we stat("frotz").
2107 * However, the second update-index, before calling
2108 * this function, notices that the cached size is 6
2109 * bytes and what is on the filesystem is an empty
2110 * file, and never calls us, so the cached size information
2111 * for "frotz" stays 6 which does not match the filesystem.
2113 ce
->ce_stat_data
.sd_size
= 0;
2117 /* Copy miscellaneous fields but not the name */
2118 static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
2119 struct cache_entry
*ce
)
2123 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
2124 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
2125 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
2126 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
2127 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
2128 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
2129 ondisk
->mode
= htonl(ce
->ce_mode
);
2130 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
2131 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
2132 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
2133 hashcpy(ondisk
->sha1
, ce
->oid
.hash
);
2135 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
2136 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
2137 ondisk
->flags
= htons(flags
);
2138 if (ce
->ce_flags
& CE_EXTENDED
) {
2139 struct ondisk_cache_entry_extended
*ondisk2
;
2140 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
2141 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
2145 static int ce_write_entry(git_hash_ctx
*c
, int fd
, struct cache_entry
*ce
,
2146 struct strbuf
*previous_name
, struct ondisk_cache_entry
*ondisk
)
2150 unsigned int saved_namelen
;
2151 int stripped_name
= 0;
2152 static unsigned char padding
[8] = { 0x00 };
2154 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2155 saved_namelen
= ce_namelen(ce
);
2160 if (ce
->ce_flags
& CE_EXTENDED
)
2161 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
2163 size
= offsetof(struct ondisk_cache_entry
, name
);
2165 if (!previous_name
) {
2166 int len
= ce_namelen(ce
);
2167 copy_cache_entry_to_ondisk(ondisk
, ce
);
2168 result
= ce_write(c
, fd
, ondisk
, size
);
2170 result
= ce_write(c
, fd
, ce
->name
, len
);
2172 result
= ce_write(c
, fd
, padding
, align_padding_size(size
, len
));
2174 int common
, to_remove
, prefix_size
;
2175 unsigned char to_remove_vi
[16];
2177 (ce
->name
[common
] &&
2178 common
< previous_name
->len
&&
2179 ce
->name
[common
] == previous_name
->buf
[common
]);
2181 ; /* still matching */
2182 to_remove
= previous_name
->len
- common
;
2183 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2185 copy_cache_entry_to_ondisk(ondisk
, ce
);
2186 result
= ce_write(c
, fd
, ondisk
, size
);
2188 result
= ce_write(c
, fd
, to_remove_vi
, prefix_size
);
2190 result
= ce_write(c
, fd
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2192 result
= ce_write(c
, fd
, padding
, 1);
2194 strbuf_splice(previous_name
, common
, to_remove
,
2195 ce
->name
+ common
, ce_namelen(ce
) - common
);
2197 if (stripped_name
) {
2198 ce
->ce_namelen
= saved_namelen
;
2199 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2206 * This function verifies if index_state has the correct sha1 of the
2207 * index file. Don't die if we have any other failure, just return 0.
2209 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2214 unsigned char hash
[GIT_MAX_RAWSZ
];
2216 if (!istate
->initialized
)
2219 fd
= open(path
, O_RDONLY
);
2226 if (st
.st_size
< sizeof(struct cache_header
) + the_hash_algo
->rawsz
)
2229 n
= pread_in_full(fd
, hash
, the_hash_algo
->rawsz
, st
.st_size
- the_hash_algo
->rawsz
);
2230 if (n
!= the_hash_algo
->rawsz
)
2233 if (hashcmp(istate
->sha1
, hash
))
2244 static int verify_index(const struct index_state
*istate
)
2246 return verify_index_from(istate
, get_index_file());
2249 static int has_racy_timestamp(struct index_state
*istate
)
2251 int entries
= istate
->cache_nr
;
2254 for (i
= 0; i
< entries
; i
++) {
2255 struct cache_entry
*ce
= istate
->cache
[i
];
2256 if (is_racy_timestamp(istate
, ce
))
2262 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
2264 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
2265 verify_index(istate
))
2266 write_locked_index(istate
, lockfile
, COMMIT_LOCK
);
2268 rollback_lock_file(lockfile
);
2272 * On success, `tempfile` is closed. If it is the temporary file
2273 * of a `struct lock_file`, we will therefore effectively perform
2274 * a 'close_lock_file_gently()`. Since that is an implementation
2275 * detail of lockfiles, callers of `do_write_index()` should not
2278 static int do_write_index(struct index_state
*istate
, struct tempfile
*tempfile
,
2279 int strip_extensions
)
2281 uint64_t start
= getnanotime();
2282 int newfd
= tempfile
->fd
;
2284 struct cache_header hdr
;
2285 int i
, err
= 0, removed
, extended
, hdr_version
;
2286 struct cache_entry
**cache
= istate
->cache
;
2287 int entries
= istate
->cache_nr
;
2289 struct ondisk_cache_entry_extended ondisk
;
2290 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2291 int drop_cache_tree
= istate
->drop_cache_tree
;
2293 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2294 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2297 /* reduce extended entries if possible */
2298 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2299 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2301 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2305 if (!istate
->version
) {
2306 istate
->version
= get_index_format_default();
2307 if (getenv("GIT_TEST_SPLIT_INDEX"))
2308 init_split_index(istate
);
2311 /* demote version 3 to version 2 when the latter suffices */
2312 if (istate
->version
== 3 || istate
->version
== 2)
2313 istate
->version
= extended
? 3 : 2;
2315 hdr_version
= istate
->version
;
2317 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2318 hdr
.hdr_version
= htonl(hdr_version
);
2319 hdr
.hdr_entries
= htonl(entries
- removed
);
2321 the_hash_algo
->init_fn(&c
);
2322 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2325 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2327 for (i
= 0; i
< entries
; i
++) {
2328 struct cache_entry
*ce
= cache
[i
];
2329 if (ce
->ce_flags
& CE_REMOVE
)
2331 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2332 ce_smudge_racily_clean_entry(ce
);
2333 if (is_null_oid(&ce
->oid
)) {
2334 static const char msg
[] = "cache entry has null sha1: %s";
2335 static int allow
= -1;
2338 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2340 warning(msg
, ce
->name
);
2342 err
= error(msg
, ce
->name
);
2344 drop_cache_tree
= 1;
2346 if (ce_write_entry(&c
, newfd
, ce
, previous_name
, (struct ondisk_cache_entry
*)&ondisk
) < 0)
2352 strbuf_release(&previous_name_buf
);
2357 /* Write extension data here */
2358 if (!strip_extensions
&& istate
->split_index
) {
2359 struct strbuf sb
= STRBUF_INIT
;
2361 err
= write_link_extension(&sb
, istate
) < 0 ||
2362 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
2364 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2365 strbuf_release(&sb
);
2369 if (!strip_extensions
&& !drop_cache_tree
&& istate
->cache_tree
) {
2370 struct strbuf sb
= STRBUF_INIT
;
2372 cache_tree_write(&sb
, istate
->cache_tree
);
2373 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2374 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2375 strbuf_release(&sb
);
2379 if (!strip_extensions
&& istate
->resolve_undo
) {
2380 struct strbuf sb
= STRBUF_INIT
;
2382 resolve_undo_write(&sb
, istate
->resolve_undo
);
2383 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2385 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2386 strbuf_release(&sb
);
2390 if (!strip_extensions
&& istate
->untracked
) {
2391 struct strbuf sb
= STRBUF_INIT
;
2393 write_untracked_extension(&sb
, istate
->untracked
);
2394 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_UNTRACKED
,
2396 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2397 strbuf_release(&sb
);
2401 if (!strip_extensions
&& istate
->fsmonitor_last_update
) {
2402 struct strbuf sb
= STRBUF_INIT
;
2404 write_fsmonitor_extension(&sb
, istate
);
2405 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_FSMONITOR
, sb
.len
) < 0
2406 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2407 strbuf_release(&sb
);
2412 if (ce_flush(&c
, newfd
, istate
->sha1
))
2414 if (close_tempfile_gently(tempfile
)) {
2415 error(_("could not close '%s'"), tempfile
->filename
.buf
);
2418 if (stat(tempfile
->filename
.buf
, &st
))
2420 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2421 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2422 trace_performance_since(start
, "write index, changed mask = %x", istate
->cache_changed
);
2426 void set_alternate_index_output(const char *name
)
2428 alternate_index_output
= name
;
2431 static int commit_locked_index(struct lock_file
*lk
)
2433 if (alternate_index_output
)
2434 return commit_lock_file_to(lk
, alternate_index_output
);
2436 return commit_lock_file(lk
);
2439 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2442 int ret
= do_write_index(istate
, lock
->tempfile
, 0);
2445 if (flags
& COMMIT_LOCK
)
2446 return commit_locked_index(lock
);
2447 return close_lock_file_gently(lock
);
2450 static int write_split_index(struct index_state
*istate
,
2451 struct lock_file
*lock
,
2455 prepare_to_write_split_index(istate
);
2456 ret
= do_write_locked_index(istate
, lock
, flags
);
2457 finish_writing_split_index(istate
);
2461 static const char *shared_index_expire
= "2.weeks.ago";
2463 static unsigned long get_shared_index_expire_date(void)
2465 static unsigned long shared_index_expire_date
;
2466 static int shared_index_expire_date_prepared
;
2468 if (!shared_index_expire_date_prepared
) {
2469 git_config_get_expiry("splitindex.sharedindexexpire",
2470 &shared_index_expire
);
2471 shared_index_expire_date
= approxidate(shared_index_expire
);
2472 shared_index_expire_date_prepared
= 1;
2475 return shared_index_expire_date
;
2478 static int should_delete_shared_index(const char *shared_index_path
)
2481 unsigned long expiration
;
2483 /* Check timestamp */
2484 expiration
= get_shared_index_expire_date();
2487 if (stat(shared_index_path
, &st
))
2488 return error_errno(_("could not stat '%s'"), shared_index_path
);
2489 if (st
.st_mtime
> expiration
)
2495 static int clean_shared_index_files(const char *current_hex
)
2498 DIR *dir
= opendir(get_git_dir());
2501 return error_errno(_("unable to open git dir: %s"), get_git_dir());
2503 while ((de
= readdir(dir
)) != NULL
) {
2504 const char *sha1_hex
;
2505 const char *shared_index_path
;
2506 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
2508 if (!strcmp(sha1_hex
, current_hex
))
2510 shared_index_path
= git_path("%s", de
->d_name
);
2511 if (should_delete_shared_index(shared_index_path
) > 0 &&
2512 unlink(shared_index_path
))
2513 warning_errno(_("unable to unlink: %s"), shared_index_path
);
2520 static int write_shared_index(struct index_state
*istate
,
2521 struct tempfile
**temp
)
2523 struct split_index
*si
= istate
->split_index
;
2526 move_cache_to_base_index(istate
);
2527 ret
= do_write_index(si
->base
, *temp
, 1);
2530 ret
= adjust_shared_perm(get_tempfile_path(*temp
));
2532 error("cannot fix permission bits on %s", get_tempfile_path(*temp
));
2535 ret
= rename_tempfile(temp
,
2536 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2538 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2539 clean_shared_index_files(sha1_to_hex(si
->base
->sha1
));
2545 static const int default_max_percent_split_change
= 20;
2547 static int too_many_not_shared_entries(struct index_state
*istate
)
2549 int i
, not_shared
= 0;
2550 int max_split
= git_config_get_max_percent_split_change();
2552 switch (max_split
) {
2554 /* not or badly configured: use the default value */
2555 max_split
= default_max_percent_split_change
;
2558 return 1; /* 0% means always write a new shared index */
2560 return 0; /* 100% means never write a new shared index */
2562 break; /* just use the configured value */
2565 /* Count not shared entries */
2566 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2567 struct cache_entry
*ce
= istate
->cache
[i
];
2572 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
2575 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2578 int new_shared_index
, ret
;
2579 struct split_index
*si
= istate
->split_index
;
2581 if ((flags
& SKIP_IF_UNCHANGED
) && !istate
->cache_changed
) {
2582 if (flags
& COMMIT_LOCK
)
2583 rollback_lock_file(lock
);
2587 if (istate
->fsmonitor_last_update
)
2588 fill_fsmonitor_bitmap(istate
);
2590 if (!si
|| alternate_index_output
||
2591 (istate
->cache_changed
& ~EXTMASK
)) {
2593 hashclr(si
->base_sha1
);
2594 ret
= do_write_locked_index(istate
, lock
, flags
);
2598 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2599 int v
= si
->base_sha1
[0];
2601 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2603 if (too_many_not_shared_entries(istate
))
2604 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2606 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
2608 if (new_shared_index
) {
2609 struct tempfile
*temp
;
2612 temp
= mks_tempfile(git_path("sharedindex_XXXXXX"));
2614 hashclr(si
->base_sha1
);
2615 ret
= do_write_locked_index(istate
, lock
, flags
);
2618 ret
= write_shared_index(istate
, &temp
);
2620 saved_errno
= errno
;
2621 if (is_tempfile_active(temp
))
2622 delete_tempfile(&temp
);
2623 errno
= saved_errno
;
2629 ret
= write_split_index(istate
, lock
, flags
);
2631 /* Freshen the shared index only if the split-index was written */
2632 if (!ret
&& !new_shared_index
) {
2633 const char *shared_index
= git_path("sharedindex.%s",
2634 sha1_to_hex(si
->base_sha1
));
2635 freshen_shared_index(shared_index
, 1);
2639 if (flags
& COMMIT_LOCK
)
2640 rollback_lock_file(lock
);
2645 * Read the index file that is potentially unmerged into given
2646 * index_state, dropping any unmerged entries. Returns true if
2647 * the index is unmerged. Callers who want to refuse to work
2648 * from an unmerged state can call this and check its return value,
2649 * instead of calling read_cache().
2651 int read_index_unmerged(struct index_state
*istate
)
2657 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2658 struct cache_entry
*ce
= istate
->cache
[i
];
2659 struct cache_entry
*new_ce
;
2665 len
= ce_namelen(ce
);
2666 size
= cache_entry_size(len
);
2667 new_ce
= xcalloc(1, size
);
2668 memcpy(new_ce
->name
, ce
->name
, len
);
2669 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2670 new_ce
->ce_namelen
= len
;
2671 new_ce
->ce_mode
= ce
->ce_mode
;
2672 if (add_index_entry(istate
, new_ce
, 0))
2673 return error("%s: cannot drop to stage #0",
2680 * Returns 1 if the path is an "other" path with respect to
2681 * the index; that is, the path is not mentioned in the index at all,
2682 * either as a file, a directory with some files in the index,
2683 * or as an unmerged entry.
2685 * We helpfully remove a trailing "/" from directories so that
2686 * the output of read_directory can be used as-is.
2688 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2692 if (namelen
&& name
[namelen
- 1] == '/')
2694 pos
= index_name_pos(istate
, name
, namelen
);
2696 return 0; /* exact match */
2698 if (pos
< istate
->cache_nr
) {
2699 struct cache_entry
*ce
= istate
->cache
[pos
];
2700 if (ce_namelen(ce
) == namelen
&&
2701 !memcmp(ce
->name
, name
, namelen
))
2702 return 0; /* Yup, this one exists unmerged */
2707 void *read_blob_data_from_index(const struct index_state
*istate
,
2708 const char *path
, unsigned long *size
)
2712 enum object_type type
;
2716 pos
= index_name_pos(istate
, path
, len
);
2719 * We might be in the middle of a merge, in which
2720 * case we would read stage #2 (ours).
2724 (pos
< 0 && i
< istate
->cache_nr
&&
2725 !strcmp(istate
->cache
[i
]->name
, path
));
2727 if (ce_stage(istate
->cache
[i
]) == 2)
2732 data
= read_sha1_file(istate
->cache
[pos
]->oid
.hash
, &type
, &sz
);
2733 if (!data
|| type
!= OBJ_BLOB
) {
2742 void stat_validity_clear(struct stat_validity
*sv
)
2744 FREE_AND_NULL(sv
->sd
);
2747 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2751 if (stat(path
, &st
) < 0)
2752 return sv
->sd
== NULL
;
2755 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2758 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2762 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2763 stat_validity_clear(sv
);
2766 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2767 fill_stat_data(sv
->sd
, &st
);
2771 void move_index_extensions(struct index_state
*dst
, struct index_state
*src
)
2773 dst
->untracked
= src
->untracked
;
2774 src
->untracked
= NULL
;