2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
10 #include "cache-tree.h"
16 #include "resolve-undo.h"
19 #include "split-index.h"
22 /* Mask for the name length in ce_flags in the on-disk index */
24 #define CE_NAMEMASK (0x0fff)
28 * The first letter should be 'A'..'Z' for extensions that are not
29 * necessary for a correct operation (i.e. optimization data).
30 * When new extensions are added that _needs_ to be understood in
31 * order to correctly interpret the index file, pick character that
32 * is outside the range, to cause the reader to abort.
35 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
36 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
37 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
38 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
39 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
41 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
42 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
43 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
44 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED)
46 struct index_state the_index
;
47 static const char *alternate_index_output
;
49 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
51 istate
->cache
[nr
] = ce
;
52 add_name_hash(istate
, ce
);
55 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
57 struct cache_entry
*old
= istate
->cache
[nr
];
59 replace_index_entry_in_base(istate
, old
, ce
);
60 remove_name_hash(istate
, old
);
62 set_index_entry(istate
, nr
, ce
);
63 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
64 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
67 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
69 struct cache_entry
*old
= istate
->cache
[nr
], *new;
70 int namelen
= strlen(new_name
);
72 new = xmalloc(cache_entry_size(namelen
));
73 copy_cache_entry(new, old
);
74 new->ce_flags
&= ~CE_HASHED
;
75 new->ce_namelen
= namelen
;
77 memcpy(new->name
, new_name
, namelen
+ 1);
79 cache_tree_invalidate_path(istate
, old
->name
);
80 untracked_cache_remove_from_index(istate
, old
->name
);
81 remove_index_entry_at(istate
, nr
);
82 add_index_entry(istate
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
85 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
87 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
88 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
89 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
90 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
91 sd
->sd_dev
= st
->st_dev
;
92 sd
->sd_ino
= st
->st_ino
;
93 sd
->sd_uid
= st
->st_uid
;
94 sd
->sd_gid
= st
->st_gid
;
95 sd
->sd_size
= st
->st_size
;
98 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
102 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
103 changed
|= MTIME_CHANGED
;
104 if (trust_ctime
&& check_stat
&&
105 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
106 changed
|= CTIME_CHANGED
;
109 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
110 changed
|= MTIME_CHANGED
;
111 if (trust_ctime
&& check_stat
&&
112 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
113 changed
|= CTIME_CHANGED
;
117 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
118 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
119 changed
|= OWNER_CHANGED
;
120 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
121 changed
|= INODE_CHANGED
;
126 * st_dev breaks on network filesystems where different
127 * clients will have different views of what "device"
128 * the filesystem is on
130 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
131 changed
|= INODE_CHANGED
;
134 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
135 changed
|= DATA_CHANGED
;
141 * This only updates the "non-critical" parts of the directory
142 * cache, ie the parts that aren't tracked by GIT, and only used
143 * to validate the cache.
145 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
147 fill_stat_data(&ce
->ce_stat_data
, st
);
149 if (assume_unchanged
)
150 ce
->ce_flags
|= CE_VALID
;
152 if (S_ISREG(st
->st_mode
))
153 ce_mark_uptodate(ce
);
156 static int ce_compare_data(const struct cache_entry
*ce
, struct stat
*st
)
159 int fd
= git_open_cloexec(ce
->name
, O_RDONLY
);
162 unsigned char sha1
[20];
163 if (!index_fd(sha1
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
164 match
= hashcmp(sha1
, ce
->oid
.hash
);
165 /* index_fd() closed the file descriptor already */
170 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
175 enum object_type type
;
176 struct strbuf sb
= STRBUF_INIT
;
178 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
181 buffer
= read_sha1_file(ce
->oid
.hash
, &type
, &size
);
184 match
= memcmp(buffer
, sb
.buf
, size
);
191 static int ce_compare_gitlink(const struct cache_entry
*ce
)
193 unsigned char sha1
[20];
196 * We don't actually require that the .git directory
197 * under GITLINK directory be a valid git directory. It
198 * might even be missing (in case nobody populated that
201 * If so, we consider it always to match.
203 if (resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) < 0)
205 return hashcmp(sha1
, ce
->oid
.hash
);
208 static int ce_modified_check_fs(const struct cache_entry
*ce
, struct stat
*st
)
210 switch (st
->st_mode
& S_IFMT
) {
212 if (ce_compare_data(ce
, st
))
216 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
220 if (S_ISGITLINK(ce
->ce_mode
))
221 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
228 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
230 unsigned int changed
= 0;
232 if (ce
->ce_flags
& CE_REMOVE
)
233 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
235 switch (ce
->ce_mode
& S_IFMT
) {
237 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
238 /* We consider only the owner x bit to be relevant for
241 if (trust_executable_bit
&&
242 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
243 changed
|= MODE_CHANGED
;
246 if (!S_ISLNK(st
->st_mode
) &&
247 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
248 changed
|= TYPE_CHANGED
;
251 /* We ignore most of the st_xxx fields for gitlinks */
252 if (!S_ISDIR(st
->st_mode
))
253 changed
|= TYPE_CHANGED
;
254 else if (ce_compare_gitlink(ce
))
255 changed
|= DATA_CHANGED
;
258 die("internal error: ce_mode is %o", ce
->ce_mode
);
261 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
263 /* Racily smudged entry? */
264 if (!ce
->ce_stat_data
.sd_size
) {
265 if (!is_empty_blob_sha1(ce
->oid
.hash
))
266 changed
|= DATA_CHANGED
;
272 static int is_racy_stat(const struct index_state
*istate
,
273 const struct stat_data
*sd
)
275 return (istate
->timestamp
.sec
&&
277 /* nanosecond timestamped files can also be racy! */
278 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
279 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
280 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
282 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
287 static int is_racy_timestamp(const struct index_state
*istate
,
288 const struct cache_entry
*ce
)
290 return (!S_ISGITLINK(ce
->ce_mode
) &&
291 is_racy_stat(istate
, &ce
->ce_stat_data
));
294 int match_stat_data_racy(const struct index_state
*istate
,
295 const struct stat_data
*sd
, struct stat
*st
)
297 if (is_racy_stat(istate
, sd
))
298 return MTIME_CHANGED
;
299 return match_stat_data(sd
, st
);
302 int ie_match_stat(const struct index_state
*istate
,
303 const struct cache_entry
*ce
, struct stat
*st
,
304 unsigned int options
)
306 unsigned int changed
;
307 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
308 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
309 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
312 * If it's marked as always valid in the index, it's
313 * valid whatever the checked-out copy says.
315 * skip-worktree has the same effect with higher precedence
317 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
319 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
323 * Intent-to-add entries have not been added, so the index entry
324 * by definition never matches what is in the work tree until it
325 * actually gets added.
327 if (ce_intent_to_add(ce
))
328 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
330 changed
= ce_match_stat_basic(ce
, st
);
333 * Within 1 second of this sequence:
334 * echo xyzzy >file && git-update-index --add file
335 * running this command:
337 * would give a falsely clean cache entry. The mtime and
338 * length match the cache, and other stat fields do not change.
340 * We could detect this at update-index time (the cache entry
341 * being registered/updated records the same time as "now")
342 * and delay the return from git-update-index, but that would
343 * effectively mean we can make at most one commit per second,
344 * which is not acceptable. Instead, we check cache entries
345 * whose mtime are the same as the index file timestamp more
346 * carefully than others.
348 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
349 if (assume_racy_is_modified
)
350 changed
|= DATA_CHANGED
;
352 changed
|= ce_modified_check_fs(ce
, st
);
358 int ie_modified(const struct index_state
*istate
,
359 const struct cache_entry
*ce
,
360 struct stat
*st
, unsigned int options
)
362 int changed
, changed_fs
;
364 changed
= ie_match_stat(istate
, ce
, st
, options
);
368 * If the mode or type has changed, there's no point in trying
369 * to refresh the entry - it's not going to match
371 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
375 * Immediately after read-tree or update-index --cacheinfo,
376 * the length field is zero, as we have never even read the
377 * lstat(2) information once, and we cannot trust DATA_CHANGED
378 * returned by ie_match_stat() which in turn was returned by
379 * ce_match_stat_basic() to signal that the filesize of the
380 * blob changed. We have to actually go to the filesystem to
381 * see if the contents match, and if so, should answer "unchanged".
383 * The logic does not apply to gitlinks, as ce_match_stat_basic()
384 * already has checked the actual HEAD from the filesystem in the
385 * subproject. If ie_match_stat() already said it is different,
386 * then we know it is.
388 if ((changed
& DATA_CHANGED
) &&
389 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
392 changed_fs
= ce_modified_check_fs(ce
, st
);
394 return changed
| changed_fs
;
398 int base_name_compare(const char *name1
, int len1
, int mode1
,
399 const char *name2
, int len2
, int mode2
)
401 unsigned char c1
, c2
;
402 int len
= len1
< len2
? len1
: len2
;
405 cmp
= memcmp(name1
, name2
, len
);
410 if (!c1
&& S_ISDIR(mode1
))
412 if (!c2
&& S_ISDIR(mode2
))
414 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
418 * df_name_compare() is identical to base_name_compare(), except it
419 * compares conflicting directory/file entries as equal. Note that
420 * while a directory name compares as equal to a regular file, they
421 * then individually compare _differently_ to a filename that has
422 * a dot after the basename (because '\0' < '.' < '/').
424 * This is used by routines that want to traverse the git namespace
425 * but then handle conflicting entries together when possible.
427 int df_name_compare(const char *name1
, int len1
, int mode1
,
428 const char *name2
, int len2
, int mode2
)
430 int len
= len1
< len2
? len1
: len2
, cmp
;
431 unsigned char c1
, c2
;
433 cmp
= memcmp(name1
, name2
, len
);
436 /* Directories and files compare equal (same length, same name) */
440 if (!c1
&& S_ISDIR(mode1
))
443 if (!c2
&& S_ISDIR(mode2
))
445 if (c1
== '/' && !c2
)
447 if (c2
== '/' && !c1
)
452 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
454 size_t min_len
= (len1
< len2
) ? len1
: len2
;
455 int cmp
= memcmp(name1
, name2
, min_len
);
465 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
469 cmp
= name_compare(name1
, len1
, name2
, len2
);
480 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
485 last
= istate
->cache_nr
;
486 while (last
> first
) {
487 int next
= (last
+ first
) >> 1;
488 struct cache_entry
*ce
= istate
->cache
[next
];
489 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
501 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
503 return index_name_stage_pos(istate
, name
, namelen
, 0);
506 int remove_index_entry_at(struct index_state
*istate
, int pos
)
508 struct cache_entry
*ce
= istate
->cache
[pos
];
510 record_resolve_undo(istate
, ce
);
511 remove_name_hash(istate
, ce
);
512 save_or_free_index_entry(istate
, ce
);
513 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
515 if (pos
>= istate
->cache_nr
)
517 memmove(istate
->cache
+ pos
,
518 istate
->cache
+ pos
+ 1,
519 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
524 * Remove all cache entries marked for removal, that is where
525 * CE_REMOVE is set in ce_flags. This is much more effective than
526 * calling remove_index_entry_at() for each entry to be removed.
528 void remove_marked_cache_entries(struct index_state
*istate
)
530 struct cache_entry
**ce_array
= istate
->cache
;
533 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
534 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
535 remove_name_hash(istate
, ce_array
[i
]);
536 save_or_free_index_entry(istate
, ce_array
[i
]);
539 ce_array
[j
++] = ce_array
[i
];
541 if (j
== istate
->cache_nr
)
543 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
544 istate
->cache_nr
= j
;
547 int remove_file_from_index(struct index_state
*istate
, const char *path
)
549 int pos
= index_name_pos(istate
, path
, strlen(path
));
552 cache_tree_invalidate_path(istate
, path
);
553 untracked_cache_remove_from_index(istate
, path
);
554 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
555 remove_index_entry_at(istate
, pos
);
559 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
561 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
564 static int index_name_pos_also_unmerged(struct index_state
*istate
,
565 const char *path
, int namelen
)
567 int pos
= index_name_pos(istate
, path
, namelen
);
568 struct cache_entry
*ce
;
573 /* maybe unmerged? */
575 if (pos
>= istate
->cache_nr
||
576 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
579 /* order of preference: stage 2, 1, 3 */
580 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
581 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
582 !compare_name(ce
, path
, namelen
))
587 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
589 int len
= ce_namelen(ce
);
590 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
594 * If we add a filename that aliases in the cache, we will use the
595 * name that we already have - but we don't want to update the same
596 * alias twice, because that implies that there were actually two
597 * different files with aliasing names!
599 * So we use the CE_ADDED flag to verify that the alias was an old
600 * one before we accept it as
602 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
603 struct cache_entry
*ce
,
604 struct cache_entry
*alias
)
607 struct cache_entry
*new;
609 if (alias
->ce_flags
& CE_ADDED
)
610 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
612 /* Ok, create the new entry using the name of the existing alias */
613 len
= ce_namelen(alias
);
614 new = xcalloc(1, cache_entry_size(len
));
615 memcpy(new->name
, alias
->name
, len
);
616 copy_cache_entry(new, ce
);
617 save_or_free_index_entry(istate
, ce
);
621 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
623 unsigned char sha1
[20];
624 if (write_sha1_file("", 0, blob_type
, sha1
))
625 die("cannot create an empty blob in the object database");
626 hashcpy(ce
->oid
.hash
, sha1
);
629 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
631 int size
, namelen
, was_same
;
632 mode_t st_mode
= st
->st_mode
;
633 struct cache_entry
*ce
, *alias
;
634 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
635 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
636 int pretend
= flags
& ADD_CACHE_PRETEND
;
637 int intent_only
= flags
& ADD_CACHE_INTENT
;
638 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
639 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
641 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
642 return error("%s: can only add regular files, symbolic links or git-directories", path
);
644 namelen
= strlen(path
);
645 if (S_ISDIR(st_mode
)) {
646 while (namelen
&& path
[namelen
-1] == '/')
649 size
= cache_entry_size(namelen
);
650 ce
= xcalloc(1, size
);
651 memcpy(ce
->name
, path
, namelen
);
652 ce
->ce_namelen
= namelen
;
654 fill_stat_cache_info(ce
, st
);
656 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
659 if (trust_executable_bit
&& has_symlinks
) {
660 ce
->ce_mode
= create_ce_mode(st_mode
);
662 /* If there is an existing entry, pick the mode bits and type
663 * from it, otherwise assume unexecutable regular file.
665 struct cache_entry
*ent
;
666 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
668 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
669 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
672 /* When core.ignorecase=true, determine if a directory of the same name but differing
673 * case already exists within the Git repository. If it does, ensure the directory
674 * case of the file being added to the repository matches (is folded into) the existing
675 * entry's directory case.
678 adjust_dirname_case(istate
, ce
->name
);
681 alias
= index_file_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
682 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
683 /* Nothing changed, really */
684 if (!S_ISGITLINK(alias
->ce_mode
))
685 ce_mark_uptodate(alias
);
686 alias
->ce_flags
|= CE_ADDED
;
692 if (index_path(ce
->oid
.hash
, path
, st
, HASH_WRITE_OBJECT
)) {
694 return error("unable to index file %s", path
);
697 set_object_name_for_intent_to_add_entry(ce
);
699 if (ignore_case
&& alias
&& different_name(ce
, alias
))
700 ce
= create_alias_ce(istate
, ce
, alias
);
701 ce
->ce_flags
|= CE_ADDED
;
703 /* It was suspected to be racily clean, but it turns out to be Ok */
706 !oidcmp(&alias
->oid
, &ce
->oid
) &&
707 ce
->ce_mode
== alias
->ce_mode
);
711 else if (add_index_entry(istate
, ce
, add_option
)) {
713 return error("unable to add %s to index", path
);
715 if (verbose
&& !was_same
)
716 printf("add '%s'\n", path
);
720 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
723 if (lstat(path
, &st
))
724 die_errno("unable to stat '%s'", path
);
725 return add_to_index(istate
, path
, &st
, flags
);
728 struct cache_entry
*make_cache_entry(unsigned int mode
,
729 const unsigned char *sha1
, const char *path
, int stage
,
730 unsigned int refresh_options
)
733 struct cache_entry
*ce
, *ret
;
735 if (!verify_path(path
)) {
736 error("Invalid path '%s'", path
);
741 size
= cache_entry_size(len
);
742 ce
= xcalloc(1, size
);
744 hashcpy(ce
->oid
.hash
, sha1
);
745 memcpy(ce
->name
, path
, len
);
746 ce
->ce_flags
= create_ce_flags(stage
);
747 ce
->ce_namelen
= len
;
748 ce
->ce_mode
= create_ce_mode(mode
);
750 ret
= refresh_cache_entry(ce
, refresh_options
);
757 * Chmod an index entry with either +x or -x.
759 * Returns -1 if the chmod for the particular cache entry failed (if it's
760 * not a regular file), -2 if an invalid flip argument is passed in, 0
763 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
766 if (!S_ISREG(ce
->ce_mode
))
773 ce
->ce_mode
&= ~0111;
778 cache_tree_invalidate_path(istate
, ce
->name
);
779 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
780 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
785 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
787 int len
= ce_namelen(a
);
788 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
792 * We fundamentally don't like some paths: we don't want
793 * dot or dot-dot anywhere, and for obvious reasons don't
794 * want to recurse into ".git" either.
796 * Also, we don't want double slashes or slashes at the
797 * end that can make pathnames ambiguous.
799 static int verify_dotfile(const char *rest
)
802 * The first character was '.', but that
803 * has already been discarded, we now test
807 /* "." is not allowed */
808 if (*rest
== '\0' || is_dir_sep(*rest
))
813 * ".git" followed by NUL or slash is bad. This
814 * shares the path end test with the ".." case.
818 if (rest
[1] != 'i' && rest
[1] != 'I')
820 if (rest
[2] != 't' && rest
[2] != 'T')
825 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
831 int verify_path(const char *path
)
835 if (has_dos_drive_prefix(path
))
844 if (protect_hfs
&& is_hfs_dotgit(path
))
846 if (protect_ntfs
&& is_ntfs_dotgit(path
))
849 if ((c
== '.' && !verify_dotfile(path
)) ||
850 is_dir_sep(c
) || c
== '\0')
858 * Do we have another file that has the beginning components being a
859 * proper superset of the name we're trying to add?
861 static int has_file_name(struct index_state
*istate
,
862 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
865 int len
= ce_namelen(ce
);
866 int stage
= ce_stage(ce
);
867 const char *name
= ce
->name
;
869 while (pos
< istate
->cache_nr
) {
870 struct cache_entry
*p
= istate
->cache
[pos
++];
872 if (len
>= ce_namelen(p
))
874 if (memcmp(name
, p
->name
, len
))
876 if (ce_stage(p
) != stage
)
878 if (p
->name
[len
] != '/')
880 if (p
->ce_flags
& CE_REMOVE
)
885 remove_index_entry_at(istate
, --pos
);
892 * Like strcmp(), but also return the offset of the first change.
893 * If strings are equal, return the length.
895 int strcmp_offset(const char *s1
, const char *s2
, size_t *first_change
)
900 return strcmp(s1
, s2
);
902 for (k
= 0; s1
[k
] == s2
[k
]; k
++)
907 return (unsigned char)s1
[k
] - (unsigned char)s2
[k
];
911 * Do we have another file with a pathname that is a proper
912 * subset of the name we're trying to add?
914 * That is, is there another file in the index with a path
915 * that matches a sub-directory in the given entry?
917 static int has_dir_name(struct index_state
*istate
,
918 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
921 int stage
= ce_stage(ce
);
922 const char *name
= ce
->name
;
923 const char *slash
= name
+ ce_namelen(ce
);
928 * We are frequently called during an iteration on a sorted
929 * list of pathnames and while building a new index. Therefore,
930 * there is a high probability that this entry will eventually
931 * be appended to the index, rather than inserted in the middle.
932 * If we can confirm that, we can avoid binary searches on the
933 * components of the pathname.
935 * Compare the entry's full path with the last path in the index.
937 if (istate
->cache_nr
> 0) {
938 cmp_last
= strcmp_offset(name
,
939 istate
->cache
[istate
->cache_nr
- 1]->name
,
942 if (len_eq_last
== 0) {
944 * The entry sorts AFTER the last one in the
945 * index and their paths have no common prefix,
946 * so there cannot be a F/D conflict.
951 * The entry sorts AFTER the last one in the
952 * index, but has a common prefix. Fall through
953 * to the loop below to disect the entry's path
954 * and see where the difference is.
957 } else if (cmp_last
== 0) {
959 * The entry exactly matches the last one in the
960 * index, but because of multiple stage and CE_REMOVE
961 * items, we fall through and let the regular search
973 if (slash
<= ce
->name
)
978 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
981 * Found one, but not so fast. This could
982 * be a marker that says "I was here, but
983 * I am being removed". Such an entry is
984 * not a part of the resulting tree, and
985 * it is Ok to have a directory at the same
988 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
992 remove_index_entry_at(istate
, pos
);
1000 * Trivial optimization: if we find an entry that
1001 * already matches the sub-directory, then we know
1002 * we're ok, and we can exit.
1004 while (pos
< istate
->cache_nr
) {
1005 struct cache_entry
*p
= istate
->cache
[pos
];
1006 if ((ce_namelen(p
) <= len
) ||
1007 (p
->name
[len
] != '/') ||
1008 memcmp(p
->name
, name
, len
))
1009 break; /* not our subdirectory */
1010 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
1012 * p is at the same stage as our entry, and
1013 * is a subdirectory of what we are looking
1014 * at, so we cannot have conflicts at our
1015 * level or anything shorter.
1024 /* We may be in a situation where we already have path/file and path
1025 * is being added, or we already have path and path/file is being
1026 * added. Either one would result in a nonsense tree that has path
1027 * twice when git-write-tree tries to write it out. Prevent it.
1029 * If ok-to-replace is specified, we remove the conflicting entries
1030 * from the cache so the caller should recompute the insert position.
1031 * When this happens, we return non-zero.
1033 static int check_file_directory_conflict(struct index_state
*istate
,
1034 const struct cache_entry
*ce
,
1035 int pos
, int ok_to_replace
)
1040 * When ce is an "I am going away" entry, we allow it to be added
1042 if (ce
->ce_flags
& CE_REMOVE
)
1046 * We check if the path is a sub-path of a subsequent pathname
1047 * first, since removing those will not change the position
1050 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
1053 * Then check if the path might have a clashing sub-directory
1056 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1059 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1062 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1063 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1064 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1065 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1067 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1068 cache_tree_invalidate_path(istate
, ce
->name
);
1071 * If this entry's path sorts after the last entry in the index,
1072 * we can avoid searching for it.
1074 if (istate
->cache_nr
> 0 &&
1075 strcmp(ce
->name
, istate
->cache
[istate
->cache_nr
- 1]->name
) > 0)
1076 pos
= -istate
->cache_nr
- 1;
1078 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1080 /* existing match? Just replace it. */
1083 replace_index_entry(istate
, pos
, ce
);
1088 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1089 untracked_cache_add_to_index(istate
, ce
->name
);
1092 * Inserting a merged entry ("stage 0") into the index
1093 * will always replace all non-merged entries..
1095 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1096 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1098 if (!remove_index_entry_at(istate
, pos
))
1105 if (!verify_path(ce
->name
))
1106 return error("Invalid path '%s'", ce
->name
);
1108 if (!skip_df_check
&&
1109 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1111 return error("'%s' appears as both a file and as a directory",
1113 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1119 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1123 if (option
& ADD_CACHE_JUST_APPEND
)
1124 pos
= istate
->cache_nr
;
1127 ret
= add_index_entry_with_check(istate
, ce
, option
);
1133 /* Make sure the array is big enough .. */
1134 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1138 if (istate
->cache_nr
> pos
+ 1)
1139 memmove(istate
->cache
+ pos
+ 1,
1140 istate
->cache
+ pos
,
1141 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1142 set_index_entry(istate
, pos
, ce
);
1143 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1148 * "refresh" does not calculate a new sha1 file or bring the
1149 * cache up-to-date for mode/content changes. But what it
1150 * _does_ do is to "re-match" the stat information of a file
1151 * with the cache, so that you can refresh the cache for a
1152 * file that hasn't been changed but where the stat entry is
1155 * For example, you'd want to do this after doing a "git-read-tree",
1156 * to link up the stat cache details with the proper files.
1158 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1159 struct cache_entry
*ce
,
1160 unsigned int options
, int *err
,
1164 struct cache_entry
*updated
;
1166 int refresh
= options
& CE_MATCH_REFRESH
;
1167 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1168 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1169 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1171 if (!refresh
|| ce_uptodate(ce
))
1175 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1176 * that the change to the work tree does not matter and told
1179 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1180 ce_mark_uptodate(ce
);
1183 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1184 ce_mark_uptodate(ce
);
1188 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1196 if (lstat(ce
->name
, &st
) < 0) {
1197 if (ignore_missing
&& errno
== ENOENT
)
1204 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1206 *changed_ret
= changed
;
1209 * The path is unchanged. If we were told to ignore
1210 * valid bit, then we did the actual stat check and
1211 * found that the entry is unmodified. If the entry
1212 * is not marked VALID, this is the place to mark it
1213 * valid again, under "assume unchanged" mode.
1215 if (ignore_valid
&& assume_unchanged
&&
1216 !(ce
->ce_flags
& CE_VALID
))
1217 ; /* mark this one VALID again */
1220 * We do not mark the index itself "modified"
1221 * because CE_UPTODATE flag is in-core only;
1222 * we are not going to write this change out.
1224 if (!S_ISGITLINK(ce
->ce_mode
))
1225 ce_mark_uptodate(ce
);
1230 if (ie_modified(istate
, ce
, &st
, options
)) {
1237 updated
= xmalloc(size
);
1238 memcpy(updated
, ce
, size
);
1239 fill_stat_cache_info(updated
, &st
);
1241 * If ignore_valid is not set, we should leave CE_VALID bit
1242 * alone. Otherwise, paths marked with --no-assume-unchanged
1243 * (i.e. things to be edited) will reacquire CE_VALID bit
1244 * automatically, which is not really what we want.
1246 if (!ignore_valid
&& assume_unchanged
&&
1247 !(ce
->ce_flags
& CE_VALID
))
1248 updated
->ce_flags
&= ~CE_VALID
;
1250 /* istate->cache_changed is updated in the caller */
1254 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1255 int * first
, const char *header_msg
)
1257 if (in_porcelain
&& *first
&& header_msg
) {
1258 printf("%s\n", header_msg
);
1264 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1265 const struct pathspec
*pathspec
,
1266 char *seen
, const char *header_msg
)
1270 int really
= (flags
& REFRESH_REALLY
) != 0;
1271 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1272 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1273 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1274 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1276 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1277 unsigned int options
= (CE_MATCH_REFRESH
|
1278 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1279 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1280 const char *modified_fmt
;
1281 const char *deleted_fmt
;
1282 const char *typechange_fmt
;
1283 const char *added_fmt
;
1284 const char *unmerged_fmt
;
1286 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1287 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1288 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1289 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1290 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1291 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1292 struct cache_entry
*ce
, *new;
1293 int cache_errno
= 0;
1297 ce
= istate
->cache
[i
];
1298 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1301 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1305 while ((i
< istate
->cache_nr
) &&
1306 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1312 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1313 &first
, header_msg
);
1321 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1327 if (really
&& cache_errno
== EINVAL
) {
1328 /* If we are doing --really-refresh that
1329 * means the index is not valid anymore.
1331 ce
->ce_flags
&= ~CE_VALID
;
1332 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1333 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1338 if (cache_errno
== ENOENT
)
1340 else if (ce_intent_to_add(ce
))
1341 fmt
= added_fmt
; /* must be before other checks */
1342 else if (changed
& TYPE_CHANGED
)
1343 fmt
= typechange_fmt
;
1347 ce
->name
, in_porcelain
, &first
, header_msg
);
1352 replace_index_entry(istate
, i
, new);
1357 struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1358 unsigned int options
)
1360 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1364 /*****************************************************************
1366 *****************************************************************/
1368 #define INDEX_FORMAT_DEFAULT 3
1370 static unsigned int get_index_format_default(void)
1372 char *envversion
= getenv("GIT_INDEX_VERSION");
1375 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1378 if (!git_config_get_int("index.version", &value
))
1380 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1381 warning(_("index.version set, but the value is invalid.\n"
1382 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1383 return INDEX_FORMAT_DEFAULT
;
1388 version
= strtoul(envversion
, &endp
, 10);
1390 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1391 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1392 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1393 version
= INDEX_FORMAT_DEFAULT
;
1399 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1400 * Again - this is just a (very strong in practice) heuristic that
1401 * the inode hasn't changed.
1403 * We save the fields in big-endian order to allow using the
1404 * index file over NFS transparently.
1406 struct ondisk_cache_entry
{
1407 struct cache_time ctime
;
1408 struct cache_time mtime
;
1415 unsigned char sha1
[20];
1417 char name
[FLEX_ARRAY
]; /* more */
1421 * This struct is used when CE_EXTENDED bit is 1
1422 * The struct must match ondisk_cache_entry exactly from
1425 struct ondisk_cache_entry_extended
{
1426 struct cache_time ctime
;
1427 struct cache_time mtime
;
1434 unsigned char sha1
[20];
1437 char name
[FLEX_ARRAY
]; /* more */
1440 /* These are only used for v3 or lower */
1441 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1442 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1443 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1444 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1445 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1446 ondisk_cache_entry_size(ce_namelen(ce)))
1448 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1451 unsigned char sha1
[20];
1454 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1455 return error("bad signature");
1456 hdr_version
= ntohl(hdr
->hdr_version
);
1457 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1458 return error("bad index version %d", hdr_version
);
1460 git_SHA1_Update(&c
, hdr
, size
- 20);
1461 git_SHA1_Final(sha1
, &c
);
1462 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1463 return error("bad index file sha1 signature");
1467 static int read_index_extension(struct index_state
*istate
,
1468 const char *ext
, void *data
, unsigned long sz
)
1470 switch (CACHE_EXT(ext
)) {
1471 case CACHE_EXT_TREE
:
1472 istate
->cache_tree
= cache_tree_read(data
, sz
);
1474 case CACHE_EXT_RESOLVE_UNDO
:
1475 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1477 case CACHE_EXT_LINK
:
1478 if (read_link_extension(istate
, data
, sz
))
1481 case CACHE_EXT_UNTRACKED
:
1482 istate
->untracked
= read_untracked_extension(data
, sz
);
1485 if (*ext
< 'A' || 'Z' < *ext
)
1486 return error("index uses %.4s extension, which we do not understand",
1488 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1494 int hold_locked_index(struct lock_file
*lk
, int lock_flags
)
1496 return hold_lock_file_for_update(lk
, get_index_file(), lock_flags
);
1499 int read_index(struct index_state
*istate
)
1501 return read_index_from(istate
, get_index_file());
1504 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1509 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1511 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1512 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1513 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1514 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1515 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1516 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1517 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1518 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1519 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1520 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1521 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1522 ce
->ce_namelen
= len
;
1524 hashcpy(ce
->oid
.hash
, ondisk
->sha1
);
1525 memcpy(ce
->name
, name
, len
);
1526 ce
->name
[len
] = '\0';
1531 * Adjacent cache entries tend to share the leading paths, so it makes
1532 * sense to only store the differences in later entries. In the v4
1533 * on-disk format of the index, each on-disk cache entry stores the
1534 * number of bytes to be stripped from the end of the previous name,
1535 * and the bytes to append to the result, to come up with its name.
1537 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1539 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1540 size_t len
= decode_varint(&cp
);
1542 if (name
->len
< len
)
1543 die("malformed name field in the index");
1544 strbuf_remove(name
, name
->len
- len
, len
);
1545 for (ep
= cp
; *ep
; ep
++)
1546 ; /* find the end */
1547 strbuf_add(name
, cp
, ep
- cp
);
1548 return (const char *)ep
+ 1 - cp_
;
1551 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1552 unsigned long *ent_size
,
1553 struct strbuf
*previous_name
)
1555 struct cache_entry
*ce
;
1560 /* On-disk flags are just 16 bits */
1561 flags
= get_be16(&ondisk
->flags
);
1562 len
= flags
& CE_NAMEMASK
;
1564 if (flags
& CE_EXTENDED
) {
1565 struct ondisk_cache_entry_extended
*ondisk2
;
1567 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1568 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1569 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1570 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1571 die("Unknown index entry format %08x", extended_flags
);
1572 flags
|= extended_flags
;
1573 name
= ondisk2
->name
;
1576 name
= ondisk
->name
;
1578 if (!previous_name
) {
1579 /* v3 and earlier */
1580 if (len
== CE_NAMEMASK
)
1582 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1584 *ent_size
= ondisk_ce_size(ce
);
1586 unsigned long consumed
;
1587 consumed
= expand_name_field(previous_name
, name
);
1588 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1590 previous_name
->len
);
1592 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1597 static void check_ce_order(struct index_state
*istate
)
1601 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1602 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1603 struct cache_entry
*next_ce
= istate
->cache
[i
];
1604 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1606 if (0 < name_compare
)
1607 die("unordered stage entries in index");
1608 if (!name_compare
) {
1610 die("multiple stage entries for merged file '%s'",
1612 if (ce_stage(ce
) > ce_stage(next_ce
))
1613 die("unordered stage entries for '%s'",
1619 static void tweak_untracked_cache(struct index_state
*istate
)
1621 switch (git_config_get_untracked_cache()) {
1622 case -1: /* keep: do nothing */
1625 remove_untracked_cache(istate
);
1628 add_untracked_cache(istate
);
1630 default: /* unknown value: do nothing */
1635 static void tweak_split_index(struct index_state
*istate
)
1637 switch (git_config_get_split_index()) {
1638 case -1: /* unset: do nothing */
1641 remove_split_index(istate
);
1644 add_split_index(istate
);
1646 default: /* unknown value: do nothing */
1651 static void post_read_index_from(struct index_state
*istate
)
1653 check_ce_order(istate
);
1654 tweak_untracked_cache(istate
);
1655 tweak_split_index(istate
);
1658 /* remember to discard_cache() before reading a different cache! */
1659 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1663 unsigned long src_offset
;
1664 struct cache_header
*hdr
;
1667 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1669 if (istate
->initialized
)
1670 return istate
->cache_nr
;
1672 istate
->timestamp
.sec
= 0;
1673 istate
->timestamp
.nsec
= 0;
1674 fd
= open(path
, O_RDONLY
);
1676 if (!must_exist
&& errno
== ENOENT
)
1678 die_errno("%s: index file open failed", path
);
1682 die_errno("cannot stat the open index");
1684 mmap_size
= xsize_t(st
.st_size
);
1685 if (mmap_size
< sizeof(struct cache_header
) + 20)
1686 die("index file smaller than expected");
1688 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1689 if (mmap
== MAP_FAILED
)
1690 die_errno("unable to map index file");
1694 if (verify_hdr(hdr
, mmap_size
) < 0)
1697 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- 20);
1698 istate
->version
= ntohl(hdr
->hdr_version
);
1699 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1700 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1701 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1702 istate
->initialized
= 1;
1704 if (istate
->version
== 4)
1705 previous_name
= &previous_name_buf
;
1707 previous_name
= NULL
;
1709 src_offset
= sizeof(*hdr
);
1710 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1711 struct ondisk_cache_entry
*disk_ce
;
1712 struct cache_entry
*ce
;
1713 unsigned long consumed
;
1715 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1716 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1717 set_index_entry(istate
, i
, ce
);
1719 src_offset
+= consumed
;
1721 strbuf_release(&previous_name_buf
);
1722 istate
->timestamp
.sec
= st
.st_mtime
;
1723 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1725 while (src_offset
<= mmap_size
- 20 - 8) {
1726 /* After an array of active_nr index entries,
1727 * there can be arbitrary number of extended
1728 * sections, each of which is prefixed with
1729 * extension name (4-byte) and section length
1730 * in 4-byte network byte order.
1733 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1734 extsize
= ntohl(extsize
);
1735 if (read_index_extension(istate
,
1736 (const char *) mmap
+ src_offset
,
1737 (char *) mmap
+ src_offset
+ 8,
1741 src_offset
+= extsize
;
1743 munmap(mmap
, mmap_size
);
1744 return istate
->cache_nr
;
1747 munmap(mmap
, mmap_size
);
1748 die("index file corrupt");
1752 * Signal that the shared index is used by updating its mtime.
1754 * This way, shared index can be removed if they have not been used
1757 static void freshen_shared_index(char *base_sha1_hex
, int warn
)
1759 const char *shared_index
= git_path("sharedindex.%s", base_sha1_hex
);
1760 if (!check_and_freshen_file(shared_index
, 1) && warn
)
1761 warning("could not freshen shared index '%s'", shared_index
);
1764 int read_index_from(struct index_state
*istate
, const char *path
)
1766 struct split_index
*split_index
;
1768 char *base_sha1_hex
;
1769 const char *base_path
;
1771 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1772 if (istate
->initialized
)
1773 return istate
->cache_nr
;
1775 ret
= do_read_index(istate
, path
, 0);
1777 split_index
= istate
->split_index
;
1778 if (!split_index
|| is_null_sha1(split_index
->base_sha1
)) {
1779 post_read_index_from(istate
);
1783 if (split_index
->base
)
1784 discard_index(split_index
->base
);
1786 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1788 base_sha1_hex
= sha1_to_hex(split_index
->base_sha1
);
1789 base_path
= git_path("sharedindex.%s", base_sha1_hex
);
1790 ret
= do_read_index(split_index
->base
, base_path
, 1);
1791 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1792 die("broken index, expect %s in %s, got %s",
1793 base_sha1_hex
, base_path
,
1794 sha1_to_hex(split_index
->base
->sha1
));
1796 freshen_shared_index(base_sha1_hex
, 0);
1797 merge_base_index(istate
);
1798 post_read_index_from(istate
);
1802 int is_index_unborn(struct index_state
*istate
)
1804 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1807 int discard_index(struct index_state
*istate
)
1811 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1812 if (istate
->cache
[i
]->index
&&
1813 istate
->split_index
&&
1814 istate
->split_index
->base
&&
1815 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1816 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1818 free(istate
->cache
[i
]);
1820 resolve_undo_clear_index(istate
);
1821 istate
->cache_nr
= 0;
1822 istate
->cache_changed
= 0;
1823 istate
->timestamp
.sec
= 0;
1824 istate
->timestamp
.nsec
= 0;
1825 free_name_hash(istate
);
1826 cache_tree_free(&(istate
->cache_tree
));
1827 istate
->initialized
= 0;
1828 free(istate
->cache
);
1829 istate
->cache
= NULL
;
1830 istate
->cache_alloc
= 0;
1831 discard_split_index(istate
);
1832 free_untracked_cache(istate
->untracked
);
1833 istate
->untracked
= NULL
;
1837 int unmerged_index(const struct index_state
*istate
)
1840 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1841 if (ce_stage(istate
->cache
[i
]))
1847 #define WRITE_BUFFER_SIZE 8192
1848 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1849 static unsigned long write_buffer_len
;
1851 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1853 unsigned int buffered
= write_buffer_len
;
1855 git_SHA1_Update(context
, write_buffer
, buffered
);
1856 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1858 write_buffer_len
= 0;
1863 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1866 unsigned int buffered
= write_buffer_len
;
1867 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1870 memcpy(write_buffer
+ buffered
, data
, partial
);
1871 buffered
+= partial
;
1872 if (buffered
== WRITE_BUFFER_SIZE
) {
1873 write_buffer_len
= buffered
;
1874 if (ce_write_flush(context
, fd
))
1878 write_buffer_len
= buffered
;
1880 data
= (char *) data
+ partial
;
1885 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1886 unsigned int ext
, unsigned int sz
)
1890 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1891 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1894 static int ce_flush(git_SHA_CTX
*context
, int fd
, unsigned char *sha1
)
1896 unsigned int left
= write_buffer_len
;
1899 write_buffer_len
= 0;
1900 git_SHA1_Update(context
, write_buffer
, left
);
1903 /* Flush first if not enough space for SHA1 signature */
1904 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1905 if (write_in_full(fd
, write_buffer
, left
) != left
)
1910 /* Append the SHA1 signature at the end */
1911 git_SHA1_Final(write_buffer
+ left
, context
);
1912 hashcpy(sha1
, write_buffer
+ left
);
1914 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1917 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1920 * The only thing we care about in this function is to smudge the
1921 * falsely clean entry due to touch-update-touch race, so we leave
1922 * everything else as they are. We are called for entries whose
1923 * ce_stat_data.sd_mtime match the index file mtime.
1925 * Note that this actually does not do much for gitlinks, for
1926 * which ce_match_stat_basic() always goes to the actual
1927 * contents. The caller checks with is_racy_timestamp() which
1928 * always says "no" for gitlinks, so we are not called for them ;-)
1932 if (lstat(ce
->name
, &st
) < 0)
1934 if (ce_match_stat_basic(ce
, &st
))
1936 if (ce_modified_check_fs(ce
, &st
)) {
1937 /* This is "racily clean"; smudge it. Note that this
1938 * is a tricky code. At first glance, it may appear
1939 * that it can break with this sequence:
1941 * $ echo xyzzy >frotz
1942 * $ git-update-index --add frotz
1945 * $ echo filfre >nitfol
1946 * $ git-update-index --add nitfol
1948 * but it does not. When the second update-index runs,
1949 * it notices that the entry "frotz" has the same timestamp
1950 * as index, and if we were to smudge it by resetting its
1951 * size to zero here, then the object name recorded
1952 * in index is the 6-byte file but the cached stat information
1953 * becomes zero --- which would then match what we would
1954 * obtain from the filesystem next time we stat("frotz").
1956 * However, the second update-index, before calling
1957 * this function, notices that the cached size is 6
1958 * bytes and what is on the filesystem is an empty
1959 * file, and never calls us, so the cached size information
1960 * for "frotz" stays 6 which does not match the filesystem.
1962 ce
->ce_stat_data
.sd_size
= 0;
1966 /* Copy miscellaneous fields but not the name */
1967 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1968 struct cache_entry
*ce
)
1972 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1973 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1974 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1975 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1976 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1977 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1978 ondisk
->mode
= htonl(ce
->ce_mode
);
1979 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1980 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1981 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1982 hashcpy(ondisk
->sha1
, ce
->oid
.hash
);
1984 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
1985 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1986 ondisk
->flags
= htons(flags
);
1987 if (ce
->ce_flags
& CE_EXTENDED
) {
1988 struct ondisk_cache_entry_extended
*ondisk2
;
1989 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1990 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1991 return ondisk2
->name
;
1994 return ondisk
->name
;
1998 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1999 struct strbuf
*previous_name
)
2002 struct ondisk_cache_entry
*ondisk
;
2003 int saved_namelen
= saved_namelen
; /* compiler workaround */
2007 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2008 saved_namelen
= ce_namelen(ce
);
2012 if (!previous_name
) {
2013 size
= ondisk_ce_size(ce
);
2014 ondisk
= xcalloc(1, size
);
2015 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
2016 memcpy(name
, ce
->name
, ce_namelen(ce
));
2018 int common
, to_remove
, prefix_size
;
2019 unsigned char to_remove_vi
[16];
2021 (ce
->name
[common
] &&
2022 common
< previous_name
->len
&&
2023 ce
->name
[common
] == previous_name
->buf
[common
]);
2025 ; /* still matching */
2026 to_remove
= previous_name
->len
- common
;
2027 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
2029 if (ce
->ce_flags
& CE_EXTENDED
)
2030 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
2032 size
= offsetof(struct ondisk_cache_entry
, name
);
2033 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
2035 ondisk
= xcalloc(1, size
);
2036 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
2037 memcpy(name
, to_remove_vi
, prefix_size
);
2038 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
2040 strbuf_splice(previous_name
, common
, to_remove
,
2041 ce
->name
+ common
, ce_namelen(ce
) - common
);
2043 if (ce
->ce_flags
& CE_STRIP_NAME
) {
2044 ce
->ce_namelen
= saved_namelen
;
2045 ce
->ce_flags
&= ~CE_STRIP_NAME
;
2048 result
= ce_write(c
, fd
, ondisk
, size
);
2054 * This function verifies if index_state has the correct sha1 of the
2055 * index file. Don't die if we have any other failure, just return 0.
2057 static int verify_index_from(const struct index_state
*istate
, const char *path
)
2062 unsigned char sha1
[20];
2064 if (!istate
->initialized
)
2067 fd
= open(path
, O_RDONLY
);
2074 if (st
.st_size
< sizeof(struct cache_header
) + 20)
2077 n
= pread_in_full(fd
, sha1
, 20, st
.st_size
- 20);
2081 if (hashcmp(istate
->sha1
, sha1
))
2092 static int verify_index(const struct index_state
*istate
)
2094 return verify_index_from(istate
, get_index_file());
2097 static int has_racy_timestamp(struct index_state
*istate
)
2099 int entries
= istate
->cache_nr
;
2102 for (i
= 0; i
< entries
; i
++) {
2103 struct cache_entry
*ce
= istate
->cache
[i
];
2104 if (is_racy_timestamp(istate
, ce
))
2111 * Opportunistically update the index but do not complain if we can't
2113 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
2115 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
2116 verify_index(istate
) &&
2117 write_locked_index(istate
, lockfile
, COMMIT_LOCK
))
2118 rollback_lock_file(lockfile
);
2121 static int do_write_index(struct index_state
*istate
, int newfd
,
2122 int strip_extensions
)
2125 struct cache_header hdr
;
2126 int i
, err
, removed
, extended
, hdr_version
;
2127 struct cache_entry
**cache
= istate
->cache
;
2128 int entries
= istate
->cache_nr
;
2130 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2132 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2133 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2136 /* reduce extended entries if possible */
2137 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2138 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2140 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2144 if (!istate
->version
) {
2145 istate
->version
= get_index_format_default();
2146 if (getenv("GIT_TEST_SPLIT_INDEX"))
2147 init_split_index(istate
);
2150 /* demote version 3 to version 2 when the latter suffices */
2151 if (istate
->version
== 3 || istate
->version
== 2)
2152 istate
->version
= extended
? 3 : 2;
2154 hdr_version
= istate
->version
;
2156 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2157 hdr
.hdr_version
= htonl(hdr_version
);
2158 hdr
.hdr_entries
= htonl(entries
- removed
);
2161 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2164 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2165 for (i
= 0; i
< entries
; i
++) {
2166 struct cache_entry
*ce
= cache
[i
];
2167 if (ce
->ce_flags
& CE_REMOVE
)
2169 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2170 ce_smudge_racily_clean_entry(ce
);
2171 if (is_null_oid(&ce
->oid
)) {
2172 static const char msg
[] = "cache entry has null sha1: %s";
2173 static int allow
= -1;
2176 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2178 warning(msg
, ce
->name
);
2180 return error(msg
, ce
->name
);
2182 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
2185 strbuf_release(&previous_name_buf
);
2187 /* Write extension data here */
2188 if (!strip_extensions
&& istate
->split_index
) {
2189 struct strbuf sb
= STRBUF_INIT
;
2191 err
= write_link_extension(&sb
, istate
) < 0 ||
2192 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
2194 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2195 strbuf_release(&sb
);
2199 if (!strip_extensions
&& istate
->cache_tree
) {
2200 struct strbuf sb
= STRBUF_INIT
;
2202 cache_tree_write(&sb
, istate
->cache_tree
);
2203 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2204 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2205 strbuf_release(&sb
);
2209 if (!strip_extensions
&& istate
->resolve_undo
) {
2210 struct strbuf sb
= STRBUF_INIT
;
2212 resolve_undo_write(&sb
, istate
->resolve_undo
);
2213 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2215 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2216 strbuf_release(&sb
);
2220 if (!strip_extensions
&& istate
->untracked
) {
2221 struct strbuf sb
= STRBUF_INIT
;
2223 write_untracked_extension(&sb
, istate
->untracked
);
2224 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_UNTRACKED
,
2226 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2227 strbuf_release(&sb
);
2232 if (ce_flush(&c
, newfd
, istate
->sha1
) || fstat(newfd
, &st
))
2234 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2235 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2239 void set_alternate_index_output(const char *name
)
2241 alternate_index_output
= name
;
2244 static int commit_locked_index(struct lock_file
*lk
)
2246 if (alternate_index_output
)
2247 return commit_lock_file_to(lk
, alternate_index_output
);
2249 return commit_lock_file(lk
);
2252 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2255 int ret
= do_write_index(istate
, get_lock_file_fd(lock
), 0);
2258 assert((flags
& (COMMIT_LOCK
| CLOSE_LOCK
)) !=
2259 (COMMIT_LOCK
| CLOSE_LOCK
));
2260 if (flags
& COMMIT_LOCK
)
2261 return commit_locked_index(lock
);
2262 else if (flags
& CLOSE_LOCK
)
2263 return close_lock_file(lock
);
2268 static int write_split_index(struct index_state
*istate
,
2269 struct lock_file
*lock
,
2273 prepare_to_write_split_index(istate
);
2274 ret
= do_write_locked_index(istate
, lock
, flags
);
2275 finish_writing_split_index(istate
);
2279 static const char *shared_index_expire
= "2.weeks.ago";
2281 static unsigned long get_shared_index_expire_date(void)
2283 static unsigned long shared_index_expire_date
;
2284 static int shared_index_expire_date_prepared
;
2286 if (!shared_index_expire_date_prepared
) {
2287 git_config_get_expiry("splitindex.sharedindexexpire",
2288 &shared_index_expire
);
2289 shared_index_expire_date
= approxidate(shared_index_expire
);
2290 shared_index_expire_date_prepared
= 1;
2293 return shared_index_expire_date
;
2296 static int should_delete_shared_index(const char *shared_index_path
)
2299 unsigned long expiration
;
2301 /* Check timestamp */
2302 expiration
= get_shared_index_expire_date();
2305 if (stat(shared_index_path
, &st
))
2306 return error_errno(_("could not stat '%s"), shared_index_path
);
2307 if (st
.st_mtime
> expiration
)
2313 static int clean_shared_index_files(const char *current_hex
)
2316 DIR *dir
= opendir(get_git_dir());
2319 return error_errno(_("unable to open git dir: %s"), get_git_dir());
2321 while ((de
= readdir(dir
)) != NULL
) {
2322 const char *sha1_hex
;
2323 const char *shared_index_path
;
2324 if (!skip_prefix(de
->d_name
, "sharedindex.", &sha1_hex
))
2326 if (!strcmp(sha1_hex
, current_hex
))
2328 shared_index_path
= git_path("%s", de
->d_name
);
2329 if (should_delete_shared_index(shared_index_path
) > 0 &&
2330 unlink(shared_index_path
))
2331 warning_errno(_("unable to unlink: %s"), shared_index_path
);
2338 static struct tempfile temporary_sharedindex
;
2340 static int write_shared_index(struct index_state
*istate
,
2341 struct lock_file
*lock
, unsigned flags
)
2343 struct split_index
*si
= istate
->split_index
;
2346 fd
= mks_tempfile(&temporary_sharedindex
, git_path("sharedindex_XXXXXX"));
2348 hashclr(si
->base_sha1
);
2349 return do_write_locked_index(istate
, lock
, flags
);
2351 move_cache_to_base_index(istate
);
2352 ret
= do_write_index(si
->base
, fd
, 1);
2354 delete_tempfile(&temporary_sharedindex
);
2357 ret
= rename_tempfile(&temporary_sharedindex
,
2358 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2360 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2361 clean_shared_index_files(sha1_to_hex(si
->base
->sha1
));
2367 static const int default_max_percent_split_change
= 20;
2369 static int too_many_not_shared_entries(struct index_state
*istate
)
2371 int i
, not_shared
= 0;
2372 int max_split
= git_config_get_max_percent_split_change();
2374 switch (max_split
) {
2376 /* not or badly configured: use the default value */
2377 max_split
= default_max_percent_split_change
;
2380 return 1; /* 0% means always write a new shared index */
2382 return 0; /* 100% means never write a new shared index */
2384 break; /* just use the configured value */
2387 /* Count not shared entries */
2388 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2389 struct cache_entry
*ce
= istate
->cache
[i
];
2394 return (int64_t)istate
->cache_nr
* max_split
< (int64_t)not_shared
* 100;
2397 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2400 int new_shared_index
, ret
;
2401 struct split_index
*si
= istate
->split_index
;
2403 if (!si
|| alternate_index_output
||
2404 (istate
->cache_changed
& ~EXTMASK
)) {
2406 hashclr(si
->base_sha1
);
2407 return do_write_locked_index(istate
, lock
, flags
);
2410 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2411 int v
= si
->base_sha1
[0];
2413 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2415 if (too_many_not_shared_entries(istate
))
2416 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2418 new_shared_index
= istate
->cache_changed
& SPLIT_INDEX_ORDERED
;
2420 if (new_shared_index
) {
2421 ret
= write_shared_index(istate
, lock
, flags
);
2426 ret
= write_split_index(istate
, lock
, flags
);
2428 /* Freshen the shared index only if the split-index was written */
2429 if (!ret
&& !new_shared_index
)
2430 freshen_shared_index(sha1_to_hex(si
->base_sha1
), 1);
2436 * Read the index file that is potentially unmerged into given
2437 * index_state, dropping any unmerged entries. Returns true if
2438 * the index is unmerged. Callers who want to refuse to work
2439 * from an unmerged state can call this and check its return value,
2440 * instead of calling read_cache().
2442 int read_index_unmerged(struct index_state
*istate
)
2448 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2449 struct cache_entry
*ce
= istate
->cache
[i
];
2450 struct cache_entry
*new_ce
;
2456 len
= ce_namelen(ce
);
2457 size
= cache_entry_size(len
);
2458 new_ce
= xcalloc(1, size
);
2459 memcpy(new_ce
->name
, ce
->name
, len
);
2460 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2461 new_ce
->ce_namelen
= len
;
2462 new_ce
->ce_mode
= ce
->ce_mode
;
2463 if (add_index_entry(istate
, new_ce
, 0))
2464 return error("%s: cannot drop to stage #0",
2471 * Returns 1 if the path is an "other" path with respect to
2472 * the index; that is, the path is not mentioned in the index at all,
2473 * either as a file, a directory with some files in the index,
2474 * or as an unmerged entry.
2476 * We helpfully remove a trailing "/" from directories so that
2477 * the output of read_directory can be used as-is.
2479 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2483 if (namelen
&& name
[namelen
- 1] == '/')
2485 pos
= index_name_pos(istate
, name
, namelen
);
2487 return 0; /* exact match */
2489 if (pos
< istate
->cache_nr
) {
2490 struct cache_entry
*ce
= istate
->cache
[pos
];
2491 if (ce_namelen(ce
) == namelen
&&
2492 !memcmp(ce
->name
, name
, namelen
))
2493 return 0; /* Yup, this one exists unmerged */
2498 void *read_blob_data_from_index(const struct index_state
*istate
,
2499 const char *path
, unsigned long *size
)
2503 enum object_type type
;
2507 pos
= index_name_pos(istate
, path
, len
);
2510 * We might be in the middle of a merge, in which
2511 * case we would read stage #2 (ours).
2515 (pos
< 0 && i
< istate
->cache_nr
&&
2516 !strcmp(istate
->cache
[i
]->name
, path
));
2518 if (ce_stage(istate
->cache
[i
]) == 2)
2523 data
= read_sha1_file(istate
->cache
[pos
]->oid
.hash
, &type
, &sz
);
2524 if (!data
|| type
!= OBJ_BLOB
) {
2533 void stat_validity_clear(struct stat_validity
*sv
)
2539 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2543 if (stat(path
, &st
) < 0)
2544 return sv
->sd
== NULL
;
2547 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2550 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2554 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2555 stat_validity_clear(sv
);
2558 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2559 fill_stat_data(sv
->sd
, &st
);