Merge branch 'maint-1.8.5' into maint-1.9
[alt-git.git] / read-cache.c
blobee07cd610ae5efebb0ad2bd233ab380a6d605f83
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
7 #include "cache.h"
8 #include "cache-tree.h"
9 #include "refs.h"
10 #include "dir.h"
11 #include "tree.h"
12 #include "commit.h"
13 #include "blob.h"
14 #include "resolve-undo.h"
15 #include "strbuf.h"
16 #include "varint.h"
17 #include "utf8.h"
19 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
20 unsigned int options);
22 /* Mask for the name length in ce_flags in the on-disk index */
24 #define CE_NAMEMASK (0x0fff)
26 /* Index extensions.
28 * The first letter should be 'A'..'Z' for extensions that are not
29 * necessary for a correct operation (i.e. optimization data).
30 * When new extensions are added that _needs_ to be understood in
31 * order to correctly interpret the index file, pick character that
32 * is outside the range, to cause the reader to abort.
35 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
36 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
37 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
39 struct index_state the_index;
41 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
43 istate->cache[nr] = ce;
44 add_name_hash(istate, ce);
47 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
49 struct cache_entry *old = istate->cache[nr];
51 remove_name_hash(istate, old);
52 set_index_entry(istate, nr, ce);
53 istate->cache_changed = 1;
56 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
58 struct cache_entry *old = istate->cache[nr], *new;
59 int namelen = strlen(new_name);
61 new = xmalloc(cache_entry_size(namelen));
62 copy_cache_entry(new, old);
63 new->ce_flags &= ~CE_STATE_MASK;
64 new->ce_namelen = namelen;
65 memcpy(new->name, new_name, namelen + 1);
67 cache_tree_invalidate_path(istate->cache_tree, old->name);
68 remove_index_entry_at(istate, nr);
69 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
72 void fill_stat_data(struct stat_data *sd, struct stat *st)
74 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
75 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
76 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
77 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
78 sd->sd_dev = st->st_dev;
79 sd->sd_ino = st->st_ino;
80 sd->sd_uid = st->st_uid;
81 sd->sd_gid = st->st_gid;
82 sd->sd_size = st->st_size;
85 int match_stat_data(const struct stat_data *sd, struct stat *st)
87 int changed = 0;
89 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
90 changed |= MTIME_CHANGED;
91 if (trust_ctime && check_stat &&
92 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
93 changed |= CTIME_CHANGED;
95 #ifdef USE_NSEC
96 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
97 changed |= MTIME_CHANGED;
98 if (trust_ctime && check_stat &&
99 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
100 changed |= CTIME_CHANGED;
101 #endif
103 if (check_stat) {
104 if (sd->sd_uid != (unsigned int) st->st_uid ||
105 sd->sd_gid != (unsigned int) st->st_gid)
106 changed |= OWNER_CHANGED;
107 if (sd->sd_ino != (unsigned int) st->st_ino)
108 changed |= INODE_CHANGED;
111 #ifdef USE_STDEV
113 * st_dev breaks on network filesystems where different
114 * clients will have different views of what "device"
115 * the filesystem is on
117 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
118 changed |= INODE_CHANGED;
119 #endif
121 if (sd->sd_size != (unsigned int) st->st_size)
122 changed |= DATA_CHANGED;
124 return changed;
128 * This only updates the "non-critical" parts of the directory
129 * cache, ie the parts that aren't tracked by GIT, and only used
130 * to validate the cache.
132 void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
134 fill_stat_data(&ce->ce_stat_data, st);
136 if (assume_unchanged)
137 ce->ce_flags |= CE_VALID;
139 if (S_ISREG(st->st_mode))
140 ce_mark_uptodate(ce);
143 static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
145 int match = -1;
146 int fd = open(ce->name, O_RDONLY);
148 if (fd >= 0) {
149 unsigned char sha1[20];
150 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
151 match = hashcmp(sha1, ce->sha1);
152 /* index_fd() closed the file descriptor already */
154 return match;
157 static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
159 int match = -1;
160 void *buffer;
161 unsigned long size;
162 enum object_type type;
163 struct strbuf sb = STRBUF_INIT;
165 if (strbuf_readlink(&sb, ce->name, expected_size))
166 return -1;
168 buffer = read_sha1_file(ce->sha1, &type, &size);
169 if (buffer) {
170 if (size == sb.len)
171 match = memcmp(buffer, sb.buf, size);
172 free(buffer);
174 strbuf_release(&sb);
175 return match;
178 static int ce_compare_gitlink(const struct cache_entry *ce)
180 unsigned char sha1[20];
183 * We don't actually require that the .git directory
184 * under GITLINK directory be a valid git directory. It
185 * might even be missing (in case nobody populated that
186 * sub-project).
188 * If so, we consider it always to match.
190 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
191 return 0;
192 return hashcmp(sha1, ce->sha1);
195 static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
197 switch (st->st_mode & S_IFMT) {
198 case S_IFREG:
199 if (ce_compare_data(ce, st))
200 return DATA_CHANGED;
201 break;
202 case S_IFLNK:
203 if (ce_compare_link(ce, xsize_t(st->st_size)))
204 return DATA_CHANGED;
205 break;
206 case S_IFDIR:
207 if (S_ISGITLINK(ce->ce_mode))
208 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
209 default:
210 return TYPE_CHANGED;
212 return 0;
215 static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
217 unsigned int changed = 0;
219 if (ce->ce_flags & CE_REMOVE)
220 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
222 switch (ce->ce_mode & S_IFMT) {
223 case S_IFREG:
224 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
225 /* We consider only the owner x bit to be relevant for
226 * "mode changes"
228 if (trust_executable_bit &&
229 (0100 & (ce->ce_mode ^ st->st_mode)))
230 changed |= MODE_CHANGED;
231 break;
232 case S_IFLNK:
233 if (!S_ISLNK(st->st_mode) &&
234 (has_symlinks || !S_ISREG(st->st_mode)))
235 changed |= TYPE_CHANGED;
236 break;
237 case S_IFGITLINK:
238 /* We ignore most of the st_xxx fields for gitlinks */
239 if (!S_ISDIR(st->st_mode))
240 changed |= TYPE_CHANGED;
241 else if (ce_compare_gitlink(ce))
242 changed |= DATA_CHANGED;
243 return changed;
244 default:
245 die("internal error: ce_mode is %o", ce->ce_mode);
248 changed |= match_stat_data(&ce->ce_stat_data, st);
250 /* Racily smudged entry? */
251 if (!ce->ce_stat_data.sd_size) {
252 if (!is_empty_blob_sha1(ce->sha1))
253 changed |= DATA_CHANGED;
256 return changed;
259 static int is_racy_timestamp(const struct index_state *istate,
260 const struct cache_entry *ce)
262 return (!S_ISGITLINK(ce->ce_mode) &&
263 istate->timestamp.sec &&
264 #ifdef USE_NSEC
265 /* nanosecond timestamped files can also be racy! */
266 (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
267 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
268 istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
269 #else
270 istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
271 #endif
275 int ie_match_stat(const struct index_state *istate,
276 const struct cache_entry *ce, struct stat *st,
277 unsigned int options)
279 unsigned int changed;
280 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
281 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
282 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
285 * If it's marked as always valid in the index, it's
286 * valid whatever the checked-out copy says.
288 * skip-worktree has the same effect with higher precedence
290 if (!ignore_skip_worktree && ce_skip_worktree(ce))
291 return 0;
292 if (!ignore_valid && (ce->ce_flags & CE_VALID))
293 return 0;
296 * Intent-to-add entries have not been added, so the index entry
297 * by definition never matches what is in the work tree until it
298 * actually gets added.
300 if (ce->ce_flags & CE_INTENT_TO_ADD)
301 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
303 changed = ce_match_stat_basic(ce, st);
306 * Within 1 second of this sequence:
307 * echo xyzzy >file && git-update-index --add file
308 * running this command:
309 * echo frotz >file
310 * would give a falsely clean cache entry. The mtime and
311 * length match the cache, and other stat fields do not change.
313 * We could detect this at update-index time (the cache entry
314 * being registered/updated records the same time as "now")
315 * and delay the return from git-update-index, but that would
316 * effectively mean we can make at most one commit per second,
317 * which is not acceptable. Instead, we check cache entries
318 * whose mtime are the same as the index file timestamp more
319 * carefully than others.
321 if (!changed && is_racy_timestamp(istate, ce)) {
322 if (assume_racy_is_modified)
323 changed |= DATA_CHANGED;
324 else
325 changed |= ce_modified_check_fs(ce, st);
328 return changed;
331 int ie_modified(const struct index_state *istate,
332 const struct cache_entry *ce,
333 struct stat *st, unsigned int options)
335 int changed, changed_fs;
337 changed = ie_match_stat(istate, ce, st, options);
338 if (!changed)
339 return 0;
341 * If the mode or type has changed, there's no point in trying
342 * to refresh the entry - it's not going to match
344 if (changed & (MODE_CHANGED | TYPE_CHANGED))
345 return changed;
348 * Immediately after read-tree or update-index --cacheinfo,
349 * the length field is zero, as we have never even read the
350 * lstat(2) information once, and we cannot trust DATA_CHANGED
351 * returned by ie_match_stat() which in turn was returned by
352 * ce_match_stat_basic() to signal that the filesize of the
353 * blob changed. We have to actually go to the filesystem to
354 * see if the contents match, and if so, should answer "unchanged".
356 * The logic does not apply to gitlinks, as ce_match_stat_basic()
357 * already has checked the actual HEAD from the filesystem in the
358 * subproject. If ie_match_stat() already said it is different,
359 * then we know it is.
361 if ((changed & DATA_CHANGED) &&
362 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
363 return changed;
365 changed_fs = ce_modified_check_fs(ce, st);
366 if (changed_fs)
367 return changed | changed_fs;
368 return 0;
371 int base_name_compare(const char *name1, int len1, int mode1,
372 const char *name2, int len2, int mode2)
374 unsigned char c1, c2;
375 int len = len1 < len2 ? len1 : len2;
376 int cmp;
378 cmp = memcmp(name1, name2, len);
379 if (cmp)
380 return cmp;
381 c1 = name1[len];
382 c2 = name2[len];
383 if (!c1 && S_ISDIR(mode1))
384 c1 = '/';
385 if (!c2 && S_ISDIR(mode2))
386 c2 = '/';
387 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
391 * df_name_compare() is identical to base_name_compare(), except it
392 * compares conflicting directory/file entries as equal. Note that
393 * while a directory name compares as equal to a regular file, they
394 * then individually compare _differently_ to a filename that has
395 * a dot after the basename (because '\0' < '.' < '/').
397 * This is used by routines that want to traverse the git namespace
398 * but then handle conflicting entries together when possible.
400 int df_name_compare(const char *name1, int len1, int mode1,
401 const char *name2, int len2, int mode2)
403 int len = len1 < len2 ? len1 : len2, cmp;
404 unsigned char c1, c2;
406 cmp = memcmp(name1, name2, len);
407 if (cmp)
408 return cmp;
409 /* Directories and files compare equal (same length, same name) */
410 if (len1 == len2)
411 return 0;
412 c1 = name1[len];
413 if (!c1 && S_ISDIR(mode1))
414 c1 = '/';
415 c2 = name2[len];
416 if (!c2 && S_ISDIR(mode2))
417 c2 = '/';
418 if (c1 == '/' && !c2)
419 return 0;
420 if (c2 == '/' && !c1)
421 return 0;
422 return c1 - c2;
425 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
427 int len = len1 < len2 ? len1 : len2;
428 int cmp;
430 cmp = memcmp(name1, name2, len);
431 if (cmp)
432 return cmp;
433 if (len1 < len2)
434 return -1;
435 if (len1 > len2)
436 return 1;
438 if (stage1 < stage2)
439 return -1;
440 if (stage1 > stage2)
441 return 1;
442 return 0;
445 int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
447 return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
450 static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
452 int first, last;
454 first = 0;
455 last = istate->cache_nr;
456 while (last > first) {
457 int next = (last + first) >> 1;
458 struct cache_entry *ce = istate->cache[next];
459 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
460 if (!cmp)
461 return next;
462 if (cmp < 0) {
463 last = next;
464 continue;
466 first = next+1;
468 return -first-1;
471 int index_name_pos(const struct index_state *istate, const char *name, int namelen)
473 return index_name_stage_pos(istate, name, namelen, 0);
476 /* Remove entry, return true if there are more entries to go.. */
477 int remove_index_entry_at(struct index_state *istate, int pos)
479 struct cache_entry *ce = istate->cache[pos];
481 record_resolve_undo(istate, ce);
482 remove_name_hash(istate, ce);
483 istate->cache_changed = 1;
484 istate->cache_nr--;
485 if (pos >= istate->cache_nr)
486 return 0;
487 memmove(istate->cache + pos,
488 istate->cache + pos + 1,
489 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
490 return 1;
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;
501 unsigned int i, j;
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]);
506 else
507 ce_array[j++] = ce_array[i];
509 istate->cache_changed = 1;
510 istate->cache_nr = j;
513 int remove_file_from_index(struct index_state *istate, const char *path)
515 int pos = index_name_pos(istate, path, strlen(path));
516 if (pos < 0)
517 pos = -pos-1;
518 cache_tree_invalidate_path(istate->cache_tree, path);
519 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
520 remove_index_entry_at(istate, pos);
521 return 0;
524 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
526 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
529 static int index_name_pos_also_unmerged(struct index_state *istate,
530 const char *path, int namelen)
532 int pos = index_name_pos(istate, path, namelen);
533 struct cache_entry *ce;
535 if (pos >= 0)
536 return pos;
538 /* maybe unmerged? */
539 pos = -1 - pos;
540 if (pos >= istate->cache_nr ||
541 compare_name((ce = istate->cache[pos]), path, namelen))
542 return -1;
544 /* order of preference: stage 2, 1, 3 */
545 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
546 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
547 !compare_name(ce, path, namelen))
548 pos++;
549 return pos;
552 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
554 int len = ce_namelen(ce);
555 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
559 * If we add a filename that aliases in the cache, we will use the
560 * name that we already have - but we don't want to update the same
561 * alias twice, because that implies that there were actually two
562 * different files with aliasing names!
564 * So we use the CE_ADDED flag to verify that the alias was an old
565 * one before we accept it as
567 static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
569 int len;
570 struct cache_entry *new;
572 if (alias->ce_flags & CE_ADDED)
573 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
575 /* Ok, create the new entry using the name of the existing alias */
576 len = ce_namelen(alias);
577 new = xcalloc(1, cache_entry_size(len));
578 memcpy(new->name, alias->name, len);
579 copy_cache_entry(new, ce);
580 free(ce);
581 return new;
584 static void record_intent_to_add(struct cache_entry *ce)
586 unsigned char sha1[20];
587 if (write_sha1_file("", 0, blob_type, sha1))
588 die("cannot create an empty blob in the object database");
589 hashcpy(ce->sha1, sha1);
592 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
594 int size, namelen, was_same;
595 mode_t st_mode = st->st_mode;
596 struct cache_entry *ce, *alias;
597 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
598 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
599 int pretend = flags & ADD_CACHE_PRETEND;
600 int intent_only = flags & ADD_CACHE_INTENT;
601 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
602 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
604 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
605 return error("%s: can only add regular files, symbolic links or git-directories", path);
607 namelen = strlen(path);
608 if (S_ISDIR(st_mode)) {
609 while (namelen && path[namelen-1] == '/')
610 namelen--;
612 size = cache_entry_size(namelen);
613 ce = xcalloc(1, size);
614 memcpy(ce->name, path, namelen);
615 ce->ce_namelen = namelen;
616 if (!intent_only)
617 fill_stat_cache_info(ce, st);
618 else
619 ce->ce_flags |= CE_INTENT_TO_ADD;
621 if (trust_executable_bit && has_symlinks)
622 ce->ce_mode = create_ce_mode(st_mode);
623 else {
624 /* If there is an existing entry, pick the mode bits and type
625 * from it, otherwise assume unexecutable regular file.
627 struct cache_entry *ent;
628 int pos = index_name_pos_also_unmerged(istate, path, namelen);
630 ent = (0 <= pos) ? istate->cache[pos] : NULL;
631 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
634 /* When core.ignorecase=true, determine if a directory of the same name but differing
635 * case already exists within the Git repository. If it does, ensure the directory
636 * case of the file being added to the repository matches (is folded into) the existing
637 * entry's directory case.
639 if (ignore_case) {
640 const char *startPtr = ce->name;
641 const char *ptr = startPtr;
642 while (*ptr) {
643 while (*ptr && *ptr != '/')
644 ++ptr;
645 if (*ptr == '/') {
646 struct cache_entry *foundce;
647 ++ptr;
648 foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
649 if (foundce) {
650 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
651 startPtr = ptr;
657 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
658 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
659 /* Nothing changed, really */
660 free(ce);
661 if (!S_ISGITLINK(alias->ce_mode))
662 ce_mark_uptodate(alias);
663 alias->ce_flags |= CE_ADDED;
664 return 0;
666 if (!intent_only) {
667 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
668 return error("unable to index file %s", path);
669 } else
670 record_intent_to_add(ce);
672 if (ignore_case && alias && different_name(ce, alias))
673 ce = create_alias_ce(ce, alias);
674 ce->ce_flags |= CE_ADDED;
676 /* It was suspected to be racily clean, but it turns out to be Ok */
677 was_same = (alias &&
678 !ce_stage(alias) &&
679 !hashcmp(alias->sha1, ce->sha1) &&
680 ce->ce_mode == alias->ce_mode);
682 if (pretend)
684 else if (add_index_entry(istate, ce, add_option))
685 return error("unable to add %s to index",path);
686 if (verbose && !was_same)
687 printf("add '%s'\n", path);
688 return 0;
691 int add_file_to_index(struct index_state *istate, const char *path, int flags)
693 struct stat st;
694 if (lstat(path, &st))
695 die_errno("unable to stat '%s'", path);
696 return add_to_index(istate, path, &st, flags);
699 struct cache_entry *make_cache_entry(unsigned int mode,
700 const unsigned char *sha1, const char *path, int stage,
701 unsigned int refresh_options)
703 int size, len;
704 struct cache_entry *ce;
706 if (!verify_path(path)) {
707 error("Invalid path '%s'", path);
708 return NULL;
711 len = strlen(path);
712 size = cache_entry_size(len);
713 ce = xcalloc(1, size);
715 hashcpy(ce->sha1, sha1);
716 memcpy(ce->name, path, len);
717 ce->ce_flags = create_ce_flags(stage);
718 ce->ce_namelen = len;
719 ce->ce_mode = create_ce_mode(mode);
721 return refresh_cache_entry(ce, refresh_options);
724 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
726 int len = ce_namelen(a);
727 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
731 * We fundamentally don't like some paths: we don't want
732 * dot or dot-dot anywhere, and for obvious reasons don't
733 * want to recurse into ".git" either.
735 * Also, we don't want double slashes or slashes at the
736 * end that can make pathnames ambiguous.
738 static int verify_dotfile(const char *rest)
741 * The first character was '.', but that
742 * has already been discarded, we now test
743 * the rest.
746 /* "." is not allowed */
747 if (*rest == '\0' || is_dir_sep(*rest))
748 return 0;
750 switch (*rest) {
752 * ".git" followed by NUL or slash is bad. This
753 * shares the path end test with the ".." case.
755 case 'g':
756 case 'G':
757 if (rest[1] != 'i' && rest[1] != 'I')
758 break;
759 if (rest[2] != 't' && rest[2] != 'T')
760 break;
761 rest += 2;
762 /* fallthrough */
763 case '.':
764 if (rest[1] == '\0' || is_dir_sep(rest[1]))
765 return 0;
767 return 1;
770 int verify_path(const char *path)
772 char c;
774 if (has_dos_drive_prefix(path))
775 return 0;
777 goto inside;
778 for (;;) {
779 if (!c)
780 return 1;
781 if (is_dir_sep(c)) {
782 inside:
783 if (protect_hfs && is_hfs_dotgit(path))
784 return 0;
785 if (protect_ntfs && is_ntfs_dotgit(path))
786 return 0;
787 c = *path++;
788 if ((c == '.' && !verify_dotfile(path)) ||
789 is_dir_sep(c) || c == '\0')
790 return 0;
792 c = *path++;
797 * Do we have another file that has the beginning components being a
798 * proper superset of the name we're trying to add?
800 static int has_file_name(struct index_state *istate,
801 const struct cache_entry *ce, int pos, int ok_to_replace)
803 int retval = 0;
804 int len = ce_namelen(ce);
805 int stage = ce_stage(ce);
806 const char *name = ce->name;
808 while (pos < istate->cache_nr) {
809 struct cache_entry *p = istate->cache[pos++];
811 if (len >= ce_namelen(p))
812 break;
813 if (memcmp(name, p->name, len))
814 break;
815 if (ce_stage(p) != stage)
816 continue;
817 if (p->name[len] != '/')
818 continue;
819 if (p->ce_flags & CE_REMOVE)
820 continue;
821 retval = -1;
822 if (!ok_to_replace)
823 break;
824 remove_index_entry_at(istate, --pos);
826 return retval;
830 * Do we have another file with a pathname that is a proper
831 * subset of the name we're trying to add?
833 static int has_dir_name(struct index_state *istate,
834 const struct cache_entry *ce, int pos, int ok_to_replace)
836 int retval = 0;
837 int stage = ce_stage(ce);
838 const char *name = ce->name;
839 const char *slash = name + ce_namelen(ce);
841 for (;;) {
842 int len;
844 for (;;) {
845 if (*--slash == '/')
846 break;
847 if (slash <= ce->name)
848 return retval;
850 len = slash - name;
852 pos = index_name_stage_pos(istate, name, len, stage);
853 if (pos >= 0) {
855 * Found one, but not so fast. This could
856 * be a marker that says "I was here, but
857 * I am being removed". Such an entry is
858 * not a part of the resulting tree, and
859 * it is Ok to have a directory at the same
860 * path.
862 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
863 retval = -1;
864 if (!ok_to_replace)
865 break;
866 remove_index_entry_at(istate, pos);
867 continue;
870 else
871 pos = -pos-1;
874 * Trivial optimization: if we find an entry that
875 * already matches the sub-directory, then we know
876 * we're ok, and we can exit.
878 while (pos < istate->cache_nr) {
879 struct cache_entry *p = istate->cache[pos];
880 if ((ce_namelen(p) <= len) ||
881 (p->name[len] != '/') ||
882 memcmp(p->name, name, len))
883 break; /* not our subdirectory */
884 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
886 * p is at the same stage as our entry, and
887 * is a subdirectory of what we are looking
888 * at, so we cannot have conflicts at our
889 * level or anything shorter.
891 return retval;
892 pos++;
895 return retval;
898 /* We may be in a situation where we already have path/file and path
899 * is being added, or we already have path and path/file is being
900 * added. Either one would result in a nonsense tree that has path
901 * twice when git-write-tree tries to write it out. Prevent it.
903 * If ok-to-replace is specified, we remove the conflicting entries
904 * from the cache so the caller should recompute the insert position.
905 * When this happens, we return non-zero.
907 static int check_file_directory_conflict(struct index_state *istate,
908 const struct cache_entry *ce,
909 int pos, int ok_to_replace)
911 int retval;
914 * When ce is an "I am going away" entry, we allow it to be added
916 if (ce->ce_flags & CE_REMOVE)
917 return 0;
920 * We check if the path is a sub-path of a subsequent pathname
921 * first, since removing those will not change the position
922 * in the array.
924 retval = has_file_name(istate, ce, pos, ok_to_replace);
927 * Then check if the path might have a clashing sub-directory
928 * before it.
930 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
933 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
935 int pos;
936 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
937 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
938 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
939 int new_only = option & ADD_CACHE_NEW_ONLY;
941 cache_tree_invalidate_path(istate->cache_tree, ce->name);
942 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
944 /* existing match? Just replace it. */
945 if (pos >= 0) {
946 if (!new_only)
947 replace_index_entry(istate, pos, ce);
948 return 0;
950 pos = -pos-1;
953 * Inserting a merged entry ("stage 0") into the index
954 * will always replace all non-merged entries..
956 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
957 while (ce_same_name(istate->cache[pos], ce)) {
958 ok_to_add = 1;
959 if (!remove_index_entry_at(istate, pos))
960 break;
964 if (!ok_to_add)
965 return -1;
966 if (!verify_path(ce->name))
967 return error("Invalid path '%s'", ce->name);
969 if (!skip_df_check &&
970 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
971 if (!ok_to_replace)
972 return error("'%s' appears as both a file and as a directory",
973 ce->name);
974 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
975 pos = -pos-1;
977 return pos + 1;
980 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
982 int pos;
984 if (option & ADD_CACHE_JUST_APPEND)
985 pos = istate->cache_nr;
986 else {
987 int ret;
988 ret = add_index_entry_with_check(istate, ce, option);
989 if (ret <= 0)
990 return ret;
991 pos = ret - 1;
994 /* Make sure the array is big enough .. */
995 if (istate->cache_nr == istate->cache_alloc) {
996 istate->cache_alloc = alloc_nr(istate->cache_alloc);
997 istate->cache = xrealloc(istate->cache,
998 istate->cache_alloc * sizeof(*istate->cache));
1001 /* Add it in.. */
1002 istate->cache_nr++;
1003 if (istate->cache_nr > pos + 1)
1004 memmove(istate->cache + pos + 1,
1005 istate->cache + pos,
1006 (istate->cache_nr - pos - 1) * sizeof(ce));
1007 set_index_entry(istate, pos, ce);
1008 istate->cache_changed = 1;
1009 return 0;
1013 * "refresh" does not calculate a new sha1 file or bring the
1014 * cache up-to-date for mode/content changes. But what it
1015 * _does_ do is to "re-match" the stat information of a file
1016 * with the cache, so that you can refresh the cache for a
1017 * file that hasn't been changed but where the stat entry is
1018 * out of date.
1020 * For example, you'd want to do this after doing a "git-read-tree",
1021 * to link up the stat cache details with the proper files.
1023 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1024 struct cache_entry *ce,
1025 unsigned int options, int *err,
1026 int *changed_ret)
1028 struct stat st;
1029 struct cache_entry *updated;
1030 int changed, size;
1031 int refresh = options & CE_MATCH_REFRESH;
1032 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1033 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1034 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1036 if (!refresh || ce_uptodate(ce))
1037 return ce;
1040 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1041 * that the change to the work tree does not matter and told
1042 * us not to worry.
1044 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1045 ce_mark_uptodate(ce);
1046 return ce;
1048 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1049 ce_mark_uptodate(ce);
1050 return ce;
1053 if (lstat(ce->name, &st) < 0) {
1054 if (ignore_missing && errno == ENOENT)
1055 return ce;
1056 if (err)
1057 *err = errno;
1058 return NULL;
1061 changed = ie_match_stat(istate, ce, &st, options);
1062 if (changed_ret)
1063 *changed_ret = changed;
1064 if (!changed) {
1066 * The path is unchanged. If we were told to ignore
1067 * valid bit, then we did the actual stat check and
1068 * found that the entry is unmodified. If the entry
1069 * is not marked VALID, this is the place to mark it
1070 * valid again, under "assume unchanged" mode.
1072 if (ignore_valid && assume_unchanged &&
1073 !(ce->ce_flags & CE_VALID))
1074 ; /* mark this one VALID again */
1075 else {
1077 * We do not mark the index itself "modified"
1078 * because CE_UPTODATE flag is in-core only;
1079 * we are not going to write this change out.
1081 if (!S_ISGITLINK(ce->ce_mode))
1082 ce_mark_uptodate(ce);
1083 return ce;
1087 if (ie_modified(istate, ce, &st, options)) {
1088 if (err)
1089 *err = EINVAL;
1090 return NULL;
1093 size = ce_size(ce);
1094 updated = xmalloc(size);
1095 memcpy(updated, ce, size);
1096 fill_stat_cache_info(updated, &st);
1098 * If ignore_valid is not set, we should leave CE_VALID bit
1099 * alone. Otherwise, paths marked with --no-assume-unchanged
1100 * (i.e. things to be edited) will reacquire CE_VALID bit
1101 * automatically, which is not really what we want.
1103 if (!ignore_valid && assume_unchanged &&
1104 !(ce->ce_flags & CE_VALID))
1105 updated->ce_flags &= ~CE_VALID;
1107 return updated;
1110 static void show_file(const char * fmt, const char * name, int in_porcelain,
1111 int * first, const char *header_msg)
1113 if (in_porcelain && *first && header_msg) {
1114 printf("%s\n", header_msg);
1115 *first = 0;
1117 printf(fmt, name);
1120 int refresh_index(struct index_state *istate, unsigned int flags,
1121 const struct pathspec *pathspec,
1122 char *seen, const char *header_msg)
1124 int i;
1125 int has_errors = 0;
1126 int really = (flags & REFRESH_REALLY) != 0;
1127 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1128 int quiet = (flags & REFRESH_QUIET) != 0;
1129 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1130 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1131 int first = 1;
1132 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1133 unsigned int options = (CE_MATCH_REFRESH |
1134 (really ? CE_MATCH_IGNORE_VALID : 0) |
1135 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1136 const char *modified_fmt;
1137 const char *deleted_fmt;
1138 const char *typechange_fmt;
1139 const char *added_fmt;
1140 const char *unmerged_fmt;
1142 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1143 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1144 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1145 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1146 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1147 for (i = 0; i < istate->cache_nr; i++) {
1148 struct cache_entry *ce, *new;
1149 int cache_errno = 0;
1150 int changed = 0;
1151 int filtered = 0;
1153 ce = istate->cache[i];
1154 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1155 continue;
1157 if (pathspec && !ce_path_match(ce, pathspec, seen))
1158 filtered = 1;
1160 if (ce_stage(ce)) {
1161 while ((i < istate->cache_nr) &&
1162 ! strcmp(istate->cache[i]->name, ce->name))
1163 i++;
1164 i--;
1165 if (allow_unmerged)
1166 continue;
1167 if (!filtered)
1168 show_file(unmerged_fmt, ce->name, in_porcelain,
1169 &first, header_msg);
1170 has_errors = 1;
1171 continue;
1174 if (filtered)
1175 continue;
1177 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1178 if (new == ce)
1179 continue;
1180 if (!new) {
1181 const char *fmt;
1183 if (really && cache_errno == EINVAL) {
1184 /* If we are doing --really-refresh that
1185 * means the index is not valid anymore.
1187 ce->ce_flags &= ~CE_VALID;
1188 istate->cache_changed = 1;
1190 if (quiet)
1191 continue;
1193 if (cache_errno == ENOENT)
1194 fmt = deleted_fmt;
1195 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1196 fmt = added_fmt; /* must be before other checks */
1197 else if (changed & TYPE_CHANGED)
1198 fmt = typechange_fmt;
1199 else
1200 fmt = modified_fmt;
1201 show_file(fmt,
1202 ce->name, in_porcelain, &first, header_msg);
1203 has_errors = 1;
1204 continue;
1207 replace_index_entry(istate, i, new);
1209 return has_errors;
1212 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1213 unsigned int options)
1215 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1219 /*****************************************************************
1220 * Index File I/O
1221 *****************************************************************/
1223 #define INDEX_FORMAT_DEFAULT 3
1226 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1227 * Again - this is just a (very strong in practice) heuristic that
1228 * the inode hasn't changed.
1230 * We save the fields in big-endian order to allow using the
1231 * index file over NFS transparently.
1233 struct ondisk_cache_entry {
1234 struct cache_time ctime;
1235 struct cache_time mtime;
1236 uint32_t dev;
1237 uint32_t ino;
1238 uint32_t mode;
1239 uint32_t uid;
1240 uint32_t gid;
1241 uint32_t size;
1242 unsigned char sha1[20];
1243 uint16_t flags;
1244 char name[FLEX_ARRAY]; /* more */
1248 * This struct is used when CE_EXTENDED bit is 1
1249 * The struct must match ondisk_cache_entry exactly from
1250 * ctime till flags
1252 struct ondisk_cache_entry_extended {
1253 struct cache_time ctime;
1254 struct cache_time mtime;
1255 uint32_t dev;
1256 uint32_t ino;
1257 uint32_t mode;
1258 uint32_t uid;
1259 uint32_t gid;
1260 uint32_t size;
1261 unsigned char sha1[20];
1262 uint16_t flags;
1263 uint16_t flags2;
1264 char name[FLEX_ARRAY]; /* more */
1267 /* These are only used for v3 or lower */
1268 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1269 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1270 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1271 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1272 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1273 ondisk_cache_entry_size(ce_namelen(ce)))
1275 static int verify_hdr(struct cache_header *hdr, unsigned long size)
1277 git_SHA_CTX c;
1278 unsigned char sha1[20];
1279 int hdr_version;
1281 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1282 return error("bad signature");
1283 hdr_version = ntohl(hdr->hdr_version);
1284 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1285 return error("bad index version %d", hdr_version);
1286 git_SHA1_Init(&c);
1287 git_SHA1_Update(&c, hdr, size - 20);
1288 git_SHA1_Final(sha1, &c);
1289 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1290 return error("bad index file sha1 signature");
1291 return 0;
1294 static int read_index_extension(struct index_state *istate,
1295 const char *ext, void *data, unsigned long sz)
1297 switch (CACHE_EXT(ext)) {
1298 case CACHE_EXT_TREE:
1299 istate->cache_tree = cache_tree_read(data, sz);
1300 break;
1301 case CACHE_EXT_RESOLVE_UNDO:
1302 istate->resolve_undo = resolve_undo_read(data, sz);
1303 break;
1304 default:
1305 if (*ext < 'A' || 'Z' < *ext)
1306 return error("index uses %.4s extension, which we do not understand",
1307 ext);
1308 fprintf(stderr, "ignoring %.4s extension\n", ext);
1309 break;
1311 return 0;
1314 int read_index(struct index_state *istate)
1316 return read_index_from(istate, get_index_file());
1319 #ifndef NEEDS_ALIGNED_ACCESS
1320 #define ntoh_s(var) ntohs(var)
1321 #define ntoh_l(var) ntohl(var)
1322 #else
1323 static inline uint16_t ntoh_s_force_align(void *p)
1325 uint16_t x;
1326 memcpy(&x, p, sizeof(x));
1327 return ntohs(x);
1329 static inline uint32_t ntoh_l_force_align(void *p)
1331 uint32_t x;
1332 memcpy(&x, p, sizeof(x));
1333 return ntohl(x);
1335 #define ntoh_s(var) ntoh_s_force_align(&(var))
1336 #define ntoh_l(var) ntoh_l_force_align(&(var))
1337 #endif
1339 static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1340 unsigned int flags,
1341 const char *name,
1342 size_t len)
1344 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1346 ce->ce_stat_data.sd_ctime.sec = ntoh_l(ondisk->ctime.sec);
1347 ce->ce_stat_data.sd_mtime.sec = ntoh_l(ondisk->mtime.sec);
1348 ce->ce_stat_data.sd_ctime.nsec = ntoh_l(ondisk->ctime.nsec);
1349 ce->ce_stat_data.sd_mtime.nsec = ntoh_l(ondisk->mtime.nsec);
1350 ce->ce_stat_data.sd_dev = ntoh_l(ondisk->dev);
1351 ce->ce_stat_data.sd_ino = ntoh_l(ondisk->ino);
1352 ce->ce_mode = ntoh_l(ondisk->mode);
1353 ce->ce_stat_data.sd_uid = ntoh_l(ondisk->uid);
1354 ce->ce_stat_data.sd_gid = ntoh_l(ondisk->gid);
1355 ce->ce_stat_data.sd_size = ntoh_l(ondisk->size);
1356 ce->ce_flags = flags & ~CE_NAMEMASK;
1357 ce->ce_namelen = len;
1358 hashcpy(ce->sha1, ondisk->sha1);
1359 memcpy(ce->name, name, len);
1360 ce->name[len] = '\0';
1361 return ce;
1365 * Adjacent cache entries tend to share the leading paths, so it makes
1366 * sense to only store the differences in later entries. In the v4
1367 * on-disk format of the index, each on-disk cache entry stores the
1368 * number of bytes to be stripped from the end of the previous name,
1369 * and the bytes to append to the result, to come up with its name.
1371 static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1373 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1374 size_t len = decode_varint(&cp);
1376 if (name->len < len)
1377 die("malformed name field in the index");
1378 strbuf_remove(name, name->len - len, len);
1379 for (ep = cp; *ep; ep++)
1380 ; /* find the end */
1381 strbuf_add(name, cp, ep - cp);
1382 return (const char *)ep + 1 - cp_;
1385 static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1386 unsigned long *ent_size,
1387 struct strbuf *previous_name)
1389 struct cache_entry *ce;
1390 size_t len;
1391 const char *name;
1392 unsigned int flags;
1394 /* On-disk flags are just 16 bits */
1395 flags = ntoh_s(ondisk->flags);
1396 len = flags & CE_NAMEMASK;
1398 if (flags & CE_EXTENDED) {
1399 struct ondisk_cache_entry_extended *ondisk2;
1400 int extended_flags;
1401 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1402 extended_flags = ntoh_s(ondisk2->flags2) << 16;
1403 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1404 if (extended_flags & ~CE_EXTENDED_FLAGS)
1405 die("Unknown index entry format %08x", extended_flags);
1406 flags |= extended_flags;
1407 name = ondisk2->name;
1409 else
1410 name = ondisk->name;
1412 if (!previous_name) {
1413 /* v3 and earlier */
1414 if (len == CE_NAMEMASK)
1415 len = strlen(name);
1416 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1418 *ent_size = ondisk_ce_size(ce);
1419 } else {
1420 unsigned long consumed;
1421 consumed = expand_name_field(previous_name, name);
1422 ce = cache_entry_from_ondisk(ondisk, flags,
1423 previous_name->buf,
1424 previous_name->len);
1426 *ent_size = (name - ((char *)ondisk)) + consumed;
1428 return ce;
1431 /* remember to discard_cache() before reading a different cache! */
1432 int read_index_from(struct index_state *istate, const char *path)
1434 int fd, i;
1435 struct stat st;
1436 unsigned long src_offset;
1437 struct cache_header *hdr;
1438 void *mmap;
1439 size_t mmap_size;
1440 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1442 if (istate->initialized)
1443 return istate->cache_nr;
1445 istate->timestamp.sec = 0;
1446 istate->timestamp.nsec = 0;
1447 fd = open(path, O_RDONLY);
1448 if (fd < 0) {
1449 if (errno == ENOENT)
1450 return 0;
1451 die_errno("index file open failed");
1454 if (fstat(fd, &st))
1455 die_errno("cannot stat the open index");
1457 mmap_size = xsize_t(st.st_size);
1458 if (mmap_size < sizeof(struct cache_header) + 20)
1459 die("index file smaller than expected");
1461 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1462 if (mmap == MAP_FAILED)
1463 die_errno("unable to map index file");
1464 close(fd);
1466 hdr = mmap;
1467 if (verify_hdr(hdr, mmap_size) < 0)
1468 goto unmap;
1470 istate->version = ntohl(hdr->hdr_version);
1471 istate->cache_nr = ntohl(hdr->hdr_entries);
1472 istate->cache_alloc = alloc_nr(istate->cache_nr);
1473 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1474 istate->initialized = 1;
1476 if (istate->version == 4)
1477 previous_name = &previous_name_buf;
1478 else
1479 previous_name = NULL;
1481 src_offset = sizeof(*hdr);
1482 for (i = 0; i < istate->cache_nr; i++) {
1483 struct ondisk_cache_entry *disk_ce;
1484 struct cache_entry *ce;
1485 unsigned long consumed;
1487 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1488 ce = create_from_disk(disk_ce, &consumed, previous_name);
1489 set_index_entry(istate, i, ce);
1491 src_offset += consumed;
1493 strbuf_release(&previous_name_buf);
1494 istate->timestamp.sec = st.st_mtime;
1495 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1497 while (src_offset <= mmap_size - 20 - 8) {
1498 /* After an array of active_nr index entries,
1499 * there can be arbitrary number of extended
1500 * sections, each of which is prefixed with
1501 * extension name (4-byte) and section length
1502 * in 4-byte network byte order.
1504 uint32_t extsize;
1505 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1506 extsize = ntohl(extsize);
1507 if (read_index_extension(istate,
1508 (const char *) mmap + src_offset,
1509 (char *) mmap + src_offset + 8,
1510 extsize) < 0)
1511 goto unmap;
1512 src_offset += 8;
1513 src_offset += extsize;
1515 munmap(mmap, mmap_size);
1516 return istate->cache_nr;
1518 unmap:
1519 munmap(mmap, mmap_size);
1520 die("index file corrupt");
1523 int is_index_unborn(struct index_state *istate)
1525 return (!istate->cache_nr && !istate->timestamp.sec);
1528 int discard_index(struct index_state *istate)
1530 int i;
1532 for (i = 0; i < istate->cache_nr; i++)
1533 free(istate->cache[i]);
1534 resolve_undo_clear_index(istate);
1535 istate->cache_nr = 0;
1536 istate->cache_changed = 0;
1537 istate->timestamp.sec = 0;
1538 istate->timestamp.nsec = 0;
1539 free_name_hash(istate);
1540 cache_tree_free(&(istate->cache_tree));
1541 istate->initialized = 0;
1542 free(istate->cache);
1543 istate->cache = NULL;
1544 istate->cache_alloc = 0;
1545 return 0;
1548 int unmerged_index(const struct index_state *istate)
1550 int i;
1551 for (i = 0; i < istate->cache_nr; i++) {
1552 if (ce_stage(istate->cache[i]))
1553 return 1;
1555 return 0;
1558 #define WRITE_BUFFER_SIZE 8192
1559 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1560 static unsigned long write_buffer_len;
1562 static int ce_write_flush(git_SHA_CTX *context, int fd)
1564 unsigned int buffered = write_buffer_len;
1565 if (buffered) {
1566 git_SHA1_Update(context, write_buffer, buffered);
1567 if (write_in_full(fd, write_buffer, buffered) != buffered)
1568 return -1;
1569 write_buffer_len = 0;
1571 return 0;
1574 static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1576 while (len) {
1577 unsigned int buffered = write_buffer_len;
1578 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1579 if (partial > len)
1580 partial = len;
1581 memcpy(write_buffer + buffered, data, partial);
1582 buffered += partial;
1583 if (buffered == WRITE_BUFFER_SIZE) {
1584 write_buffer_len = buffered;
1585 if (ce_write_flush(context, fd))
1586 return -1;
1587 buffered = 0;
1589 write_buffer_len = buffered;
1590 len -= partial;
1591 data = (char *) data + partial;
1593 return 0;
1596 static int write_index_ext_header(git_SHA_CTX *context, int fd,
1597 unsigned int ext, unsigned int sz)
1599 ext = htonl(ext);
1600 sz = htonl(sz);
1601 return ((ce_write(context, fd, &ext, 4) < 0) ||
1602 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1605 static int ce_flush(git_SHA_CTX *context, int fd)
1607 unsigned int left = write_buffer_len;
1609 if (left) {
1610 write_buffer_len = 0;
1611 git_SHA1_Update(context, write_buffer, left);
1614 /* Flush first if not enough space for SHA1 signature */
1615 if (left + 20 > WRITE_BUFFER_SIZE) {
1616 if (write_in_full(fd, write_buffer, left) != left)
1617 return -1;
1618 left = 0;
1621 /* Append the SHA1 signature at the end */
1622 git_SHA1_Final(write_buffer + left, context);
1623 left += 20;
1624 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1627 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1630 * The only thing we care about in this function is to smudge the
1631 * falsely clean entry due to touch-update-touch race, so we leave
1632 * everything else as they are. We are called for entries whose
1633 * ce_stat_data.sd_mtime match the index file mtime.
1635 * Note that this actually does not do much for gitlinks, for
1636 * which ce_match_stat_basic() always goes to the actual
1637 * contents. The caller checks with is_racy_timestamp() which
1638 * always says "no" for gitlinks, so we are not called for them ;-)
1640 struct stat st;
1642 if (lstat(ce->name, &st) < 0)
1643 return;
1644 if (ce_match_stat_basic(ce, &st))
1645 return;
1646 if (ce_modified_check_fs(ce, &st)) {
1647 /* This is "racily clean"; smudge it. Note that this
1648 * is a tricky code. At first glance, it may appear
1649 * that it can break with this sequence:
1651 * $ echo xyzzy >frotz
1652 * $ git-update-index --add frotz
1653 * $ : >frotz
1654 * $ sleep 3
1655 * $ echo filfre >nitfol
1656 * $ git-update-index --add nitfol
1658 * but it does not. When the second update-index runs,
1659 * it notices that the entry "frotz" has the same timestamp
1660 * as index, and if we were to smudge it by resetting its
1661 * size to zero here, then the object name recorded
1662 * in index is the 6-byte file but the cached stat information
1663 * becomes zero --- which would then match what we would
1664 * obtain from the filesystem next time we stat("frotz").
1666 * However, the second update-index, before calling
1667 * this function, notices that the cached size is 6
1668 * bytes and what is on the filesystem is an empty
1669 * file, and never calls us, so the cached size information
1670 * for "frotz" stays 6 which does not match the filesystem.
1672 ce->ce_stat_data.sd_size = 0;
1676 /* Copy miscellaneous fields but not the name */
1677 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1678 struct cache_entry *ce)
1680 short flags;
1682 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1683 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1684 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1685 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1686 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1687 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
1688 ondisk->mode = htonl(ce->ce_mode);
1689 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1690 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1691 ondisk->size = htonl(ce->ce_stat_data.sd_size);
1692 hashcpy(ondisk->sha1, ce->sha1);
1694 flags = ce->ce_flags;
1695 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1696 ondisk->flags = htons(flags);
1697 if (ce->ce_flags & CE_EXTENDED) {
1698 struct ondisk_cache_entry_extended *ondisk2;
1699 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1700 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1701 return ondisk2->name;
1703 else {
1704 return ondisk->name;
1708 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1709 struct strbuf *previous_name)
1711 int size;
1712 struct ondisk_cache_entry *ondisk;
1713 char *name;
1714 int result;
1716 if (!previous_name) {
1717 size = ondisk_ce_size(ce);
1718 ondisk = xcalloc(1, size);
1719 name = copy_cache_entry_to_ondisk(ondisk, ce);
1720 memcpy(name, ce->name, ce_namelen(ce));
1721 } else {
1722 int common, to_remove, prefix_size;
1723 unsigned char to_remove_vi[16];
1724 for (common = 0;
1725 (ce->name[common] &&
1726 common < previous_name->len &&
1727 ce->name[common] == previous_name->buf[common]);
1728 common++)
1729 ; /* still matching */
1730 to_remove = previous_name->len - common;
1731 prefix_size = encode_varint(to_remove, to_remove_vi);
1733 if (ce->ce_flags & CE_EXTENDED)
1734 size = offsetof(struct ondisk_cache_entry_extended, name);
1735 else
1736 size = offsetof(struct ondisk_cache_entry, name);
1737 size += prefix_size + (ce_namelen(ce) - common + 1);
1739 ondisk = xcalloc(1, size);
1740 name = copy_cache_entry_to_ondisk(ondisk, ce);
1741 memcpy(name, to_remove_vi, prefix_size);
1742 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1744 strbuf_splice(previous_name, common, to_remove,
1745 ce->name + common, ce_namelen(ce) - common);
1748 result = ce_write(c, fd, ondisk, size);
1749 free(ondisk);
1750 return result;
1753 static int has_racy_timestamp(struct index_state *istate)
1755 int entries = istate->cache_nr;
1756 int i;
1758 for (i = 0; i < entries; i++) {
1759 struct cache_entry *ce = istate->cache[i];
1760 if (is_racy_timestamp(istate, ce))
1761 return 1;
1763 return 0;
1767 * Opportunistically update the index but do not complain if we can't
1769 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1771 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1772 !write_index(istate, lockfile->fd))
1773 commit_locked_index(lockfile);
1774 else
1775 rollback_lock_file(lockfile);
1778 int write_index(struct index_state *istate, int newfd)
1780 git_SHA_CTX c;
1781 struct cache_header hdr;
1782 int i, err, removed, extended, hdr_version;
1783 struct cache_entry **cache = istate->cache;
1784 int entries = istate->cache_nr;
1785 struct stat st;
1786 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1788 for (i = removed = extended = 0; i < entries; i++) {
1789 if (cache[i]->ce_flags & CE_REMOVE)
1790 removed++;
1792 /* reduce extended entries if possible */
1793 cache[i]->ce_flags &= ~CE_EXTENDED;
1794 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1795 extended++;
1796 cache[i]->ce_flags |= CE_EXTENDED;
1800 if (!istate->version)
1801 istate->version = INDEX_FORMAT_DEFAULT;
1803 /* demote version 3 to version 2 when the latter suffices */
1804 if (istate->version == 3 || istate->version == 2)
1805 istate->version = extended ? 3 : 2;
1807 hdr_version = istate->version;
1809 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1810 hdr.hdr_version = htonl(hdr_version);
1811 hdr.hdr_entries = htonl(entries - removed);
1813 git_SHA1_Init(&c);
1814 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1815 return -1;
1817 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1818 for (i = 0; i < entries; i++) {
1819 struct cache_entry *ce = cache[i];
1820 if (ce->ce_flags & CE_REMOVE)
1821 continue;
1822 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
1823 ce_smudge_racily_clean_entry(ce);
1824 if (is_null_sha1(ce->sha1)) {
1825 static const char msg[] = "cache entry has null sha1: %s";
1826 static int allow = -1;
1828 if (allow < 0)
1829 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1830 if (allow)
1831 warning(msg, ce->name);
1832 else
1833 return error(msg, ce->name);
1835 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1836 return -1;
1838 strbuf_release(&previous_name_buf);
1840 /* Write extension data here */
1841 if (istate->cache_tree) {
1842 struct strbuf sb = STRBUF_INIT;
1844 cache_tree_write(&sb, istate->cache_tree);
1845 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1846 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1847 strbuf_release(&sb);
1848 if (err)
1849 return -1;
1851 if (istate->resolve_undo) {
1852 struct strbuf sb = STRBUF_INIT;
1854 resolve_undo_write(&sb, istate->resolve_undo);
1855 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
1856 sb.len) < 0
1857 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1858 strbuf_release(&sb);
1859 if (err)
1860 return -1;
1863 if (ce_flush(&c, newfd) || fstat(newfd, &st))
1864 return -1;
1865 istate->timestamp.sec = (unsigned int)st.st_mtime;
1866 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1867 return 0;
1871 * Read the index file that is potentially unmerged into given
1872 * index_state, dropping any unmerged entries. Returns true if
1873 * the index is unmerged. Callers who want to refuse to work
1874 * from an unmerged state can call this and check its return value,
1875 * instead of calling read_cache().
1877 int read_index_unmerged(struct index_state *istate)
1879 int i;
1880 int unmerged = 0;
1882 read_index(istate);
1883 for (i = 0; i < istate->cache_nr; i++) {
1884 struct cache_entry *ce = istate->cache[i];
1885 struct cache_entry *new_ce;
1886 int size, len;
1888 if (!ce_stage(ce))
1889 continue;
1890 unmerged = 1;
1891 len = ce_namelen(ce);
1892 size = cache_entry_size(len);
1893 new_ce = xcalloc(1, size);
1894 memcpy(new_ce->name, ce->name, len);
1895 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
1896 new_ce->ce_namelen = len;
1897 new_ce->ce_mode = ce->ce_mode;
1898 if (add_index_entry(istate, new_ce, 0))
1899 return error("%s: cannot drop to stage #0",
1900 ce->name);
1901 i = index_name_pos(istate, new_ce->name, len);
1903 return unmerged;
1907 * Returns 1 if the path is an "other" path with respect to
1908 * the index; that is, the path is not mentioned in the index at all,
1909 * either as a file, a directory with some files in the index,
1910 * or as an unmerged entry.
1912 * We helpfully remove a trailing "/" from directories so that
1913 * the output of read_directory can be used as-is.
1915 int index_name_is_other(const struct index_state *istate, const char *name,
1916 int namelen)
1918 int pos;
1919 if (namelen && name[namelen - 1] == '/')
1920 namelen--;
1921 pos = index_name_pos(istate, name, namelen);
1922 if (0 <= pos)
1923 return 0; /* exact match */
1924 pos = -pos - 1;
1925 if (pos < istate->cache_nr) {
1926 struct cache_entry *ce = istate->cache[pos];
1927 if (ce_namelen(ce) == namelen &&
1928 !memcmp(ce->name, name, namelen))
1929 return 0; /* Yup, this one exists unmerged */
1931 return 1;
1934 void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
1936 int pos, len;
1937 unsigned long sz;
1938 enum object_type type;
1939 void *data;
1941 len = strlen(path);
1942 pos = index_name_pos(istate, path, len);
1943 if (pos < 0) {
1945 * We might be in the middle of a merge, in which
1946 * case we would read stage #2 (ours).
1948 int i;
1949 for (i = -pos - 1;
1950 (pos < 0 && i < istate->cache_nr &&
1951 !strcmp(istate->cache[i]->name, path));
1952 i++)
1953 if (ce_stage(istate->cache[i]) == 2)
1954 pos = i;
1956 if (pos < 0)
1957 return NULL;
1958 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
1959 if (!data || type != OBJ_BLOB) {
1960 free(data);
1961 return NULL;
1963 if (size)
1964 *size = sz;
1965 return data;
1968 void stat_validity_clear(struct stat_validity *sv)
1970 free(sv->sd);
1971 sv->sd = NULL;
1974 int stat_validity_check(struct stat_validity *sv, const char *path)
1976 struct stat st;
1978 if (stat(path, &st) < 0)
1979 return sv->sd == NULL;
1980 if (!sv->sd)
1981 return 0;
1982 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
1985 void stat_validity_update(struct stat_validity *sv, int fd)
1987 struct stat st;
1989 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
1990 stat_validity_clear(sv);
1991 else {
1992 if (!sv->sd)
1993 sv->sd = xcalloc(1, sizeof(struct stat_data));
1994 fill_stat_data(sv->sd, &st);