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"
18 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
, int really
);
20 /* Mask for the name length in ce_flags in the on-disk index */
22 #define CE_NAMEMASK (0x0fff)
26 * The first letter should be 'A'..'Z' for extensions that are not
27 * necessary for a correct operation (i.e. optimization data).
28 * When new extensions are added that _needs_ to be understood in
29 * order to correctly interpret the index file, pick character that
30 * is outside the range, to cause the reader to abort.
33 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
34 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
35 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
37 struct index_state the_index
;
39 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
41 istate
->cache
[nr
] = ce
;
42 add_name_hash(istate
, ce
);
45 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
47 struct cache_entry
*old
= istate
->cache
[nr
];
49 remove_name_hash(istate
, old
);
51 set_index_entry(istate
, nr
, ce
);
52 istate
->cache_changed
= 1;
55 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
57 struct cache_entry
*old
= istate
->cache
[nr
], *new;
58 int namelen
= strlen(new_name
);
60 new = xmalloc(cache_entry_size(namelen
));
61 copy_cache_entry(new, old
);
62 new->ce_flags
&= ~CE_HASHED
;
63 new->ce_namelen
= namelen
;
64 memcpy(new->name
, new_name
, namelen
+ 1);
66 cache_tree_invalidate_path(istate
->cache_tree
, old
->name
);
67 remove_index_entry_at(istate
, nr
);
68 add_index_entry(istate
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
71 void fill_stat_data(struct stat_data
*sd
, struct stat
*st
)
73 sd
->sd_ctime
.sec
= (unsigned int)st
->st_ctime
;
74 sd
->sd_mtime
.sec
= (unsigned int)st
->st_mtime
;
75 sd
->sd_ctime
.nsec
= ST_CTIME_NSEC(*st
);
76 sd
->sd_mtime
.nsec
= ST_MTIME_NSEC(*st
);
77 sd
->sd_dev
= st
->st_dev
;
78 sd
->sd_ino
= st
->st_ino
;
79 sd
->sd_uid
= st
->st_uid
;
80 sd
->sd_gid
= st
->st_gid
;
81 sd
->sd_size
= st
->st_size
;
84 int match_stat_data(const struct stat_data
*sd
, struct stat
*st
)
88 if (sd
->sd_mtime
.sec
!= (unsigned int)st
->st_mtime
)
89 changed
|= MTIME_CHANGED
;
90 if (trust_ctime
&& check_stat
&&
91 sd
->sd_ctime
.sec
!= (unsigned int)st
->st_ctime
)
92 changed
|= CTIME_CHANGED
;
95 if (check_stat
&& sd
->sd_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
96 changed
|= MTIME_CHANGED
;
97 if (trust_ctime
&& check_stat
&&
98 sd
->sd_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
99 changed
|= CTIME_CHANGED
;
103 if (sd
->sd_uid
!= (unsigned int) st
->st_uid
||
104 sd
->sd_gid
!= (unsigned int) st
->st_gid
)
105 changed
|= OWNER_CHANGED
;
106 if (sd
->sd_ino
!= (unsigned int) st
->st_ino
)
107 changed
|= INODE_CHANGED
;
112 * st_dev breaks on network filesystems where different
113 * clients will have different views of what "device"
114 * the filesystem is on
116 if (check_stat
&& sd
->sd_dev
!= (unsigned int) st
->st_dev
)
117 changed
|= INODE_CHANGED
;
120 if (sd
->sd_size
!= (unsigned int) st
->st_size
)
121 changed
|= DATA_CHANGED
;
127 * This only updates the "non-critical" parts of the directory
128 * cache, ie the parts that aren't tracked by GIT, and only used
129 * to validate the cache.
131 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
133 fill_stat_data(&ce
->ce_stat_data
, st
);
135 if (assume_unchanged
)
136 ce
->ce_flags
|= CE_VALID
;
138 if (S_ISREG(st
->st_mode
))
139 ce_mark_uptodate(ce
);
142 static int ce_compare_data(const struct cache_entry
*ce
, struct stat
*st
)
145 int fd
= open(ce
->name
, O_RDONLY
);
148 unsigned char sha1
[20];
149 if (!index_fd(sha1
, fd
, st
, OBJ_BLOB
, ce
->name
, 0))
150 match
= hashcmp(sha1
, ce
->sha1
);
151 /* index_fd() closed the file descriptor already */
156 static int ce_compare_link(const struct cache_entry
*ce
, size_t expected_size
)
161 enum object_type type
;
162 struct strbuf sb
= STRBUF_INIT
;
164 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
167 buffer
= read_sha1_file(ce
->sha1
, &type
, &size
);
170 match
= memcmp(buffer
, sb
.buf
, size
);
177 static int ce_compare_gitlink(const struct cache_entry
*ce
)
179 unsigned char sha1
[20];
182 * We don't actually require that the .git directory
183 * under GITLINK directory be a valid git directory. It
184 * might even be missing (in case nobody populated that
187 * If so, we consider it always to match.
189 if (resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) < 0)
191 return hashcmp(sha1
, ce
->sha1
);
194 static int ce_modified_check_fs(const struct cache_entry
*ce
, struct stat
*st
)
196 switch (st
->st_mode
& S_IFMT
) {
198 if (ce_compare_data(ce
, st
))
202 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
206 if (S_ISGITLINK(ce
->ce_mode
))
207 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
214 static int ce_match_stat_basic(const struct cache_entry
*ce
, struct stat
*st
)
216 unsigned int changed
= 0;
218 if (ce
->ce_flags
& CE_REMOVE
)
219 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
221 switch (ce
->ce_mode
& S_IFMT
) {
223 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
224 /* We consider only the owner x bit to be relevant for
227 if (trust_executable_bit
&&
228 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
229 changed
|= MODE_CHANGED
;
232 if (!S_ISLNK(st
->st_mode
) &&
233 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
234 changed
|= TYPE_CHANGED
;
237 /* We ignore most of the st_xxx fields for gitlinks */
238 if (!S_ISDIR(st
->st_mode
))
239 changed
|= TYPE_CHANGED
;
240 else if (ce_compare_gitlink(ce
))
241 changed
|= DATA_CHANGED
;
244 die("internal error: ce_mode is %o", ce
->ce_mode
);
247 changed
|= match_stat_data(&ce
->ce_stat_data
, st
);
249 /* Racily smudged entry? */
250 if (!ce
->ce_stat_data
.sd_size
) {
251 if (!is_empty_blob_sha1(ce
->sha1
))
252 changed
|= DATA_CHANGED
;
258 static int is_racy_timestamp(const struct index_state
*istate
,
259 const struct cache_entry
*ce
)
261 return (!S_ISGITLINK(ce
->ce_mode
) &&
262 istate
->timestamp
.sec
&&
264 /* nanosecond timestamped files can also be racy! */
265 (istate
->timestamp
.sec
< ce
->ce_stat_data
.sd_mtime
.sec
||
266 (istate
->timestamp
.sec
== ce
->ce_stat_data
.sd_mtime
.sec
&&
267 istate
->timestamp
.nsec
<= ce
->ce_stat_data
.sd_mtime
.nsec
))
269 istate
->timestamp
.sec
<= ce
->ce_stat_data
.sd_mtime
.sec
274 int ie_match_stat(const struct index_state
*istate
,
275 const struct cache_entry
*ce
, struct stat
*st
,
276 unsigned int options
)
278 unsigned int changed
;
279 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
280 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
281 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
284 * If it's marked as always valid in the index, it's
285 * valid whatever the checked-out copy says.
287 * skip-worktree has the same effect with higher precedence
289 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
291 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
295 * Intent-to-add entries have not been added, so the index entry
296 * by definition never matches what is in the work tree until it
297 * actually gets added.
299 if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
300 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
302 changed
= ce_match_stat_basic(ce
, st
);
305 * Within 1 second of this sequence:
306 * echo xyzzy >file && git-update-index --add file
307 * running this command:
309 * would give a falsely clean cache entry. The mtime and
310 * length match the cache, and other stat fields do not change.
312 * We could detect this at update-index time (the cache entry
313 * being registered/updated records the same time as "now")
314 * and delay the return from git-update-index, but that would
315 * effectively mean we can make at most one commit per second,
316 * which is not acceptable. Instead, we check cache entries
317 * whose mtime are the same as the index file timestamp more
318 * carefully than others.
320 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
321 if (assume_racy_is_modified
)
322 changed
|= DATA_CHANGED
;
324 changed
|= ce_modified_check_fs(ce
, st
);
330 int ie_modified(const struct index_state
*istate
,
331 const struct cache_entry
*ce
,
332 struct stat
*st
, unsigned int options
)
334 int changed
, changed_fs
;
336 changed
= ie_match_stat(istate
, ce
, st
, options
);
340 * If the mode or type has changed, there's no point in trying
341 * to refresh the entry - it's not going to match
343 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
347 * Immediately after read-tree or update-index --cacheinfo,
348 * the length field is zero, as we have never even read the
349 * lstat(2) information once, and we cannot trust DATA_CHANGED
350 * returned by ie_match_stat() which in turn was returned by
351 * ce_match_stat_basic() to signal that the filesize of the
352 * blob changed. We have to actually go to the filesystem to
353 * see if the contents match, and if so, should answer "unchanged".
355 * The logic does not apply to gitlinks, as ce_match_stat_basic()
356 * already has checked the actual HEAD from the filesystem in the
357 * subproject. If ie_match_stat() already said it is different,
358 * then we know it is.
360 if ((changed
& DATA_CHANGED
) &&
361 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_stat_data
.sd_size
!= 0))
364 changed_fs
= ce_modified_check_fs(ce
, st
);
366 return changed
| changed_fs
;
370 int base_name_compare(const char *name1
, int len1
, int mode1
,
371 const char *name2
, int len2
, int mode2
)
373 unsigned char c1
, c2
;
374 int len
= len1
< len2
? len1
: len2
;
377 cmp
= memcmp(name1
, name2
, len
);
382 if (!c1
&& S_ISDIR(mode1
))
384 if (!c2
&& S_ISDIR(mode2
))
386 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
390 * df_name_compare() is identical to base_name_compare(), except it
391 * compares conflicting directory/file entries as equal. Note that
392 * while a directory name compares as equal to a regular file, they
393 * then individually compare _differently_ to a filename that has
394 * a dot after the basename (because '\0' < '.' < '/').
396 * This is used by routines that want to traverse the git namespace
397 * but then handle conflicting entries together when possible.
399 int df_name_compare(const char *name1
, int len1
, int mode1
,
400 const char *name2
, int len2
, int mode2
)
402 int len
= len1
< len2
? len1
: len2
, cmp
;
403 unsigned char c1
, c2
;
405 cmp
= memcmp(name1
, name2
, len
);
408 /* Directories and files compare equal (same length, same name) */
412 if (!c1
&& S_ISDIR(mode1
))
415 if (!c2
&& S_ISDIR(mode2
))
417 if (c1
== '/' && !c2
)
419 if (c2
== '/' && !c1
)
424 int cache_name_stage_compare(const char *name1
, int len1
, int stage1
, const char *name2
, int len2
, int stage2
)
426 int len
= len1
< len2
? len1
: len2
;
429 cmp
= memcmp(name1
, name2
, len
);
444 int cache_name_compare(const char *name1
, int len1
, const char *name2
, int len2
)
446 return cache_name_stage_compare(name1
, len1
, 0, name2
, len2
, 0);
449 static int index_name_stage_pos(const struct index_state
*istate
, const char *name
, int namelen
, int stage
)
454 last
= istate
->cache_nr
;
455 while (last
> first
) {
456 int next
= (last
+ first
) >> 1;
457 struct cache_entry
*ce
= istate
->cache
[next
];
458 int cmp
= cache_name_stage_compare(name
, namelen
, stage
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
470 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
472 return index_name_stage_pos(istate
, name
, namelen
, 0);
475 /* Remove entry, return true if there are more entries to go.. */
476 int remove_index_entry_at(struct index_state
*istate
, int pos
)
478 struct cache_entry
*ce
= istate
->cache
[pos
];
480 record_resolve_undo(istate
, ce
);
481 remove_name_hash(istate
, ce
);
483 istate
->cache_changed
= 1;
485 if (pos
>= istate
->cache_nr
)
487 memmove(istate
->cache
+ pos
,
488 istate
->cache
+ pos
+ 1,
489 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
494 * Remove all cache entries marked for removal, that is where
495 * CE_REMOVE is set in ce_flags. This is much more effective than
496 * calling remove_index_entry_at() for each entry to be removed.
498 void remove_marked_cache_entries(struct index_state
*istate
)
500 struct cache_entry
**ce_array
= istate
->cache
;
503 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
504 if (ce_array
[i
]->ce_flags
& CE_REMOVE
) {
505 remove_name_hash(istate
, ce_array
[i
]);
509 ce_array
[j
++] = ce_array
[i
];
511 istate
->cache_changed
= 1;
512 istate
->cache_nr
= j
;
515 int remove_file_from_index(struct index_state
*istate
, const char *path
)
517 int pos
= index_name_pos(istate
, path
, strlen(path
));
520 cache_tree_invalidate_path(istate
->cache_tree
, path
);
521 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
522 remove_index_entry_at(istate
, pos
);
526 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
528 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
531 static int index_name_pos_also_unmerged(struct index_state
*istate
,
532 const char *path
, int namelen
)
534 int pos
= index_name_pos(istate
, path
, namelen
);
535 struct cache_entry
*ce
;
540 /* maybe unmerged? */
542 if (pos
>= istate
->cache_nr
||
543 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
546 /* order of preference: stage 2, 1, 3 */
547 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
548 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
549 !compare_name(ce
, path
, namelen
))
554 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
556 int len
= ce_namelen(ce
);
557 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
561 * If we add a filename that aliases in the cache, we will use the
562 * name that we already have - but we don't want to update the same
563 * alias twice, because that implies that there were actually two
564 * different files with aliasing names!
566 * So we use the CE_ADDED flag to verify that the alias was an old
567 * one before we accept it as
569 static struct cache_entry
*create_alias_ce(struct cache_entry
*ce
, struct cache_entry
*alias
)
572 struct cache_entry
*new;
574 if (alias
->ce_flags
& CE_ADDED
)
575 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
577 /* Ok, create the new entry using the name of the existing alias */
578 len
= ce_namelen(alias
);
579 new = xcalloc(1, cache_entry_size(len
));
580 memcpy(new->name
, alias
->name
, len
);
581 copy_cache_entry(new, ce
);
586 static void record_intent_to_add(struct cache_entry
*ce
)
588 unsigned char sha1
[20];
589 if (write_sha1_file("", 0, blob_type
, sha1
))
590 die("cannot create an empty blob in the object database");
591 hashcpy(ce
->sha1
, sha1
);
594 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
596 int size
, namelen
, was_same
;
597 mode_t st_mode
= st
->st_mode
;
598 struct cache_entry
*ce
, *alias
;
599 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
600 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
601 int pretend
= flags
& ADD_CACHE_PRETEND
;
602 int intent_only
= flags
& ADD_CACHE_INTENT
;
603 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
604 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
606 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
607 return error("%s: can only add regular files, symbolic links or git-directories", path
);
609 namelen
= strlen(path
);
610 if (S_ISDIR(st_mode
)) {
611 while (namelen
&& path
[namelen
-1] == '/')
614 size
= cache_entry_size(namelen
);
615 ce
= xcalloc(1, size
);
616 memcpy(ce
->name
, path
, namelen
);
617 ce
->ce_namelen
= namelen
;
619 fill_stat_cache_info(ce
, st
);
621 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
623 if (trust_executable_bit
&& has_symlinks
)
624 ce
->ce_mode
= create_ce_mode(st_mode
);
626 /* If there is an existing entry, pick the mode bits and type
627 * from it, otherwise assume unexecutable regular file.
629 struct cache_entry
*ent
;
630 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
632 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
633 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
636 /* When core.ignorecase=true, determine if a directory of the same name but differing
637 * case already exists within the Git repository. If it does, ensure the directory
638 * case of the file being added to the repository matches (is folded into) the existing
639 * entry's directory case.
642 const char *startPtr
= ce
->name
;
643 const char *ptr
= startPtr
;
645 while (*ptr
&& *ptr
!= '/')
648 struct cache_entry
*foundce
;
650 foundce
= index_dir_exists(istate
, ce
->name
, ptr
- ce
->name
- 1);
652 memcpy((void *)startPtr
, foundce
->name
+ (startPtr
- ce
->name
), ptr
- startPtr
);
659 alias
= index_file_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
660 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
661 /* Nothing changed, really */
663 if (!S_ISGITLINK(alias
->ce_mode
))
664 ce_mark_uptodate(alias
);
665 alias
->ce_flags
|= CE_ADDED
;
669 if (index_path(ce
->sha1
, path
, st
, HASH_WRITE_OBJECT
))
670 return error("unable to index file %s", path
);
672 record_intent_to_add(ce
);
674 if (ignore_case
&& alias
&& different_name(ce
, alias
))
675 ce
= create_alias_ce(ce
, alias
);
676 ce
->ce_flags
|= CE_ADDED
;
678 /* It was suspected to be racily clean, but it turns out to be Ok */
681 !hashcmp(alias
->sha1
, ce
->sha1
) &&
682 ce
->ce_mode
== alias
->ce_mode
);
686 else if (add_index_entry(istate
, ce
, add_option
))
687 return error("unable to add %s to index",path
);
688 if (verbose
&& !was_same
)
689 printf("add '%s'\n", path
);
693 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
696 if (lstat(path
, &st
))
697 die_errno("unable to stat '%s'", path
);
698 return add_to_index(istate
, path
, &st
, flags
);
701 struct cache_entry
*make_cache_entry(unsigned int mode
,
702 const unsigned char *sha1
, const char *path
, int stage
,
706 struct cache_entry
*ce
;
708 if (!verify_path(path
)) {
709 error("Invalid path '%s'", path
);
714 size
= cache_entry_size(len
);
715 ce
= xcalloc(1, size
);
717 hashcpy(ce
->sha1
, sha1
);
718 memcpy(ce
->name
, path
, len
);
719 ce
->ce_flags
= create_ce_flags(stage
);
720 ce
->ce_namelen
= len
;
721 ce
->ce_mode
= create_ce_mode(mode
);
724 return refresh_cache_entry(ce
, 0);
729 int ce_same_name(const struct cache_entry
*a
, const struct cache_entry
*b
)
731 int len
= ce_namelen(a
);
732 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
735 int ce_path_match(const struct cache_entry
*ce
, const struct pathspec
*pathspec
)
737 return match_pathspec_depth(pathspec
, ce
->name
, ce_namelen(ce
), 0, NULL
);
741 * We fundamentally don't like some paths: we don't want
742 * dot or dot-dot anywhere, and for obvious reasons don't
743 * want to recurse into ".git" either.
745 * Also, we don't want double slashes or slashes at the
746 * end that can make pathnames ambiguous.
748 static int verify_dotfile(const char *rest
)
751 * The first character was '.', but that
752 * has already been discarded, we now test
756 /* "." is not allowed */
757 if (*rest
== '\0' || is_dir_sep(*rest
))
762 * ".git" followed by NUL or slash is bad. This
763 * shares the path end test with the ".." case.
773 if (rest
[1] == '\0' || is_dir_sep(rest
[1]))
779 int verify_path(const char *path
)
783 if (has_dos_drive_prefix(path
))
793 if ((c
== '.' && !verify_dotfile(path
)) ||
794 is_dir_sep(c
) || c
== '\0')
802 * Do we have another file that has the beginning components being a
803 * proper superset of the name we're trying to add?
805 static int has_file_name(struct index_state
*istate
,
806 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
809 int len
= ce_namelen(ce
);
810 int stage
= ce_stage(ce
);
811 const char *name
= ce
->name
;
813 while (pos
< istate
->cache_nr
) {
814 struct cache_entry
*p
= istate
->cache
[pos
++];
816 if (len
>= ce_namelen(p
))
818 if (memcmp(name
, p
->name
, len
))
820 if (ce_stage(p
) != stage
)
822 if (p
->name
[len
] != '/')
824 if (p
->ce_flags
& CE_REMOVE
)
829 remove_index_entry_at(istate
, --pos
);
835 * Do we have another file with a pathname that is a proper
836 * subset of the name we're trying to add?
838 static int has_dir_name(struct index_state
*istate
,
839 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
842 int stage
= ce_stage(ce
);
843 const char *name
= ce
->name
;
844 const char *slash
= name
+ ce_namelen(ce
);
852 if (slash
<= ce
->name
)
857 pos
= index_name_stage_pos(istate
, name
, len
, stage
);
860 * Found one, but not so fast. This could
861 * be a marker that says "I was here, but
862 * I am being removed". Such an entry is
863 * not a part of the resulting tree, and
864 * it is Ok to have a directory at the same
867 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
871 remove_index_entry_at(istate
, pos
);
879 * Trivial optimization: if we find an entry that
880 * already matches the sub-directory, then we know
881 * we're ok, and we can exit.
883 while (pos
< istate
->cache_nr
) {
884 struct cache_entry
*p
= istate
->cache
[pos
];
885 if ((ce_namelen(p
) <= len
) ||
886 (p
->name
[len
] != '/') ||
887 memcmp(p
->name
, name
, len
))
888 break; /* not our subdirectory */
889 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
891 * p is at the same stage as our entry, and
892 * is a subdirectory of what we are looking
893 * at, so we cannot have conflicts at our
894 * level or anything shorter.
903 /* We may be in a situation where we already have path/file and path
904 * is being added, or we already have path and path/file is being
905 * added. Either one would result in a nonsense tree that has path
906 * twice when git-write-tree tries to write it out. Prevent it.
908 * If ok-to-replace is specified, we remove the conflicting entries
909 * from the cache so the caller should recompute the insert position.
910 * When this happens, we return non-zero.
912 static int check_file_directory_conflict(struct index_state
*istate
,
913 const struct cache_entry
*ce
,
914 int pos
, int ok_to_replace
)
919 * When ce is an "I am going away" entry, we allow it to be added
921 if (ce
->ce_flags
& CE_REMOVE
)
925 * We check if the path is a sub-path of a subsequent pathname
926 * first, since removing those will not change the position
929 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
932 * Then check if the path might have a clashing sub-directory
935 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
938 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
941 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
942 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
943 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
944 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
946 cache_tree_invalidate_path(istate
->cache_tree
, ce
->name
);
947 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
949 /* existing match? Just replace it. */
952 replace_index_entry(istate
, pos
, ce
);
958 * Inserting a merged entry ("stage 0") into the index
959 * will always replace all non-merged entries..
961 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
962 while (ce_same_name(istate
->cache
[pos
], ce
)) {
964 if (!remove_index_entry_at(istate
, pos
))
971 if (!verify_path(ce
->name
))
972 return error("Invalid path '%s'", ce
->name
);
974 if (!skip_df_check
&&
975 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
977 return error("'%s' appears as both a file and as a directory",
979 pos
= index_name_stage_pos(istate
, ce
->name
, ce_namelen(ce
), ce_stage(ce
));
985 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
989 if (option
& ADD_CACHE_JUST_APPEND
)
990 pos
= istate
->cache_nr
;
993 ret
= add_index_entry_with_check(istate
, ce
, option
);
999 /* Make sure the array is big enough .. */
1000 if (istate
->cache_nr
== istate
->cache_alloc
) {
1001 istate
->cache_alloc
= alloc_nr(istate
->cache_alloc
);
1002 istate
->cache
= xrealloc(istate
->cache
,
1003 istate
->cache_alloc
* sizeof(*istate
->cache
));
1008 if (istate
->cache_nr
> pos
+ 1)
1009 memmove(istate
->cache
+ pos
+ 1,
1010 istate
->cache
+ pos
,
1011 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
1012 set_index_entry(istate
, pos
, ce
);
1013 istate
->cache_changed
= 1;
1018 * "refresh" does not calculate a new sha1 file or bring the
1019 * cache up-to-date for mode/content changes. But what it
1020 * _does_ do is to "re-match" the stat information of a file
1021 * with the cache, so that you can refresh the cache for a
1022 * file that hasn't been changed but where the stat entry is
1025 * For example, you'd want to do this after doing a "git-read-tree",
1026 * to link up the stat cache details with the proper files.
1028 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1029 struct cache_entry
*ce
,
1030 unsigned int options
, int *err
,
1034 struct cache_entry
*updated
;
1036 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1037 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1039 if (ce_uptodate(ce
))
1043 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1044 * that the change to the work tree does not matter and told
1047 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1048 ce_mark_uptodate(ce
);
1051 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1052 ce_mark_uptodate(ce
);
1056 if (lstat(ce
->name
, &st
) < 0) {
1062 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1064 *changed_ret
= changed
;
1067 * The path is unchanged. If we were told to ignore
1068 * valid bit, then we did the actual stat check and
1069 * found that the entry is unmodified. If the entry
1070 * is not marked VALID, this is the place to mark it
1071 * valid again, under "assume unchanged" mode.
1073 if (ignore_valid
&& assume_unchanged
&&
1074 !(ce
->ce_flags
& CE_VALID
))
1075 ; /* mark this one VALID again */
1078 * We do not mark the index itself "modified"
1079 * because CE_UPTODATE flag is in-core only;
1080 * we are not going to write this change out.
1082 if (!S_ISGITLINK(ce
->ce_mode
))
1083 ce_mark_uptodate(ce
);
1088 if (ie_modified(istate
, ce
, &st
, options
)) {
1095 updated
= xmalloc(size
);
1096 memcpy(updated
, ce
, size
);
1097 fill_stat_cache_info(updated
, &st
);
1099 * If ignore_valid is not set, we should leave CE_VALID bit
1100 * alone. Otherwise, paths marked with --no-assume-unchanged
1101 * (i.e. things to be edited) will reacquire CE_VALID bit
1102 * automatically, which is not really what we want.
1104 if (!ignore_valid
&& assume_unchanged
&&
1105 !(ce
->ce_flags
& CE_VALID
))
1106 updated
->ce_flags
&= ~CE_VALID
;
1111 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1112 int * first
, const char *header_msg
)
1114 if (in_porcelain
&& *first
&& header_msg
) {
1115 printf("%s\n", header_msg
);
1121 int refresh_index(struct index_state
*istate
, unsigned int flags
,
1122 const struct pathspec
*pathspec
,
1123 char *seen
, const char *header_msg
)
1127 int really
= (flags
& REFRESH_REALLY
) != 0;
1128 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1129 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1130 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1131 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1133 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1134 unsigned int options
= really
? CE_MATCH_IGNORE_VALID
: 0;
1135 const char *modified_fmt
;
1136 const char *deleted_fmt
;
1137 const char *typechange_fmt
;
1138 const char *added_fmt
;
1139 const char *unmerged_fmt
;
1141 modified_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1142 deleted_fmt
= (in_porcelain
? "D\t%s\n" : "%s: needs update\n");
1143 typechange_fmt
= (in_porcelain
? "T\t%s\n" : "%s needs update\n");
1144 added_fmt
= (in_porcelain
? "A\t%s\n" : "%s needs update\n");
1145 unmerged_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1146 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1147 struct cache_entry
*ce
, *new;
1148 int cache_errno
= 0;
1152 ce
= istate
->cache
[i
];
1153 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1157 !match_pathspec_depth(pathspec
, ce
->name
, ce_namelen(ce
), 0, seen
))
1161 while ((i
< istate
->cache_nr
) &&
1162 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1168 show_file(unmerged_fmt
, ce
->name
, in_porcelain
,
1169 &first
, header_msg
);
1177 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
, &changed
);
1183 if (not_new
&& cache_errno
== ENOENT
)
1185 if (really
&& cache_errno
== EINVAL
) {
1186 /* If we are doing --really-refresh that
1187 * means the index is not valid anymore.
1189 ce
->ce_flags
&= ~CE_VALID
;
1190 istate
->cache_changed
= 1;
1195 if (cache_errno
== ENOENT
)
1197 else if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
1198 fmt
= added_fmt
; /* must be before other checks */
1199 else if (changed
& TYPE_CHANGED
)
1200 fmt
= typechange_fmt
;
1204 ce
->name
, in_porcelain
, &first
, header_msg
);
1209 replace_index_entry(istate
, i
, new);
1214 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
, int really
)
1216 return refresh_cache_ent(&the_index
, ce
, really
, NULL
, NULL
);
1220 /*****************************************************************
1222 *****************************************************************/
1224 #define INDEX_FORMAT_DEFAULT 3
1227 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1228 * Again - this is just a (very strong in practice) heuristic that
1229 * the inode hasn't changed.
1231 * We save the fields in big-endian order to allow using the
1232 * index file over NFS transparently.
1234 struct ondisk_cache_entry
{
1235 struct cache_time ctime
;
1236 struct cache_time mtime
;
1243 unsigned char sha1
[20];
1245 char name
[FLEX_ARRAY
]; /* more */
1249 * This struct is used when CE_EXTENDED bit is 1
1250 * The struct must match ondisk_cache_entry exactly from
1253 struct ondisk_cache_entry_extended
{
1254 struct cache_time ctime
;
1255 struct cache_time mtime
;
1262 unsigned char sha1
[20];
1265 char name
[FLEX_ARRAY
]; /* more */
1268 /* These are only used for v3 or lower */
1269 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1270 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1271 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1272 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1273 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1274 ondisk_cache_entry_size(ce_namelen(ce)))
1276 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1279 unsigned char sha1
[20];
1282 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1283 return error("bad signature");
1284 hdr_version
= ntohl(hdr
->hdr_version
);
1285 if (hdr_version
< INDEX_FORMAT_LB
|| INDEX_FORMAT_UB
< hdr_version
)
1286 return error("bad index version %d", hdr_version
);
1288 git_SHA1_Update(&c
, hdr
, size
- 20);
1289 git_SHA1_Final(sha1
, &c
);
1290 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1291 return error("bad index file sha1 signature");
1295 static int read_index_extension(struct index_state
*istate
,
1296 const char *ext
, void *data
, unsigned long sz
)
1298 switch (CACHE_EXT(ext
)) {
1299 case CACHE_EXT_TREE
:
1300 istate
->cache_tree
= cache_tree_read(data
, sz
);
1302 case CACHE_EXT_RESOLVE_UNDO
:
1303 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1306 if (*ext
< 'A' || 'Z' < *ext
)
1307 return error("index uses %.4s extension, which we do not understand",
1309 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1315 int read_index(struct index_state
*istate
)
1317 return read_index_from(istate
, get_index_file());
1320 #ifndef NEEDS_ALIGNED_ACCESS
1321 #define ntoh_s(var) ntohs(var)
1322 #define ntoh_l(var) ntohl(var)
1324 static inline uint16_t ntoh_s_force_align(void *p
)
1327 memcpy(&x
, p
, sizeof(x
));
1330 static inline uint32_t ntoh_l_force_align(void *p
)
1333 memcpy(&x
, p
, sizeof(x
));
1336 #define ntoh_s(var) ntoh_s_force_align(&(var))
1337 #define ntoh_l(var) ntoh_l_force_align(&(var))
1340 static struct cache_entry
*cache_entry_from_ondisk(struct ondisk_cache_entry
*ondisk
,
1345 struct cache_entry
*ce
= xmalloc(cache_entry_size(len
));
1347 ce
->ce_stat_data
.sd_ctime
.sec
= ntoh_l(ondisk
->ctime
.sec
);
1348 ce
->ce_stat_data
.sd_mtime
.sec
= ntoh_l(ondisk
->mtime
.sec
);
1349 ce
->ce_stat_data
.sd_ctime
.nsec
= ntoh_l(ondisk
->ctime
.nsec
);
1350 ce
->ce_stat_data
.sd_mtime
.nsec
= ntoh_l(ondisk
->mtime
.nsec
);
1351 ce
->ce_stat_data
.sd_dev
= ntoh_l(ondisk
->dev
);
1352 ce
->ce_stat_data
.sd_ino
= ntoh_l(ondisk
->ino
);
1353 ce
->ce_mode
= ntoh_l(ondisk
->mode
);
1354 ce
->ce_stat_data
.sd_uid
= ntoh_l(ondisk
->uid
);
1355 ce
->ce_stat_data
.sd_gid
= ntoh_l(ondisk
->gid
);
1356 ce
->ce_stat_data
.sd_size
= ntoh_l(ondisk
->size
);
1357 ce
->ce_flags
= flags
& ~CE_NAMEMASK
;
1358 ce
->ce_namelen
= len
;
1359 hashcpy(ce
->sha1
, ondisk
->sha1
);
1360 memcpy(ce
->name
, name
, len
);
1361 ce
->name
[len
] = '\0';
1366 * Adjacent cache entries tend to share the leading paths, so it makes
1367 * sense to only store the differences in later entries. In the v4
1368 * on-disk format of the index, each on-disk cache entry stores the
1369 * number of bytes to be stripped from the end of the previous name,
1370 * and the bytes to append to the result, to come up with its name.
1372 static unsigned long expand_name_field(struct strbuf
*name
, const char *cp_
)
1374 const unsigned char *ep
, *cp
= (const unsigned char *)cp_
;
1375 size_t len
= decode_varint(&cp
);
1377 if (name
->len
< len
)
1378 die("malformed name field in the index");
1379 strbuf_remove(name
, name
->len
- len
, len
);
1380 for (ep
= cp
; *ep
; ep
++)
1381 ; /* find the end */
1382 strbuf_add(name
, cp
, ep
- cp
);
1383 return (const char *)ep
+ 1 - cp_
;
1386 static struct cache_entry
*create_from_disk(struct ondisk_cache_entry
*ondisk
,
1387 unsigned long *ent_size
,
1388 struct strbuf
*previous_name
)
1390 struct cache_entry
*ce
;
1395 /* On-disk flags are just 16 bits */
1396 flags
= ntoh_s(ondisk
->flags
);
1397 len
= flags
& CE_NAMEMASK
;
1399 if (flags
& CE_EXTENDED
) {
1400 struct ondisk_cache_entry_extended
*ondisk2
;
1402 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1403 extended_flags
= ntoh_s(ondisk2
->flags2
) << 16;
1404 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1405 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1406 die("Unknown index entry format %08x", extended_flags
);
1407 flags
|= extended_flags
;
1408 name
= ondisk2
->name
;
1411 name
= ondisk
->name
;
1413 if (!previous_name
) {
1414 /* v3 and earlier */
1415 if (len
== CE_NAMEMASK
)
1417 ce
= cache_entry_from_ondisk(ondisk
, flags
, name
, len
);
1419 *ent_size
= ondisk_ce_size(ce
);
1421 unsigned long consumed
;
1422 consumed
= expand_name_field(previous_name
, name
);
1423 ce
= cache_entry_from_ondisk(ondisk
, flags
,
1425 previous_name
->len
);
1427 *ent_size
= (name
- ((char *)ondisk
)) + consumed
;
1432 /* remember to discard_cache() before reading a different cache! */
1433 int read_index_from(struct index_state
*istate
, const char *path
)
1437 unsigned long src_offset
;
1438 struct cache_header
*hdr
;
1441 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1443 if (istate
->initialized
)
1444 return istate
->cache_nr
;
1446 istate
->timestamp
.sec
= 0;
1447 istate
->timestamp
.nsec
= 0;
1448 fd
= open(path
, O_RDONLY
);
1450 if (errno
== ENOENT
)
1452 die_errno("index file open failed");
1456 die_errno("cannot stat the open index");
1458 mmap_size
= xsize_t(st
.st_size
);
1459 if (mmap_size
< sizeof(struct cache_header
) + 20)
1460 die("index file smaller than expected");
1462 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
| PROT_WRITE
, MAP_PRIVATE
, fd
, 0);
1463 if (mmap
== MAP_FAILED
)
1464 die_errno("unable to map index file");
1468 if (verify_hdr(hdr
, mmap_size
) < 0)
1471 istate
->version
= ntohl(hdr
->hdr_version
);
1472 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1473 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1474 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(*istate
->cache
));
1475 istate
->initialized
= 1;
1477 if (istate
->version
== 4)
1478 previous_name
= &previous_name_buf
;
1480 previous_name
= NULL
;
1482 src_offset
= sizeof(*hdr
);
1483 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1484 struct ondisk_cache_entry
*disk_ce
;
1485 struct cache_entry
*ce
;
1486 unsigned long consumed
;
1488 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1489 ce
= create_from_disk(disk_ce
, &consumed
, previous_name
);
1490 set_index_entry(istate
, i
, ce
);
1492 src_offset
+= consumed
;
1494 strbuf_release(&previous_name_buf
);
1495 istate
->timestamp
.sec
= st
.st_mtime
;
1496 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1498 while (src_offset
<= mmap_size
- 20 - 8) {
1499 /* After an array of active_nr index entries,
1500 * there can be arbitrary number of extended
1501 * sections, each of which is prefixed with
1502 * extension name (4-byte) and section length
1503 * in 4-byte network byte order.
1506 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1507 extsize
= ntohl(extsize
);
1508 if (read_index_extension(istate
,
1509 (const char *) mmap
+ src_offset
,
1510 (char *) mmap
+ src_offset
+ 8,
1514 src_offset
+= extsize
;
1516 munmap(mmap
, mmap_size
);
1517 return istate
->cache_nr
;
1520 munmap(mmap
, mmap_size
);
1521 die("index file corrupt");
1524 int is_index_unborn(struct index_state
*istate
)
1526 return (!istate
->cache_nr
&& !istate
->timestamp
.sec
);
1529 int discard_index(struct index_state
*istate
)
1533 for (i
= 0; i
< istate
->cache_nr
; i
++)
1534 free(istate
->cache
[i
]);
1535 resolve_undo_clear_index(istate
);
1536 istate
->cache_nr
= 0;
1537 istate
->cache_changed
= 0;
1538 istate
->timestamp
.sec
= 0;
1539 istate
->timestamp
.nsec
= 0;
1540 free_name_hash(istate
);
1541 cache_tree_free(&(istate
->cache_tree
));
1542 istate
->initialized
= 0;
1543 free(istate
->cache
);
1544 istate
->cache
= NULL
;
1545 istate
->cache_alloc
= 0;
1549 int unmerged_index(const struct index_state
*istate
)
1552 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1553 if (ce_stage(istate
->cache
[i
]))
1559 #define WRITE_BUFFER_SIZE 8192
1560 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1561 static unsigned long write_buffer_len
;
1563 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1565 unsigned int buffered
= write_buffer_len
;
1567 git_SHA1_Update(context
, write_buffer
, buffered
);
1568 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1570 write_buffer_len
= 0;
1575 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1578 unsigned int buffered
= write_buffer_len
;
1579 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1582 memcpy(write_buffer
+ buffered
, data
, partial
);
1583 buffered
+= partial
;
1584 if (buffered
== WRITE_BUFFER_SIZE
) {
1585 write_buffer_len
= buffered
;
1586 if (ce_write_flush(context
, fd
))
1590 write_buffer_len
= buffered
;
1592 data
= (char *) data
+ partial
;
1597 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1598 unsigned int ext
, unsigned int sz
)
1602 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1603 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1606 static int ce_flush(git_SHA_CTX
*context
, int fd
)
1608 unsigned int left
= write_buffer_len
;
1611 write_buffer_len
= 0;
1612 git_SHA1_Update(context
, write_buffer
, left
);
1615 /* Flush first if not enough space for SHA1 signature */
1616 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1617 if (write_in_full(fd
, write_buffer
, left
) != left
)
1622 /* Append the SHA1 signature at the end */
1623 git_SHA1_Final(write_buffer
+ left
, context
);
1625 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1628 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1631 * The only thing we care about in this function is to smudge the
1632 * falsely clean entry due to touch-update-touch race, so we leave
1633 * everything else as they are. We are called for entries whose
1634 * ce_stat_data.sd_mtime match the index file mtime.
1636 * Note that this actually does not do much for gitlinks, for
1637 * which ce_match_stat_basic() always goes to the actual
1638 * contents. The caller checks with is_racy_timestamp() which
1639 * always says "no" for gitlinks, so we are not called for them ;-)
1643 if (lstat(ce
->name
, &st
) < 0)
1645 if (ce_match_stat_basic(ce
, &st
))
1647 if (ce_modified_check_fs(ce
, &st
)) {
1648 /* This is "racily clean"; smudge it. Note that this
1649 * is a tricky code. At first glance, it may appear
1650 * that it can break with this sequence:
1652 * $ echo xyzzy >frotz
1653 * $ git-update-index --add frotz
1656 * $ echo filfre >nitfol
1657 * $ git-update-index --add nitfol
1659 * but it does not. When the second update-index runs,
1660 * it notices that the entry "frotz" has the same timestamp
1661 * as index, and if we were to smudge it by resetting its
1662 * size to zero here, then the object name recorded
1663 * in index is the 6-byte file but the cached stat information
1664 * becomes zero --- which would then match what we would
1665 * obtain from the filesystem next time we stat("frotz").
1667 * However, the second update-index, before calling
1668 * this function, notices that the cached size is 6
1669 * bytes and what is on the filesystem is an empty
1670 * file, and never calls us, so the cached size information
1671 * for "frotz" stays 6 which does not match the filesystem.
1673 ce
->ce_stat_data
.sd_size
= 0;
1677 /* Copy miscellaneous fields but not the name */
1678 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry
*ondisk
,
1679 struct cache_entry
*ce
)
1683 ondisk
->ctime
.sec
= htonl(ce
->ce_stat_data
.sd_ctime
.sec
);
1684 ondisk
->mtime
.sec
= htonl(ce
->ce_stat_data
.sd_mtime
.sec
);
1685 ondisk
->ctime
.nsec
= htonl(ce
->ce_stat_data
.sd_ctime
.nsec
);
1686 ondisk
->mtime
.nsec
= htonl(ce
->ce_stat_data
.sd_mtime
.nsec
);
1687 ondisk
->dev
= htonl(ce
->ce_stat_data
.sd_dev
);
1688 ondisk
->ino
= htonl(ce
->ce_stat_data
.sd_ino
);
1689 ondisk
->mode
= htonl(ce
->ce_mode
);
1690 ondisk
->uid
= htonl(ce
->ce_stat_data
.sd_uid
);
1691 ondisk
->gid
= htonl(ce
->ce_stat_data
.sd_gid
);
1692 ondisk
->size
= htonl(ce
->ce_stat_data
.sd_size
);
1693 hashcpy(ondisk
->sha1
, ce
->sha1
);
1695 flags
= ce
->ce_flags
;
1696 flags
|= (ce_namelen(ce
) >= CE_NAMEMASK
? CE_NAMEMASK
: ce_namelen(ce
));
1697 ondisk
->flags
= htons(flags
);
1698 if (ce
->ce_flags
& CE_EXTENDED
) {
1699 struct ondisk_cache_entry_extended
*ondisk2
;
1700 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1701 ondisk2
->flags2
= htons((ce
->ce_flags
& CE_EXTENDED_FLAGS
) >> 16);
1702 return ondisk2
->name
;
1705 return ondisk
->name
;
1709 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
,
1710 struct strbuf
*previous_name
)
1713 struct ondisk_cache_entry
*ondisk
;
1717 if (!previous_name
) {
1718 size
= ondisk_ce_size(ce
);
1719 ondisk
= xcalloc(1, size
);
1720 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1721 memcpy(name
, ce
->name
, ce_namelen(ce
));
1723 int common
, to_remove
, prefix_size
;
1724 unsigned char to_remove_vi
[16];
1726 (ce
->name
[common
] &&
1727 common
< previous_name
->len
&&
1728 ce
->name
[common
] == previous_name
->buf
[common
]);
1730 ; /* still matching */
1731 to_remove
= previous_name
->len
- common
;
1732 prefix_size
= encode_varint(to_remove
, to_remove_vi
);
1734 if (ce
->ce_flags
& CE_EXTENDED
)
1735 size
= offsetof(struct ondisk_cache_entry_extended
, name
);
1737 size
= offsetof(struct ondisk_cache_entry
, name
);
1738 size
+= prefix_size
+ (ce_namelen(ce
) - common
+ 1);
1740 ondisk
= xcalloc(1, size
);
1741 name
= copy_cache_entry_to_ondisk(ondisk
, ce
);
1742 memcpy(name
, to_remove_vi
, prefix_size
);
1743 memcpy(name
+ prefix_size
, ce
->name
+ common
, ce_namelen(ce
) - common
);
1745 strbuf_splice(previous_name
, common
, to_remove
,
1746 ce
->name
+ common
, ce_namelen(ce
) - common
);
1749 result
= ce_write(c
, fd
, ondisk
, size
);
1754 static int has_racy_timestamp(struct index_state
*istate
)
1756 int entries
= istate
->cache_nr
;
1759 for (i
= 0; i
< entries
; i
++) {
1760 struct cache_entry
*ce
= istate
->cache
[i
];
1761 if (is_racy_timestamp(istate
, ce
))
1768 * Opportunistically update the index but do not complain if we can't
1770 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
1772 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
1773 !write_index(istate
, lockfile
->fd
))
1774 commit_locked_index(lockfile
);
1776 rollback_lock_file(lockfile
);
1779 int write_index(struct index_state
*istate
, int newfd
)
1782 struct cache_header hdr
;
1783 int i
, err
, removed
, extended
, hdr_version
;
1784 struct cache_entry
**cache
= istate
->cache
;
1785 int entries
= istate
->cache_nr
;
1787 struct strbuf previous_name_buf
= STRBUF_INIT
, *previous_name
;
1789 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
1790 if (cache
[i
]->ce_flags
& CE_REMOVE
)
1793 /* reduce extended entries if possible */
1794 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
1795 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
1797 cache
[i
]->ce_flags
|= CE_EXTENDED
;
1801 if (!istate
->version
)
1802 istate
->version
= INDEX_FORMAT_DEFAULT
;
1804 /* demote version 3 to version 2 when the latter suffices */
1805 if (istate
->version
== 3 || istate
->version
== 2)
1806 istate
->version
= extended
? 3 : 2;
1808 hdr_version
= istate
->version
;
1810 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
1811 hdr
.hdr_version
= htonl(hdr_version
);
1812 hdr
.hdr_entries
= htonl(entries
- removed
);
1815 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
1818 previous_name
= (hdr_version
== 4) ? &previous_name_buf
: NULL
;
1819 for (i
= 0; i
< entries
; i
++) {
1820 struct cache_entry
*ce
= cache
[i
];
1821 if (ce
->ce_flags
& CE_REMOVE
)
1823 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
1824 ce_smudge_racily_clean_entry(ce
);
1825 if (is_null_sha1(ce
->sha1
)) {
1826 static const char msg
[] = "cache entry has null sha1: %s";
1827 static int allow
= -1;
1830 allow
= git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1832 warning(msg
, ce
->name
);
1834 return error(msg
, ce
->name
);
1836 if (ce_write_entry(&c
, newfd
, ce
, previous_name
) < 0)
1839 strbuf_release(&previous_name_buf
);
1841 /* Write extension data here */
1842 if (istate
->cache_tree
) {
1843 struct strbuf sb
= STRBUF_INIT
;
1845 cache_tree_write(&sb
, istate
->cache_tree
);
1846 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
1847 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
1848 strbuf_release(&sb
);
1852 if (istate
->resolve_undo
) {
1853 struct strbuf sb
= STRBUF_INIT
;
1855 resolve_undo_write(&sb
, istate
->resolve_undo
);
1856 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
1858 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
1859 strbuf_release(&sb
);
1864 if (ce_flush(&c
, newfd
) || fstat(newfd
, &st
))
1866 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
1867 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1872 * Read the index file that is potentially unmerged into given
1873 * index_state, dropping any unmerged entries. Returns true if
1874 * the index is unmerged. Callers who want to refuse to work
1875 * from an unmerged state can call this and check its return value,
1876 * instead of calling read_cache().
1878 int read_index_unmerged(struct index_state
*istate
)
1884 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1885 struct cache_entry
*ce
= istate
->cache
[i
];
1886 struct cache_entry
*new_ce
;
1892 len
= ce_namelen(ce
);
1893 size
= cache_entry_size(len
);
1894 new_ce
= xcalloc(1, size
);
1895 memcpy(new_ce
->name
, ce
->name
, len
);
1896 new_ce
->ce_flags
= create_ce_flags(0) | CE_CONFLICTED
;
1897 new_ce
->ce_namelen
= len
;
1898 new_ce
->ce_mode
= ce
->ce_mode
;
1899 if (add_index_entry(istate
, new_ce
, 0))
1900 return error("%s: cannot drop to stage #0",
1902 i
= index_name_pos(istate
, new_ce
->name
, len
);
1908 * Returns 1 if the path is an "other" path with respect to
1909 * the index; that is, the path is not mentioned in the index at all,
1910 * either as a file, a directory with some files in the index,
1911 * or as an unmerged entry.
1913 * We helpfully remove a trailing "/" from directories so that
1914 * the output of read_directory can be used as-is.
1916 int index_name_is_other(const struct index_state
*istate
, const char *name
,
1920 if (namelen
&& name
[namelen
- 1] == '/')
1922 pos
= index_name_pos(istate
, name
, namelen
);
1924 return 0; /* exact match */
1926 if (pos
< istate
->cache_nr
) {
1927 struct cache_entry
*ce
= istate
->cache
[pos
];
1928 if (ce_namelen(ce
) == namelen
&&
1929 !memcmp(ce
->name
, name
, namelen
))
1930 return 0; /* Yup, this one exists unmerged */
1935 void *read_blob_data_from_index(struct index_state
*istate
, const char *path
, unsigned long *size
)
1939 enum object_type type
;
1943 pos
= index_name_pos(istate
, path
, len
);
1946 * We might be in the middle of a merge, in which
1947 * case we would read stage #2 (ours).
1951 (pos
< 0 && i
< istate
->cache_nr
&&
1952 !strcmp(istate
->cache
[i
]->name
, path
));
1954 if (ce_stage(istate
->cache
[i
]) == 2)
1959 data
= read_sha1_file(istate
->cache
[pos
]->sha1
, &type
, &sz
);
1960 if (!data
|| type
!= OBJ_BLOB
) {
1969 void stat_validity_clear(struct stat_validity
*sv
)
1975 int stat_validity_check(struct stat_validity
*sv
, const char *path
)
1979 if (stat(path
, &st
) < 0)
1980 return sv
->sd
== NULL
;
1983 return S_ISREG(st
.st_mode
) && !match_stat_data(sv
->sd
, &st
);
1986 void stat_validity_update(struct stat_validity
*sv
, int fd
)
1990 if (fstat(fd
, &st
) < 0 || !S_ISREG(st
.st_mode
))
1991 stat_validity_clear(sv
);
1994 sv
->sd
= xcalloc(1, sizeof(struct stat_data
));
1995 fill_stat_data(sv
->sd
, &st
);