2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
9 #include "cache-tree.h"
15 #include "resolve-undo.h"
18 #include "split-index.h"
22 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
23 unsigned int options
);
25 /* Mask for the name length in ce_flags in the on-disk index */
27 #define CE_NAMEMASK (0x0fff)
31 * The first letter should be 'A'..'Z' for extensions that are not
32 * necessary for a correct operation (i.e. optimization data).
33 * When new extensions are added that _needs_ to be understood in
34 * order to correctly interpret the index file, pick character that
35 * is outside the range, to cause the reader to abort.
38 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
39 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
40 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
41 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
43 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
44 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
45 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
48 struct index_state the_index
;
49 static const char *alternate_index_output
;
51 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
53 istate
->cache
[nr
] = ce
;
54 add_name_hash(istate
, ce
);
57 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
59 struct cache_entry
*old
= istate
->cache
[nr
];
61 replace_index_entry_in_base(istate
, old
, ce
);
62 remove_name_hash(istate
, old
);
64 set_index_entry(istate
, nr
, ce
);
65 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
66 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
69 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
71 struct cache_entry
*old
= istate
->cache
[nr
], *new;
72 int namelen
= strlen(new_name
);
74 new = xmalloc(cache_entry_size(namelen
));
75 copy_cache_entry(new, old
);
76 new->ce_flags
&= ~CE_HASHED
;
77 new->ce_namelen
= namelen
;
79 memcpy(new->name
, new_name
, namelen
+ 1);
81 cache_tree_invalidate_path(istate
, old
->name
);
82 remove_index_entry_at(istate
, nr
);
83 add_index_entry(istate
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
86 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
88 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
89 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
90 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
91 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
92 sd
->sd_dev
= st
->st_dev
;
93 sd
->sd_ino
= st
->st_ino
;
94 sd
->sd_uid
= st
->st_uid
;
95 sd
->sd_gid
= st
->st_gid
;
96 sd
->sd_size
= st
->st_size
;
99 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
103 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
104 changed
|= MTIME_CHANGED
;
105 if (trust_ctime
&& check_stat
&&
106 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
107 changed
|= CTIME_CHANGED
;
110 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
111 changed
|= MTIME_CHANGED
;
112 if (trust_ctime
&& check_stat
&&
113 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
114 changed
|= CTIME_CHANGED
;
118 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
119 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
120 changed
|= OWNER_CHANGED
;
121 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
122 changed
|= INODE_CHANGED
;
127 * st_dev breaks on network filesystems where different
128 * clients will have different views of what "device"
129 * the filesystem is on
131 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
132 changed
|= INODE_CHANGED
;
135 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
136 changed
|= DATA_CHANGED
;
142 * This only updates the "non-critical" parts of the directory
143 * cache, ie the parts that aren't tracked by GIT, and only used
144 * to validate the cache.
146 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
148 fill_stat_data(&ce
->ce_stat_data
, st
);
150 if (assume_unchanged
)
151 ce
->ce_flags
|= CE_VALID
;
153 if (S_ISREG(st
->st_mode
))
154 ce_mark_uptodate(ce
);
157 static int ce_compare_data(const struct cache_entry
*ce
, struct stat
*st
)
160 int fd
= open(ce
->name
, O_RDONLY
);
163 unsigned char sha1
[20];
164 if (!index_fd(sha1
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
165 match
= hashcmp(sha1
, ce
->sha1
);
166 /* index_fd() closed the file descriptor already */
171 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
176 enum object_type type
;
177 struct strbuf sb
= STRBUF_INIT
;
179 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
182 buffer
= read_sha1_file(ce
->sha1
, &type
, &size
);
185 match
= memcmp(buffer
, sb
.buf
, size
);
192 static int ce_compare_gitlink(const struct cache_entry
*ce
)
194 unsigned char sha1
[20];
197 * We don't actually require that the .git directory
198 * under GITLINK directory be a valid git directory. It
199 * might even be missing (in case nobody populated that
202 * If so, we consider it always to match.
204 if (resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) < 0)
206 return hashcmp(sha1
, ce
->sha1
);
209 static int ce_modified_check_fs(const struct cache_entry
*ce
, struct stat
*st
)
211 switch (st
->st_mode
& S_IFMT
) {
213 if (ce_compare_data(ce
, st
))
217 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
221 if (S_ISGITLINK(ce
->ce_mode
))
222 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
229 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
231 unsigned int changed
= 0;
233 if (ce
->ce_flags
& CE_REMOVE
)
234 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
236 switch (ce
->ce_mode
& S_IFMT
) {
238 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
239 /* We consider only the owner x bit to be relevant for
242 if (trust_executable_bit
&&
243 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
244 changed
|= MODE_CHANGED
;
247 if (!S_ISLNK(st
->st_mode
) &&
248 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
249 changed
|= TYPE_CHANGED
;
252 /* We ignore most of the st_xxx fields for gitlinks */
253 if (!S_ISDIR(st
->st_mode
))
254 changed
|= TYPE_CHANGED
;
255 else if (ce_compare_gitlink(ce
))
256 changed
|= DATA_CHANGED
;
259 die("internal error: ce_mode is %o", ce
->ce_mode
);
262 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
264 /* Racily smudged entry? */
265 if (!ce
->ce_stat_data
.sd_size
) {
266 if (!is_empty_blob_sha1(ce
->sha1
))
267 changed
|= DATA_CHANGED
;
273 static int is_racy_timestamp(const struct index_state
*istate
,
274 const struct cache_entry
*ce
)
276 return (!S_ISGITLINK(ce
->ce_mode
) &&
277 istate
->timestamp
.sec
&&
279 /* nanosecond timestamped files can also be racy! */
280 (istate
->timestamp
.sec
< ce
->ce_stat_data
.sd_mtime
.sec
||
281 (istate
->timestamp
.sec
== ce
->ce_stat_data
.sd_mtime
.sec
&&
282 istate
->timestamp
.nsec
<= ce
->ce_stat_data
.sd_mtime
.nsec
))
284 istate
->timestamp
.sec
<= ce
->ce_stat_data
.sd_mtime
.sec
289 int ie_match_stat(const struct index_state
*istate
,
290 const struct cache_entry
*ce
, struct stat
*st
,
291 unsigned int options
)
293 unsigned int changed
;
294 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
295 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
296 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
299 * If it's marked as always valid in the index, it's
300 * valid whatever the checked-out copy says.
302 * skip-worktree has the same effect with higher precedence
304 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
306 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
310 * Intent-to-add entries have not been added, so the index entry
311 * by definition never matches what is in the work tree until it
312 * actually gets added.
314 if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
315 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
317 changed
= ce_match_stat_basic(ce
, st
);
320 * Within 1 second of this sequence:
321 * echo xyzzy >file && git-update-index --add file
322 * running this command:
324 * would give a falsely clean cache entry. The mtime and
325 * length match the cache, and other stat fields do not change.
327 * We could detect this at update-index time (the cache entry
328 * being registered/updated records the same time as "now")
329 * and delay the return from git-update-index, but that would
330 * effectively mean we can make at most one commit per second,
331 * which is not acceptable. Instead, we check cache entries
332 * whose mtime are the same as the index file timestamp more
333 * carefully than others.
335 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
336 if (assume_racy_is_modified
)
337 changed
|= DATA_CHANGED
;
339 changed
|= ce_modified_check_fs(ce
, st
);
345 int ie_modified(const struct index_state
*istate
,
346 const struct cache_entry
*ce
,
347 struct stat
*st
, unsigned int options
)
349 int changed
, changed_fs
;
351 changed
= ie_match_stat(istate
, ce
, st
, options
);
355 * If the mode or type has changed, there's no point in trying
356 * to refresh the entry - it's not going to match
358 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
362 * Immediately after read-tree or update-index --cacheinfo,
363 * the length field is zero, as we have never even read the
364 * lstat(2) information once, and we cannot trust DATA_CHANGED
365 * returned by ie_match_stat() which in turn was returned by
366 * ce_match_stat_basic() to signal that the filesize of the
367 * blob changed. We have to actually go to the filesystem to
368 * see if the contents match, and if so, should answer "unchanged".
370 * The logic does not apply to gitlinks, as ce_match_stat_basic()
371 * already has checked the actual HEAD from the filesystem in the
372 * subproject. If ie_match_stat() already said it is different,
373 * then we know it is.
375 if ((changed
& DATA_CHANGED
) &&
376 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
379 changed_fs
= ce_modified_check_fs(ce
, st
);
381 return changed
| changed_fs
;
385 int base_name_compare(const char *name1
, int len1
, int mode1
,
386 const char *name2
, int len2
, int mode2
)
388 unsigned char c1
, c2
;
389 int len
= len1
< len2
? len1
: len2
;
392 cmp
= memcmp(name1
, name2
, len
);
397 if (!c1
&& S_ISDIR(mode1
))
399 if (!c2
&& S_ISDIR(mode2
))
401 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
405 * df_name_compare() is identical to base_name_compare(), except it
406 * compares conflicting directory/file entries as equal. Note that
407 * while a directory name compares as equal to a regular file, they
408 * then individually compare _differently_ to a filename that has
409 * a dot after the basename (because '\0' < '.' < '/').
411 * This is used by routines that want to traverse the git namespace
412 * but then handle conflicting entries together when possible.
414 int df_name_compare(const char *name1
, int len1
, int mode1
,
415 const char *name2
, int len2
, int mode2
)
417 int len
= len1
< len2
? len1
: len2
, cmp
;
418 unsigned char c1
, c2
;
420 cmp
= memcmp(name1
, name2
, len
);
423 /* Directories and files compare equal (same length, same name) */
427 if (!c1
&& S_ISDIR(mode1
))
430 if (!c2
&& S_ISDIR(mode2
))
432 if (c1
== '/' && !c2
)
434 if (c2
== '/' && !c1
)
439 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
441 size_t min_len
= (len1
< len2
) ? len1
: len2
;
442 int cmp
= memcmp(name1
, name2
, min_len
);
452 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
456 cmp
= name_compare(name1
, len1
, name2
, len2
);
467 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
472 last
= istate
->cache_nr
;
473 while (last
> first
) {
474 int next
= (last
+ first
) >> 1;
475 struct cache_entry
*ce
= istate
->cache
[next
];
476 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
488 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
490 return index_name_stage_pos(istate
, name
, namelen
, 0);
493 /* Remove entry, return true if there are more entries to go.. */
494 int remove_index_entry_at(struct index_state
*istate
, int pos
)
496 struct cache_entry
*ce
= istate
->cache
[pos
];
498 record_resolve_undo(istate
, ce
);
499 remove_name_hash(istate
, ce
);
500 save_or_free_index_entry(istate
, ce
);
501 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
503 if (pos
>= istate
->cache_nr
)
505 memmove(istate
->cache
+ pos
,
506 istate
->cache
+ pos
+ 1,
507 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
512 * Remove all cache entries marked for removal, that is where
513 * CE_REMOVE is set in ce_flags. This is much more effective than
514 * calling remove_index_entry_at() for each entry to be removed.
516 void remove_marked_cache_entries(struct index_state
*istate
)
518 struct cache_entry
**ce_array
= istate
->cache
;
521 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
522 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
523 remove_name_hash(istate
, ce_array
[i
]);
524 save_or_free_index_entry(istate
, ce_array
[i
]);
527 ce_array
[j
++] = ce_array
[i
];
529 if (j
== istate
->cache_nr
)
531 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
532 istate
->cache_nr
= j
;
535 int remove_file_from_index(struct index_state
*istate
, const char *path
)
537 int pos
= index_name_pos(istate
, path
, strlen(path
));
540 cache_tree_invalidate_path(istate
, path
);
541 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
542 remove_index_entry_at(istate
, pos
);
546 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
548 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
551 static int index_name_pos_also_unmerged(struct index_state
*istate
,
552 const char *path
, int namelen
)
554 int pos
= index_name_pos(istate
, path
, namelen
);
555 struct cache_entry
*ce
;
560 /* maybe unmerged? */
562 if (pos
>= istate
->cache_nr
||
563 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
566 /* order of preference: stage 2, 1, 3 */
567 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
568 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
569 !compare_name(ce
, path
, namelen
))
574 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
576 int len
= ce_namelen(ce
);
577 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
581 * If we add a filename that aliases in the cache, we will use the
582 * name that we already have - but we don't want to update the same
583 * alias twice, because that implies that there were actually two
584 * different files with aliasing names!
586 * So we use the CE_ADDED flag to verify that the alias was an old
587 * one before we accept it as
589 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
590 struct cache_entry
*ce
,
591 struct cache_entry
*alias
)
594 struct cache_entry
*new;
596 if (alias
->ce_flags
& CE_ADDED
)
597 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
599 /* Ok, create the new entry using the name of the existing alias */
600 len
= ce_namelen(alias
);
601 new = xcalloc(1, cache_entry_size(len
));
602 memcpy(new->name
, alias
->name
, len
);
603 copy_cache_entry(new, ce
);
604 save_or_free_index_entry(istate
, ce
);
608 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
610 unsigned char sha1
[20];
611 if (write_sha1_file("", 0, blob_type
, sha1
))
612 die("cannot create an empty blob in the object database");
613 hashcpy(ce
->sha1
, sha1
);
616 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
618 int size
, namelen
, was_same
;
619 mode_t st_mode
= st
->st_mode
;
620 struct cache_entry
*ce
, *alias
;
621 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
622 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
623 int pretend
= flags
& ADD_CACHE_PRETEND
;
624 int intent_only
= flags
& ADD_CACHE_INTENT
;
625 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
626 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
628 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
629 return error("%s: can only add regular files, symbolic links or git-directories", path
);
631 namelen
= strlen(path
);
632 if (S_ISDIR(st_mode
)) {
633 while (namelen
&& path
[namelen
-1] == '/')
636 size
= cache_entry_size(namelen
);
637 ce
= xcalloc(1, size
);
638 memcpy(ce
->name
, path
, namelen
);
639 ce
->ce_namelen
= namelen
;
641 fill_stat_cache_info(ce
, st
);
643 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
645 if (trust_executable_bit
&& has_symlinks
)
646 ce
->ce_mode
= create_ce_mode(st_mode
);
648 /* If there is an existing entry, pick the mode bits and type
649 * from it, otherwise assume unexecutable regular file.
651 struct cache_entry
*ent
;
652 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
654 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
655 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
658 /* When core.ignorecase=true, determine if a directory of the same name but differing
659 * case already exists within the Git repository. If it does, ensure the directory
660 * case of the file being added to the repository matches (is folded into) the existing
661 * entry's directory case.
664 const char *startPtr
= ce
->name
;
665 const char *ptr
= startPtr
;
667 while (*ptr
&& *ptr
!= '/')
670 struct cache_entry
*foundce
;
672 foundce
= index_dir_exists(istate
, ce
->name
, ptr
- ce
->name
- 1);
674 memcpy((void *)startPtr
, foundce
->name
+ (startPtr
- ce
->name
), ptr
- startPtr
);
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 */
685 if (!S_ISGITLINK(alias
->ce_mode
))
686 ce_mark_uptodate(alias
);
687 alias
->ce_flags
|= CE_ADDED
;
691 if (index_path(ce
->sha1
, path
, st
, HASH_WRITE_OBJECT
))
692 return error("unable to index file %s", path
);
694 set_object_name_for_intent_to_add_entry(ce
);
696 if (ignore_case
&& alias
&& different_name(ce
, alias
))
697 ce
= create_alias_ce(istate
, ce
, alias
);
698 ce
->ce_flags
|= CE_ADDED
;
700 /* It was suspected to be racily clean, but it turns out to be Ok */
703 !hashcmp(alias
->sha1
, ce
->sha1
) &&
704 ce
->ce_mode
== alias
->ce_mode
);
708 else if (add_index_entry(istate
, ce
, add_option
))
709 return error("unable to add %s to index",path
);
710 if (verbose
&& !was_same
)
711 printf("add '%s'\n", path
);
715 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
718 if (lstat(path
, &st
))
719 die_errno("unable to stat '%s'", path
);
720 return add_to_index(istate
, path
, &st
, flags
);
723 struct cache_entry
*make_cache_entry(unsigned int mode
,
724 const unsigned char *sha1
, const char *path
, int stage
,
725 unsigned int refresh_options
)
728 struct cache_entry
*ce
, *ret
;
730 if (!verify_path(path
)) {
731 error("Invalid path '%s'", path
);
736 size
= cache_entry_size(len
);
737 ce
= xcalloc(1, size
);
739 hashcpy(ce
->sha1
, sha1
);
740 memcpy(ce
->name
, path
, len
);
741 ce
->ce_flags
= create_ce_flags(stage
);
742 ce
->ce_namelen
= len
;
743 ce
->ce_mode
= create_ce_mode(mode
);
745 ret
= refresh_cache_entry(ce
, refresh_options
);
754 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
756 int len
= ce_namelen(a
);
757 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
761 * We fundamentally don't like some paths: we don't want
762 * dot or dot-dot anywhere, and for obvious reasons don't
763 * want to recurse into ".git" either.
765 * Also, we don't want double slashes or slashes at the
766 * end that can make pathnames ambiguous.
768 static int verify_dotfile(const char *rest
)
771 * The first character was '.', but that
772 * has already been discarded, we now test
776 /* "." is not allowed */
777 if (*rest
== '\0' || is_dir_sep(*rest
))
782 * ".git" followed by NUL or slash is bad. This
783 * shares the path end test with the ".." case.
787 if (rest
[1] != 'i' && rest
[1] != 'I')
789 if (rest
[2] != 't' && rest
[2] != 'T')
794 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
800 int verify_path(const char *path
)
804 if (has_dos_drive_prefix(path
))
813 if (protect_hfs
&& is_hfs_dotgit(path
))
815 if (protect_ntfs
&& is_ntfs_dotgit(path
))
818 if ((c
== '.' && !verify_dotfile(path
)) ||
819 is_dir_sep(c
) || c
== '\0')
827 * Do we have another file that has the beginning components being a
828 * proper superset of the name we're trying to add?
830 static int has_file_name(struct index_state
*istate
,
831 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
834 int len
= ce_namelen(ce
);
835 int stage
= ce_stage(ce
);
836 const char *name
= ce
->name
;
838 while (pos
< istate
->cache_nr
) {
839 struct cache_entry
*p
= istate
->cache
[pos
++];
841 if (len
>= ce_namelen(p
))
843 if (memcmp(name
, p
->name
, len
))
845 if (ce_stage(p
) != stage
)
847 if (p
->name
[len
] != '/')
849 if (p
->ce_flags
& CE_REMOVE
)
854 remove_index_entry_at(istate
, --pos
);
860 * Do we have another file with a pathname that is a proper
861 * subset of the name we're trying to add?
863 static int has_dir_name(struct index_state
*istate
,
864 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
867 int stage
= ce_stage(ce
);
868 const char *name
= ce
->name
;
869 const char *slash
= name
+ ce_namelen(ce
);
877 if (slash
<= ce
->name
)
882 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
885 * Found one, but not so fast. This could
886 * be a marker that says "I was here, but
887 * I am being removed". Such an entry is
888 * not a part of the resulting tree, and
889 * it is Ok to have a directory at the same
892 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
896 remove_index_entry_at(istate
, pos
);
904 * Trivial optimization: if we find an entry that
905 * already matches the sub-directory, then we know
906 * we're ok, and we can exit.
908 while (pos
< istate
->cache_nr
) {
909 struct cache_entry
*p
= istate
->cache
[pos
];
910 if ((ce_namelen(p
) <= len
) ||
911 (p
->name
[len
] != '/') ||
912 memcmp(p
->name
, name
, len
))
913 break; /* not our subdirectory */
914 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
916 * p is at the same stage as our entry, and
917 * is a subdirectory of what we are looking
918 * at, so we cannot have conflicts at our
919 * level or anything shorter.
928 /* We may be in a situation where we already have path/file and path
929 * is being added, or we already have path and path/file is being
930 * added. Either one would result in a nonsense tree that has path
931 * twice when git-write-tree tries to write it out. Prevent it.
933 * If ok-to-replace is specified, we remove the conflicting entries
934 * from the cache so the caller should recompute the insert position.
935 * When this happens, we return non-zero.
937 static int check_file_directory_conflict(struct index_state
*istate
,
938 const struct cache_entry
*ce
,
939 int pos
, int ok_to_replace
)
944 * When ce is an "I am going away" entry, we allow it to be added
946 if (ce
->ce_flags
& CE_REMOVE
)
950 * We check if the path is a sub-path of a subsequent pathname
951 * first, since removing those will not change the position
954 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
957 * Then check if the path might have a clashing sub-directory
960 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
963 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
966 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
967 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
968 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
969 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
971 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
972 cache_tree_invalidate_path(istate
, ce
->name
);
973 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
975 /* existing match? Just replace it. */
978 replace_index_entry(istate
, pos
, ce
);
984 * Inserting a merged entry ("stage 0") into the index
985 * will always replace all non-merged entries..
987 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
988 while (ce_same_name(istate
->cache
[pos
], ce
)) {
990 if (!remove_index_entry_at(istate
, pos
))
997 if (!verify_path(ce
->name
))
998 return error("Invalid path '%s'", ce
->name
);
1000 if (!skip_df_check
&&
1001 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1003 return error("'%s' appears as both a file and as a directory",
1005 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1011 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1015 if (option
& ADD_CACHE_JUST_APPEND
)
1016 pos
= istate
->cache_nr
;
1019 ret
= add_index_entry_with_check(istate
, ce
, option
);
1025 /* Make sure the array is big enough .. */
1026 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1030 if (istate
->cache_nr
> pos
+ 1)
1031 memmove(istate
->cache
+ pos
+ 1,
1032 istate
->cache
+ pos
,
1033 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1034 set_index_entry(istate
, pos
, ce
);
1035 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1040 * "refresh" does not calculate a new sha1 file or bring the
1041 * cache up-to-date for mode/content changes. But what it
1042 * _does_ do is to "re-match" the stat information of a file
1043 * with the cache, so that you can refresh the cache for a
1044 * file that hasn't been changed but where the stat entry is
1047 * For example, you'd want to do this after doing a "git-read-tree",
1048 * to link up the stat cache details with the proper files.
1050 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1051 struct cache_entry
*ce
,
1052 unsigned int options
, int *err
,
1056 struct cache_entry
*updated
;
1058 int refresh
= options
& CE_MATCH_REFRESH
;
1059 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1060 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1061 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1063 if (!refresh
|| ce_uptodate(ce
))
1067 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1068 * that the change to the work tree does not matter and told
1071 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1072 ce_mark_uptodate(ce
);
1075 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1076 ce_mark_uptodate(ce
);
1080 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1088 if (lstat(ce
->name
, &st
) < 0) {
1089 if (ignore_missing
&& errno
== ENOENT
)
1096 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1098 *changed_ret
= changed
;
1101 * The path is unchanged. If we were told to ignore
1102 * valid bit, then we did the actual stat check and
1103 * found that the entry is unmodified. If the entry
1104 * is not marked VALID, this is the place to mark it
1105 * valid again, under "assume unchanged" mode.
1107 if (ignore_valid
&& assume_unchanged
&&
1108 !(ce
->ce_flags
& CE_VALID
))
1109 ; /* mark this one VALID again */
1112 * We do not mark the index itself "modified"
1113 * because CE_UPTODATE flag is in-core only;
1114 * we are not going to write this change out.
1116 if (!S_ISGITLINK(ce
->ce_mode
))
1117 ce_mark_uptodate(ce
);
1122 if (ie_modified(istate
, ce
, &st
, options
)) {
1129 updated
= xmalloc(size
);
1130 memcpy(updated
, ce
, size
);
1131 fill_stat_cache_info(updated
, &st
);
1133 * If ignore_valid is not set, we should leave CE_VALID bit
1134 * alone. Otherwise, paths marked with --no-assume-unchanged
1135 * (i.e. things to be edited) will reacquire CE_VALID bit
1136 * automatically, which is not really what we want.
1138 if (!ignore_valid
&& assume_unchanged
&&
1139 !(ce
->ce_flags
& CE_VALID
))
1140 updated
->ce_flags
&= ~CE_VALID
;
1142 /* istate->cache_changed is updated in the caller */
1146 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1147 int * first
, const char *header_msg
)
1149 if (in_porcelain
&& *first
&& header_msg
) {
1150 printf("%s\n", header_msg
);
1156 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1157 const struct pathspec
*pathspec
,
1158 char *seen
, const char *header_msg
)
1162 int really
= (flags
& REFRESH_REALLY
) != 0;
1163 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1164 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1165 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1166 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1168 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1169 unsigned int options
= (CE_MATCH_REFRESH
|
1170 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1171 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1172 const char *modified_fmt
;
1173 const char *deleted_fmt
;
1174 const char *typechange_fmt
;
1175 const char *added_fmt
;
1176 const char *unmerged_fmt
;
1178 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1179 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1180 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1181 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1182 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1183 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1184 struct cache_entry
*ce
, *new;
1185 int cache_errno
= 0;
1189 ce
= istate
->cache
[i
];
1190 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1193 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1197 while ((i
< istate
->cache_nr
) &&
1198 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1204 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1205 &first
, header_msg
);
1213 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1219 if (really
&& cache_errno
== EINVAL
) {
1220 /* If we are doing --really-refresh that
1221 * means the index is not valid anymore.
1223 ce
->ce_flags
&= ~CE_VALID
;
1224 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1225 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1230 if (cache_errno
== ENOENT
)
1232 else if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
1233 fmt
= added_fmt
; /* must be before other checks */
1234 else if (changed
& TYPE_CHANGED
)
1235 fmt
= typechange_fmt
;
1239 ce
->name
, in_porcelain
, &first
, header_msg
);
1244 replace_index_entry(istate
, i
, new);
1249 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1250 unsigned int options
)
1252 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1256 /*****************************************************************
1258 *****************************************************************/
1260 #define INDEX_FORMAT_DEFAULT 3
1262 static unsigned int get_index_format_default(void)
1264 char *envversion
= getenv("GIT_INDEX_VERSION");
1267 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1270 if (!git_config_get_int("index.version", &value
))
1272 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1273 warning(_("index.version set, but the value is invalid.\n"
1274 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1275 return INDEX_FORMAT_DEFAULT
;
1280 version
= strtoul(envversion
, &endp
, 10);
1282 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1283 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1284 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1285 version
= INDEX_FORMAT_DEFAULT
;
1291 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1292 * Again - this is just a (very strong in practice) heuristic that
1293 * the inode hasn't changed.
1295 * We save the fields in big-endian order to allow using the
1296 * index file over NFS transparently.
1298 struct ondisk_cache_entry
{
1299 struct cache_time ctime
;
1300 struct cache_time mtime
;
1307 unsigned char sha1
[20];
1309 char name
[FLEX_ARRAY
]; /* more */
1313 * This struct is used when CE_EXTENDED bit is 1
1314 * The struct must match ondisk_cache_entry exactly from
1317 struct ondisk_cache_entry_extended
{
1318 struct cache_time ctime
;
1319 struct cache_time mtime
;
1326 unsigned char sha1
[20];
1329 char name
[FLEX_ARRAY
]; /* more */
1332 /* These are only used for v3 or lower */
1333 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1334 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1335 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1336 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1337 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1338 ondisk_cache_entry_size(ce_namelen(ce)))
1340 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1343 unsigned char sha1
[20];
1346 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1347 return error("bad signature");
1348 hdr_version
= ntohl(hdr
->hdr_version
);
1349 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1350 return error("bad index version %d", hdr_version
);
1352 git_SHA1_Update(&c
, hdr
, size
- 20);
1353 git_SHA1_Final(sha1
, &c
);
1354 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1355 return error("bad index file sha1 signature");
1359 static int read_index_extension(struct index_state
*istate
,
1360 const char *ext
, void *data
, unsigned long sz
)
1362 switch (CACHE_EXT(ext
)) {
1363 case CACHE_EXT_TREE
:
1364 istate
->cache_tree
= cache_tree_read(data
, sz
);
1366 case CACHE_EXT_RESOLVE_UNDO
:
1367 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1369 case CACHE_EXT_LINK
:
1370 if (read_link_extension(istate
, data
, sz
))
1374 if (*ext
< 'A' || 'Z' < *ext
)
1375 return error("index uses %.4s extension, which we do not understand",
1377 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1383 int hold_locked_index(struct lock_file
*lk
, int die_on_error
)
1385 return hold_lock_file_for_update(lk
, get_index_file(),
1391 int read_index(struct index_state
*istate
)
1393 return read_index_from(istate
, get_index_file());
1396 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1401 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1403 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1404 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1405 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1406 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1407 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1408 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1409 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1410 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1411 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1412 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1413 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1414 ce
->ce_namelen
= len
;
1416 hashcpy(ce
->sha1
, ondisk
->sha1
);
1417 memcpy(ce
->name
, name
, len
);
1418 ce
->name
[len
] = '\0';
1423 * Adjacent cache entries tend to share the leading paths, so it makes
1424 * sense to only store the differences in later entries. In the v4
1425 * on-disk format of the index, each on-disk cache entry stores the
1426 * number of bytes to be stripped from the end of the previous name,
1427 * and the bytes to append to the result, to come up with its name.
1429 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1431 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1432 size_t len
= decode_varint(&cp
);
1434 if (name
->len
< len
)
1435 die("malformed name field in the index");
1436 strbuf_remove(name
, name
->len
- len
, len
);
1437 for (ep
= cp
; *ep
; ep
++)
1438 ; /* find the end */
1439 strbuf_add(name
, cp
, ep
- cp
);
1440 return (const char *)ep
+ 1 - cp_
;
1443 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1444 unsigned long *ent_size
,
1445 struct strbuf
*previous_name
)
1447 struct cache_entry
*ce
;
1452 /* On-disk flags are just 16 bits */
1453 flags
= get_be16(&ondisk
->flags
);
1454 len
= flags
& CE_NAMEMASK
;
1456 if (flags
& CE_EXTENDED
) {
1457 struct ondisk_cache_entry_extended
*ondisk2
;
1459 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1460 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1461 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1462 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1463 die("Unknown index entry format %08x", extended_flags
);
1464 flags
|= extended_flags
;
1465 name
= ondisk2
->name
;
1468 name
= ondisk
->name
;
1470 if (!previous_name
) {
1471 /* v3 and earlier */
1472 if (len
== CE_NAMEMASK
)
1474 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1476 *ent_size
= ondisk_ce_size(ce
);
1478 unsigned long consumed
;
1479 consumed
= expand_name_field(previous_name
, name
);
1480 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1482 previous_name
->len
);
1484 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1489 static void check_ce_order(struct index_state
*istate
)
1493 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1494 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1495 struct cache_entry
*next_ce
= istate
->cache
[i
];
1496 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1498 if (0 < name_compare
)
1499 die("unordered stage entries in index");
1500 if (!name_compare
) {
1502 die("multiple stage entries for merged file '%s'",
1504 if (ce_stage(ce
) > ce_stage(next_ce
))
1505 die("unordered stage entries for '%s'",
1511 /* remember to discard_cache() before reading a different cache! */
1512 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1516 unsigned long src_offset
;
1517 struct cache_header
*hdr
;
1520 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1522 if (istate
->initialized
)
1523 return istate
->cache_nr
;
1525 istate
->timestamp
.sec
= 0;
1526 istate
->timestamp
.nsec
= 0;
1527 fd
= open(path
, O_RDONLY
);
1529 if (!must_exist
&& errno
== ENOENT
)
1531 die_errno("%s: index file open failed", path
);
1535 die_errno("cannot stat the open index");
1537 mmap_size
= xsize_t(st
.st_size
);
1538 if (mmap_size
< sizeof(struct cache_header
) + 20)
1539 die("index file smaller than expected");
1541 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
| PROT_WRITE
, MAP_PRIVATE
, fd
, 0);
1542 if (mmap
== MAP_FAILED
)
1543 die_errno("unable to map index file");
1547 if (verify_hdr(hdr
, mmap_size
) < 0)
1550 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- 20);
1551 istate
->version
= ntohl(hdr
->hdr_version
);
1552 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1553 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1554 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1555 istate
->initialized
= 1;
1557 if (istate
->version
== 4)
1558 previous_name
= &previous_name_buf
;
1560 previous_name
= NULL
;
1562 src_offset
= sizeof(*hdr
);
1563 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1564 struct ondisk_cache_entry
*disk_ce
;
1565 struct cache_entry
*ce
;
1566 unsigned long consumed
;
1568 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1569 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1570 set_index_entry(istate
, i
, ce
);
1572 src_offset
+= consumed
;
1574 strbuf_release(&previous_name_buf
);
1575 istate
->timestamp
.sec
= st
.st_mtime
;
1576 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1578 while (src_offset
<= mmap_size
- 20 - 8) {
1579 /* After an array of active_nr index entries,
1580 * there can be arbitrary number of extended
1581 * sections, each of which is prefixed with
1582 * extension name (4-byte) and section length
1583 * in 4-byte network byte order.
1586 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1587 extsize
= ntohl(extsize
);
1588 if (read_index_extension(istate
,
1589 (const char *) mmap
+ src_offset
,
1590 (char *) mmap
+ src_offset
+ 8,
1594 src_offset
+= extsize
;
1596 munmap(mmap
, mmap_size
);
1597 return istate
->cache_nr
;
1600 munmap(mmap
, mmap_size
);
1601 die("index file corrupt");
1604 int read_index_from(struct index_state
*istate
, const char *path
)
1606 struct split_index
*split_index
;
1609 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1610 if (istate
->initialized
)
1611 return istate
->cache_nr
;
1613 ret
= do_read_index(istate
, path
, 0);
1614 split_index
= istate
->split_index
;
1615 if (!split_index
|| is_null_sha1(split_index
->base_sha1
)) {
1616 check_ce_order(istate
);
1620 if (split_index
->base
)
1621 discard_index(split_index
->base
);
1623 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1624 ret
= do_read_index(split_index
->base
,
1625 git_path("sharedindex.%s",
1626 sha1_to_hex(split_index
->base_sha1
)), 1);
1627 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1628 die("broken index, expect %s in %s, got %s",
1629 sha1_to_hex(split_index
->base_sha1
),
1630 git_path("sharedindex.%s",
1631 sha1_to_hex(split_index
->base_sha1
)),
1632 sha1_to_hex(split_index
->base
->sha1
));
1633 merge_base_index(istate
);
1634 check_ce_order(istate
);
1638 int is_index_unborn(struct index_state
*istate
)
1640 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1643 int discard_index(struct index_state
*istate
)
1647 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1648 if (istate
->cache
[i
]->index
&&
1649 istate
->split_index
&&
1650 istate
->split_index
->base
&&
1651 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1652 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1654 free(istate
->cache
[i
]);
1656 resolve_undo_clear_index(istate
);
1657 istate
->cache_nr
= 0;
1658 istate
->cache_changed
= 0;
1659 istate
->timestamp
.sec
= 0;
1660 istate
->timestamp
.nsec
= 0;
1661 free_name_hash(istate
);
1662 cache_tree_free(&(istate
->cache_tree
));
1663 istate
->initialized
= 0;
1664 free(istate
->cache
);
1665 istate
->cache
= NULL
;
1666 istate
->cache_alloc
= 0;
1667 discard_split_index(istate
);
1671 int unmerged_index(const struct index_state
*istate
)
1674 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1675 if (ce_stage(istate
->cache
[i
]))
1681 #define WRITE_BUFFER_SIZE 8192
1682 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1683 static unsigned long write_buffer_len
;
1685 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1687 unsigned int buffered
= write_buffer_len
;
1689 git_SHA1_Update(context
, write_buffer
, buffered
);
1690 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1692 write_buffer_len
= 0;
1697 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1700 unsigned int buffered
= write_buffer_len
;
1701 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1704 memcpy(write_buffer
+ buffered
, data
, partial
);
1705 buffered
+= partial
;
1706 if (buffered
== WRITE_BUFFER_SIZE
) {
1707 write_buffer_len
= buffered
;
1708 if (ce_write_flush(context
, fd
))
1712 write_buffer_len
= buffered
;
1714 data
= (char *) data
+ partial
;
1719 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1720 unsigned int ext
, unsigned int sz
)
1724 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1725 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1728 static int ce_flush(git_SHA_CTX
*context
, int fd
, unsigned char *sha1
)
1730 unsigned int left
= write_buffer_len
;
1733 write_buffer_len
= 0;
1734 git_SHA1_Update(context
, write_buffer
, left
);
1737 /* Flush first if not enough space for SHA1 signature */
1738 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1739 if (write_in_full(fd
, write_buffer
, left
) != left
)
1744 /* Append the SHA1 signature at the end */
1745 git_SHA1_Final(write_buffer
+ left
, context
);
1746 hashcpy(sha1
, write_buffer
+ left
);
1748 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1751 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1754 * The only thing we care about in this function is to smudge the
1755 * falsely clean entry due to touch-update-touch race, so we leave
1756 * everything else as they are. We are called for entries whose
1757 * ce_stat_data.sd_mtime match the index file mtime.
1759 * Note that this actually does not do much for gitlinks, for
1760 * which ce_match_stat_basic() always goes to the actual
1761 * contents. The caller checks with is_racy_timestamp() which
1762 * always says "no" for gitlinks, so we are not called for them ;-)
1766 if (lstat(ce
->name
, &st
) < 0)
1768 if (ce_match_stat_basic(ce
, &st
))
1770 if (ce_modified_check_fs(ce
, &st
)) {
1771 /* This is "racily clean"; smudge it. Note that this
1772 * is a tricky code. At first glance, it may appear
1773 * that it can break with this sequence:
1775 * $ echo xyzzy >frotz
1776 * $ git-update-index --add frotz
1779 * $ echo filfre >nitfol
1780 * $ git-update-index --add nitfol
1782 * but it does not. When the second update-index runs,
1783 * it notices that the entry "frotz" has the same timestamp
1784 * as index, and if we were to smudge it by resetting its
1785 * size to zero here, then the object name recorded
1786 * in index is the 6-byte file but the cached stat information
1787 * becomes zero --- which would then match what we would
1788 * obtain from the filesystem next time we stat("frotz").
1790 * However, the second update-index, before calling
1791 * this function, notices that the cached size is 6
1792 * bytes and what is on the filesystem is an empty
1793 * file, and never calls us, so the cached size information
1794 * for "frotz" stays 6 which does not match the filesystem.
1796 ce
->ce_stat_data
.sd_size
= 0;
1800 /* Copy miscellaneous fields but not the name */
1801 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1802 struct cache_entry
*ce
)
1806 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1807 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1808 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1809 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1810 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1811 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1812 ondisk
->mode
= htonl(ce
->ce_mode
);
1813 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1814 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1815 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1816 hashcpy(ondisk
->sha1
, ce
->sha1
);
1818 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
1819 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1820 ondisk
->flags
= htons(flags
);
1821 if (ce
->ce_flags
& CE_EXTENDED
) {
1822 struct ondisk_cache_entry_extended
*ondisk2
;
1823 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1824 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1825 return ondisk2
->name
;
1828 return ondisk
->name
;
1832 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1833 struct strbuf
*previous_name
)
1836 struct ondisk_cache_entry
*ondisk
;
1837 int saved_namelen
= saved_namelen
; /* compiler workaround */
1841 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1842 saved_namelen
= ce_namelen(ce
);
1846 if (!previous_name
) {
1847 size
= ondisk_ce_size(ce
);
1848 ondisk
= xcalloc(1, size
);
1849 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1850 memcpy(name
, ce
->name
, ce_namelen(ce
));
1852 int common
, to_remove
, prefix_size
;
1853 unsigned char to_remove_vi
[16];
1855 (ce
->name
[common
] &&
1856 common
< previous_name
->len
&&
1857 ce
->name
[common
] == previous_name
->buf
[common
]);
1859 ; /* still matching */
1860 to_remove
= previous_name
->len
- common
;
1861 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
1863 if (ce
->ce_flags
& CE_EXTENDED
)
1864 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
1866 size
= offsetof(struct ondisk_cache_entry
, name
);
1867 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
1869 ondisk
= xcalloc(1, size
);
1870 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1871 memcpy(name
, to_remove_vi
, prefix_size
);
1872 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
1874 strbuf_splice(previous_name
, common
, to_remove
,
1875 ce
->name
+ common
, ce_namelen(ce
) - common
);
1877 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1878 ce
->ce_namelen
= saved_namelen
;
1879 ce
->ce_flags
&= ~CE_STRIP_NAME
;
1882 result
= ce_write(c
, fd
, ondisk
, size
);
1888 * This function verifies if index_state has the correct sha1 of the
1889 * index file. Don't die if we have any other failure, just return 0.
1891 static int verify_index_from(const struct index_state
*istate
, const char *path
)
1896 unsigned char sha1
[20];
1898 if (!istate
->initialized
)
1901 fd
= open(path
, O_RDONLY
);
1908 if (st
.st_size
< sizeof(struct cache_header
) + 20)
1911 n
= pread_in_full(fd
, sha1
, 20, st
.st_size
- 20);
1915 if (hashcmp(istate
->sha1
, sha1
))
1926 static int verify_index(const struct index_state
*istate
)
1928 return verify_index_from(istate
, get_index_file());
1931 static int has_racy_timestamp(struct index_state
*istate
)
1933 int entries
= istate
->cache_nr
;
1936 for (i
= 0; i
< entries
; i
++) {
1937 struct cache_entry
*ce
= istate
->cache
[i
];
1938 if (is_racy_timestamp(istate
, ce
))
1945 * Opportunistically update the index but do not complain if we can't
1947 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
1949 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
1950 verify_index(istate
) &&
1951 write_locked_index(istate
, lockfile
, COMMIT_LOCK
))
1952 rollback_lock_file(lockfile
);
1955 static int do_write_index(struct index_state
*istate
, int newfd
,
1956 int strip_extensions
)
1959 struct cache_header hdr
;
1960 int i
, err
, removed
, extended
, hdr_version
;
1961 struct cache_entry
**cache
= istate
->cache
;
1962 int entries
= istate
->cache_nr
;
1964 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1966 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
1967 if (cache
[i
]->ce_flags
& CE_REMOVE
)
1970 /* reduce extended entries if possible */
1971 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
1972 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
1974 cache
[i
]->ce_flags
|= CE_EXTENDED
;
1978 if (!istate
->version
) {
1979 istate
->version
= get_index_format_default();
1980 if (getenv("GIT_TEST_SPLIT_INDEX"))
1981 init_split_index(istate
);
1984 /* demote version 3 to version 2 when the latter suffices */
1985 if (istate
->version
== 3 || istate
->version
== 2)
1986 istate
->version
= extended
? 3 : 2;
1988 hdr_version
= istate
->version
;
1990 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
1991 hdr
.hdr_version
= htonl(hdr_version
);
1992 hdr
.hdr_entries
= htonl(entries
- removed
);
1995 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
1998 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
1999 for (i
= 0; i
< entries
; i
++) {
2000 struct cache_entry
*ce
= cache
[i
];
2001 if (ce
->ce_flags
& CE_REMOVE
)
2003 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2004 ce_smudge_racily_clean_entry(ce
);
2005 if (is_null_sha1(ce
->sha1
)) {
2006 static const char msg
[] = "cache entry has null sha1: %s";
2007 static int allow
= -1;
2010 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2012 warning(msg
, ce
->name
);
2014 return error(msg
, ce
->name
);
2016 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
2019 strbuf_release(&previous_name_buf
);
2021 /* Write extension data here */
2022 if (!strip_extensions
&& istate
->split_index
) {
2023 struct strbuf sb
= STRBUF_INIT
;
2025 err
= write_link_extension(&sb
, istate
) < 0 ||
2026 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
2028 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2029 strbuf_release(&sb
);
2033 if (!strip_extensions
&& istate
->cache_tree
) {
2034 struct strbuf sb
= STRBUF_INIT
;
2036 cache_tree_write(&sb
, istate
->cache_tree
);
2037 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2038 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2039 strbuf_release(&sb
);
2043 if (!strip_extensions
&& istate
->resolve_undo
) {
2044 struct strbuf sb
= STRBUF_INIT
;
2046 resolve_undo_write(&sb
, istate
->resolve_undo
);
2047 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2049 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2050 strbuf_release(&sb
);
2055 if (ce_flush(&c
, newfd
, istate
->sha1
) || fstat(newfd
, &st
))
2057 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2058 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2062 void set_alternate_index_output(const char *name
)
2064 alternate_index_output
= name
;
2067 static int commit_locked_index(struct lock_file
*lk
)
2069 if (alternate_index_output
)
2070 return commit_lock_file_to(lk
, alternate_index_output
);
2072 return commit_lock_file(lk
);
2075 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2078 int ret
= do_write_index(istate
, lock
->fd
, 0);
2081 assert((flags
& (COMMIT_LOCK
| CLOSE_LOCK
)) !=
2082 (COMMIT_LOCK
| CLOSE_LOCK
));
2083 if (flags
& COMMIT_LOCK
)
2084 return commit_locked_index(lock
);
2085 else if (flags
& CLOSE_LOCK
)
2086 return close_lock_file(lock
);
2091 static int write_split_index(struct index_state
*istate
,
2092 struct lock_file
*lock
,
2096 prepare_to_write_split_index(istate
);
2097 ret
= do_write_locked_index(istate
, lock
, flags
);
2098 finish_writing_split_index(istate
);
2102 static char *temporary_sharedindex
;
2104 static void remove_temporary_sharedindex(void)
2106 if (temporary_sharedindex
) {
2107 unlink_or_warn(temporary_sharedindex
);
2108 free(temporary_sharedindex
);
2109 temporary_sharedindex
= NULL
;
2113 static void remove_temporary_sharedindex_on_signal(int signo
)
2115 remove_temporary_sharedindex();
2116 sigchain_pop(signo
);
2120 static int write_shared_index(struct index_state
*istate
,
2121 struct lock_file
*lock
, unsigned flags
)
2123 struct split_index
*si
= istate
->split_index
;
2124 static int installed_handler
;
2127 temporary_sharedindex
= git_pathdup("sharedindex_XXXXXX");
2128 fd
= mkstemp(temporary_sharedindex
);
2130 free(temporary_sharedindex
);
2131 temporary_sharedindex
= NULL
;
2132 hashclr(si
->base_sha1
);
2133 return do_write_locked_index(istate
, lock
, flags
);
2135 if (!installed_handler
) {
2136 atexit(remove_temporary_sharedindex
);
2137 sigchain_push_common(remove_temporary_sharedindex_on_signal
);
2139 move_cache_to_base_index(istate
);
2140 ret
= do_write_index(si
->base
, fd
, 1);
2143 remove_temporary_sharedindex();
2146 ret
= rename(temporary_sharedindex
,
2147 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2148 free(temporary_sharedindex
);
2149 temporary_sharedindex
= NULL
;
2151 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2155 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2158 struct split_index
*si
= istate
->split_index
;
2160 if (!si
|| alternate_index_output
||
2161 (istate
->cache_changed
& ~EXTMASK
)) {
2163 hashclr(si
->base_sha1
);
2164 return do_write_locked_index(istate
, lock
, flags
);
2167 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2168 int v
= si
->base_sha1
[0];
2170 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2172 if (istate
->cache_changed
& SPLIT_INDEX_ORDERED
) {
2173 int ret
= write_shared_index(istate
, lock
, flags
);
2178 return write_split_index(istate
, lock
, flags
);
2182 * Read the index file that is potentially unmerged into given
2183 * index_state, dropping any unmerged entries. Returns true if
2184 * the index is unmerged. Callers who want to refuse to work
2185 * from an unmerged state can call this and check its return value,
2186 * instead of calling read_cache().
2188 int read_index_unmerged(struct index_state
*istate
)
2194 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2195 struct cache_entry
*ce
= istate
->cache
[i
];
2196 struct cache_entry
*new_ce
;
2202 len
= ce_namelen(ce
);
2203 size
= cache_entry_size(len
);
2204 new_ce
= xcalloc(1, size
);
2205 memcpy(new_ce
->name
, ce
->name
, len
);
2206 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2207 new_ce
->ce_namelen
= len
;
2208 new_ce
->ce_mode
= ce
->ce_mode
;
2209 if (add_index_entry(istate
, new_ce
, 0))
2210 return error("%s: cannot drop to stage #0",
2217 * Returns 1 if the path is an "other" path with respect to
2218 * the index; that is, the path is not mentioned in the index at all,
2219 * either as a file, a directory with some files in the index,
2220 * or as an unmerged entry.
2222 * We helpfully remove a trailing "/" from directories so that
2223 * the output of read_directory can be used as-is.
2225 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2229 if (namelen
&& name
[namelen
- 1] == '/')
2231 pos
= index_name_pos(istate
, name
, namelen
);
2233 return 0; /* exact match */
2235 if (pos
< istate
->cache_nr
) {
2236 struct cache_entry
*ce
= istate
->cache
[pos
];
2237 if (ce_namelen(ce
) == namelen
&&
2238 !memcmp(ce
->name
, name
, namelen
))
2239 return 0; /* Yup, this one exists unmerged */
2244 void *read_blob_data_from_index(struct index_state
*istate
, const char *path
, unsigned long *size
)
2248 enum object_type type
;
2252 pos
= index_name_pos(istate
, path
, len
);
2255 * We might be in the middle of a merge, in which
2256 * case we would read stage #2 (ours).
2260 (pos
< 0 && i
< istate
->cache_nr
&&
2261 !strcmp(istate
->cache
[i
]->name
, path
));
2263 if (ce_stage(istate
->cache
[i
]) == 2)
2268 data
= read_sha1_file(istate
->cache
[pos
]->sha1
, &type
, &sz
);
2269 if (!data
|| type
!= OBJ_BLOB
) {
2278 void stat_validity_clear(struct stat_validity
*sv
)
2284 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2288 if (stat(path
, &st
) < 0)
2289 return sv
->sd
== NULL
;
2292 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2295 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2299 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2300 stat_validity_clear(sv
);
2303 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2304 fill_stat_data(sv
->sd
, &st
);