2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
8 #include "cache-tree.h"
14 #include "resolve-undo.h"
17 #include "split-index.h"
21 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
22 unsigned int options
);
24 /* Mask for the name length in ce_flags in the on-disk index */
26 #define CE_NAMEMASK (0x0fff)
30 * The first letter should be 'A'..'Z' for extensions that are not
31 * necessary for a correct operation (i.e. optimization data).
32 * When new extensions are added that _needs_ to be understood in
33 * order to correctly interpret the index file, pick character that
34 * is outside the range, to cause the reader to abort.
37 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
38 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
39 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
40 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
42 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
43 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
44 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
47 struct index_state the_index
;
48 static const char *alternate_index_output
;
50 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
52 istate
->cache
[nr
] = ce
;
53 add_name_hash(istate
, ce
);
56 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
58 struct cache_entry
*old
= istate
->cache
[nr
];
60 replace_index_entry_in_base(istate
, old
, ce
);
61 remove_name_hash(istate
, old
);
63 set_index_entry(istate
, nr
, ce
);
64 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
65 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
68 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
70 struct cache_entry
*old
= istate
->cache
[nr
], *new;
71 int namelen
= strlen(new_name
);
73 new = xmalloc(cache_entry_size(namelen
));
74 copy_cache_entry(new, old
);
75 new->ce_flags
&= ~CE_HASHED
;
76 new->ce_namelen
= namelen
;
78 memcpy(new->name
, new_name
, namelen
+ 1);
80 cache_tree_invalidate_path(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_timestamp(const struct index_state
*istate
,
273 const struct cache_entry
*ce
)
275 return (!S_ISGITLINK(ce
->ce_mode
) &&
276 istate
->timestamp
.sec
&&
278 /* nanosecond timestamped files can also be racy! */
279 (istate
->timestamp
.sec
< ce
->ce_stat_data
.sd_mtime
.sec
||
280 (istate
->timestamp
.sec
== ce
->ce_stat_data
.sd_mtime
.sec
&&
281 istate
->timestamp
.nsec
<= ce
->ce_stat_data
.sd_mtime
.nsec
))
283 istate
->timestamp
.sec
<= ce
->ce_stat_data
.sd_mtime
.sec
288 int ie_match_stat(const struct index_state
*istate
,
289 const struct cache_entry
*ce
, struct stat
*st
,
290 unsigned int options
)
292 unsigned int changed
;
293 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
294 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
295 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
298 * If it's marked as always valid in the index, it's
299 * valid whatever the checked-out copy says.
301 * skip-worktree has the same effect with higher precedence
303 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
305 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
309 * Intent-to-add entries have not been added, so the index entry
310 * by definition never matches what is in the work tree until it
311 * actually gets added.
313 if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
314 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
316 changed
= ce_match_stat_basic(ce
, st
);
319 * Within 1 second of this sequence:
320 * echo xyzzy >file && git-update-index --add file
321 * running this command:
323 * would give a falsely clean cache entry. The mtime and
324 * length match the cache, and other stat fields do not change.
326 * We could detect this at update-index time (the cache entry
327 * being registered/updated records the same time as "now")
328 * and delay the return from git-update-index, but that would
329 * effectively mean we can make at most one commit per second,
330 * which is not acceptable. Instead, we check cache entries
331 * whose mtime are the same as the index file timestamp more
332 * carefully than others.
334 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
335 if (assume_racy_is_modified
)
336 changed
|= DATA_CHANGED
;
338 changed
|= ce_modified_check_fs(ce
, st
);
344 int ie_modified(const struct index_state
*istate
,
345 const struct cache_entry
*ce
,
346 struct stat
*st
, unsigned int options
)
348 int changed
, changed_fs
;
350 changed
= ie_match_stat(istate
, ce
, st
, options
);
354 * If the mode or type has changed, there's no point in trying
355 * to refresh the entry - it's not going to match
357 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
361 * Immediately after read-tree or update-index --cacheinfo,
362 * the length field is zero, as we have never even read the
363 * lstat(2) information once, and we cannot trust DATA_CHANGED
364 * returned by ie_match_stat() which in turn was returned by
365 * ce_match_stat_basic() to signal that the filesize of the
366 * blob changed. We have to actually go to the filesystem to
367 * see if the contents match, and if so, should answer "unchanged".
369 * The logic does not apply to gitlinks, as ce_match_stat_basic()
370 * already has checked the actual HEAD from the filesystem in the
371 * subproject. If ie_match_stat() already said it is different,
372 * then we know it is.
374 if ((changed
& DATA_CHANGED
) &&
375 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
378 changed_fs
= ce_modified_check_fs(ce
, st
);
380 return changed
| changed_fs
;
384 int base_name_compare(const char *name1
, int len1
, int mode1
,
385 const char *name2
, int len2
, int mode2
)
387 unsigned char c1
, c2
;
388 int len
= len1
< len2
? len1
: len2
;
391 cmp
= memcmp(name1
, name2
, len
);
396 if (!c1
&& S_ISDIR(mode1
))
398 if (!c2
&& S_ISDIR(mode2
))
400 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
404 * df_name_compare() is identical to base_name_compare(), except it
405 * compares conflicting directory/file entries as equal. Note that
406 * while a directory name compares as equal to a regular file, they
407 * then individually compare _differently_ to a filename that has
408 * a dot after the basename (because '\0' < '.' < '/').
410 * This is used by routines that want to traverse the git namespace
411 * but then handle conflicting entries together when possible.
413 int df_name_compare(const char *name1
, int len1
, int mode1
,
414 const char *name2
, int len2
, int mode2
)
416 int len
= len1
< len2
? len1
: len2
, cmp
;
417 unsigned char c1
, c2
;
419 cmp
= memcmp(name1
, name2
, len
);
422 /* Directories and files compare equal (same length, same name) */
426 if (!c1
&& S_ISDIR(mode1
))
429 if (!c2
&& S_ISDIR(mode2
))
431 if (c1
== '/' && !c2
)
433 if (c2
== '/' && !c1
)
438 int name_compare(const char *name1
, size_t len1
, const char *name2
, size_t len2
)
440 size_t min_len
= (len1
< len2
) ? len1
: len2
;
441 int cmp
= memcmp(name1
, name2
, min_len
);
451 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
455 cmp
= name_compare(name1
, len1
, name2
, len2
);
466 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
471 last
= istate
->cache_nr
;
472 while (last
> first
) {
473 int next
= (last
+ first
) >> 1;
474 struct cache_entry
*ce
= istate
->cache
[next
];
475 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
487 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
489 return index_name_stage_pos(istate
, name
, namelen
, 0);
492 /* Remove entry, return true if there are more entries to go.. */
493 int remove_index_entry_at(struct index_state
*istate
, int pos
)
495 struct cache_entry
*ce
= istate
->cache
[pos
];
497 record_resolve_undo(istate
, ce
);
498 remove_name_hash(istate
, ce
);
499 save_or_free_index_entry(istate
, ce
);
500 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
502 if (pos
>= istate
->cache_nr
)
504 memmove(istate
->cache
+ pos
,
505 istate
->cache
+ pos
+ 1,
506 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
511 * Remove all cache entries marked for removal, that is where
512 * CE_REMOVE is set in ce_flags. This is much more effective than
513 * calling remove_index_entry_at() for each entry to be removed.
515 void remove_marked_cache_entries(struct index_state
*istate
)
517 struct cache_entry
**ce_array
= istate
->cache
;
520 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
521 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
522 remove_name_hash(istate
, ce_array
[i
]);
523 save_or_free_index_entry(istate
, ce_array
[i
]);
526 ce_array
[j
++] = ce_array
[i
];
528 if (j
== istate
->cache_nr
)
530 istate
->cache_changed
|= CE_ENTRY_REMOVED
;
531 istate
->cache_nr
= j
;
534 int remove_file_from_index(struct index_state
*istate
, const char *path
)
536 int pos
= index_name_pos(istate
, path
, strlen(path
));
539 cache_tree_invalidate_path(istate
, path
);
540 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
541 remove_index_entry_at(istate
, pos
);
545 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
547 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
550 static int index_name_pos_also_unmerged(struct index_state
*istate
,
551 const char *path
, int namelen
)
553 int pos
= index_name_pos(istate
, path
, namelen
);
554 struct cache_entry
*ce
;
559 /* maybe unmerged? */
561 if (pos
>= istate
->cache_nr
||
562 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
565 /* order of preference: stage 2, 1, 3 */
566 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
567 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
568 !compare_name(ce
, path
, namelen
))
573 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
575 int len
= ce_namelen(ce
);
576 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
580 * If we add a filename that aliases in the cache, we will use the
581 * name that we already have - but we don't want to update the same
582 * alias twice, because that implies that there were actually two
583 * different files with aliasing names!
585 * So we use the CE_ADDED flag to verify that the alias was an old
586 * one before we accept it as
588 static struct cache_entry
*create_alias_ce(struct index_state
*istate
,
589 struct cache_entry
*ce
,
590 struct cache_entry
*alias
)
593 struct cache_entry
*new;
595 if (alias
->ce_flags
& CE_ADDED
)
596 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
598 /* Ok, create the new entry using the name of the existing alias */
599 len
= ce_namelen(alias
);
600 new = xcalloc(1, cache_entry_size(len
));
601 memcpy(new->name
, alias
->name
, len
);
602 copy_cache_entry(new, ce
);
603 save_or_free_index_entry(istate
, ce
);
607 void set_object_name_for_intent_to_add_entry(struct cache_entry
*ce
)
609 unsigned char sha1
[20];
610 if (write_sha1_file("", 0, blob_type
, sha1
))
611 die("cannot create an empty blob in the object database");
612 hashcpy(ce
->sha1
, sha1
);
615 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
617 int size
, namelen
, was_same
;
618 mode_t st_mode
= st
->st_mode
;
619 struct cache_entry
*ce
, *alias
;
620 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
621 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
622 int pretend
= flags
& ADD_CACHE_PRETEND
;
623 int intent_only
= flags
& ADD_CACHE_INTENT
;
624 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
625 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
627 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
628 return error("%s: can only add regular files, symbolic links or git-directories", path
);
630 namelen
= strlen(path
);
631 if (S_ISDIR(st_mode
)) {
632 while (namelen
&& path
[namelen
-1] == '/')
635 size
= cache_entry_size(namelen
);
636 ce
= xcalloc(1, size
);
637 memcpy(ce
->name
, path
, namelen
);
638 ce
->ce_namelen
= namelen
;
640 fill_stat_cache_info(ce
, st
);
642 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
644 if (trust_executable_bit
&& has_symlinks
)
645 ce
->ce_mode
= create_ce_mode(st_mode
);
647 /* If there is an existing entry, pick the mode bits and type
648 * from it, otherwise assume unexecutable regular file.
650 struct cache_entry
*ent
;
651 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
653 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
654 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
657 /* When core.ignorecase=true, determine if a directory of the same name but differing
658 * case already exists within the Git repository. If it does, ensure the directory
659 * case of the file being added to the repository matches (is folded into) the existing
660 * entry's directory case.
663 const char *startPtr
= ce
->name
;
664 const char *ptr
= startPtr
;
666 while (*ptr
&& *ptr
!= '/')
669 struct cache_entry
*foundce
;
671 foundce
= index_dir_exists(istate
, ce
->name
, ptr
- ce
->name
- 1);
673 memcpy((void *)startPtr
, foundce
->name
+ (startPtr
- ce
->name
), ptr
- startPtr
);
680 alias
= index_file_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
681 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
682 /* Nothing changed, really */
684 if (!S_ISGITLINK(alias
->ce_mode
))
685 ce_mark_uptodate(alias
);
686 alias
->ce_flags
|= CE_ADDED
;
690 if (index_path(ce
->sha1
, path
, st
, HASH_WRITE_OBJECT
))
691 return error("unable to index file %s", path
);
693 set_object_name_for_intent_to_add_entry(ce
);
695 if (ignore_case
&& alias
&& different_name(ce
, alias
))
696 ce
= create_alias_ce(istate
, ce
, alias
);
697 ce
->ce_flags
|= CE_ADDED
;
699 /* It was suspected to be racily clean, but it turns out to be Ok */
702 !hashcmp(alias
->sha1
, ce
->sha1
) &&
703 ce
->ce_mode
== alias
->ce_mode
);
707 else if (add_index_entry(istate
, ce
, add_option
))
708 return error("unable to add %s to index",path
);
709 if (verbose
&& !was_same
)
710 printf("add '%s'\n", path
);
714 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
717 if (lstat(path
, &st
))
718 die_errno("unable to stat '%s'", path
);
719 return add_to_index(istate
, path
, &st
, flags
);
722 struct cache_entry
*make_cache_entry(unsigned int mode
,
723 const unsigned char *sha1
, const char *path
, int stage
,
724 unsigned int refresh_options
)
727 struct cache_entry
*ce
;
729 if (!verify_path(path
)) {
730 error("Invalid path '%s'", path
);
735 size
= cache_entry_size(len
);
736 ce
= xcalloc(1, size
);
738 hashcpy(ce
->sha1
, sha1
);
739 memcpy(ce
->name
, path
, len
);
740 ce
->ce_flags
= create_ce_flags(stage
);
741 ce
->ce_namelen
= len
;
742 ce
->ce_mode
= create_ce_mode(mode
);
744 return refresh_cache_entry(ce
, refresh_options
);
747 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
749 int len
= ce_namelen(a
);
750 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
754 * We fundamentally don't like some paths: we don't want
755 * dot or dot-dot anywhere, and for obvious reasons don't
756 * want to recurse into ".git" either.
758 * Also, we don't want double slashes or slashes at the
759 * end that can make pathnames ambiguous.
761 static int verify_dotfile(const char *rest
)
764 * The first character was '.', but that
765 * has already been discarded, we now test
769 /* "." is not allowed */
770 if (*rest
== '\0' || is_dir_sep(*rest
))
775 * ".git" followed by NUL or slash is bad. This
776 * shares the path end test with the ".." case.
780 if (rest
[1] != 'i' && rest
[1] != 'I')
782 if (rest
[2] != 't' && rest
[2] != 'T')
787 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
793 int verify_path(const char *path
)
797 if (has_dos_drive_prefix(path
))
806 if (protect_hfs
&& is_hfs_dotgit(path
))
808 if (protect_ntfs
&& is_ntfs_dotgit(path
))
811 if ((c
== '.' && !verify_dotfile(path
)) ||
812 is_dir_sep(c
) || c
== '\0')
820 * Do we have another file that has the beginning components being a
821 * proper superset of the name we're trying to add?
823 static int has_file_name(struct index_state
*istate
,
824 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
827 int len
= ce_namelen(ce
);
828 int stage
= ce_stage(ce
);
829 const char *name
= ce
->name
;
831 while (pos
< istate
->cache_nr
) {
832 struct cache_entry
*p
= istate
->cache
[pos
++];
834 if (len
>= ce_namelen(p
))
836 if (memcmp(name
, p
->name
, len
))
838 if (ce_stage(p
) != stage
)
840 if (p
->name
[len
] != '/')
842 if (p
->ce_flags
& CE_REMOVE
)
847 remove_index_entry_at(istate
, --pos
);
853 * Do we have another file with a pathname that is a proper
854 * subset of the name we're trying to add?
856 static int has_dir_name(struct index_state
*istate
,
857 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
860 int stage
= ce_stage(ce
);
861 const char *name
= ce
->name
;
862 const char *slash
= name
+ ce_namelen(ce
);
870 if (slash
<= ce
->name
)
875 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
878 * Found one, but not so fast. This could
879 * be a marker that says "I was here, but
880 * I am being removed". Such an entry is
881 * not a part of the resulting tree, and
882 * it is Ok to have a directory at the same
885 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
889 remove_index_entry_at(istate
, pos
);
897 * Trivial optimization: if we find an entry that
898 * already matches the sub-directory, then we know
899 * we're ok, and we can exit.
901 while (pos
< istate
->cache_nr
) {
902 struct cache_entry
*p
= istate
->cache
[pos
];
903 if ((ce_namelen(p
) <= len
) ||
904 (p
->name
[len
] != '/') ||
905 memcmp(p
->name
, name
, len
))
906 break; /* not our subdirectory */
907 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
909 * p is at the same stage as our entry, and
910 * is a subdirectory of what we are looking
911 * at, so we cannot have conflicts at our
912 * level or anything shorter.
921 /* We may be in a situation where we already have path/file and path
922 * is being added, or we already have path and path/file is being
923 * added. Either one would result in a nonsense tree that has path
924 * twice when git-write-tree tries to write it out. Prevent it.
926 * If ok-to-replace is specified, we remove the conflicting entries
927 * from the cache so the caller should recompute the insert position.
928 * When this happens, we return non-zero.
930 static int check_file_directory_conflict(struct index_state
*istate
,
931 const struct cache_entry
*ce
,
932 int pos
, int ok_to_replace
)
937 * When ce is an "I am going away" entry, we allow it to be added
939 if (ce
->ce_flags
& CE_REMOVE
)
943 * We check if the path is a sub-path of a subsequent pathname
944 * first, since removing those will not change the position
947 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
950 * Then check if the path might have a clashing sub-directory
953 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
956 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
959 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
960 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
961 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
962 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
964 if (!(option
& ADD_CACHE_KEEP_CACHE_TREE
))
965 cache_tree_invalidate_path(istate
, ce
->name
);
966 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
968 /* existing match? Just replace it. */
971 replace_index_entry(istate
, pos
, ce
);
977 * Inserting a merged entry ("stage 0") into the index
978 * will always replace all non-merged entries..
980 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
981 while (ce_same_name(istate
->cache
[pos
], ce
)) {
983 if (!remove_index_entry_at(istate
, pos
))
990 if (!verify_path(ce
->name
))
991 return error("Invalid path '%s'", ce
->name
);
993 if (!skip_df_check
&&
994 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
996 return error("'%s' appears as both a file and as a directory",
998 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
1004 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
1008 if (option
& ADD_CACHE_JUST_APPEND
)
1009 pos
= istate
->cache_nr
;
1012 ret
= add_index_entry_with_check(istate
, ce
, option
);
1018 /* Make sure the array is big enough .. */
1019 ALLOC_GROW(istate
->cache
, istate
->cache_nr
+ 1, istate
->cache_alloc
);
1023 if (istate
->cache_nr
> pos
+ 1)
1024 memmove(istate
->cache
+ pos
+ 1,
1025 istate
->cache
+ pos
,
1026 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1027 set_index_entry(istate
, pos
, ce
);
1028 istate
->cache_changed
|= CE_ENTRY_ADDED
;
1033 * "refresh" does not calculate a new sha1 file or bring the
1034 * cache up-to-date for mode/content changes. But what it
1035 * _does_ do is to "re-match" the stat information of a file
1036 * with the cache, so that you can refresh the cache for a
1037 * file that hasn't been changed but where the stat entry is
1040 * For example, you'd want to do this after doing a "git-read-tree",
1041 * to link up the stat cache details with the proper files.
1043 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1044 struct cache_entry
*ce
,
1045 unsigned int options
, int *err
,
1049 struct cache_entry
*updated
;
1051 int refresh
= options
& CE_MATCH_REFRESH
;
1052 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1053 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1054 int ignore_missing
= options
& CE_MATCH_IGNORE_MISSING
;
1056 if (!refresh
|| ce_uptodate(ce
))
1060 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1061 * that the change to the work tree does not matter and told
1064 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1065 ce_mark_uptodate(ce
);
1068 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1069 ce_mark_uptodate(ce
);
1073 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
))) {
1081 if (lstat(ce
->name
, &st
) < 0) {
1082 if (ignore_missing
&& errno
== ENOENT
)
1089 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1091 *changed_ret
= changed
;
1094 * The path is unchanged. If we were told to ignore
1095 * valid bit, then we did the actual stat check and
1096 * found that the entry is unmodified. If the entry
1097 * is not marked VALID, this is the place to mark it
1098 * valid again, under "assume unchanged" mode.
1100 if (ignore_valid
&& assume_unchanged
&&
1101 !(ce
->ce_flags
& CE_VALID
))
1102 ; /* mark this one VALID again */
1105 * We do not mark the index itself "modified"
1106 * because CE_UPTODATE flag is in-core only;
1107 * we are not going to write this change out.
1109 if (!S_ISGITLINK(ce
->ce_mode
))
1110 ce_mark_uptodate(ce
);
1115 if (ie_modified(istate
, ce
, &st
, options
)) {
1122 updated
= xmalloc(size
);
1123 memcpy(updated
, ce
, size
);
1124 fill_stat_cache_info(updated
, &st
);
1126 * If ignore_valid is not set, we should leave CE_VALID bit
1127 * alone. Otherwise, paths marked with --no-assume-unchanged
1128 * (i.e. things to be edited) will reacquire CE_VALID bit
1129 * automatically, which is not really what we want.
1131 if (!ignore_valid
&& assume_unchanged
&&
1132 !(ce
->ce_flags
& CE_VALID
))
1133 updated
->ce_flags
&= ~CE_VALID
;
1135 /* istate->cache_changed is updated in the caller */
1139 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1140 int * first
, const char *header_msg
)
1142 if (in_porcelain
&& *first
&& header_msg
) {
1143 printf("%s\n", header_msg
);
1149 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1150 const struct pathspec
*pathspec
,
1151 char *seen
, const char *header_msg
)
1155 int really
= (flags
& REFRESH_REALLY
) != 0;
1156 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1157 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1158 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1159 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1161 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1162 unsigned int options
= (CE_MATCH_REFRESH
|
1163 (really
? CE_MATCH_IGNORE_VALID
: 0) |
1164 (not_new
? CE_MATCH_IGNORE_MISSING
: 0));
1165 const char *modified_fmt
;
1166 const char *deleted_fmt
;
1167 const char *typechange_fmt
;
1168 const char *added_fmt
;
1169 const char *unmerged_fmt
;
1171 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1172 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1173 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1174 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1175 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1176 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1177 struct cache_entry
*ce
, *new;
1178 int cache_errno
= 0;
1182 ce
= istate
->cache
[i
];
1183 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1186 if (pathspec
&& !ce_path_match(ce
, pathspec
, seen
))
1190 while ((i
< istate
->cache_nr
) &&
1191 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1197 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1198 &first
, header_msg
);
1206 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1212 if (really
&& cache_errno
== EINVAL
) {
1213 /* If we are doing --really-refresh that
1214 * means the index is not valid anymore.
1216 ce
->ce_flags
&= ~CE_VALID
;
1217 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
1218 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
1223 if (cache_errno
== ENOENT
)
1225 else if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
1226 fmt
= added_fmt
; /* must be before other checks */
1227 else if (changed
& TYPE_CHANGED
)
1228 fmt
= typechange_fmt
;
1232 ce
->name
, in_porcelain
, &first
, header_msg
);
1237 replace_index_entry(istate
, i
, new);
1242 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
,
1243 unsigned int options
)
1245 return refresh_cache_ent(&the_index
, ce
, options
, NULL
, NULL
);
1249 /*****************************************************************
1251 *****************************************************************/
1253 #define INDEX_FORMAT_DEFAULT 3
1255 static int index_format_config(const char *var
, const char *value
, void *cb
)
1257 unsigned int *version
= cb
;
1258 if (!strcmp(var
, "index.version")) {
1259 *version
= git_config_int(var
, value
);
1265 static unsigned int get_index_format_default(void)
1267 char *envversion
= getenv("GIT_INDEX_VERSION");
1269 unsigned int version
= INDEX_FORMAT_DEFAULT
;
1272 git_config(index_format_config
, &version
);
1273 if (version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1274 warning(_("index.version set, but the value is invalid.\n"
1275 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1276 return INDEX_FORMAT_DEFAULT
;
1281 version
= strtoul(envversion
, &endp
, 10);
1283 version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< version
) {
1284 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1285 "Using version %i"), INDEX_FORMAT_DEFAULT
);
1286 version
= INDEX_FORMAT_DEFAULT
;
1292 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1293 * Again - this is just a (very strong in practice) heuristic that
1294 * the inode hasn't changed.
1296 * We save the fields in big-endian order to allow using the
1297 * index file over NFS transparently.
1299 struct ondisk_cache_entry
{
1300 struct cache_time ctime
;
1301 struct cache_time mtime
;
1308 unsigned char sha1
[20];
1310 char name
[FLEX_ARRAY
]; /* more */
1314 * This struct is used when CE_EXTENDED bit is 1
1315 * The struct must match ondisk_cache_entry exactly from
1318 struct ondisk_cache_entry_extended
{
1319 struct cache_time ctime
;
1320 struct cache_time mtime
;
1327 unsigned char sha1
[20];
1330 char name
[FLEX_ARRAY
]; /* more */
1333 /* These are only used for v3 or lower */
1334 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1335 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1336 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1337 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1338 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1339 ondisk_cache_entry_size(ce_namelen(ce)))
1341 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1344 unsigned char sha1
[20];
1347 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1348 return error("bad signature");
1349 hdr_version
= ntohl(hdr
->hdr_version
);
1350 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1351 return error("bad index version %d", hdr_version
);
1353 git_SHA1_Update(&c
, hdr
, size
- 20);
1354 git_SHA1_Final(sha1
, &c
);
1355 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1356 return error("bad index file sha1 signature");
1360 static int read_index_extension(struct index_state
*istate
,
1361 const char *ext
, void *data
, unsigned long sz
)
1363 switch (CACHE_EXT(ext
)) {
1364 case CACHE_EXT_TREE
:
1365 istate
->cache_tree
= cache_tree_read(data
, sz
);
1367 case CACHE_EXT_RESOLVE_UNDO
:
1368 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1370 case CACHE_EXT_LINK
:
1371 if (read_link_extension(istate
, data
, sz
))
1375 if (*ext
< 'A' || 'Z' < *ext
)
1376 return error("index uses %.4s extension, which we do not understand",
1378 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1384 int read_index(struct index_state
*istate
)
1386 return read_index_from(istate
, get_index_file());
1389 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1394 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1396 ce
->ce_stat_data
.sd_ctime
.sec
= get_be32(&ondisk
->ctime
.sec
);
1397 ce
->ce_stat_data
.sd_mtime
.sec
= get_be32(&ondisk
->mtime
.sec
);
1398 ce
->ce_stat_data
.sd_ctime
.nsec
= get_be32(&ondisk
->ctime
.nsec
);
1399 ce
->ce_stat_data
.sd_mtime
.nsec
= get_be32(&ondisk
->mtime
.nsec
);
1400 ce
->ce_stat_data
.sd_dev
= get_be32(&ondisk
->dev
);
1401 ce
->ce_stat_data
.sd_ino
= get_be32(&ondisk
->ino
);
1402 ce
->ce_mode
= get_be32(&ondisk
->mode
);
1403 ce
->ce_stat_data
.sd_uid
= get_be32(&ondisk
->uid
);
1404 ce
->ce_stat_data
.sd_gid
= get_be32(&ondisk
->gid
);
1405 ce
->ce_stat_data
.sd_size
= get_be32(&ondisk
->size
);
1406 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1407 ce
->ce_namelen
= len
;
1409 hashcpy(ce
->sha1
, ondisk
->sha1
);
1410 memcpy(ce
->name
, name
, len
);
1411 ce
->name
[len
] = '\0';
1416 * Adjacent cache entries tend to share the leading paths, so it makes
1417 * sense to only store the differences in later entries. In the v4
1418 * on-disk format of the index, each on-disk cache entry stores the
1419 * number of bytes to be stripped from the end of the previous name,
1420 * and the bytes to append to the result, to come up with its name.
1422 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1424 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1425 size_t len
= decode_varint(&cp
);
1427 if (name
->len
< len
)
1428 die("malformed name field in the index");
1429 strbuf_remove(name
, name
->len
- len
, len
);
1430 for (ep
= cp
; *ep
; ep
++)
1431 ; /* find the end */
1432 strbuf_add(name
, cp
, ep
- cp
);
1433 return (const char *)ep
+ 1 - cp_
;
1436 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1437 unsigned long *ent_size
,
1438 struct strbuf
*previous_name
)
1440 struct cache_entry
*ce
;
1445 /* On-disk flags are just 16 bits */
1446 flags
= get_be16(&ondisk
->flags
);
1447 len
= flags
& CE_NAMEMASK
;
1449 if (flags
& CE_EXTENDED
) {
1450 struct ondisk_cache_entry_extended
*ondisk2
;
1452 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1453 extended_flags
= get_be16(&ondisk2
->flags2
) << 16;
1454 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1455 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1456 die("Unknown index entry format %08x", extended_flags
);
1457 flags
|= extended_flags
;
1458 name
= ondisk2
->name
;
1461 name
= ondisk
->name
;
1463 if (!previous_name
) {
1464 /* v3 and earlier */
1465 if (len
== CE_NAMEMASK
)
1467 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1469 *ent_size
= ondisk_ce_size(ce
);
1471 unsigned long consumed
;
1472 consumed
= expand_name_field(previous_name
, name
);
1473 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1475 previous_name
->len
);
1477 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1482 /* remember to discard_cache() before reading a different cache! */
1483 int do_read_index(struct index_state
*istate
, const char *path
, int must_exist
)
1487 unsigned long src_offset
;
1488 struct cache_header
*hdr
;
1491 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1493 if (istate
->initialized
)
1494 return istate
->cache_nr
;
1496 istate
->timestamp
.sec
= 0;
1497 istate
->timestamp
.nsec
= 0;
1498 fd
= open(path
, O_RDONLY
);
1500 if (!must_exist
&& errno
== ENOENT
)
1502 die_errno("%s: index file open failed", path
);
1506 die_errno("cannot stat the open index");
1508 mmap_size
= xsize_t(st
.st_size
);
1509 if (mmap_size
< sizeof(struct cache_header
) + 20)
1510 die("index file smaller than expected");
1512 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
| PROT_WRITE
, MAP_PRIVATE
, fd
, 0);
1513 if (mmap
== MAP_FAILED
)
1514 die_errno("unable to map index file");
1518 if (verify_hdr(hdr
, mmap_size
) < 0)
1521 hashcpy(istate
->sha1
, (const unsigned char *)hdr
+ mmap_size
- 20);
1522 istate
->version
= ntohl(hdr
->hdr_version
);
1523 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1524 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1525 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1526 istate
->initialized
= 1;
1528 if (istate
->version
== 4)
1529 previous_name
= &previous_name_buf
;
1531 previous_name
= NULL
;
1533 src_offset
= sizeof(*hdr
);
1534 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1535 struct ondisk_cache_entry
*disk_ce
;
1536 struct cache_entry
*ce
;
1537 unsigned long consumed
;
1539 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1540 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1541 set_index_entry(istate
, i
, ce
);
1543 src_offset
+= consumed
;
1545 strbuf_release(&previous_name_buf
);
1546 istate
->timestamp
.sec
= st
.st_mtime
;
1547 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1549 while (src_offset
<= mmap_size
- 20 - 8) {
1550 /* After an array of active_nr index entries,
1551 * there can be arbitrary number of extended
1552 * sections, each of which is prefixed with
1553 * extension name (4-byte) and section length
1554 * in 4-byte network byte order.
1557 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1558 extsize
= ntohl(extsize
);
1559 if (read_index_extension(istate
,
1560 (const char *) mmap
+ src_offset
,
1561 (char *) mmap
+ src_offset
+ 8,
1565 src_offset
+= extsize
;
1567 munmap(mmap
, mmap_size
);
1568 return istate
->cache_nr
;
1571 munmap(mmap
, mmap_size
);
1572 die("index file corrupt");
1575 int read_index_from(struct index_state
*istate
, const char *path
)
1577 struct split_index
*split_index
;
1580 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1581 if (istate
->initialized
)
1582 return istate
->cache_nr
;
1584 ret
= do_read_index(istate
, path
, 0);
1585 split_index
= istate
->split_index
;
1589 if (is_null_sha1(split_index
->base_sha1
))
1592 if (split_index
->base
)
1593 discard_index(split_index
->base
);
1595 split_index
->base
= xcalloc(1, sizeof(*split_index
->base
));
1596 ret
= do_read_index(split_index
->base
,
1597 git_path("sharedindex.%s",
1598 sha1_to_hex(split_index
->base_sha1
)), 1);
1599 if (hashcmp(split_index
->base_sha1
, split_index
->base
->sha1
))
1600 die("broken index, expect %s in %s, got %s",
1601 sha1_to_hex(split_index
->base_sha1
),
1602 git_path("sharedindex.%s",
1603 sha1_to_hex(split_index
->base_sha1
)),
1604 sha1_to_hex(split_index
->base
->sha1
));
1605 merge_base_index(istate
);
1609 int is_index_unborn(struct index_state
*istate
)
1611 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1614 int discard_index(struct index_state
*istate
)
1618 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1619 if (istate
->cache
[i
]->index
&&
1620 istate
->split_index
&&
1621 istate
->split_index
->base
&&
1622 istate
->cache
[i
]->index
<= istate
->split_index
->base
->cache_nr
&&
1623 istate
->cache
[i
] == istate
->split_index
->base
->cache
[istate
->cache
[i
]->index
- 1])
1625 free(istate
->cache
[i
]);
1627 resolve_undo_clear_index(istate
);
1628 istate
->cache_nr
= 0;
1629 istate
->cache_changed
= 0;
1630 istate
->timestamp
.sec
= 0;
1631 istate
->timestamp
.nsec
= 0;
1632 free_name_hash(istate
);
1633 cache_tree_free(&(istate
->cache_tree
));
1634 istate
->initialized
= 0;
1635 free(istate
->cache
);
1636 istate
->cache
= NULL
;
1637 istate
->cache_alloc
= 0;
1638 discard_split_index(istate
);
1642 int unmerged_index(const struct index_state
*istate
)
1645 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1646 if (ce_stage(istate
->cache
[i
]))
1652 #define WRITE_BUFFER_SIZE 8192
1653 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1654 static unsigned long write_buffer_len
;
1656 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1658 unsigned int buffered
= write_buffer_len
;
1660 git_SHA1_Update(context
, write_buffer
, buffered
);
1661 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1663 write_buffer_len
= 0;
1668 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1671 unsigned int buffered
= write_buffer_len
;
1672 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1675 memcpy(write_buffer
+ buffered
, data
, partial
);
1676 buffered
+= partial
;
1677 if (buffered
== WRITE_BUFFER_SIZE
) {
1678 write_buffer_len
= buffered
;
1679 if (ce_write_flush(context
, fd
))
1683 write_buffer_len
= buffered
;
1685 data
= (char *) data
+ partial
;
1690 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1691 unsigned int ext
, unsigned int sz
)
1695 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1696 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1699 static int ce_flush(git_SHA_CTX
*context
, int fd
, unsigned char *sha1
)
1701 unsigned int left
= write_buffer_len
;
1704 write_buffer_len
= 0;
1705 git_SHA1_Update(context
, write_buffer
, left
);
1708 /* Flush first if not enough space for SHA1 signature */
1709 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1710 if (write_in_full(fd
, write_buffer
, left
) != left
)
1715 /* Append the SHA1 signature at the end */
1716 git_SHA1_Final(write_buffer
+ left
, context
);
1717 hashcpy(sha1
, write_buffer
+ left
);
1719 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1722 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1725 * The only thing we care about in this function is to smudge the
1726 * falsely clean entry due to touch-update-touch race, so we leave
1727 * everything else as they are. We are called for entries whose
1728 * ce_stat_data.sd_mtime match the index file mtime.
1730 * Note that this actually does not do much for gitlinks, for
1731 * which ce_match_stat_basic() always goes to the actual
1732 * contents. The caller checks with is_racy_timestamp() which
1733 * always says "no" for gitlinks, so we are not called for them ;-)
1737 if (lstat(ce
->name
, &st
) < 0)
1739 if (ce_match_stat_basic(ce
, &st
))
1741 if (ce_modified_check_fs(ce
, &st
)) {
1742 /* This is "racily clean"; smudge it. Note that this
1743 * is a tricky code. At first glance, it may appear
1744 * that it can break with this sequence:
1746 * $ echo xyzzy >frotz
1747 * $ git-update-index --add frotz
1750 * $ echo filfre >nitfol
1751 * $ git-update-index --add nitfol
1753 * but it does not. When the second update-index runs,
1754 * it notices that the entry "frotz" has the same timestamp
1755 * as index, and if we were to smudge it by resetting its
1756 * size to zero here, then the object name recorded
1757 * in index is the 6-byte file but the cached stat information
1758 * becomes zero --- which would then match what we would
1759 * obtain from the filesystem next time we stat("frotz").
1761 * However, the second update-index, before calling
1762 * this function, notices that the cached size is 6
1763 * bytes and what is on the filesystem is an empty
1764 * file, and never calls us, so the cached size information
1765 * for "frotz" stays 6 which does not match the filesystem.
1767 ce
->ce_stat_data
.sd_size
= 0;
1771 /* Copy miscellaneous fields but not the name */
1772 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1773 struct cache_entry
*ce
)
1777 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1778 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1779 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1780 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1781 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1782 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1783 ondisk
->mode
= htonl(ce
->ce_mode
);
1784 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1785 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1786 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1787 hashcpy(ondisk
->sha1
, ce
->sha1
);
1789 flags
= ce
->ce_flags
& ~CE_NAMEMASK
;
1790 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1791 ondisk
->flags
= htons(flags
);
1792 if (ce
->ce_flags
& CE_EXTENDED
) {
1793 struct ondisk_cache_entry_extended
*ondisk2
;
1794 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1795 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1796 return ondisk2
->name
;
1799 return ondisk
->name
;
1803 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1804 struct strbuf
*previous_name
)
1807 struct ondisk_cache_entry
*ondisk
;
1808 int saved_namelen
= saved_namelen
; /* compiler workaround */
1812 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1813 saved_namelen
= ce_namelen(ce
);
1817 if (!previous_name
) {
1818 size
= ondisk_ce_size(ce
);
1819 ondisk
= xcalloc(1, size
);
1820 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1821 memcpy(name
, ce
->name
, ce_namelen(ce
));
1823 int common
, to_remove
, prefix_size
;
1824 unsigned char to_remove_vi
[16];
1826 (ce
->name
[common
] &&
1827 common
< previous_name
->len
&&
1828 ce
->name
[common
] == previous_name
->buf
[common
]);
1830 ; /* still matching */
1831 to_remove
= previous_name
->len
- common
;
1832 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
1834 if (ce
->ce_flags
& CE_EXTENDED
)
1835 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
1837 size
= offsetof(struct ondisk_cache_entry
, name
);
1838 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
1840 ondisk
= xcalloc(1, size
);
1841 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1842 memcpy(name
, to_remove_vi
, prefix_size
);
1843 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
1845 strbuf_splice(previous_name
, common
, to_remove
,
1846 ce
->name
+ common
, ce_namelen(ce
) - common
);
1848 if (ce
->ce_flags
& CE_STRIP_NAME
) {
1849 ce
->ce_namelen
= saved_namelen
;
1850 ce
->ce_flags
&= ~CE_STRIP_NAME
;
1853 result
= ce_write(c
, fd
, ondisk
, size
);
1859 * This function verifies if index_state has the correct sha1 of the
1860 * index file. Don't die if we have any other failure, just return 0.
1862 static int verify_index_from(const struct index_state
*istate
, const char *path
)
1867 unsigned char sha1
[20];
1869 if (!istate
->initialized
)
1872 fd
= open(path
, O_RDONLY
);
1879 if (st
.st_size
< sizeof(struct cache_header
) + 20)
1882 n
= pread_in_full(fd
, sha1
, 20, st
.st_size
- 20);
1886 if (hashcmp(istate
->sha1
, sha1
))
1897 static int verify_index(const struct index_state
*istate
)
1899 return verify_index_from(istate
, get_index_file());
1902 static int has_racy_timestamp(struct index_state
*istate
)
1904 int entries
= istate
->cache_nr
;
1907 for (i
= 0; i
< entries
; i
++) {
1908 struct cache_entry
*ce
= istate
->cache
[i
];
1909 if (is_racy_timestamp(istate
, ce
))
1916 * Opportunistically update the index but do not complain if we can't
1918 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
1920 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
1921 verify_index(istate
) &&
1922 write_locked_index(istate
, lockfile
, COMMIT_LOCK
))
1923 rollback_lock_file(lockfile
);
1926 static int do_write_index(struct index_state
*istate
, int newfd
,
1927 int strip_extensions
)
1930 struct cache_header hdr
;
1931 int i
, err
, removed
, extended
, hdr_version
;
1932 struct cache_entry
**cache
= istate
->cache
;
1933 int entries
= istate
->cache_nr
;
1935 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1937 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
1938 if (cache
[i
]->ce_flags
& CE_REMOVE
)
1941 /* reduce extended entries if possible */
1942 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
1943 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
1945 cache
[i
]->ce_flags
|= CE_EXTENDED
;
1949 if (!istate
->version
) {
1950 istate
->version
= get_index_format_default();
1951 if (getenv("GIT_TEST_SPLIT_INDEX"))
1952 init_split_index(istate
);
1955 /* demote version 3 to version 2 when the latter suffices */
1956 if (istate
->version
== 3 || istate
->version
== 2)
1957 istate
->version
= extended
? 3 : 2;
1959 hdr_version
= istate
->version
;
1961 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
1962 hdr
.hdr_version
= htonl(hdr_version
);
1963 hdr
.hdr_entries
= htonl(entries
- removed
);
1966 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
1969 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
1970 for (i
= 0; i
< entries
; i
++) {
1971 struct cache_entry
*ce
= cache
[i
];
1972 if (ce
->ce_flags
& CE_REMOVE
)
1974 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
1975 ce_smudge_racily_clean_entry(ce
);
1976 if (is_null_sha1(ce
->sha1
)) {
1977 static const char msg
[] = "cache entry has null sha1: %s";
1978 static int allow
= -1;
1981 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1983 warning(msg
, ce
->name
);
1985 return error(msg
, ce
->name
);
1987 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
1990 strbuf_release(&previous_name_buf
);
1992 /* Write extension data here */
1993 if (!strip_extensions
&& istate
->split_index
) {
1994 struct strbuf sb
= STRBUF_INIT
;
1996 err
= write_link_extension(&sb
, istate
) < 0 ||
1997 write_index_ext_header(&c
, newfd
, CACHE_EXT_LINK
,
1999 ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2000 strbuf_release(&sb
);
2004 if (!strip_extensions
&& istate
->cache_tree
) {
2005 struct strbuf sb
= STRBUF_INIT
;
2007 cache_tree_write(&sb
, istate
->cache_tree
);
2008 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
2009 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2010 strbuf_release(&sb
);
2014 if (!strip_extensions
&& istate
->resolve_undo
) {
2015 struct strbuf sb
= STRBUF_INIT
;
2017 resolve_undo_write(&sb
, istate
->resolve_undo
);
2018 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
2020 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
2021 strbuf_release(&sb
);
2026 if (ce_flush(&c
, newfd
, istate
->sha1
) || fstat(newfd
, &st
))
2028 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
2029 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
2033 void set_alternate_index_output(const char *name
)
2035 alternate_index_output
= name
;
2038 static int commit_locked_index(struct lock_file
*lk
)
2040 if (alternate_index_output
) {
2041 if (lk
->fd
>= 0 && close_lock_file(lk
))
2043 if (rename(lk
->filename
, alternate_index_output
))
2045 lk
->filename
[0] = 0;
2048 return commit_lock_file(lk
);
2052 static int do_write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2055 int ret
= do_write_index(istate
, lock
->fd
, 0);
2058 assert((flags
& (COMMIT_LOCK
| CLOSE_LOCK
)) !=
2059 (COMMIT_LOCK
| CLOSE_LOCK
));
2060 if (flags
& COMMIT_LOCK
)
2061 return commit_locked_index(lock
);
2062 else if (flags
& CLOSE_LOCK
)
2063 return close_lock_file(lock
);
2068 static int write_split_index(struct index_state
*istate
,
2069 struct lock_file
*lock
,
2073 prepare_to_write_split_index(istate
);
2074 ret
= do_write_locked_index(istate
, lock
, flags
);
2075 finish_writing_split_index(istate
);
2079 static char *temporary_sharedindex
;
2081 static void remove_temporary_sharedindex(void)
2083 if (temporary_sharedindex
) {
2084 unlink_or_warn(temporary_sharedindex
);
2085 free(temporary_sharedindex
);
2086 temporary_sharedindex
= NULL
;
2090 static void remove_temporary_sharedindex_on_signal(int signo
)
2092 remove_temporary_sharedindex();
2093 sigchain_pop(signo
);
2097 static int write_shared_index(struct index_state
*istate
,
2098 struct lock_file
*lock
, unsigned flags
)
2100 struct split_index
*si
= istate
->split_index
;
2101 static int installed_handler
;
2104 temporary_sharedindex
= git_pathdup("sharedindex_XXXXXX");
2105 fd
= mkstemp(temporary_sharedindex
);
2107 free(temporary_sharedindex
);
2108 temporary_sharedindex
= NULL
;
2109 hashclr(si
->base_sha1
);
2110 return do_write_locked_index(istate
, lock
, flags
);
2112 if (!installed_handler
) {
2113 atexit(remove_temporary_sharedindex
);
2114 sigchain_push_common(remove_temporary_sharedindex_on_signal
);
2116 move_cache_to_base_index(istate
);
2117 ret
= do_write_index(si
->base
, fd
, 1);
2120 remove_temporary_sharedindex();
2123 ret
= rename(temporary_sharedindex
,
2124 git_path("sharedindex.%s", sha1_to_hex(si
->base
->sha1
)));
2125 free(temporary_sharedindex
);
2126 temporary_sharedindex
= NULL
;
2128 hashcpy(si
->base_sha1
, si
->base
->sha1
);
2132 int write_locked_index(struct index_state
*istate
, struct lock_file
*lock
,
2135 struct split_index
*si
= istate
->split_index
;
2137 if (!si
|| alternate_index_output
||
2138 (istate
->cache_changed
& ~EXTMASK
)) {
2140 hashclr(si
->base_sha1
);
2141 return do_write_locked_index(istate
, lock
, flags
);
2144 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2145 int v
= si
->base_sha1
[0];
2147 istate
->cache_changed
|= SPLIT_INDEX_ORDERED
;
2149 if (istate
->cache_changed
& SPLIT_INDEX_ORDERED
) {
2150 int ret
= write_shared_index(istate
, lock
, flags
);
2155 return write_split_index(istate
, lock
, flags
);
2159 * Read the index file that is potentially unmerged into given
2160 * index_state, dropping any unmerged entries. Returns true if
2161 * the index is unmerged. Callers who want to refuse to work
2162 * from an unmerged state can call this and check its return value,
2163 * instead of calling read_cache().
2165 int read_index_unmerged(struct index_state
*istate
)
2171 for (i
= 0; i
< istate
->cache_nr
; i
++) {
2172 struct cache_entry
*ce
= istate
->cache
[i
];
2173 struct cache_entry
*new_ce
;
2179 len
= ce_namelen(ce
);
2180 size
= cache_entry_size(len
);
2181 new_ce
= xcalloc(1, size
);
2182 memcpy(new_ce
->name
, ce
->name
, len
);
2183 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
2184 new_ce
->ce_namelen
= len
;
2185 new_ce
->ce_mode
= ce
->ce_mode
;
2186 if (add_index_entry(istate
, new_ce
, 0))
2187 return error("%s: cannot drop to stage #0",
2189 i
= index_name_pos(istate
, new_ce
->name
, len
);
2195 * Returns 1 if the path is an "other" path with respect to
2196 * the index; that is, the path is not mentioned in the index at all,
2197 * either as a file, a directory with some files in the index,
2198 * or as an unmerged entry.
2200 * We helpfully remove a trailing "/" from directories so that
2201 * the output of read_directory can be used as-is.
2203 int index_name_is_other(const struct index_state
*istate
, const char *name
,
2207 if (namelen
&& name
[namelen
- 1] == '/')
2209 pos
= index_name_pos(istate
, name
, namelen
);
2211 return 0; /* exact match */
2213 if (pos
< istate
->cache_nr
) {
2214 struct cache_entry
*ce
= istate
->cache
[pos
];
2215 if (ce_namelen(ce
) == namelen
&&
2216 !memcmp(ce
->name
, name
, namelen
))
2217 return 0; /* Yup, this one exists unmerged */
2222 void *read_blob_data_from_index(struct index_state
*istate
, const char *path
, unsigned long *size
)
2226 enum object_type type
;
2230 pos
= index_name_pos(istate
, path
, len
);
2233 * We might be in the middle of a merge, in which
2234 * case we would read stage #2 (ours).
2238 (pos
< 0 && i
< istate
->cache_nr
&&
2239 !strcmp(istate
->cache
[i
]->name
, path
));
2241 if (ce_stage(istate
->cache
[i
]) == 2)
2246 data
= read_sha1_file(istate
->cache
[pos
]->sha1
, &type
, &sz
);
2247 if (!data
|| type
!= OBJ_BLOB
) {
2256 void stat_validity_clear(struct stat_validity
*sv
)
2262 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
2266 if (stat(path
, &st
) < 0)
2267 return sv
->sd
== NULL
;
2270 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
2273 void stat_validity_update(struct stat_validity
*sv
, int fd
)
2277 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
2278 stat_validity_clear(sv
);
2281 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
2282 fill_stat_data(sv
->sd
, &st
);