2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
10 #include "cache-tree.h"
16 #include "resolve-undo.h"
19 #include "split-index.h"
22 /* Mask for the name length in ce_flags in the on-disk index */
24 #define CE_NAMEMASK (0x0fff)
28 * The first letter should be 'A'..'Z' for extensions that are not
29 * necessary for a correct operation (i.e. optimization data).
30 * When new extensions are added that _needs_ to be understood in
31 * order to correctly interpret the index file, pick character that
32 * is outside the range, to cause the reader to abort.
35 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
36 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
37 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
38 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
39 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
41 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
42 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
43 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
44 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED)
46 struct index_state the_index
;
47 static const char *alternate_index_output
;
49 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
51 istate
->cache
[nr
] = ce
;
52 add_name_hash(istate
, ce
);
55 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
57 struct cache_entry
*old
= istate
->cache
[nr
];
59 replace_index_entry_in_base(istate
, old
, ce
);
60 remove_name_hash(istate
, old
);
62 set_index_entry(istate
, nr
, ce
);
63 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
64 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
67 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
69 struct cache_entry
*old
= istate
->cache
[nr
], *new;
70 int namelen
= strlen(new_name
);
72 new = xmalloc(cache_entry_size(namelen
));
73 copy_cache_entry(new, old
);
74 new->ce_flags
&= ~CE_HASHED
;
75 new->ce_namelen
= namelen
;
77 memcpy(new->name
, new_name
, namelen
+ 1);
79 cache_tree_invalidate_path(istate
, old
->name
);
80 untracked_cache_remove_from_index(istate
, old
->name
);
81 remove_index_entry_at(istate
, nr
);
82 add_index_entry(istate
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
85 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
87 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
88 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
89 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
90 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
91 sd
->sd_dev
= st
->st_dev
;
92 sd
->sd_ino
= st
->st_ino
;
93 sd
->sd_uid
= st
->st_uid
;
94 sd
->sd_gid
= st
->st_gid
;
95 sd
->sd_size
= st
->st_size
;
98 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
102 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
103 changed
|= MTIME_CHANGED
;
104 if (trust_ctime
&& check_stat
&&
105 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
106 changed
|= CTIME_CHANGED
;
109 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
110 changed
|= MTIME_CHANGED
;
111 if (trust_ctime
&& check_stat
&&
112 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
113 changed
|= CTIME_CHANGED
;
117 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
118 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
119 changed
|= OWNER_CHANGED
;
120 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
121 changed
|= INODE_CHANGED
;
126 * st_dev breaks on network filesystems where different
127 * clients will have different views of what "device"
128 * the filesystem is on
130 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
131 changed
|= INODE_CHANGED
;
134 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
135 changed
|= DATA_CHANGED
;
141 * This only updates the "non-critical" parts of the directory
142 * cache, ie the parts that aren't tracked by GIT, and only used
143 * to validate the cache.
145 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
147 fill_stat_data(&ce
->ce_stat_data
, st
);
149 if (assume_unchanged
)
150 ce
->ce_flags
|= CE_VALID
;
152 if (S_ISREG(st
->st_mode
))
153 ce_mark_uptodate(ce
);
156 static int ce_compare_data(const struct cache_entry
*ce
, struct stat
*st
)
159 int fd
= open(ce
->name
, O_RDONLY
);
162 unsigned char sha1
[20];
163 if (!index_fd(sha1
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
164 match
= hashcmp(sha1
, ce
->sha1
);
165 /* index_fd() closed the file descriptor already */
170 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
175 enum object_type type
;
176 struct strbuf sb
= STRBUF_INIT
;
178 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
181 buffer
= read_sha1_file(ce
->sha1
, &type
, &size
);
184 match
= memcmp(buffer
, sb
.buf
, size
);
191 static int ce_compare_gitlink(const struct cache_entry
*ce
)
193 unsigned char sha1
[20];
196 * We don't actually require that the .git directory
197 * under GITLINK directory be a valid git directory. It
198 * might even be missing (in case nobody populated that
201 * If so, we consider it always to match.
203 if (resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) < 0)
205 return hashcmp(sha1
, ce
->sha1
);
208 static int ce_modified_check_fs(const struct cache_entry
*ce
, struct stat
*st
)
210 switch (st
->st_mode
& S_IFMT
) {
212 if (ce_compare_data(ce
, st
))
216 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
220 if (S_ISGITLINK(ce
->ce_mode
))
221 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
228 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
230 unsigned int changed
= 0;
232 if (ce
->ce_flags
& CE_REMOVE
)
233 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
235 switch (ce
->ce_mode
& S_IFMT
) {
237 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
238 /* We consider only the owner x bit to be relevant for
241 if (trust_executable_bit
&&
242 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
243 changed
|= MODE_CHANGED
;
246 if (!S_ISLNK(st
->st_mode
) &&
247 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
248 changed
|= TYPE_CHANGED
;
251 /* We ignore most of the st_xxx fields for gitlinks */
252 if (!S_ISDIR(st
->st_mode
))
253 changed
|= TYPE_CHANGED
;
254 else if (ce_compare_gitlink(ce
))
255 changed
|= DATA_CHANGED
;
258 die("internal error: ce_mode is %o", ce
->ce_mode
);
261 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
263 /* Racily smudged entry? */
264 if (!ce
->ce_stat_data
.sd_size
) {
265 if (!is_empty_blob_sha1(ce
->sha1
))
266 changed
|= DATA_CHANGED
;
272 static int is_racy_stat(const struct index_state
*istate
,
273 const struct stat_data
*sd
)
275 return (istate
->timestamp
.sec
&&
277 /* nanosecond timestamped files can also be racy! */
278 (istate
->timestamp
.sec
< sd
->sd_mtime
.sec
||
279 (istate
->timestamp
.sec
== sd
->sd_mtime
.sec
&&
280 istate
->timestamp
.nsec
<= sd
->sd_mtime
.nsec
))
282 istate
->timestamp
.sec
<= sd
->sd_mtime
.sec
287 static int is_racy_timestamp(const struct index_state
*istate
,
288 const struct cache_entry
*ce
)
290 return (!S_ISGITLINK(ce
->ce_mode
) &&
291 is_racy_stat(istate
, &ce
->ce_stat_data
));
294 int match_stat_data_racy(const struct index_state
*istate
,
295 const struct stat_data
*sd
, struct stat
*st
)
297 if (is_racy_stat(istate
, sd
))
298 return MTIME_CHANGED
;
299 return match_stat_data(sd
, st
);
302 int ie_match_stat(const struct index_state
*istate
,
303 const struct cache_entry
*ce
, struct stat
*st
,
304 unsigned int options
)
306 unsigned int changed
;
307 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
308 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
309 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
312 * If it's marked as always valid in the index, it's
313 * valid whatever the checked-out copy says.
315 * skip-worktree has the same effect with higher precedence
317 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
319 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
323 * Intent-to-add entries have not been added, so the index entry
324 * by definition never matches what is in the work tree until it
325 * actually gets added.
327 if (ce_intent_to_add(ce
))
328 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
330 changed
= ce_match_stat_basic(ce
, st
);
333 * Within 1 second of this sequence:
334 * echo xyzzy >file && git-update-index --add file
335 * running this command:
337 * would give a falsely clean cache entry. The mtime and
338 * length match the cache, and other stat fields do not change.
340 * We could detect this at update-index time (the cache entry
341 * being registered/updated records the same time as "now")
342 * and delay the return from git-update-index, but that would
343 * effectively mean we can make at most one commit per second,
344 * which is not acceptable. Instead, we check cache entries
345 * whose mtime are the same as the index file timestamp more
346 * carefully than others.
348 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
349 if (assume_racy_is_modified
)
350 changed
|= DATA_CHANGED
;
352 changed
|= ce_modified_check_fs(ce
, st
);
358 int ie_modified(const struct index_state
*istate
,
359 const struct cache_entry
*ce
,
360 struct stat
*st
, unsigned int options
)
362 int changed
, changed_fs
;
364 changed
= ie_match_stat(istate
, ce
, st
, options
);
368 * If the mode or type has changed, there's no point in trying
369 * to refresh the entry - it's not going to match
371 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
375 * Immediately after read-tree or update-index --cacheinfo,
376 * the length field is zero, as we have never even read the
377 * lstat(2) information once, and we cannot trust DATA_CHANGED
378 * returned by ie_match_stat() which in turn was returned by
379 * ce_match_stat_basic() to signal that the filesize of the
380 * blob changed. We have to actually go to the filesystem to
381 * see if the contents match, and if so, should answer "unchanged".
383 * The logic does not apply to gitlinks, as ce_match_stat_basic()
384 * already has checked the actual HEAD from the filesystem in the
385 * subproject. If ie_match_stat() already said it is different,
386 * then we know it is.
388 if ((changed
& DATA_CHANGED
) &&
389 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
392 changed_fs
= ce_modified_check_fs(ce
, st
);
394 return changed
| changed_fs
;
398 int base_name_compare(const char *name1
, int len1
, int mode1
,
399 const char *name2
, int len2
, int mode2
)
401 unsigned char c1
, c2
;
402 int len
= len1
< len2
? len1
: len2
;
405 cmp
= memcmp(name1
, name2
, len
);
410 if (!c1
&& S_ISDIR(mode1
))
412 if (!c2
&& S_ISDIR(mode2
))
414 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
418 * df_name_compare() is identical to base_name_compare(), except it
419 * compares conflicting directory/file entries as equal. Note that
420 * while a directory name compares as equal to a regular file, they
421 * then individually compare _differently_ to a filename that has
422 * a dot after the basename (because '\0' < '.' < '/').
424 * This is used by routines that want to traverse the git namespace
425 * but then handle conflicting entries together when possible.
427 int df_name_compare(const char *name1
, int len1
, int mode1
,
428 const char *name2
, int len2
, int mode2
)
430 int len
= len1
< len2
? len1
: len2
, cmp
;
431 unsigned char c1
, c2
;
433 cmp
= memcmp(name1
, name2
, len
);
436 /* Directories and files compare equal (same length, same name) */
440 if (!c1
&& S_ISDIR(mode1
))
443 if (!c2
&& S_ISDIR(mode2
))
445 if (c1
== '/' && !c2
)
447 if (c2
== '/' && !c1
)
452 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
454 size_t min_len
= (len1
< len2
) ? len1
: len2
;
455 int cmp
= memcmp(name1
, name2
, min_len
);
465 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
469 cmp
= name_compare(name1
, len1
, name2
, len2
);
480 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
485 last
= istate
->cache_nr
;
486 while (last
> first
) {
487 int next
= (last
+ first
) >> 1;
488 struct cache_entry
*ce
= istate
->cache
[next
];
489 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
501 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
503 return index_name_stage_pos(istate
, name
, namelen
, 0);
506 /* Remove entry, return true if there are more entries to go.. */
507 int remove_index_entry_at(struct index_state
*istate
, int pos
)
509 struct cache_entry
*ce
= istate
->cache
[pos
];
511 record_resolve_undo(istate
, ce
);
512 remove_name_hash(istate
, ce
);
513 save_or_free_index_entry(istate
, ce
);
514 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
516 if (pos
>= istate
->cache_nr
)
518 memmove(istate
->cache
+ pos
,
519 istate
->cache
+ pos
+ 1,
520 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
525 * Remove all cache entries marked for removal, that is where
526 * CE_REMOVE is set in ce_flags. This is much more effective than
527 * calling remove_index_entry_at() for each entry to be removed.
529 void remove_marked_cache_entries(struct index_state
*istate
)
531 struct cache_entry
**ce_array
= istate
->cache
;
534 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
535 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
536 remove_name_hash(istate
, ce_array
[i
]);
537 save_or_free_index_entry(istate
, ce_array
[i
]);
540 ce_array
[j
++] = ce_array
[i
];
542 if (j
== istate
->cache_nr
)
544 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
545 istate
->cache_nr
= j
;
548 int remove_file_from_index(struct index_state
*istate
, const char *path
)
550 int pos
= index_name_pos(istate
, path
, strlen(path
));
553 cache_tree_invalidate_path(istate
, path
);
554 untracked_cache_remove_from_index(istate
, path
);
555 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
556 remove_index_entry_at(istate
, pos
);
560 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
562 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
565 static int index_name_pos_also_unmerged(struct index_state
*istate
,
566 const char *path
, int namelen
)
568 int pos
= index_name_pos(istate
, path
, namelen
);
569 struct cache_entry
*ce
;
574 /* maybe unmerged? */
576 if (pos
>= istate
->cache_nr
||
577 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
580 /* order of preference: stage 2, 1, 3 */
581 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
582 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
583 !compare_name(ce
, path
, namelen
))
588 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
590 int len
= ce_namelen(ce
);
591 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
595 * If we add a filename that aliases in the cache, we will use the
596 * name that we already have - but we don't want to update the same
597 * alias twice, because that implies that there were actually two
598 * different files with aliasing names!
600 * So we use the CE_ADDED flag to verify that the alias was an old
601 * one before we accept it as
603 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
604 struct cache_entry
*ce
,
605 struct cache_entry
*alias
)
608 struct cache_entry
*new;
610 if (alias
->ce_flags
& CE_ADDED
)
611 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
613 /* Ok, create the new entry using the name of the existing alias */
614 len
= ce_namelen(alias
);
615 new = xcalloc(1, cache_entry_size(len
));
616 memcpy(new->name
, alias
->name
, len
);
617 copy_cache_entry(new, ce
);
618 save_or_free_index_entry(istate
, ce
);
622 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
624 unsigned char sha1
[20];
625 if (write_sha1_file("", 0, blob_type
, sha1
))
626 die("cannot create an empty blob in the object database");
627 hashcpy(ce
->sha1
, sha1
);
630 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
, int force_mode
)
632 int size
, namelen
, was_same
;
633 mode_t st_mode
= st
->st_mode
;
634 struct cache_entry
*ce
, *alias
;
635 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
636 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
637 int pretend
= flags
& ADD_CACHE_PRETEND
;
638 int intent_only
= flags
& ADD_CACHE_INTENT
;
639 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
640 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
642 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
643 return error("%s: can only add regular files, symbolic links or git-directories", path
);
645 namelen
= strlen(path
);
646 if (S_ISDIR(st_mode
)) {
647 while (namelen
&& path
[namelen
-1] == '/')
650 size
= cache_entry_size(namelen
);
651 ce
= xcalloc(1, size
);
652 memcpy(ce
->name
, path
, namelen
);
653 ce
->ce_namelen
= namelen
;
655 fill_stat_cache_info(ce
, st
);
657 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
659 if (S_ISREG(st_mode
) && force_mode
)
660 ce
->ce_mode
= create_ce_mode(force_mode
);
661 else if (trust_executable_bit
&& has_symlinks
)
662 ce
->ce_mode
= create_ce_mode(st_mode
);
664 /* If there is an existing entry, pick the mode bits and type
665 * from it, otherwise assume unexecutable regular file.
667 struct cache_entry
*ent
;
668 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
670 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
671 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
674 /* When core.ignorecase=true, determine if a directory of the same name but differing
675 * case already exists within the Git repository. If it does, ensure the directory
676 * case of the file being added to the repository matches (is folded into) the existing
677 * entry's directory case.
680 adjust_dirname_case(istate
, ce
->name
);
683 alias
= index_file_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
684 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
685 /* Nothing changed, really */
686 if (!S_ISGITLINK(alias
->ce_mode
))
687 ce_mark_uptodate(alias
);
688 alias
->ce_flags
|= CE_ADDED
;
694 if (index_path(ce
->sha1
, path
, st
, HASH_WRITE_OBJECT
)) {
696 return error("unable to index file %s", path
);
699 set_object_name_for_intent_to_add_entry(ce
);
701 if (ignore_case
&& alias
&& different_name(ce
, alias
))
702 ce
= create_alias_ce(istate
, ce
, alias
);
703 ce
->ce_flags
|= CE_ADDED
;
705 /* It was suspected to be racily clean, but it turns out to be Ok */
708 !hashcmp(alias
->sha1
, ce
->sha1
) &&
709 ce
->ce_mode
== alias
->ce_mode
);
713 else if (add_index_entry(istate
, ce
, add_option
)) {
715 return error("unable to add %s to index", path
);
717 if (verbose
&& !was_same
)
718 printf("add '%s'\n", path
);
722 int add_file_to_index(struct index_state
*istate
, const char *path
,
723 int flags
, int force_mode
)
726 if (lstat(path
, &st
))
727 die_errno("unable to stat '%s'", path
);
728 return add_to_index(istate
, path
, &st
, flags
, force_mode
);
731 struct cache_entry
*make_cache_entry(unsigned int mode
,
732 const unsigned char *sha1
, const char *path
, int stage
,
733 unsigned int refresh_options
)
736 struct cache_entry
*ce
, *ret
;
738 if (!verify_path(path
)) {
739 error("Invalid path '%s'", path
);
744 size
= cache_entry_size(len
);
745 ce
= xcalloc(1, size
);
747 hashcpy(ce
->sha1
, sha1
);
748 memcpy(ce
->name
, path
, len
);
749 ce
->ce_flags
= create_ce_flags(stage
);
750 ce
->ce_namelen
= len
;
751 ce
->ce_mode
= create_ce_mode(mode
);
753 ret
= refresh_cache_entry(ce
, refresh_options
);
759 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
761 int len
= ce_namelen(a
);
762 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
766 * We fundamentally don't like some paths: we don't want
767 * dot or dot-dot anywhere, and for obvious reasons don't
768 * want to recurse into ".git" either.
770 * Also, we don't want double slashes or slashes at the
771 * end that can make pathnames ambiguous.
773 static int verify_dotfile(const char *rest
)
776 * The first character was '.', but that
777 * has already been discarded, we now test
781 /* "." is not allowed */
782 if (*rest
== '\0' || is_dir_sep(*rest
))
787 * ".git" followed by NUL or slash is bad. This
788 * shares the path end test with the ".." case.
792 if (rest
[1] != 'i' && rest
[1] != 'I')
794 if (rest
[2] != 't' && rest
[2] != 'T')
799 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
805 int verify_path(const char *path
)
809 if (has_dos_drive_prefix(path
))
818 if (protect_hfs
&& is_hfs_dotgit(path
))
820 if (protect_ntfs
&& is_ntfs_dotgit(path
))
823 if ((c
== '.' && !verify_dotfile(path
)) ||
824 is_dir_sep(c
) || c
== '\0')
832 * Do we have another file that has the beginning components being a
833 * proper superset of the name we're trying to add?
835 static int has_file_name(struct index_state
*istate
,
836 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
839 int len
= ce_namelen(ce
);
840 int stage
= ce_stage(ce
);
841 const char *name
= ce
->name
;
843 while (pos
< istate
->cache_nr
) {
844 struct cache_entry
*p
= istate
->cache
[pos
++];
846 if (len
>= ce_namelen(p
))
848 if (memcmp(name
, p
->name
, len
))
850 if (ce_stage(p
) != stage
)
852 if (p
->name
[len
] != '/')
854 if (p
->ce_flags
& CE_REMOVE
)
859 remove_index_entry_at(istate
, --pos
);
865 * Do we have another file with a pathname that is a proper
866 * subset of the name we're trying to add?
868 static int has_dir_name(struct index_state
*istate
,
869 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
872 int stage
= ce_stage(ce
);
873 const char *name
= ce
->name
;
874 const char *slash
= name
+ ce_namelen(ce
);
882 if (slash
<= ce
->name
)
887 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
890 * Found one, but not so fast. This could
891 * be a marker that says "I was here, but
892 * I am being removed". Such an entry is
893 * not a part of the resulting tree, and
894 * it is Ok to have a directory at the same
897 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
901 remove_index_entry_at(istate
, pos
);
909 * Trivial optimization: if we find an entry that
910 * already matches the sub-directory, then we know
911 * we're ok, and we can exit.
913 while (pos
< istate
->cache_nr
) {
914 struct cache_entry
*p
= istate
->cache
[pos
];
915 if ((ce_namelen(p
) <= len
) ||
916 (p
->name
[len
] != '/') ||
917 memcmp(p
->name
, name
, len
))
918 break; /* not our subdirectory */
919 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
921 * p is at the same stage as our entry, and
922 * is a subdirectory of what we are looking
923 * at, so we cannot have conflicts at our
924 * level or anything shorter.
933 /* We may be in a situation where we already have path/file and path
934 * is being added, or we already have path and path/file is being
935 * added. Either one would result in a nonsense tree that has path
936 * twice when git-write-tree tries to write it out. Prevent it.
938 * If ok-to-replace is specified, we remove the conflicting entries
939 * from the cache so the caller should recompute the insert position.
940 * When this happens, we return non-zero.
942 static int check_file_directory_conflict(struct index_state
*istate
,
943 const struct cache_entry
*ce
,
944 int pos
, int ok_to_replace
)
949 * When ce is an "I am going away" entry, we allow it to be added
951 if (ce
->ce_flags
& CE_REMOVE
)
955 * We check if the path is a sub-path of a subsequent pathname
956 * first, since removing those will not change the position
959 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
962 * Then check if the path might have a clashing sub-directory
965 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
968 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
971 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
972 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
973 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
974 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
976 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
977 cache_tree_invalidate_path(istate
, ce
->name
);
978 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
980 /* existing match? Just replace it. */
983 replace_index_entry(istate
, pos
, ce
);
988 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
989 untracked_cache_add_to_index(istate
, ce
->name
);
992 * Inserting a merged entry ("stage 0") into the index
993 * will always replace all non-merged entries..
995 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
996 while (ce_same_name(istate
->cache
[pos
], ce
)) {
998 if (!remove_index_entry_at(istate
, pos
))
1005 if (!verify_path(ce
->name
))
1006 return error("Invalid path '%s'", ce
->name
);
1008 if (!skip_df_check
&&
1009 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
1011 return error("'%s' appears as both a file and as a directory",
1013 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1019 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1023 if (option
& ADD_CACHE_JUST_APPEND
)
1024 pos
= istate
->cache_nr
;
1027 ret
= add_index_entry_with_check(istate
, ce
, option
);
1033 /* Make sure the array is big enough .. */
1034 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1038 if (istate
->cache_nr
> pos
+ 1)
1039 memmove(istate
->cache
+ pos
+ 1,
1040 istate
->cache
+ pos
,
1041 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1042 set_index_entry(istate
, pos
, ce
);
1043 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1048 * "refresh" does not calculate a new sha1 file or bring the
1049 * cache up-to-date for mode/content changes. But what it
1050 * _does_ do is to "re-match" the stat information of a file
1051 * with the cache, so that you can refresh the cache for a
1052 * file that hasn't been changed but where the stat entry is
1055 * For example, you'd want to do this after doing a "git-read-tree",
1056 * to link up the stat cache details with the proper files.
1058 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1059 struct cache_entry
*ce
,
1060 unsigned int options
, int *err
,
1064 struct cache_entry
*updated
;
1066 int refresh
= options
& CE_MATCH_REFRESH
;
1067 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1068 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1069 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1071 if (!refresh
|| ce_uptodate(ce
))
1075 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1076 * that the change to the work tree does not matter and told
1079 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1080 ce_mark_uptodate(ce
);
1083 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1084 ce_mark_uptodate(ce
);
1088 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1096 if (lstat(ce
->name
, &st
) < 0) {
1097 if (ignore_missing
&& errno
== ENOENT
)
1104 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1106 *changed_ret
= changed
;
1109 * The path is unchanged. If we were told to ignore
1110 * valid bit, then we did the actual stat check and
1111 * found that the entry is unmodified. If the entry
1112 * is not marked VALID, this is the place to mark it
1113 * valid again, under "assume unchanged" mode.
1115 if (ignore_valid
&& assume_unchanged
&&
1116 !(ce
->ce_flags
& CE_VALID
))
1117 ; /* mark this one VALID again */
1120 * We do not mark the index itself "modified"
1121 * because CE_UPTODATE flag is in-core only;
1122 * we are not going to write this change out.
1124 if (!S_ISGITLINK(ce
->ce_mode
))
1125 ce_mark_uptodate(ce
);
1130 if (ie_modified(istate
, ce
, &st
, options
)) {
1137 updated
= xmalloc(size
);
1138 memcpy(updated
, ce
, size
);
1139 fill_stat_cache_info(updated
, &st
);
1141 * If ignore_valid is not set, we should leave CE_VALID bit
1142 * alone. Otherwise, paths marked with --no-assume-unchanged
1143 * (i.e. things to be edited) will reacquire CE_VALID bit
1144 * automatically, which is not really what we want.
1146 if (!ignore_valid
&& assume_unchanged
&&
1147 !(ce
->ce_flags
& CE_VALID
))
1148 updated
->ce_flags
&= ~CE_VALID
;
1150 /* istate->cache_changed is updated in the caller */
1154 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1155 int * first
, const char *header_msg
)
1157 if (in_porcelain
&& *first
&& header_msg
) {
1158 printf("%s\n", header_msg
);
1164 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1165 const struct pathspec
*pathspec
,
1166 char *seen
, const char *header_msg
)
1170 int really
= (flags
& REFRESH_REALLY
) != 0;
1171 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1172 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1173 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1174 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1176 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1177 unsigned int options
= (CE_MATCH_REFRESH
|
1178 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1179 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1180 const char *modified_fmt
;
1181 const char *deleted_fmt
;
1182 const char *typechange_fmt
;
1183 const char *added_fmt
;
1184 const char *unmerged_fmt
;
1186 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1187 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1188 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1189 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1190 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1191 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1192 struct cache_entry
*ce
, *new;
1193 int cache_errno
= 0;
1197 ce
= istate
->cache
[i
];
1198 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1201 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1205 while ((i
< istate
->cache_nr
) &&
1206 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1212 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1213 &first
, header_msg
);
1221 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1227 if (really
&& cache_errno
== EINVAL
) {
1228 /* If we are doing --really-refresh that
1229 * means the index is not valid anymore.
1231 ce
->ce_flags
&= ~CE_VALID
;
1232 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1233 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1238 if (cache_errno
== ENOENT
)
1240 else if (ce_intent_to_add(ce
))
1241 fmt
= added_fmt
; /* must be before other checks */
1242 else if (changed
& TYPE_CHANGED
)
1243 fmt
= typechange_fmt
;
1247 ce
->name
, in_porcelain
, &first
, header_msg
);
1252 replace_index_entry(istate
, i
, new);
1257 struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1258 unsigned int options
)
1260 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1264 /*****************************************************************
1266 *****************************************************************/
1268 #define INDEX_FORMAT_DEFAULT 3
1270 static unsigned int get_index_format_default(void)
1272 char *envversion
= getenv("GIT_INDEX_VERSION");
1275 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1278 if (!git_config_get_int("index.version", &value
))
1280 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1281 warning(_("index.version set, but the value is invalid.\n"
1282 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1283 return INDEX_FORMAT_DEFAULT
;
1288 version
= strtoul(envversion
, &endp
, 10);
1290 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1291 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1292 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1293 version
= INDEX_FORMAT_DEFAULT
;
1299 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1300 * Again - this is just a (very strong in practice) heuristic that
1301 * the inode hasn't changed.
1303 * We save the fields in big-endian order to allow using the
1304 * index file over NFS transparently.
1306 struct ondisk_cache_entry
{
1307 struct cache_time ctime
;
1308 struct cache_time mtime
;
1315 unsigned char sha1
[20];
1317 char name
[FLEX_ARRAY
]; /* more */
1321 * This struct is used when CE_EXTENDED bit is 1
1322 * The struct must match ondisk_cache_entry exactly from
1325 struct ondisk_cache_entry_extended
{
1326 struct cache_time ctime
;
1327 struct cache_time mtime
;
1334 unsigned char sha1
[20];
1337 char name
[FLEX_ARRAY
]; /* more */
1340 /* These are only used for v3 or lower */
1341 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1342 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1343 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1344 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1345 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1346 ondisk_cache_entry_size(ce_namelen(ce)))
1348 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1351 unsigned char sha1
[20];
1354 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1355 return error("bad signature");
1356 hdr_version
= ntohl(hdr
->hdr_version
);
1357 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1358 return error("bad index version %d", hdr_version
);
1360 git_SHA1_Update(&c
, hdr
, size
- 20);
1361 git_SHA1_Final(sha1
, &c
);
1362 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1363 return error("bad index file sha1 signature");
1367 static int read_index_extension(struct index_state
*istate
,
1368 const char *ext
, void *data
, unsigned long sz
)
1370 switch (CACHE_EXT(ext
)) {
1371 case CACHE_EXT_TREE
:
1372 istate
->cache_tree
= cache_tree_read(data
, sz
);
1374 case CACHE_EXT_RESOLVE_UNDO
:
1375 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1377 case CACHE_EXT_LINK
:
1378 if (read_link_extension(istate
, data
, sz
))
1381 case CACHE_EXT_UNTRACKED
:
1382 istate
->untracked
= read_untracked_extension(data
, sz
);
1385 if (*ext
< 'A' || 'Z' < *ext
)
1386 return error("index uses %.4s extension, which we do not understand",
1388 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1394 int hold_locked_index(struct lock_file
*lk
, int die_on_error
)
1396 return hold_lock_file_for_update(lk
, get_index_file(),
1402 int read_index(struct index_state
*istate
)
1404 return read_index_from(istate
, get_index_file());
1407 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1412 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1414 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1415 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1416 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1417 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1418 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1419 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1420 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1421 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1422 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1423 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1424 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1425 ce
->ce_namelen
= len
;
1427 hashcpy(ce
->sha1
, ondisk
->sha1
);
1428 memcpy(ce
->name
, name
, len
);
1429 ce
->name
[len
] = '\0';
1434 * Adjacent cache entries tend to share the leading paths, so it makes
1435 * sense to only store the differences in later entries. In the v4
1436 * on-disk format of the index, each on-disk cache entry stores the
1437 * number of bytes to be stripped from the end of the previous name,
1438 * and the bytes to append to the result, to come up with its name.
1440 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1442 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1443 size_t len
= decode_varint(&cp
);
1445 if (name
->len
< len
)
1446 die("malformed name field in the index");
1447 strbuf_remove(name
, name
->len
- len
, len
);
1448 for (ep
= cp
; *ep
; ep
++)
1449 ; /* find the end */
1450 strbuf_add(name
, cp
, ep
- cp
);
1451 return (const char *)ep
+ 1 - cp_
;
1454 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1455 unsigned long *ent_size
,
1456 struct strbuf
*previous_name
)
1458 struct cache_entry
*ce
;
1463 /* On-disk flags are just 16 bits */
1464 flags
= get_be16(&ondisk
->flags
);
1465 len
= flags
& CE_NAMEMASK
;
1467 if (flags
& CE_EXTENDED
) {
1468 struct ondisk_cache_entry_extended
*ondisk2
;
1470 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1471 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1472 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1473 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1474 die("Unknown index entry format %08x", extended_flags
);
1475 flags
|= extended_flags
;
1476 name
= ondisk2
->name
;
1479 name
= ondisk
->name
;
1481 if (!previous_name
) {
1482 /* v3 and earlier */
1483 if (len
== CE_NAMEMASK
)
1485 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1487 *ent_size
= ondisk_ce_size(ce
);
1489 unsigned long consumed
;
1490 consumed
= expand_name_field(previous_name
, name
);
1491 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1493 previous_name
->len
);
1495 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1500 static void check_ce_order(struct index_state
*istate
)
1504 for (i
= 1; i
< istate
->cache_nr
; i
++) {
1505 struct cache_entry
*ce
= istate
->cache
[i
- 1];
1506 struct cache_entry
*next_ce
= istate
->cache
[i
];
1507 int name_compare
= strcmp(ce
->name
, next_ce
->name
);
1509 if (0 < name_compare
)
1510 die("unordered stage entries in index");
1511 if (!name_compare
) {
1513 die("multiple stage entries for merged file '%s'",
1515 if (ce_stage(ce
) > ce_stage(next_ce
))
1516 die("unordered stage entries for '%s'",
1522 static void tweak_untracked_cache(struct index_state
*istate
)
1524 switch (git_config_get_untracked_cache()) {
1525 case -1: /* keep: do nothing */
1528 remove_untracked_cache(istate
);
1531 add_untracked_cache(istate
);
1533 default: /* unknown value: do nothing */
1538 static void post_read_index_from(struct index_state
*istate
)
1540 check_ce_order(istate
);
1541 tweak_untracked_cache(istate
);
1544 /* remember to discard_cache() before reading a different cache! */
1545 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1549 unsigned long src_offset
;
1550 struct cache_header
*hdr
;
1553 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1555 if (istate
->initialized
)
1556 return istate
->cache_nr
;
1558 istate
->timestamp
.sec
= 0;
1559 istate
->timestamp
.nsec
= 0;
1560 fd
= open(path
, O_RDONLY
);
1562 if (!must_exist
&& errno
== ENOENT
)
1564 die_errno("%s: index file open failed", path
);
1568 die_errno("cannot stat the open index");
1570 mmap_size
= xsize_t(st
.st_size
);
1571 if (mmap_size
< sizeof(struct cache_header
) + 20)
1572 die("index file smaller than expected");
1574 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1575 if (mmap
== MAP_FAILED
)
1576 die_errno("unable to map index file");
1580 if (verify_hdr(hdr
, mmap_size
) < 0)
1583 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- 20);
1584 istate
->version
= ntohl(hdr
->hdr_version
);
1585 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1586 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1587 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1588 istate
->initialized
= 1;
1590 if (istate
->version
== 4)
1591 previous_name
= &previous_name_buf
;
1593 previous_name
= NULL
;
1595 src_offset
= sizeof(*hdr
);
1596 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1597 struct ondisk_cache_entry
*disk_ce
;
1598 struct cache_entry
*ce
;
1599 unsigned long consumed
;
1601 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1602 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1603 set_index_entry(istate
, i
, ce
);
1605 src_offset
+= consumed
;
1607 strbuf_release(&previous_name_buf
);
1608 istate
->timestamp
.sec
= st
.st_mtime
;
1609 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1611 while (src_offset
<= mmap_size
- 20 - 8) {
1612 /* After an array of active_nr index entries,
1613 * there can be arbitrary number of extended
1614 * sections, each of which is prefixed with
1615 * extension name (4-byte) and section length
1616 * in 4-byte network byte order.
1619 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1620 extsize
= ntohl(extsize
);
1621 if (read_index_extension(istate
,
1622 (const char *) mmap
+ src_offset
,
1623 (char *) mmap
+ src_offset
+ 8,
1627 src_offset
+= extsize
;
1629 munmap(mmap
, mmap_size
);
1630 return istate
->cache_nr
;
1633 munmap(mmap
, mmap_size
);
1634 die("index file corrupt");
1637 int read_index_from(struct index_state
*istate
, const char *path
)
1639 struct split_index
*split_index
;
1642 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1643 if (istate
->initialized
)
1644 return istate
->cache_nr
;
1646 ret
= do_read_index(istate
, path
, 0);
1648 split_index
= istate
->split_index
;
1649 if (!split_index
|| is_null_sha1(split_index
->base_sha1
)) {
1650 post_read_index_from(istate
);
1654 if (split_index
->base
)
1655 discard_index(split_index
->base
);
1657 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1658 ret
= do_read_index(split_index
->base
,
1659 git_path("sharedindex.%s",
1660 sha1_to_hex(split_index
->base_sha1
)), 1);
1661 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1662 die("broken index, expect %s in %s, got %s",
1663 sha1_to_hex(split_index
->base_sha1
),
1664 git_path("sharedindex.%s",
1665 sha1_to_hex(split_index
->base_sha1
)),
1666 sha1_to_hex(split_index
->base
->sha1
));
1667 merge_base_index(istate
);
1668 post_read_index_from(istate
);
1672 int is_index_unborn(struct index_state
*istate
)
1674 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1677 int discard_index(struct index_state
*istate
)
1681 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1682 if (istate
->cache
[i
]->index
&&
1683 istate
->split_index
&&
1684 istate
->split_index
->base
&&
1685 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1686 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1688 free(istate
->cache
[i
]);
1690 resolve_undo_clear_index(istate
);
1691 istate
->cache_nr
= 0;
1692 istate
->cache_changed
= 0;
1693 istate
->timestamp
.sec
= 0;
1694 istate
->timestamp
.nsec
= 0;
1695 free_name_hash(istate
);
1696 cache_tree_free(&(istate
->cache_tree
));
1697 istate
->initialized
= 0;
1698 free(istate
->cache
);
1699 istate
->cache
= NULL
;
1700 istate
->cache_alloc
= 0;
1701 discard_split_index(istate
);
1702 free_untracked_cache(istate
->untracked
);
1703 istate
->untracked
= NULL
;
1707 int unmerged_index(const struct index_state
*istate
)
1710 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1711 if (ce_stage(istate
->cache
[i
]))
1717 #define WRITE_BUFFER_SIZE 8192
1718 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1719 static unsigned long write_buffer_len
;
1721 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1723 unsigned int buffered
= write_buffer_len
;
1725 git_SHA1_Update(context
, write_buffer
, buffered
);
1726 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1728 write_buffer_len
= 0;
1733 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1736 unsigned int buffered
= write_buffer_len
;
1737 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1740 memcpy(write_buffer
+ buffered
, data
, partial
);
1741 buffered
+= partial
;
1742 if (buffered
== WRITE_BUFFER_SIZE
) {
1743 write_buffer_len
= buffered
;
1744 if (ce_write_flush(context
, fd
))
1748 write_buffer_len
= buffered
;
1750 data
= (char *) data
+ partial
;
1755 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1756 unsigned int ext
, unsigned int sz
)
1760 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1761 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1764 static int ce_flush(git_SHA_CTX
*context
, int fd
, unsigned char *sha1
)
1766 unsigned int left
= write_buffer_len
;
1769 write_buffer_len
= 0;
1770 git_SHA1_Update(context
, write_buffer
, left
);
1773 /* Flush first if not enough space for SHA1 signature */
1774 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1775 if (write_in_full(fd
, write_buffer
, left
) != left
)
1780 /* Append the SHA1 signature at the end */
1781 git_SHA1_Final(write_buffer
+ left
, context
);
1782 hashcpy(sha1
, write_buffer
+ left
);
1784 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1787 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1790 * The only thing we care about in this function is to smudge the
1791 * falsely clean entry due to touch-update-touch race, so we leave
1792 * everything else as they are. We are called for entries whose
1793 * ce_stat_data.sd_mtime match the index file mtime.
1795 * Note that this actually does not do much for gitlinks, for
1796 * which ce_match_stat_basic() always goes to the actual
1797 * contents. The caller checks with is_racy_timestamp() which
1798 * always says "no" for gitlinks, so we are not called for them ;-)
1802 if (lstat(ce
->name
, &st
) < 0)
1804 if (ce_match_stat_basic(ce
, &st
))
1806 if (ce_modified_check_fs(ce
, &st
)) {
1807 /* This is "racily clean"; smudge it. Note that this
1808 * is a tricky code. At first glance, it may appear
1809 * that it can break with this sequence:
1811 * $ echo xyzzy >frotz
1812 * $ git-update-index --add frotz
1815 * $ echo filfre >nitfol
1816 * $ git-update-index --add nitfol
1818 * but it does not. When the second update-index runs,
1819 * it notices that the entry "frotz" has the same timestamp
1820 * as index, and if we were to smudge it by resetting its
1821 * size to zero here, then the object name recorded
1822 * in index is the 6-byte file but the cached stat information
1823 * becomes zero --- which would then match what we would
1824 * obtain from the filesystem next time we stat("frotz").
1826 * However, the second update-index, before calling
1827 * this function, notices that the cached size is 6
1828 * bytes and what is on the filesystem is an empty
1829 * file, and never calls us, so the cached size information
1830 * for "frotz" stays 6 which does not match the filesystem.
1832 ce
->ce_stat_data
.sd_size
= 0;
1836 /* Copy miscellaneous fields but not the name */
1837 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1838 struct cache_entry
*ce
)
1842 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1843 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1844 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1845 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1846 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1847 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1848 ondisk
->mode
= htonl(ce
->ce_mode
);
1849 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1850 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1851 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1852 hashcpy(ondisk
->sha1
, ce
->sha1
);
1854 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
1855 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1856 ondisk
->flags
= htons(flags
);
1857 if (ce
->ce_flags
& CE_EXTENDED
) {
1858 struct ondisk_cache_entry_extended
*ondisk2
;
1859 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1860 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1861 return ondisk2
->name
;
1864 return ondisk
->name
;
1868 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1869 struct strbuf
*previous_name
)
1872 struct ondisk_cache_entry
*ondisk
;
1873 int saved_namelen
= saved_namelen
; /* compiler workaround */
1877 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1878 saved_namelen
= ce_namelen(ce
);
1882 if (!previous_name
) {
1883 size
= ondisk_ce_size(ce
);
1884 ondisk
= xcalloc(1, size
);
1885 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1886 memcpy(name
, ce
->name
, ce_namelen(ce
));
1888 int common
, to_remove
, prefix_size
;
1889 unsigned char to_remove_vi
[16];
1891 (ce
->name
[common
] &&
1892 common
< previous_name
->len
&&
1893 ce
->name
[common
] == previous_name
->buf
[common
]);
1895 ; /* still matching */
1896 to_remove
= previous_name
->len
- common
;
1897 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
1899 if (ce
->ce_flags
& CE_EXTENDED
)
1900 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
1902 size
= offsetof(struct ondisk_cache_entry
, name
);
1903 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
1905 ondisk
= xcalloc(1, size
);
1906 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1907 memcpy(name
, to_remove_vi
, prefix_size
);
1908 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
1910 strbuf_splice(previous_name
, common
, to_remove
,
1911 ce
->name
+ common
, ce_namelen(ce
) - common
);
1913 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1914 ce
->ce_namelen
= saved_namelen
;
1915 ce
->ce_flags
&= ~CE_STRIP_NAME
;
1918 result
= ce_write(c
, fd
, ondisk
, size
);
1924 * This function verifies if index_state has the correct sha1 of the
1925 * index file. Don't die if we have any other failure, just return 0.
1927 static int verify_index_from(const struct index_state
*istate
, const char *path
)
1932 unsigned char sha1
[20];
1934 if (!istate
->initialized
)
1937 fd
= open(path
, O_RDONLY
);
1944 if (st
.st_size
< sizeof(struct cache_header
) + 20)
1947 n
= pread_in_full(fd
, sha1
, 20, st
.st_size
- 20);
1951 if (hashcmp(istate
->sha1
, sha1
))
1962 static int verify_index(const struct index_state
*istate
)
1964 return verify_index_from(istate
, get_index_file());
1967 static int has_racy_timestamp(struct index_state
*istate
)
1969 int entries
= istate
->cache_nr
;
1972 for (i
= 0; i
< entries
; i
++) {
1973 struct cache_entry
*ce
= istate
->cache
[i
];
1974 if (is_racy_timestamp(istate
, ce
))
1981 * Opportunistically update the index but do not complain if we can't
1983 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
1985 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
1986 verify_index(istate
) &&
1987 write_locked_index(istate
, lockfile
, COMMIT_LOCK
))
1988 rollback_lock_file(lockfile
);
1991 static int do_write_index(struct index_state
*istate
, int newfd
,
1992 int strip_extensions
)
1995 struct cache_header hdr
;
1996 int i
, err
, removed
, extended
, hdr_version
;
1997 struct cache_entry
**cache
= istate
->cache
;
1998 int entries
= istate
->cache_nr
;
2000 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
2002 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
2003 if (cache
[i
]->ce_flags
& CE_REMOVE
)
2006 /* reduce extended entries if possible */
2007 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
2008 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
2010 cache
[i
]->ce_flags
|= CE_EXTENDED
;
2014 if (!istate
->version
) {
2015 istate
->version
= get_index_format_default();
2016 if (getenv("GIT_TEST_SPLIT_INDEX"))
2017 init_split_index(istate
);
2020 /* demote version 3 to version 2 when the latter suffices */
2021 if (istate
->version
== 3 || istate
->version
== 2)
2022 istate
->version
= extended
? 3 : 2;
2024 hdr_version
= istate
->version
;
2026 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
2027 hdr
.hdr_version
= htonl(hdr_version
);
2028 hdr
.hdr_entries
= htonl(entries
- removed
);
2031 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
2034 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
2035 for (i
= 0; i
< entries
; i
++) {
2036 struct cache_entry
*ce
= cache
[i
];
2037 if (ce
->ce_flags
& CE_REMOVE
)
2039 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
2040 ce_smudge_racily_clean_entry(ce
);
2041 if (is_null_sha1(ce
->sha1
)) {
2042 static const char msg
[] = "cache entry has null sha1: %s";
2043 static int allow
= -1;
2046 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2048 warning(msg
, ce
->name
);
2050 return error(msg
, ce
->name
);
2052 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
2055 strbuf_release(&previous_name_buf
);
2057 /* Write extension data here */
2058 if (!strip_extensions
&& istate
->split_index
) {
2059 struct strbuf sb
= STRBUF_INIT
;
2061 err
= write_link_extension(&sb
, istate
) < 0 ||
2062 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
2064 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2065 strbuf_release(&sb
);
2069 if (!strip_extensions
&& istate
->cache_tree
) {
2070 struct strbuf sb
= STRBUF_INIT
;
2072 cache_tree_write(&sb
, istate
->cache_tree
);
2073 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2074 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2075 strbuf_release(&sb
);
2079 if (!strip_extensions
&& istate
->resolve_undo
) {
2080 struct strbuf sb
= STRBUF_INIT
;
2082 resolve_undo_write(&sb
, istate
->resolve_undo
);
2083 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2085 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2086 strbuf_release(&sb
);
2090 if (!strip_extensions
&& istate
->untracked
) {
2091 struct strbuf sb
= STRBUF_INIT
;
2093 write_untracked_extension(&sb
, istate
->untracked
);
2094 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_UNTRACKED
,
2096 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2097 strbuf_release(&sb
);
2102 if (ce_flush(&c
, newfd
, istate
->sha1
) || fstat(newfd
, &st
))
2104 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2105 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2109 void set_alternate_index_output(const char *name
)
2111 alternate_index_output
= name
;
2114 static int commit_locked_index(struct lock_file
*lk
)
2116 if (alternate_index_output
)
2117 return commit_lock_file_to(lk
, alternate_index_output
);
2119 return commit_lock_file(lk
);
2122 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2125 int ret
= do_write_index(istate
, get_lock_file_fd(lock
), 0);
2128 assert((flags
& (COMMIT_LOCK
| CLOSE_LOCK
)) !=
2129 (COMMIT_LOCK
| CLOSE_LOCK
));
2130 if (flags
& COMMIT_LOCK
)
2131 return commit_locked_index(lock
);
2132 else if (flags
& CLOSE_LOCK
)
2133 return close_lock_file(lock
);
2138 static int write_split_index(struct index_state
*istate
,
2139 struct lock_file
*lock
,
2143 prepare_to_write_split_index(istate
);
2144 ret
= do_write_locked_index(istate
, lock
, flags
);
2145 finish_writing_split_index(istate
);
2149 static struct tempfile temporary_sharedindex
;
2151 static int write_shared_index(struct index_state
*istate
,
2152 struct lock_file
*lock
, unsigned flags
)
2154 struct split_index
*si
= istate
->split_index
;
2157 fd
= mks_tempfile(&temporary_sharedindex
, git_path("sharedindex_XXXXXX"));
2159 hashclr(si
->base_sha1
);
2160 return do_write_locked_index(istate
, lock
, flags
);
2162 move_cache_to_base_index(istate
);
2163 ret
= do_write_index(si
->base
, fd
, 1);
2165 delete_tempfile(&temporary_sharedindex
);
2168 ret
= rename_tempfile(&temporary_sharedindex
,
2169 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2171 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2175 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2178 struct split_index
*si
= istate
->split_index
;
2180 if (!si
|| alternate_index_output
||
2181 (istate
->cache_changed
& ~EXTMASK
)) {
2183 hashclr(si
->base_sha1
);
2184 return do_write_locked_index(istate
, lock
, flags
);
2187 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2188 int v
= si
->base_sha1
[0];
2190 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2192 if (istate
->cache_changed
& SPLIT_INDEX_ORDERED
) {
2193 int ret
= write_shared_index(istate
, lock
, flags
);
2198 return write_split_index(istate
, lock
, flags
);
2202 * Read the index file that is potentially unmerged into given
2203 * index_state, dropping any unmerged entries. Returns true if
2204 * the index is unmerged. Callers who want to refuse to work
2205 * from an unmerged state can call this and check its return value,
2206 * instead of calling read_cache().
2208 int read_index_unmerged(struct index_state
*istate
)
2214 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2215 struct cache_entry
*ce
= istate
->cache
[i
];
2216 struct cache_entry
*new_ce
;
2222 len
= ce_namelen(ce
);
2223 size
= cache_entry_size(len
);
2224 new_ce
= xcalloc(1, size
);
2225 memcpy(new_ce
->name
, ce
->name
, len
);
2226 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2227 new_ce
->ce_namelen
= len
;
2228 new_ce
->ce_mode
= ce
->ce_mode
;
2229 if (add_index_entry(istate
, new_ce
, 0))
2230 return error("%s: cannot drop to stage #0",
2237 * Returns 1 if the path is an "other" path with respect to
2238 * the index; that is, the path is not mentioned in the index at all,
2239 * either as a file, a directory with some files in the index,
2240 * or as an unmerged entry.
2242 * We helpfully remove a trailing "/" from directories so that
2243 * the output of read_directory can be used as-is.
2245 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2249 if (namelen
&& name
[namelen
- 1] == '/')
2251 pos
= index_name_pos(istate
, name
, namelen
);
2253 return 0; /* exact match */
2255 if (pos
< istate
->cache_nr
) {
2256 struct cache_entry
*ce
= istate
->cache
[pos
];
2257 if (ce_namelen(ce
) == namelen
&&
2258 !memcmp(ce
->name
, name
, namelen
))
2259 return 0; /* Yup, this one exists unmerged */
2264 void *read_blob_data_from_index(struct index_state
*istate
, const char *path
, unsigned long *size
)
2268 enum object_type type
;
2272 pos
= index_name_pos(istate
, path
, len
);
2275 * We might be in the middle of a merge, in which
2276 * case we would read stage #2 (ours).
2280 (pos
< 0 && i
< istate
->cache_nr
&&
2281 !strcmp(istate
->cache
[i
]->name
, path
));
2283 if (ce_stage(istate
->cache
[i
]) == 2)
2288 data
= read_sha1_file(istate
->cache
[pos
]->sha1
, &type
, &sz
);
2289 if (!data
|| type
!= OBJ_BLOB
) {
2298 void stat_validity_clear(struct stat_validity
*sv
)
2304 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2308 if (stat(path
, &st
) < 0)
2309 return sv
->sd
== NULL
;
2312 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2315 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2319 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2320 stat_validity_clear(sv
);
2323 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2324 fill_stat_data(sv
->sd
, &st
);