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 static int cloexec
= O_CLOEXEC
;
160 int fd
= open(ce
->name
, O_RDONLY
| cloexec
);
162 if ((cloexec
& O_CLOEXEC
) && fd
< 0 && errno
== EINVAL
) {
163 /* Try again w/o O_CLOEXEC: the kernel might not support it */
164 cloexec
&= ~O_CLOEXEC
;
165 fd
= open(ce
->name
, O_RDONLY
| cloexec
);
169 unsigned char sha1
[20];
170 if (!index_fd(sha1
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
171 match
= hashcmp(sha1
, ce
->oid
.hash
);
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 unsigned char sha1
[20];
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", sha1
) < 0)
212 return hashcmp(sha1
, ce
->oid
.hash
);
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;
235 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
237 unsigned int changed
= 0;
239 if (ce
->ce_flags
& CE_REMOVE
)
240 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
242 switch (ce
->ce_mode
& S_IFMT
) {
244 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
245 /* We consider only the owner x bit to be relevant for
248 if (trust_executable_bit
&&
249 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
250 changed
|= MODE_CHANGED
;
253 if (!S_ISLNK(st
->st_mode
) &&
254 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
255 changed
|= TYPE_CHANGED
;
258 /* We ignore most of the st_xxx fields for gitlinks */
259 if (!S_ISDIR(st
->st_mode
))
260 changed
|= TYPE_CHANGED
;
261 else if (ce_compare_gitlink(ce
))
262 changed
|= DATA_CHANGED
;
265 die("internal error: ce_mode is %o", ce
->ce_mode
);
268 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
270 /* Racily smudged entry? */
271 if (!ce
->ce_stat_data
.sd_size
) {
272 if (!is_empty_blob_sha1(ce
->oid
.hash
))
273 changed
|= DATA_CHANGED
;
279 static int is_racy_stat(const struct index_state
*istate
,
280 const struct stat_data
*sd
)
282 return (istate
->timestamp
.sec
&&
284 /* nanosecond timestamped files can also be racy! */
285 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
286 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
287 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
289 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
294 static int is_racy_timestamp(const struct index_state
*istate
,
295 const struct cache_entry
*ce
)
297 return (!S_ISGITLINK(ce
->ce_mode
) &&
298 is_racy_stat(istate
, &ce
->ce_stat_data
));
301 int match_stat_data_racy(const struct index_state
*istate
,
302 const struct stat_data
*sd
, struct stat
*st
)
304 if (is_racy_stat(istate
, sd
))
305 return MTIME_CHANGED
;
306 return match_stat_data(sd
, st
);
309 int ie_match_stat(const struct index_state
*istate
,
310 const struct cache_entry
*ce
, struct stat
*st
,
311 unsigned int options
)
313 unsigned int changed
;
314 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
315 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
316 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
319 * If it's marked as always valid in the index, it's
320 * valid whatever the checked-out copy says.
322 * skip-worktree has the same effect with higher precedence
324 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
326 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
330 * Intent-to-add entries have not been added, so the index entry
331 * by definition never matches what is in the work tree until it
332 * actually gets added.
334 if (ce_intent_to_add(ce
))
335 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
337 changed
= ce_match_stat_basic(ce
, st
);
340 * Within 1 second of this sequence:
341 * echo xyzzy >file && git-update-index --add file
342 * running this command:
344 * would give a falsely clean cache entry. The mtime and
345 * length match the cache, and other stat fields do not change.
347 * We could detect this at update-index time (the cache entry
348 * being registered/updated records the same time as "now")
349 * and delay the return from git-update-index, but that would
350 * effectively mean we can make at most one commit per second,
351 * which is not acceptable. Instead, we check cache entries
352 * whose mtime are the same as the index file timestamp more
353 * carefully than others.
355 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
356 if (assume_racy_is_modified
)
357 changed
|= DATA_CHANGED
;
359 changed
|= ce_modified_check_fs(ce
, st
);
365 int ie_modified(const struct index_state
*istate
,
366 const struct cache_entry
*ce
,
367 struct stat
*st
, unsigned int options
)
369 int changed
, changed_fs
;
371 changed
= ie_match_stat(istate
, ce
, st
, options
);
375 * If the mode or type has changed, there's no point in trying
376 * to refresh the entry - it's not going to match
378 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
382 * Immediately after read-tree or update-index --cacheinfo,
383 * the length field is zero, as we have never even read the
384 * lstat(2) information once, and we cannot trust DATA_CHANGED
385 * returned by ie_match_stat() which in turn was returned by
386 * ce_match_stat_basic() to signal that the filesize of the
387 * blob changed. We have to actually go to the filesystem to
388 * see if the contents match, and if so, should answer "unchanged".
390 * The logic does not apply to gitlinks, as ce_match_stat_basic()
391 * already has checked the actual HEAD from the filesystem in the
392 * subproject. If ie_match_stat() already said it is different,
393 * then we know it is.
395 if ((changed
& DATA_CHANGED
) &&
396 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
399 changed_fs
= ce_modified_check_fs(ce
, st
);
401 return changed
| changed_fs
;
405 int base_name_compare(const char *name1
, int len1
, int mode1
,
406 const char *name2
, int len2
, int mode2
)
408 unsigned char c1
, c2
;
409 int len
= len1
< len2
? len1
: len2
;
412 cmp
= memcmp(name1
, name2
, len
);
417 if (!c1
&& S_ISDIR(mode1
))
419 if (!c2
&& S_ISDIR(mode2
))
421 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
425 * df_name_compare() is identical to base_name_compare(), except it
426 * compares conflicting directory/file entries as equal. Note that
427 * while a directory name compares as equal to a regular file, they
428 * then individually compare _differently_ to a filename that has
429 * a dot after the basename (because '\0' < '.' < '/').
431 * This is used by routines that want to traverse the git namespace
432 * but then handle conflicting entries together when possible.
434 int df_name_compare(const char *name1
, int len1
, int mode1
,
435 const char *name2
, int len2
, int mode2
)
437 int len
= len1
< len2
? len1
: len2
, cmp
;
438 unsigned char c1
, c2
;
440 cmp
= memcmp(name1
, name2
, len
);
443 /* Directories and files compare equal (same length, same name) */
447 if (!c1
&& S_ISDIR(mode1
))
450 if (!c2
&& S_ISDIR(mode2
))
452 if (c1
== '/' && !c2
)
454 if (c2
== '/' && !c1
)
459 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
461 size_t min_len
= (len1
< len2
) ? len1
: len2
;
462 int cmp
= memcmp(name1
, name2
, min_len
);
472 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
476 cmp
= name_compare(name1
, len1
, name2
, len2
);
487 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
492 last
= istate
->cache_nr
;
493 while (last
> first
) {
494 int next
= (last
+ first
) >> 1;
495 struct cache_entry
*ce
= istate
->cache
[next
];
496 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
508 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
510 return index_name_stage_pos(istate
, name
, namelen
, 0);
513 int remove_index_entry_at(struct index_state
*istate
, int pos
)
515 struct cache_entry
*ce
= istate
->cache
[pos
];
517 record_resolve_undo(istate
, ce
);
518 remove_name_hash(istate
, ce
);
519 save_or_free_index_entry(istate
, ce
);
520 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
522 if (pos
>= istate
->cache_nr
)
524 memmove(istate
->cache
+ pos
,
525 istate
->cache
+ pos
+ 1,
526 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
531 * Remove all cache entries marked for removal, that is where
532 * CE_REMOVE is set in ce_flags. This is much more effective than
533 * calling remove_index_entry_at() for each entry to be removed.
535 void remove_marked_cache_entries(struct index_state
*istate
)
537 struct cache_entry
**ce_array
= istate
->cache
;
540 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
541 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
542 remove_name_hash(istate
, ce_array
[i
]);
543 save_or_free_index_entry(istate
, ce_array
[i
]);
546 ce_array
[j
++] = ce_array
[i
];
548 if (j
== istate
->cache_nr
)
550 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
551 istate
->cache_nr
= j
;
554 int remove_file_from_index(struct index_state
*istate
, const char *path
)
556 int pos
= index_name_pos(istate
, path
, strlen(path
));
559 cache_tree_invalidate_path(istate
, path
);
560 untracked_cache_remove_from_index(istate
, path
);
561 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
562 remove_index_entry_at(istate
, pos
);
566 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
568 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
571 static int index_name_pos_also_unmerged(struct index_state
*istate
,
572 const char *path
, int namelen
)
574 int pos
= index_name_pos(istate
, path
, namelen
);
575 struct cache_entry
*ce
;
580 /* maybe unmerged? */
582 if (pos
>= istate
->cache_nr
||
583 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
586 /* order of preference: stage 2, 1, 3 */
587 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
588 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
589 !compare_name(ce
, path
, namelen
))
594 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
596 int len
= ce_namelen(ce
);
597 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
601 * If we add a filename that aliases in the cache, we will use the
602 * name that we already have - but we don't want to update the same
603 * alias twice, because that implies that there were actually two
604 * different files with aliasing names!
606 * So we use the CE_ADDED flag to verify that the alias was an old
607 * one before we accept it as
609 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
610 struct cache_entry
*ce
,
611 struct cache_entry
*alias
)
614 struct cache_entry
*new;
616 if (alias
->ce_flags
& CE_ADDED
)
617 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
619 /* Ok, create the new entry using the name of the existing alias */
620 len
= ce_namelen(alias
);
621 new = xcalloc(1, cache_entry_size(len
));
622 memcpy(new->name
, alias
->name
, len
);
623 copy_cache_entry(new, ce
);
624 save_or_free_index_entry(istate
, ce
);
628 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
630 unsigned char sha1
[20];
631 if (write_sha1_file("", 0, blob_type
, sha1
))
632 die("cannot create an empty blob in the object database");
633 hashcpy(ce
->oid
.hash
, sha1
);
636 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
638 int size
, namelen
, was_same
;
639 mode_t st_mode
= st
->st_mode
;
640 struct cache_entry
*ce
, *alias
;
641 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
642 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
643 int pretend
= flags
& ADD_CACHE_PRETEND
;
644 int intent_only
= flags
& ADD_CACHE_INTENT
;
645 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
646 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
648 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
649 return error("%s: can only add regular files, symbolic links or git-directories", path
);
651 namelen
= strlen(path
);
652 if (S_ISDIR(st_mode
)) {
653 while (namelen
&& path
[namelen
-1] == '/')
656 size
= cache_entry_size(namelen
);
657 ce
= xcalloc(1, size
);
658 memcpy(ce
->name
, path
, namelen
);
659 ce
->ce_namelen
= namelen
;
661 fill_stat_cache_info(ce
, st
);
663 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
666 if (trust_executable_bit
&& has_symlinks
) {
667 ce
->ce_mode
= create_ce_mode(st_mode
);
669 /* If there is an existing entry, pick the mode bits and type
670 * from it, otherwise assume unexecutable regular file.
672 struct cache_entry
*ent
;
673 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
675 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
676 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
679 /* When core.ignorecase=true, determine if a directory of the same name but differing
680 * case already exists within the Git repository. If it does, ensure the directory
681 * case of the file being added to the repository matches (is folded into) the existing
682 * entry's directory case.
685 adjust_dirname_case(istate
, ce
->name
);
688 alias
= index_file_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
689 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
690 /* Nothing changed, really */
691 if (!S_ISGITLINK(alias
->ce_mode
))
692 ce_mark_uptodate(alias
);
693 alias
->ce_flags
|= CE_ADDED
;
699 if (index_path(ce
->oid
.hash
, path
, st
, HASH_WRITE_OBJECT
)) {
701 return error("unable to index file %s", path
);
704 set_object_name_for_intent_to_add_entry(ce
);
706 if (ignore_case
&& alias
&& different_name(ce
, alias
))
707 ce
= create_alias_ce(istate
, ce
, alias
);
708 ce
->ce_flags
|= CE_ADDED
;
710 /* It was suspected to be racily clean, but it turns out to be Ok */
713 !oidcmp(&alias
->oid
, &ce
->oid
) &&
714 ce
->ce_mode
== alias
->ce_mode
);
718 else if (add_index_entry(istate
, ce
, add_option
)) {
720 return error("unable to add %s to index", path
);
722 if (verbose
&& !was_same
)
723 printf("add '%s'\n", path
);
727 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
730 if (lstat(path
, &st
))
731 die_errno("unable to stat '%s'", path
);
732 return add_to_index(istate
, path
, &st
, flags
);
735 struct cache_entry
*make_cache_entry(unsigned int mode
,
736 const unsigned char *sha1
, const char *path
, int stage
,
737 unsigned int refresh_options
)
740 struct cache_entry
*ce
, *ret
;
742 if (!verify_path(path
)) {
743 error("Invalid path '%s'", path
);
748 size
= cache_entry_size(len
);
749 ce
= xcalloc(1, size
);
751 hashcpy(ce
->oid
.hash
, sha1
);
752 memcpy(ce
->name
, path
, len
);
753 ce
->ce_flags
= create_ce_flags(stage
);
754 ce
->ce_namelen
= len
;
755 ce
->ce_mode
= create_ce_mode(mode
);
757 ret
= refresh_cache_entry(ce
, refresh_options
);
764 * Chmod an index entry with either +x or -x.
766 * Returns -1 if the chmod for the particular cache entry failed (if it's
767 * not a regular file), -2 if an invalid flip argument is passed in, 0
770 int chmod_index_entry(struct index_state
*istate
, struct cache_entry
*ce
,
773 if (!S_ISREG(ce
->ce_mode
))
780 ce
->ce_mode
&= ~0111;
785 cache_tree_invalidate_path(istate
, ce
->name
);
786 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
787 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
792 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
794 int len
= ce_namelen(a
);
795 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
799 * We fundamentally don't like some paths: we don't want
800 * dot or dot-dot anywhere, and for obvious reasons don't
801 * want to recurse into ".git" either.
803 * Also, we don't want double slashes or slashes at the
804 * end that can make pathnames ambiguous.
806 static int verify_dotfile(const char *rest
)
809 * The first character was '.', but that
810 * has already been discarded, we now test
814 /* "." is not allowed */
815 if (*rest
== '\0' || is_dir_sep(*rest
))
820 * ".git" followed by NUL or slash is bad. This
821 * shares the path end test with the ".." case.
825 if (rest
[1] != 'i' && rest
[1] != 'I')
827 if (rest
[2] != 't' && rest
[2] != 'T')
832 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
838 int verify_path(const char *path
)
842 if (has_dos_drive_prefix(path
))
851 if (protect_hfs
&& is_hfs_dotgit(path
))
853 if (protect_ntfs
&& is_ntfs_dotgit(path
))
856 if ((c
== '.' && !verify_dotfile(path
)) ||
857 is_dir_sep(c
) || c
== '\0')
865 * Do we have another file that has the beginning components being a
866 * proper superset of the name we're trying to add?
868 static int has_file_name(struct index_state
*istate
,
869 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
872 int len
= ce_namelen(ce
);
873 int stage
= ce_stage(ce
);
874 const char *name
= ce
->name
;
876 while (pos
< istate
->cache_nr
) {
877 struct cache_entry
*p
= istate
->cache
[pos
++];
879 if (len
>= ce_namelen(p
))
881 if (memcmp(name
, p
->name
, len
))
883 if (ce_stage(p
) != stage
)
885 if (p
->name
[len
] != '/')
887 if (p
->ce_flags
& CE_REMOVE
)
892 remove_index_entry_at(istate
, --pos
);
898 * Do we have another file with a pathname that is a proper
899 * subset of the name we're trying to add?
901 static int has_dir_name(struct index_state
*istate
,
902 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
905 int stage
= ce_stage(ce
);
906 const char *name
= ce
->name
;
907 const char *slash
= name
+ ce_namelen(ce
);
915 if (slash
<= ce
->name
)
920 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
923 * Found one, but not so fast. This could
924 * be a marker that says "I was here, but
925 * I am being removed". Such an entry is
926 * not a part of the resulting tree, and
927 * it is Ok to have a directory at the same
930 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
934 remove_index_entry_at(istate
, pos
);
942 * Trivial optimization: if we find an entry that
943 * already matches the sub-directory, then we know
944 * we're ok, and we can exit.
946 while (pos
< istate
->cache_nr
) {
947 struct cache_entry
*p
= istate
->cache
[pos
];
948 if ((ce_namelen(p
) <= len
) ||
949 (p
->name
[len
] != '/') ||
950 memcmp(p
->name
, name
, len
))
951 break; /* not our subdirectory */
952 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
954 * p is at the same stage as our entry, and
955 * is a subdirectory of what we are looking
956 * at, so we cannot have conflicts at our
957 * level or anything shorter.
966 /* We may be in a situation where we already have path/file and path
967 * is being added, or we already have path and path/file is being
968 * added. Either one would result in a nonsense tree that has path
969 * twice when git-write-tree tries to write it out. Prevent it.
971 * If ok-to-replace is specified, we remove the conflicting entries
972 * from the cache so the caller should recompute the insert position.
973 * When this happens, we return non-zero.
975 static int check_file_directory_conflict(struct index_state
*istate
,
976 const struct cache_entry
*ce
,
977 int pos
, int ok_to_replace
)
982 * When ce is an "I am going away" entry, we allow it to be added
984 if (ce
->ce_flags
& CE_REMOVE
)
988 * We check if the path is a sub-path of a subsequent pathname
989 * first, since removing those will not change the position
992 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
995 * Then check if the path might have a clashing sub-directory
998 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
1001 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1004 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
1005 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
1006 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
1007 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
1009 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1010 cache_tree_invalidate_path(istate
, ce
->name
);
1011 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1013 /* existing match? Just replace it. */
1016 replace_index_entry(istate
, pos
, ce
);
1021 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
1022 untracked_cache_add_to_index(istate
, ce
->name
);
1025 * Inserting a merged entry ("stage 0") into the index
1026 * will always replace all non-merged entries..
1028 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
1029 while (ce_same_name(istate
->cache
[pos
], ce
)) {
1031 if (!remove_index_entry_at(istate
, pos
))
1038 if (!verify_path(ce
->name
))
1039 return error("Invalid path '%s'", ce
->name
);
1041 if (!skip_df_check
&&
1042 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1044 return error("'%s' appears as both a file and as a directory",
1046 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1052 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1056 if (option
& ADD_CACHE_JUST_APPEND
)
1057 pos
= istate
->cache_nr
;
1060 ret
= add_index_entry_with_check(istate
, ce
, option
);
1066 /* Make sure the array is big enough .. */
1067 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1071 if (istate
->cache_nr
> pos
+ 1)
1072 memmove(istate
->cache
+ pos
+ 1,
1073 istate
->cache
+ pos
,
1074 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1075 set_index_entry(istate
, pos
, ce
);
1076 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1081 * "refresh" does not calculate a new sha1 file or bring the
1082 * cache up-to-date for mode/content changes. But what it
1083 * _does_ do is to "re-match" the stat information of a file
1084 * with the cache, so that you can refresh the cache for a
1085 * file that hasn't been changed but where the stat entry is
1088 * For example, you'd want to do this after doing a "git-read-tree",
1089 * to link up the stat cache details with the proper files.
1091 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1092 struct cache_entry
*ce
,
1093 unsigned int options
, int *err
,
1097 struct cache_entry
*updated
;
1099 int refresh
= options
& CE_MATCH_REFRESH
;
1100 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1101 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1102 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1104 if (!refresh
|| ce_uptodate(ce
))
1108 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1109 * that the change to the work tree does not matter and told
1112 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1113 ce_mark_uptodate(ce
);
1116 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1117 ce_mark_uptodate(ce
);
1121 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1129 if (lstat(ce
->name
, &st
) < 0) {
1130 if (ignore_missing
&& errno
== ENOENT
)
1137 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1139 *changed_ret
= changed
;
1142 * The path is unchanged. If we were told to ignore
1143 * valid bit, then we did the actual stat check and
1144 * found that the entry is unmodified. If the entry
1145 * is not marked VALID, this is the place to mark it
1146 * valid again, under "assume unchanged" mode.
1148 if (ignore_valid
&& assume_unchanged
&&
1149 !(ce
->ce_flags
& CE_VALID
))
1150 ; /* mark this one VALID again */
1153 * We do not mark the index itself "modified"
1154 * because CE_UPTODATE flag is in-core only;
1155 * we are not going to write this change out.
1157 if (!S_ISGITLINK(ce
->ce_mode
))
1158 ce_mark_uptodate(ce
);
1163 if (ie_modified(istate
, ce
, &st
, options
)) {
1170 updated
= xmalloc(size
);
1171 memcpy(updated
, ce
, size
);
1172 fill_stat_cache_info(updated
, &st
);
1174 * If ignore_valid is not set, we should leave CE_VALID bit
1175 * alone. Otherwise, paths marked with --no-assume-unchanged
1176 * (i.e. things to be edited) will reacquire CE_VALID bit
1177 * automatically, which is not really what we want.
1179 if (!ignore_valid
&& assume_unchanged
&&
1180 !(ce
->ce_flags
& CE_VALID
))
1181 updated
->ce_flags
&= ~CE_VALID
;
1183 /* istate->cache_changed is updated in the caller */
1187 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1188 int * first
, const char *header_msg
)
1190 if (in_porcelain
&& *first
&& header_msg
) {
1191 printf("%s\n", header_msg
);
1197 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1198 const struct pathspec
*pathspec
,
1199 char *seen
, const char *header_msg
)
1203 int really
= (flags
& REFRESH_REALLY
) != 0;
1204 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1205 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1206 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1207 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1209 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1210 unsigned int options
= (CE_MATCH_REFRESH
|
1211 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1212 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1213 const char *modified_fmt
;
1214 const char *deleted_fmt
;
1215 const char *typechange_fmt
;
1216 const char *added_fmt
;
1217 const char *unmerged_fmt
;
1219 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1220 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1221 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1222 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1223 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1224 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1225 struct cache_entry
*ce
, *new;
1226 int cache_errno
= 0;
1230 ce
= istate
->cache
[i
];
1231 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1234 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1238 while ((i
< istate
->cache_nr
) &&
1239 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1245 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1246 &first
, header_msg
);
1254 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1260 if (really
&& cache_errno
== EINVAL
) {
1261 /* If we are doing --really-refresh that
1262 * means the index is not valid anymore.
1264 ce
->ce_flags
&= ~CE_VALID
;
1265 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1266 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1271 if (cache_errno
== ENOENT
)
1273 else if (ce_intent_to_add(ce
))
1274 fmt
= added_fmt
; /* must be before other checks */
1275 else if (changed
& TYPE_CHANGED
)
1276 fmt
= typechange_fmt
;
1280 ce
->name
, in_porcelain
, &first
, header_msg
);
1285 replace_index_entry(istate
, i
, new);
1290 struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1291 unsigned int options
)
1293 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1297 /*****************************************************************
1299 *****************************************************************/
1301 #define INDEX_FORMAT_DEFAULT 3
1303 static unsigned int get_index_format_default(void)
1305 char *envversion
= getenv("GIT_INDEX_VERSION");
1308 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1311 if (!git_config_get_int("index.version", &value
))
1313 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1314 warning(_("index.version set, but the value is invalid.\n"
1315 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1316 return INDEX_FORMAT_DEFAULT
;
1321 version
= strtoul(envversion
, &endp
, 10);
1323 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1324 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1325 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1326 version
= INDEX_FORMAT_DEFAULT
;
1332 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1333 * Again - this is just a (very strong in practice) heuristic that
1334 * the inode hasn't changed.
1336 * We save the fields in big-endian order to allow using the
1337 * index file over NFS transparently.
1339 struct ondisk_cache_entry
{
1340 struct cache_time ctime
;
1341 struct cache_time mtime
;
1348 unsigned char sha1
[20];
1350 char name
[FLEX_ARRAY
]; /* more */
1354 * This struct is used when CE_EXTENDED bit is 1
1355 * The struct must match ondisk_cache_entry exactly from
1358 struct ondisk_cache_entry_extended
{
1359 struct cache_time ctime
;
1360 struct cache_time mtime
;
1367 unsigned char sha1
[20];
1370 char name
[FLEX_ARRAY
]; /* more */
1373 /* These are only used for v3 or lower */
1374 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1375 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1376 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1377 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1378 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1379 ondisk_cache_entry_size(ce_namelen(ce)))
1381 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1384 unsigned char sha1
[20];
1387 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1388 return error("bad signature");
1389 hdr_version
= ntohl(hdr
->hdr_version
);
1390 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1391 return error("bad index version %d", hdr_version
);
1393 git_SHA1_Update(&c
, hdr
, size
- 20);
1394 git_SHA1_Final(sha1
, &c
);
1395 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1396 return error("bad index file sha1 signature");
1400 static int read_index_extension(struct index_state
*istate
,
1401 const char *ext
, void *data
, unsigned long sz
)
1403 switch (CACHE_EXT(ext
)) {
1404 case CACHE_EXT_TREE
:
1405 istate
->cache_tree
= cache_tree_read(data
, sz
);
1407 case CACHE_EXT_RESOLVE_UNDO
:
1408 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1410 case CACHE_EXT_LINK
:
1411 if (read_link_extension(istate
, data
, sz
))
1414 case CACHE_EXT_UNTRACKED
:
1415 istate
->untracked
= read_untracked_extension(data
, sz
);
1418 if (*ext
< 'A' || 'Z' < *ext
)
1419 return error("index uses %.4s extension, which we do not understand",
1421 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1427 int hold_locked_index(struct lock_file
*lk
, int die_on_error
)
1429 return hold_lock_file_for_update(lk
, get_index_file(),
1435 int read_index(struct index_state
*istate
)
1437 return read_index_from(istate
, get_index_file());
1440 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1445 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1447 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1448 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1449 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1450 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1451 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1452 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1453 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1454 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1455 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1456 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1457 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1458 ce
->ce_namelen
= len
;
1460 hashcpy(ce
->oid
.hash
, ondisk
->sha1
);
1461 memcpy(ce
->name
, name
, len
);
1462 ce
->name
[len
] = '\0';
1467 * Adjacent cache entries tend to share the leading paths, so it makes
1468 * sense to only store the differences in later entries. In the v4
1469 * on-disk format of the index, each on-disk cache entry stores the
1470 * number of bytes to be stripped from the end of the previous name,
1471 * and the bytes to append to the result, to come up with its name.
1473 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1475 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1476 size_t len
= decode_varint(&cp
);
1478 if (name
->len
< len
)
1479 die("malformed name field in the index");
1480 strbuf_remove(name
, name
->len
- len
, len
);
1481 for (ep
= cp
; *ep
; ep
++)
1482 ; /* find the end */
1483 strbuf_add(name
, cp
, ep
- cp
);
1484 return (const char *)ep
+ 1 - cp_
;
1487 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1488 unsigned long *ent_size
,
1489 struct strbuf
*previous_name
)
1491 struct cache_entry
*ce
;
1496 /* On-disk flags are just 16 bits */
1497 flags
= get_be16(&ondisk
->flags
);
1498 len
= flags
& CE_NAMEMASK
;
1500 if (flags
& CE_EXTENDED
) {
1501 struct ondisk_cache_entry_extended
*ondisk2
;
1503 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1504 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1505 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1506 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1507 die("Unknown index entry format %08x", extended_flags
);
1508 flags
|= extended_flags
;
1509 name
= ondisk2
->name
;
1512 name
= ondisk
->name
;
1514 if (!previous_name
) {
1515 /* v3 and earlier */
1516 if (len
== CE_NAMEMASK
)
1518 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1520 *ent_size
= ondisk_ce_size(ce
);
1522 unsigned long consumed
;
1523 consumed
= expand_name_field(previous_name
, name
);
1524 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1526 previous_name
->len
);
1528 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1533 static void check_ce_order(struct index_state
*istate
)
1537 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1538 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1539 struct cache_entry
*next_ce
= istate
->cache
[i
];
1540 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1542 if (0 < name_compare
)
1543 die("unordered stage entries in index");
1544 if (!name_compare
) {
1546 die("multiple stage entries for merged file '%s'",
1548 if (ce_stage(ce
) > ce_stage(next_ce
))
1549 die("unordered stage entries for '%s'",
1555 static void tweak_untracked_cache(struct index_state
*istate
)
1557 switch (git_config_get_untracked_cache()) {
1558 case -1: /* keep: do nothing */
1561 remove_untracked_cache(istate
);
1564 add_untracked_cache(istate
);
1566 default: /* unknown value: do nothing */
1571 static void post_read_index_from(struct index_state
*istate
)
1573 check_ce_order(istate
);
1574 tweak_untracked_cache(istate
);
1577 /* remember to discard_cache() before reading a different cache! */
1578 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1582 unsigned long src_offset
;
1583 struct cache_header
*hdr
;
1586 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1588 if (istate
->initialized
)
1589 return istate
->cache_nr
;
1591 istate
->timestamp
.sec
= 0;
1592 istate
->timestamp
.nsec
= 0;
1593 fd
= open(path
, O_RDONLY
);
1595 if (!must_exist
&& errno
== ENOENT
)
1597 die_errno("%s: index file open failed", path
);
1601 die_errno("cannot stat the open index");
1603 mmap_size
= xsize_t(st
.st_size
);
1604 if (mmap_size
< sizeof(struct cache_header
) + 20)
1605 die("index file smaller than expected");
1607 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1608 if (mmap
== MAP_FAILED
)
1609 die_errno("unable to map index file");
1613 if (verify_hdr(hdr
, mmap_size
) < 0)
1616 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- 20);
1617 istate
->version
= ntohl(hdr
->hdr_version
);
1618 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1619 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1620 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1621 istate
->initialized
= 1;
1623 if (istate
->version
== 4)
1624 previous_name
= &previous_name_buf
;
1626 previous_name
= NULL
;
1628 src_offset
= sizeof(*hdr
);
1629 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1630 struct ondisk_cache_entry
*disk_ce
;
1631 struct cache_entry
*ce
;
1632 unsigned long consumed
;
1634 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1635 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1636 set_index_entry(istate
, i
, ce
);
1638 src_offset
+= consumed
;
1640 strbuf_release(&previous_name_buf
);
1641 istate
->timestamp
.sec
= st
.st_mtime
;
1642 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1644 while (src_offset
<= mmap_size
- 20 - 8) {
1645 /* After an array of active_nr index entries,
1646 * there can be arbitrary number of extended
1647 * sections, each of which is prefixed with
1648 * extension name (4-byte) and section length
1649 * in 4-byte network byte order.
1652 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1653 extsize
= ntohl(extsize
);
1654 if (read_index_extension(istate
,
1655 (const char *) mmap
+ src_offset
,
1656 (char *) mmap
+ src_offset
+ 8,
1660 src_offset
+= extsize
;
1662 munmap(mmap
, mmap_size
);
1663 return istate
->cache_nr
;
1666 munmap(mmap
, mmap_size
);
1667 die("index file corrupt");
1670 int read_index_from(struct index_state
*istate
, const char *path
)
1672 struct split_index
*split_index
;
1675 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1676 if (istate
->initialized
)
1677 return istate
->cache_nr
;
1679 ret
= do_read_index(istate
, path
, 0);
1681 split_index
= istate
->split_index
;
1682 if (!split_index
|| is_null_sha1(split_index
->base_sha1
)) {
1683 post_read_index_from(istate
);
1687 if (split_index
->base
)
1688 discard_index(split_index
->base
);
1690 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1691 ret
= do_read_index(split_index
->base
,
1692 git_path("sharedindex.%s",
1693 sha1_to_hex(split_index
->base_sha1
)), 1);
1694 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1695 die("broken index, expect %s in %s, got %s",
1696 sha1_to_hex(split_index
->base_sha1
),
1697 git_path("sharedindex.%s",
1698 sha1_to_hex(split_index
->base_sha1
)),
1699 sha1_to_hex(split_index
->base
->sha1
));
1700 merge_base_index(istate
);
1701 post_read_index_from(istate
);
1705 int is_index_unborn(struct index_state
*istate
)
1707 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1710 int discard_index(struct index_state
*istate
)
1714 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1715 if (istate
->cache
[i
]->index
&&
1716 istate
->split_index
&&
1717 istate
->split_index
->base
&&
1718 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1719 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1721 free(istate
->cache
[i
]);
1723 resolve_undo_clear_index(istate
);
1724 istate
->cache_nr
= 0;
1725 istate
->cache_changed
= 0;
1726 istate
->timestamp
.sec
= 0;
1727 istate
->timestamp
.nsec
= 0;
1728 free_name_hash(istate
);
1729 cache_tree_free(&(istate
->cache_tree
));
1730 istate
->initialized
= 0;
1731 free(istate
->cache
);
1732 istate
->cache
= NULL
;
1733 istate
->cache_alloc
= 0;
1734 discard_split_index(istate
);
1735 free_untracked_cache(istate
->untracked
);
1736 istate
->untracked
= NULL
;
1740 int unmerged_index(const struct index_state
*istate
)
1743 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1744 if (ce_stage(istate
->cache
[i
]))
1750 #define WRITE_BUFFER_SIZE 8192
1751 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1752 static unsigned long write_buffer_len
;
1754 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1756 unsigned int buffered
= write_buffer_len
;
1758 git_SHA1_Update(context
, write_buffer
, buffered
);
1759 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1761 write_buffer_len
= 0;
1766 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1769 unsigned int buffered
= write_buffer_len
;
1770 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1773 memcpy(write_buffer
+ buffered
, data
, partial
);
1774 buffered
+= partial
;
1775 if (buffered
== WRITE_BUFFER_SIZE
) {
1776 write_buffer_len
= buffered
;
1777 if (ce_write_flush(context
, fd
))
1781 write_buffer_len
= buffered
;
1783 data
= (char *) data
+ partial
;
1788 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1789 unsigned int ext
, unsigned int sz
)
1793 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1794 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1797 static int ce_flush(git_SHA_CTX
*context
, int fd
, unsigned char *sha1
)
1799 unsigned int left
= write_buffer_len
;
1802 write_buffer_len
= 0;
1803 git_SHA1_Update(context
, write_buffer
, left
);
1806 /* Flush first if not enough space for SHA1 signature */
1807 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1808 if (write_in_full(fd
, write_buffer
, left
) != left
)
1813 /* Append the SHA1 signature at the end */
1814 git_SHA1_Final(write_buffer
+ left
, context
);
1815 hashcpy(sha1
, write_buffer
+ left
);
1817 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1820 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1823 * The only thing we care about in this function is to smudge the
1824 * falsely clean entry due to touch-update-touch race, so we leave
1825 * everything else as they are. We are called for entries whose
1826 * ce_stat_data.sd_mtime match the index file mtime.
1828 * Note that this actually does not do much for gitlinks, for
1829 * which ce_match_stat_basic() always goes to the actual
1830 * contents. The caller checks with is_racy_timestamp() which
1831 * always says "no" for gitlinks, so we are not called for them ;-)
1835 if (lstat(ce
->name
, &st
) < 0)
1837 if (ce_match_stat_basic(ce
, &st
))
1839 if (ce_modified_check_fs(ce
, &st
)) {
1840 /* This is "racily clean"; smudge it. Note that this
1841 * is a tricky code. At first glance, it may appear
1842 * that it can break with this sequence:
1844 * $ echo xyzzy >frotz
1845 * $ git-update-index --add frotz
1848 * $ echo filfre >nitfol
1849 * $ git-update-index --add nitfol
1851 * but it does not. When the second update-index runs,
1852 * it notices that the entry "frotz" has the same timestamp
1853 * as index, and if we were to smudge it by resetting its
1854 * size to zero here, then the object name recorded
1855 * in index is the 6-byte file but the cached stat information
1856 * becomes zero --- which would then match what we would
1857 * obtain from the filesystem next time we stat("frotz").
1859 * However, the second update-index, before calling
1860 * this function, notices that the cached size is 6
1861 * bytes and what is on the filesystem is an empty
1862 * file, and never calls us, so the cached size information
1863 * for "frotz" stays 6 which does not match the filesystem.
1865 ce
->ce_stat_data
.sd_size
= 0;
1869 /* Copy miscellaneous fields but not the name */
1870 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1871 struct cache_entry
*ce
)
1875 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1876 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1877 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1878 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1879 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1880 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1881 ondisk
->mode
= htonl(ce
->ce_mode
);
1882 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1883 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1884 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1885 hashcpy(ondisk
->sha1
, ce
->oid
.hash
);
1887 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
1888 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1889 ondisk
->flags
= htons(flags
);
1890 if (ce
->ce_flags
& CE_EXTENDED
) {
1891 struct ondisk_cache_entry_extended
*ondisk2
;
1892 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1893 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1894 return ondisk2
->name
;
1897 return ondisk
->name
;
1901 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1902 struct strbuf
*previous_name
)
1905 struct ondisk_cache_entry
*ondisk
;
1906 int saved_namelen
= saved_namelen
; /* compiler workaround */
1910 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1911 saved_namelen
= ce_namelen(ce
);
1915 if (!previous_name
) {
1916 size
= ondisk_ce_size(ce
);
1917 ondisk
= xcalloc(1, size
);
1918 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1919 memcpy(name
, ce
->name
, ce_namelen(ce
));
1921 int common
, to_remove
, prefix_size
;
1922 unsigned char to_remove_vi
[16];
1924 (ce
->name
[common
] &&
1925 common
< previous_name
->len
&&
1926 ce
->name
[common
] == previous_name
->buf
[common
]);
1928 ; /* still matching */
1929 to_remove
= previous_name
->len
- common
;
1930 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
1932 if (ce
->ce_flags
& CE_EXTENDED
)
1933 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
1935 size
= offsetof(struct ondisk_cache_entry
, name
);
1936 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
1938 ondisk
= xcalloc(1, size
);
1939 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1940 memcpy(name
, to_remove_vi
, prefix_size
);
1941 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
1943 strbuf_splice(previous_name
, common
, to_remove
,
1944 ce
->name
+ common
, ce_namelen(ce
) - common
);
1946 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1947 ce
->ce_namelen
= saved_namelen
;
1948 ce
->ce_flags
&= ~CE_STRIP_NAME
;
1951 result
= ce_write(c
, fd
, ondisk
, size
);
1957 * This function verifies if index_state has the correct sha1 of the
1958 * index file. Don't die if we have any other failure, just return 0.
1960 static int verify_index_from(const struct index_state
*istate
, const char *path
)
1965 unsigned char sha1
[20];
1967 if (!istate
->initialized
)
1970 fd
= open(path
, O_RDONLY
);
1977 if (st
.st_size
< sizeof(struct cache_header
) + 20)
1980 n
= pread_in_full(fd
, sha1
, 20, st
.st_size
- 20);
1984 if (hashcmp(istate
->sha1
, sha1
))
1995 static int verify_index(const struct index_state
*istate
)
1997 return verify_index_from(istate
, get_index_file());
2000 static int has_racy_timestamp(struct index_state
*istate
)
2002 int entries
= istate
->cache_nr
;
2005 for (i
= 0; i
< entries
; i
++) {
2006 struct cache_entry
*ce
= istate
->cache
[i
];
2007 if (is_racy_timestamp(istate
, ce
))
2014 * Opportunistically update the index but do not complain if we can't
2016 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
2018 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
2019 verify_index(istate
) &&
2020 write_locked_index(istate
, lockfile
, COMMIT_LOCK
))
2021 rollback_lock_file(lockfile
);
2024 static int do_write_index(struct index_state
*istate
, int newfd
,
2025 int strip_extensions
)
2028 struct cache_header hdr
;
2029 int i
, err
, removed
, extended
, hdr_version
;
2030 struct cache_entry
**cache
= istate
->cache
;
2031 int entries
= istate
->cache_nr
;
2033 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2035 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2036 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2039 /* reduce extended entries if possible */
2040 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2041 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2043 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2047 if (!istate
->version
) {
2048 istate
->version
= get_index_format_default();
2049 if (getenv("GIT_TEST_SPLIT_INDEX"))
2050 init_split_index(istate
);
2053 /* demote version 3 to version 2 when the latter suffices */
2054 if (istate
->version
== 3 || istate
->version
== 2)
2055 istate
->version
= extended
? 3 : 2;
2057 hdr_version
= istate
->version
;
2059 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2060 hdr
.hdr_version
= htonl(hdr_version
);
2061 hdr
.hdr_entries
= htonl(entries
- removed
);
2064 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2067 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2068 for (i
= 0; i
< entries
; i
++) {
2069 struct cache_entry
*ce
= cache
[i
];
2070 if (ce
->ce_flags
& CE_REMOVE
)
2072 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2073 ce_smudge_racily_clean_entry(ce
);
2074 if (is_null_oid(&ce
->oid
)) {
2075 static const char msg
[] = "cache entry has null sha1: %s";
2076 static int allow
= -1;
2079 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2081 warning(msg
, ce
->name
);
2083 return error(msg
, ce
->name
);
2085 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
2088 strbuf_release(&previous_name_buf
);
2090 /* Write extension data here */
2091 if (!strip_extensions
&& istate
->split_index
) {
2092 struct strbuf sb
= STRBUF_INIT
;
2094 err
= write_link_extension(&sb
, istate
) < 0 ||
2095 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
2097 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2098 strbuf_release(&sb
);
2102 if (!strip_extensions
&& istate
->cache_tree
) {
2103 struct strbuf sb
= STRBUF_INIT
;
2105 cache_tree_write(&sb
, istate
->cache_tree
);
2106 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2107 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2108 strbuf_release(&sb
);
2112 if (!strip_extensions
&& istate
->resolve_undo
) {
2113 struct strbuf sb
= STRBUF_INIT
;
2115 resolve_undo_write(&sb
, istate
->resolve_undo
);
2116 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2118 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2119 strbuf_release(&sb
);
2123 if (!strip_extensions
&& istate
->untracked
) {
2124 struct strbuf sb
= STRBUF_INIT
;
2126 write_untracked_extension(&sb
, istate
->untracked
);
2127 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_UNTRACKED
,
2129 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2130 strbuf_release(&sb
);
2135 if (ce_flush(&c
, newfd
, istate
->sha1
) || fstat(newfd
, &st
))
2137 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2138 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2142 void set_alternate_index_output(const char *name
)
2144 alternate_index_output
= name
;
2147 static int commit_locked_index(struct lock_file
*lk
)
2149 if (alternate_index_output
)
2150 return commit_lock_file_to(lk
, alternate_index_output
);
2152 return commit_lock_file(lk
);
2155 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2158 int ret
= do_write_index(istate
, get_lock_file_fd(lock
), 0);
2161 assert((flags
& (COMMIT_LOCK
| CLOSE_LOCK
)) !=
2162 (COMMIT_LOCK
| CLOSE_LOCK
));
2163 if (flags
& COMMIT_LOCK
)
2164 return commit_locked_index(lock
);
2165 else if (flags
& CLOSE_LOCK
)
2166 return close_lock_file(lock
);
2171 static int write_split_index(struct index_state
*istate
,
2172 struct lock_file
*lock
,
2176 prepare_to_write_split_index(istate
);
2177 ret
= do_write_locked_index(istate
, lock
, flags
);
2178 finish_writing_split_index(istate
);
2182 static struct tempfile temporary_sharedindex
;
2184 static int write_shared_index(struct index_state
*istate
,
2185 struct lock_file
*lock
, unsigned flags
)
2187 struct split_index
*si
= istate
->split_index
;
2190 fd
= mks_tempfile(&temporary_sharedindex
, git_path("sharedindex_XXXXXX"));
2192 hashclr(si
->base_sha1
);
2193 return do_write_locked_index(istate
, lock
, flags
);
2195 move_cache_to_base_index(istate
);
2196 ret
= do_write_index(si
->base
, fd
, 1);
2198 delete_tempfile(&temporary_sharedindex
);
2201 ret
= rename_tempfile(&temporary_sharedindex
,
2202 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2204 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2208 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2211 struct split_index
*si
= istate
->split_index
;
2213 if (!si
|| alternate_index_output
||
2214 (istate
->cache_changed
& ~EXTMASK
)) {
2216 hashclr(si
->base_sha1
);
2217 return do_write_locked_index(istate
, lock
, flags
);
2220 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2221 int v
= si
->base_sha1
[0];
2223 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2225 if (istate
->cache_changed
& SPLIT_INDEX_ORDERED
) {
2226 int ret
= write_shared_index(istate
, lock
, flags
);
2231 return write_split_index(istate
, lock
, flags
);
2235 * Read the index file that is potentially unmerged into given
2236 * index_state, dropping any unmerged entries. Returns true if
2237 * the index is unmerged. Callers who want to refuse to work
2238 * from an unmerged state can call this and check its return value,
2239 * instead of calling read_cache().
2241 int read_index_unmerged(struct index_state
*istate
)
2247 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2248 struct cache_entry
*ce
= istate
->cache
[i
];
2249 struct cache_entry
*new_ce
;
2255 len
= ce_namelen(ce
);
2256 size
= cache_entry_size(len
);
2257 new_ce
= xcalloc(1, size
);
2258 memcpy(new_ce
->name
, ce
->name
, len
);
2259 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2260 new_ce
->ce_namelen
= len
;
2261 new_ce
->ce_mode
= ce
->ce_mode
;
2262 if (add_index_entry(istate
, new_ce
, 0))
2263 return error("%s: cannot drop to stage #0",
2270 * Returns 1 if the path is an "other" path with respect to
2271 * the index; that is, the path is not mentioned in the index at all,
2272 * either as a file, a directory with some files in the index,
2273 * or as an unmerged entry.
2275 * We helpfully remove a trailing "/" from directories so that
2276 * the output of read_directory can be used as-is.
2278 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2282 if (namelen
&& name
[namelen
- 1] == '/')
2284 pos
= index_name_pos(istate
, name
, namelen
);
2286 return 0; /* exact match */
2288 if (pos
< istate
->cache_nr
) {
2289 struct cache_entry
*ce
= istate
->cache
[pos
];
2290 if (ce_namelen(ce
) == namelen
&&
2291 !memcmp(ce
->name
, name
, namelen
))
2292 return 0; /* Yup, this one exists unmerged */
2297 void *read_blob_data_from_index(struct index_state
*istate
, const char *path
, unsigned long *size
)
2301 enum object_type type
;
2305 pos
= index_name_pos(istate
, path
, len
);
2308 * We might be in the middle of a merge, in which
2309 * case we would read stage #2 (ours).
2313 (pos
< 0 && i
< istate
->cache_nr
&&
2314 !strcmp(istate
->cache
[i
]->name
, path
));
2316 if (ce_stage(istate
->cache
[i
]) == 2)
2321 data
= read_sha1_file(istate
->cache
[pos
]->oid
.hash
, &type
, &sz
);
2322 if (!data
|| type
!= OBJ_BLOB
) {
2331 void stat_validity_clear(struct stat_validity
*sv
)
2337 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2341 if (stat(path
, &st
) < 0)
2342 return sv
->sd
== NULL
;
2345 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2348 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2352 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2353 stat_validity_clear(sv
);
2356 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2357 fill_stat_data(sv
->sd
, &st
);