read-cache: fix untracked cache invalidation when split-index is used
[git/mjg.git] / read-cache.c
blob34d2e5ea428895253180c26c6eb3db6c6e032ed3
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 "lockfile.h"
9 #include "cache-tree.h"
10 #include "refs.h"
11 #include "dir.h"
12 #include "tree.h"
13 #include "commit.h"
14 #include "blob.h"
15 #include "resolve-undo.h"
16 #include "strbuf.h"
17 #include "varint.h"
18 #include "split-index.h"
19 #include "sigchain.h"
20 #include "utf8.h"
22 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
23 unsigned int options);
25 /* Mask for the name length in ce_flags in the on-disk index */
27 #define CE_NAMEMASK (0x0fff)
29 /* Index extensions.
31 * The first letter should be 'A'..'Z' for extensions that are not
32 * necessary for a correct operation (i.e. optimization data).
33 * When new extensions are added that _needs_ to be understood in
34 * order to correctly interpret the index file, pick character that
35 * is outside the range, to cause the reader to abort.
38 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
39 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
40 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
41 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
42 #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
44 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
45 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
46 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
47 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED)
49 struct index_state the_index;
50 static const char *alternate_index_output;
52 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
54 istate->cache[nr] = ce;
55 add_name_hash(istate, ce);
58 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
60 struct cache_entry *old = istate->cache[nr];
62 replace_index_entry_in_base(istate, old, ce);
63 remove_name_hash(istate, old);
64 free(old);
65 set_index_entry(istate, nr, ce);
66 ce->ce_flags |= CE_UPDATE_IN_BASE;
67 istate->cache_changed |= CE_ENTRY_CHANGED;
70 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
72 struct cache_entry *old = istate->cache[nr], *new;
73 int namelen = strlen(new_name);
75 new = xmalloc(cache_entry_size(namelen));
76 copy_cache_entry(new, old);
77 new->ce_flags &= ~CE_HASHED;
78 new->ce_namelen = namelen;
79 new->index = 0;
80 memcpy(new->name, new_name, namelen + 1);
82 cache_tree_invalidate_path(istate, old->name);
83 untracked_cache_remove_from_index(istate, old->name);
84 remove_index_entry_at(istate, nr);
85 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
88 void fill_stat_data(struct stat_data *sd, struct stat *st)
90 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
91 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
92 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
93 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
94 sd->sd_dev = st->st_dev;
95 sd->sd_ino = st->st_ino;
96 sd->sd_uid = st->st_uid;
97 sd->sd_gid = st->st_gid;
98 sd->sd_size = st->st_size;
101 int match_stat_data(const struct stat_data *sd, struct stat *st)
103 int changed = 0;
105 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
106 changed |= MTIME_CHANGED;
107 if (trust_ctime && check_stat &&
108 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
109 changed |= CTIME_CHANGED;
111 #ifdef USE_NSEC
112 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
113 changed |= MTIME_CHANGED;
114 if (trust_ctime && check_stat &&
115 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
116 changed |= CTIME_CHANGED;
117 #endif
119 if (check_stat) {
120 if (sd->sd_uid != (unsigned int) st->st_uid ||
121 sd->sd_gid != (unsigned int) st->st_gid)
122 changed |= OWNER_CHANGED;
123 if (sd->sd_ino != (unsigned int) st->st_ino)
124 changed |= INODE_CHANGED;
127 #ifdef USE_STDEV
129 * st_dev breaks on network filesystems where different
130 * clients will have different views of what "device"
131 * the filesystem is on
133 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
134 changed |= INODE_CHANGED;
135 #endif
137 if (sd->sd_size != (unsigned int) st->st_size)
138 changed |= DATA_CHANGED;
140 return changed;
144 * This only updates the "non-critical" parts of the directory
145 * cache, ie the parts that aren't tracked by GIT, and only used
146 * to validate the cache.
148 void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
150 fill_stat_data(&ce->ce_stat_data, st);
152 if (assume_unchanged)
153 ce->ce_flags |= CE_VALID;
155 if (S_ISREG(st->st_mode))
156 ce_mark_uptodate(ce);
159 static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
161 int match = -1;
162 int fd = open(ce->name, O_RDONLY);
164 if (fd >= 0) {
165 unsigned char sha1[20];
166 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
167 match = hashcmp(sha1, ce->sha1);
168 /* index_fd() closed the file descriptor already */
170 return match;
173 static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
175 int match = -1;
176 void *buffer;
177 unsigned long size;
178 enum object_type type;
179 struct strbuf sb = STRBUF_INIT;
181 if (strbuf_readlink(&sb, ce->name, expected_size))
182 return -1;
184 buffer = read_sha1_file(ce->sha1, &type, &size);
185 if (buffer) {
186 if (size == sb.len)
187 match = memcmp(buffer, sb.buf, size);
188 free(buffer);
190 strbuf_release(&sb);
191 return match;
194 static int ce_compare_gitlink(const struct cache_entry *ce)
196 unsigned char sha1[20];
199 * We don't actually require that the .git directory
200 * under GITLINK directory be a valid git directory. It
201 * might even be missing (in case nobody populated that
202 * sub-project).
204 * If so, we consider it always to match.
206 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
207 return 0;
208 return hashcmp(sha1, ce->sha1);
211 static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
213 switch (st->st_mode & S_IFMT) {
214 case S_IFREG:
215 if (ce_compare_data(ce, st))
216 return DATA_CHANGED;
217 break;
218 case S_IFLNK:
219 if (ce_compare_link(ce, xsize_t(st->st_size)))
220 return DATA_CHANGED;
221 break;
222 case S_IFDIR:
223 if (S_ISGITLINK(ce->ce_mode))
224 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
225 default:
226 return TYPE_CHANGED;
228 return 0;
231 static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
233 unsigned int changed = 0;
235 if (ce->ce_flags & CE_REMOVE)
236 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
238 switch (ce->ce_mode & S_IFMT) {
239 case S_IFREG:
240 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
241 /* We consider only the owner x bit to be relevant for
242 * "mode changes"
244 if (trust_executable_bit &&
245 (0100 & (ce->ce_mode ^ st->st_mode)))
246 changed |= MODE_CHANGED;
247 break;
248 case S_IFLNK:
249 if (!S_ISLNK(st->st_mode) &&
250 (has_symlinks || !S_ISREG(st->st_mode)))
251 changed |= TYPE_CHANGED;
252 break;
253 case S_IFGITLINK:
254 /* We ignore most of the st_xxx fields for gitlinks */
255 if (!S_ISDIR(st->st_mode))
256 changed |= TYPE_CHANGED;
257 else if (ce_compare_gitlink(ce))
258 changed |= DATA_CHANGED;
259 return changed;
260 default:
261 die("internal error: ce_mode is %o", ce->ce_mode);
264 changed |= match_stat_data(&ce->ce_stat_data, st);
266 /* Racily smudged entry? */
267 if (!ce->ce_stat_data.sd_size) {
268 if (!is_empty_blob_sha1(ce->sha1))
269 changed |= DATA_CHANGED;
272 return changed;
275 static int is_racy_stat(const struct index_state *istate,
276 const struct stat_data *sd)
278 return (istate->timestamp.sec &&
279 #ifdef USE_NSEC
280 /* nanosecond timestamped files can also be racy! */
281 (istate->timestamp.sec < sd->sd_mtime.sec ||
282 (istate->timestamp.sec == sd->sd_mtime.sec &&
283 istate->timestamp.nsec <= sd->sd_mtime.nsec))
284 #else
285 istate->timestamp.sec <= sd->sd_mtime.sec
286 #endif
290 static int is_racy_timestamp(const struct index_state *istate,
291 const struct cache_entry *ce)
293 return (!S_ISGITLINK(ce->ce_mode) &&
294 is_racy_stat(istate, &ce->ce_stat_data));
297 int match_stat_data_racy(const struct index_state *istate,
298 const struct stat_data *sd, struct stat *st)
300 if (is_racy_stat(istate, sd))
301 return MTIME_CHANGED;
302 return match_stat_data(sd, st);
305 int ie_match_stat(const struct index_state *istate,
306 const struct cache_entry *ce, struct stat *st,
307 unsigned int options)
309 unsigned int changed;
310 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
311 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
312 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
315 * If it's marked as always valid in the index, it's
316 * valid whatever the checked-out copy says.
318 * skip-worktree has the same effect with higher precedence
320 if (!ignore_skip_worktree && ce_skip_worktree(ce))
321 return 0;
322 if (!ignore_valid && (ce->ce_flags & CE_VALID))
323 return 0;
326 * Intent-to-add entries have not been added, so the index entry
327 * by definition never matches what is in the work tree until it
328 * actually gets added.
330 if (ce->ce_flags & CE_INTENT_TO_ADD)
331 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
333 changed = ce_match_stat_basic(ce, st);
336 * Within 1 second of this sequence:
337 * echo xyzzy >file && git-update-index --add file
338 * running this command:
339 * echo frotz >file
340 * would give a falsely clean cache entry. The mtime and
341 * length match the cache, and other stat fields do not change.
343 * We could detect this at update-index time (the cache entry
344 * being registered/updated records the same time as "now")
345 * and delay the return from git-update-index, but that would
346 * effectively mean we can make at most one commit per second,
347 * which is not acceptable. Instead, we check cache entries
348 * whose mtime are the same as the index file timestamp more
349 * carefully than others.
351 if (!changed && is_racy_timestamp(istate, ce)) {
352 if (assume_racy_is_modified)
353 changed |= DATA_CHANGED;
354 else
355 changed |= ce_modified_check_fs(ce, st);
358 return changed;
361 int ie_modified(const struct index_state *istate,
362 const struct cache_entry *ce,
363 struct stat *st, unsigned int options)
365 int changed, changed_fs;
367 changed = ie_match_stat(istate, ce, st, options);
368 if (!changed)
369 return 0;
371 * If the mode or type has changed, there's no point in trying
372 * to refresh the entry - it's not going to match
374 if (changed & (MODE_CHANGED | TYPE_CHANGED))
375 return changed;
378 * Immediately after read-tree or update-index --cacheinfo,
379 * the length field is zero, as we have never even read the
380 * lstat(2) information once, and we cannot trust DATA_CHANGED
381 * returned by ie_match_stat() which in turn was returned by
382 * ce_match_stat_basic() to signal that the filesize of the
383 * blob changed. We have to actually go to the filesystem to
384 * see if the contents match, and if so, should answer "unchanged".
386 * The logic does not apply to gitlinks, as ce_match_stat_basic()
387 * already has checked the actual HEAD from the filesystem in the
388 * subproject. If ie_match_stat() already said it is different,
389 * then we know it is.
391 if ((changed & DATA_CHANGED) &&
392 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
393 return changed;
395 changed_fs = ce_modified_check_fs(ce, st);
396 if (changed_fs)
397 return changed | changed_fs;
398 return 0;
401 int base_name_compare(const char *name1, int len1, int mode1,
402 const char *name2, int len2, int mode2)
404 unsigned char c1, c2;
405 int len = len1 < len2 ? len1 : len2;
406 int cmp;
408 cmp = memcmp(name1, name2, len);
409 if (cmp)
410 return cmp;
411 c1 = name1[len];
412 c2 = name2[len];
413 if (!c1 && S_ISDIR(mode1))
414 c1 = '/';
415 if (!c2 && S_ISDIR(mode2))
416 c2 = '/';
417 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
421 * df_name_compare() is identical to base_name_compare(), except it
422 * compares conflicting directory/file entries as equal. Note that
423 * while a directory name compares as equal to a regular file, they
424 * then individually compare _differently_ to a filename that has
425 * a dot after the basename (because '\0' < '.' < '/').
427 * This is used by routines that want to traverse the git namespace
428 * but then handle conflicting entries together when possible.
430 int df_name_compare(const char *name1, int len1, int mode1,
431 const char *name2, int len2, int mode2)
433 int len = len1 < len2 ? len1 : len2, cmp;
434 unsigned char c1, c2;
436 cmp = memcmp(name1, name2, len);
437 if (cmp)
438 return cmp;
439 /* Directories and files compare equal (same length, same name) */
440 if (len1 == len2)
441 return 0;
442 c1 = name1[len];
443 if (!c1 && S_ISDIR(mode1))
444 c1 = '/';
445 c2 = name2[len];
446 if (!c2 && S_ISDIR(mode2))
447 c2 = '/';
448 if (c1 == '/' && !c2)
449 return 0;
450 if (c2 == '/' && !c1)
451 return 0;
452 return c1 - c2;
455 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
457 size_t min_len = (len1 < len2) ? len1 : len2;
458 int cmp = memcmp(name1, name2, min_len);
459 if (cmp)
460 return cmp;
461 if (len1 < len2)
462 return -1;
463 if (len1 > len2)
464 return 1;
465 return 0;
468 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
470 int cmp;
472 cmp = name_compare(name1, len1, name2, len2);
473 if (cmp)
474 return cmp;
476 if (stage1 < stage2)
477 return -1;
478 if (stage1 > stage2)
479 return 1;
480 return 0;
483 static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
485 int first, last;
487 first = 0;
488 last = istate->cache_nr;
489 while (last > first) {
490 int next = (last + first) >> 1;
491 struct cache_entry *ce = istate->cache[next];
492 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
493 if (!cmp)
494 return next;
495 if (cmp < 0) {
496 last = next;
497 continue;
499 first = next+1;
501 return -first-1;
504 int index_name_pos(const struct index_state *istate, const char *name, int namelen)
506 return index_name_stage_pos(istate, name, namelen, 0);
509 /* Remove entry, return true if there are more entries to go.. */
510 int remove_index_entry_at(struct index_state *istate, int pos)
512 struct cache_entry *ce = istate->cache[pos];
514 record_resolve_undo(istate, ce);
515 remove_name_hash(istate, ce);
516 save_or_free_index_entry(istate, ce);
517 istate->cache_changed |= CE_ENTRY_REMOVED;
518 istate->cache_nr--;
519 if (pos >= istate->cache_nr)
520 return 0;
521 memmove(istate->cache + pos,
522 istate->cache + pos + 1,
523 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
524 return 1;
528 * Remove all cache entries marked for removal, that is where
529 * CE_REMOVE is set in ce_flags. This is much more effective than
530 * calling remove_index_entry_at() for each entry to be removed.
532 void remove_marked_cache_entries(struct index_state *istate)
534 struct cache_entry **ce_array = istate->cache;
535 unsigned int i, j;
537 for (i = j = 0; i < istate->cache_nr; i++) {
538 if (ce_array[i]->ce_flags & CE_REMOVE) {
539 remove_name_hash(istate, ce_array[i]);
540 save_or_free_index_entry(istate, ce_array[i]);
542 else
543 ce_array[j++] = ce_array[i];
545 if (j == istate->cache_nr)
546 return;
547 istate->cache_changed |= CE_ENTRY_REMOVED;
548 istate->cache_nr = j;
551 int remove_file_from_index(struct index_state *istate, const char *path)
553 int pos = index_name_pos(istate, path, strlen(path));
554 if (pos < 0)
555 pos = -pos-1;
556 cache_tree_invalidate_path(istate, path);
557 untracked_cache_remove_from_index(istate, path);
558 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
559 remove_index_entry_at(istate, pos);
560 return 0;
563 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
565 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
568 static int index_name_pos_also_unmerged(struct index_state *istate,
569 const char *path, int namelen)
571 int pos = index_name_pos(istate, path, namelen);
572 struct cache_entry *ce;
574 if (pos >= 0)
575 return pos;
577 /* maybe unmerged? */
578 pos = -1 - pos;
579 if (pos >= istate->cache_nr ||
580 compare_name((ce = istate->cache[pos]), path, namelen))
581 return -1;
583 /* order of preference: stage 2, 1, 3 */
584 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
585 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
586 !compare_name(ce, path, namelen))
587 pos++;
588 return pos;
591 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
593 int len = ce_namelen(ce);
594 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
598 * If we add a filename that aliases in the cache, we will use the
599 * name that we already have - but we don't want to update the same
600 * alias twice, because that implies that there were actually two
601 * different files with aliasing names!
603 * So we use the CE_ADDED flag to verify that the alias was an old
604 * one before we accept it as
606 static struct cache_entry *create_alias_ce(struct index_state *istate,
607 struct cache_entry *ce,
608 struct cache_entry *alias)
610 int len;
611 struct cache_entry *new;
613 if (alias->ce_flags & CE_ADDED)
614 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
616 /* Ok, create the new entry using the name of the existing alias */
617 len = ce_namelen(alias);
618 new = xcalloc(1, cache_entry_size(len));
619 memcpy(new->name, alias->name, len);
620 copy_cache_entry(new, ce);
621 save_or_free_index_entry(istate, ce);
622 return new;
625 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
627 unsigned char sha1[20];
628 if (write_sha1_file("", 0, blob_type, sha1))
629 die("cannot create an empty blob in the object database");
630 hashcpy(ce->sha1, sha1);
633 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
635 int size, namelen, was_same;
636 mode_t st_mode = st->st_mode;
637 struct cache_entry *ce, *alias;
638 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
639 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
640 int pretend = flags & ADD_CACHE_PRETEND;
641 int intent_only = flags & ADD_CACHE_INTENT;
642 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
643 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
645 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
646 return error("%s: can only add regular files, symbolic links or git-directories", path);
648 namelen = strlen(path);
649 if (S_ISDIR(st_mode)) {
650 while (namelen && path[namelen-1] == '/')
651 namelen--;
653 size = cache_entry_size(namelen);
654 ce = xcalloc(1, size);
655 memcpy(ce->name, path, namelen);
656 ce->ce_namelen = namelen;
657 if (!intent_only)
658 fill_stat_cache_info(ce, st);
659 else
660 ce->ce_flags |= CE_INTENT_TO_ADD;
662 if (trust_executable_bit && has_symlinks)
663 ce->ce_mode = create_ce_mode(st_mode);
664 else {
665 /* If there is an existing entry, pick the mode bits and type
666 * from it, otherwise assume unexecutable regular file.
668 struct cache_entry *ent;
669 int pos = index_name_pos_also_unmerged(istate, path, namelen);
671 ent = (0 <= pos) ? istate->cache[pos] : NULL;
672 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
675 /* When core.ignorecase=true, determine if a directory of the same name but differing
676 * case already exists within the Git repository. If it does, ensure the directory
677 * case of the file being added to the repository matches (is folded into) the existing
678 * entry's directory case.
680 if (ignore_case) {
681 const char *startPtr = ce->name;
682 const char *ptr = startPtr;
683 while (*ptr) {
684 while (*ptr && *ptr != '/')
685 ++ptr;
686 if (*ptr == '/') {
687 struct cache_entry *foundce;
688 ++ptr;
689 foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
690 if (foundce) {
691 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
692 startPtr = ptr;
698 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
699 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
700 /* Nothing changed, really */
701 free(ce);
702 if (!S_ISGITLINK(alias->ce_mode))
703 ce_mark_uptodate(alias);
704 alias->ce_flags |= CE_ADDED;
705 return 0;
707 if (!intent_only) {
708 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
709 return error("unable to index file %s", path);
710 } else
711 set_object_name_for_intent_to_add_entry(ce);
713 if (ignore_case && alias && different_name(ce, alias))
714 ce = create_alias_ce(istate, ce, alias);
715 ce->ce_flags |= CE_ADDED;
717 /* It was suspected to be racily clean, but it turns out to be Ok */
718 was_same = (alias &&
719 !ce_stage(alias) &&
720 !hashcmp(alias->sha1, ce->sha1) &&
721 ce->ce_mode == alias->ce_mode);
723 if (pretend)
725 else if (add_index_entry(istate, ce, add_option))
726 return error("unable to add %s to index",path);
727 if (verbose && !was_same)
728 printf("add '%s'\n", path);
729 return 0;
732 int add_file_to_index(struct index_state *istate, const char *path, int flags)
734 struct stat st;
735 if (lstat(path, &st))
736 die_errno("unable to stat '%s'", path);
737 return add_to_index(istate, path, &st, flags);
740 struct cache_entry *make_cache_entry(unsigned int mode,
741 const unsigned char *sha1, const char *path, int stage,
742 unsigned int refresh_options)
744 int size, len;
745 struct cache_entry *ce, *ret;
747 if (!verify_path(path)) {
748 error("Invalid path '%s'", path);
749 return NULL;
752 len = strlen(path);
753 size = cache_entry_size(len);
754 ce = xcalloc(1, size);
756 hashcpy(ce->sha1, sha1);
757 memcpy(ce->name, path, len);
758 ce->ce_flags = create_ce_flags(stage);
759 ce->ce_namelen = len;
760 ce->ce_mode = create_ce_mode(mode);
762 ret = refresh_cache_entry(ce, refresh_options);
763 if (!ret) {
764 free(ce);
765 return NULL;
766 } else {
767 return ret;
771 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
773 int len = ce_namelen(a);
774 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
778 * We fundamentally don't like some paths: we don't want
779 * dot or dot-dot anywhere, and for obvious reasons don't
780 * want to recurse into ".git" either.
782 * Also, we don't want double slashes or slashes at the
783 * end that can make pathnames ambiguous.
785 static int verify_dotfile(const char *rest)
788 * The first character was '.', but that
789 * has already been discarded, we now test
790 * the rest.
793 /* "." is not allowed */
794 if (*rest == '\0' || is_dir_sep(*rest))
795 return 0;
797 switch (*rest) {
799 * ".git" followed by NUL or slash is bad. This
800 * shares the path end test with the ".." case.
802 case 'g':
803 case 'G':
804 if (rest[1] != 'i' && rest[1] != 'I')
805 break;
806 if (rest[2] != 't' && rest[2] != 'T')
807 break;
808 rest += 2;
809 /* fallthrough */
810 case '.':
811 if (rest[1] == '\0' || is_dir_sep(rest[1]))
812 return 0;
814 return 1;
817 int verify_path(const char *path)
819 char c;
821 if (has_dos_drive_prefix(path))
822 return 0;
824 goto inside;
825 for (;;) {
826 if (!c)
827 return 1;
828 if (is_dir_sep(c)) {
829 inside:
830 if (protect_hfs && is_hfs_dotgit(path))
831 return 0;
832 if (protect_ntfs && is_ntfs_dotgit(path))
833 return 0;
834 c = *path++;
835 if ((c == '.' && !verify_dotfile(path)) ||
836 is_dir_sep(c) || c == '\0')
837 return 0;
839 c = *path++;
844 * Do we have another file that has the beginning components being a
845 * proper superset of the name we're trying to add?
847 static int has_file_name(struct index_state *istate,
848 const struct cache_entry *ce, int pos, int ok_to_replace)
850 int retval = 0;
851 int len = ce_namelen(ce);
852 int stage = ce_stage(ce);
853 const char *name = ce->name;
855 while (pos < istate->cache_nr) {
856 struct cache_entry *p = istate->cache[pos++];
858 if (len >= ce_namelen(p))
859 break;
860 if (memcmp(name, p->name, len))
861 break;
862 if (ce_stage(p) != stage)
863 continue;
864 if (p->name[len] != '/')
865 continue;
866 if (p->ce_flags & CE_REMOVE)
867 continue;
868 retval = -1;
869 if (!ok_to_replace)
870 break;
871 remove_index_entry_at(istate, --pos);
873 return retval;
877 * Do we have another file with a pathname that is a proper
878 * subset of the name we're trying to add?
880 static int has_dir_name(struct index_state *istate,
881 const struct cache_entry *ce, int pos, int ok_to_replace)
883 int retval = 0;
884 int stage = ce_stage(ce);
885 const char *name = ce->name;
886 const char *slash = name + ce_namelen(ce);
888 for (;;) {
889 int len;
891 for (;;) {
892 if (*--slash == '/')
893 break;
894 if (slash <= ce->name)
895 return retval;
897 len = slash - name;
899 pos = index_name_stage_pos(istate, name, len, stage);
900 if (pos >= 0) {
902 * Found one, but not so fast. This could
903 * be a marker that says "I was here, but
904 * I am being removed". Such an entry is
905 * not a part of the resulting tree, and
906 * it is Ok to have a directory at the same
907 * path.
909 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
910 retval = -1;
911 if (!ok_to_replace)
912 break;
913 remove_index_entry_at(istate, pos);
914 continue;
917 else
918 pos = -pos-1;
921 * Trivial optimization: if we find an entry that
922 * already matches the sub-directory, then we know
923 * we're ok, and we can exit.
925 while (pos < istate->cache_nr) {
926 struct cache_entry *p = istate->cache[pos];
927 if ((ce_namelen(p) <= len) ||
928 (p->name[len] != '/') ||
929 memcmp(p->name, name, len))
930 break; /* not our subdirectory */
931 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
933 * p is at the same stage as our entry, and
934 * is a subdirectory of what we are looking
935 * at, so we cannot have conflicts at our
936 * level or anything shorter.
938 return retval;
939 pos++;
942 return retval;
945 /* We may be in a situation where we already have path/file and path
946 * is being added, or we already have path and path/file is being
947 * added. Either one would result in a nonsense tree that has path
948 * twice when git-write-tree tries to write it out. Prevent it.
950 * If ok-to-replace is specified, we remove the conflicting entries
951 * from the cache so the caller should recompute the insert position.
952 * When this happens, we return non-zero.
954 static int check_file_directory_conflict(struct index_state *istate,
955 const struct cache_entry *ce,
956 int pos, int ok_to_replace)
958 int retval;
961 * When ce is an "I am going away" entry, we allow it to be added
963 if (ce->ce_flags & CE_REMOVE)
964 return 0;
967 * We check if the path is a sub-path of a subsequent pathname
968 * first, since removing those will not change the position
969 * in the array.
971 retval = has_file_name(istate, ce, pos, ok_to_replace);
974 * Then check if the path might have a clashing sub-directory
975 * before it.
977 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
980 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
982 int pos;
983 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
984 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
985 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
986 int new_only = option & ADD_CACHE_NEW_ONLY;
988 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
989 cache_tree_invalidate_path(istate, ce->name);
990 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
992 /* existing match? Just replace it. */
993 if (pos >= 0) {
994 if (!new_only)
995 replace_index_entry(istate, pos, ce);
996 return 0;
998 pos = -pos-1;
1000 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1001 untracked_cache_add_to_index(istate, ce->name);
1004 * Inserting a merged entry ("stage 0") into the index
1005 * will always replace all non-merged entries..
1007 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1008 while (ce_same_name(istate->cache[pos], ce)) {
1009 ok_to_add = 1;
1010 if (!remove_index_entry_at(istate, pos))
1011 break;
1015 if (!ok_to_add)
1016 return -1;
1017 if (!verify_path(ce->name))
1018 return error("Invalid path '%s'", ce->name);
1020 if (!skip_df_check &&
1021 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1022 if (!ok_to_replace)
1023 return error("'%s' appears as both a file and as a directory",
1024 ce->name);
1025 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1026 pos = -pos-1;
1028 return pos + 1;
1031 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1033 int pos;
1035 if (option & ADD_CACHE_JUST_APPEND)
1036 pos = istate->cache_nr;
1037 else {
1038 int ret;
1039 ret = add_index_entry_with_check(istate, ce, option);
1040 if (ret <= 0)
1041 return ret;
1042 pos = ret - 1;
1045 /* Make sure the array is big enough .. */
1046 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1048 /* Add it in.. */
1049 istate->cache_nr++;
1050 if (istate->cache_nr > pos + 1)
1051 memmove(istate->cache + pos + 1,
1052 istate->cache + pos,
1053 (istate->cache_nr - pos - 1) * sizeof(ce));
1054 set_index_entry(istate, pos, ce);
1055 istate->cache_changed |= CE_ENTRY_ADDED;
1056 return 0;
1060 * "refresh" does not calculate a new sha1 file or bring the
1061 * cache up-to-date for mode/content changes. But what it
1062 * _does_ do is to "re-match" the stat information of a file
1063 * with the cache, so that you can refresh the cache for a
1064 * file that hasn't been changed but where the stat entry is
1065 * out of date.
1067 * For example, you'd want to do this after doing a "git-read-tree",
1068 * to link up the stat cache details with the proper files.
1070 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1071 struct cache_entry *ce,
1072 unsigned int options, int *err,
1073 int *changed_ret)
1075 struct stat st;
1076 struct cache_entry *updated;
1077 int changed, size;
1078 int refresh = options & CE_MATCH_REFRESH;
1079 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1080 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1081 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1083 if (!refresh || ce_uptodate(ce))
1084 return ce;
1087 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1088 * that the change to the work tree does not matter and told
1089 * us not to worry.
1091 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1092 ce_mark_uptodate(ce);
1093 return ce;
1095 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1096 ce_mark_uptodate(ce);
1097 return ce;
1100 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1101 if (ignore_missing)
1102 return ce;
1103 if (err)
1104 *err = ENOENT;
1105 return NULL;
1108 if (lstat(ce->name, &st) < 0) {
1109 if (ignore_missing && errno == ENOENT)
1110 return ce;
1111 if (err)
1112 *err = errno;
1113 return NULL;
1116 changed = ie_match_stat(istate, ce, &st, options);
1117 if (changed_ret)
1118 *changed_ret = changed;
1119 if (!changed) {
1121 * The path is unchanged. If we were told to ignore
1122 * valid bit, then we did the actual stat check and
1123 * found that the entry is unmodified. If the entry
1124 * is not marked VALID, this is the place to mark it
1125 * valid again, under "assume unchanged" mode.
1127 if (ignore_valid && assume_unchanged &&
1128 !(ce->ce_flags & CE_VALID))
1129 ; /* mark this one VALID again */
1130 else {
1132 * We do not mark the index itself "modified"
1133 * because CE_UPTODATE flag is in-core only;
1134 * we are not going to write this change out.
1136 if (!S_ISGITLINK(ce->ce_mode))
1137 ce_mark_uptodate(ce);
1138 return ce;
1142 if (ie_modified(istate, ce, &st, options)) {
1143 if (err)
1144 *err = EINVAL;
1145 return NULL;
1148 size = ce_size(ce);
1149 updated = xmalloc(size);
1150 memcpy(updated, ce, size);
1151 fill_stat_cache_info(updated, &st);
1153 * If ignore_valid is not set, we should leave CE_VALID bit
1154 * alone. Otherwise, paths marked with --no-assume-unchanged
1155 * (i.e. things to be edited) will reacquire CE_VALID bit
1156 * automatically, which is not really what we want.
1158 if (!ignore_valid && assume_unchanged &&
1159 !(ce->ce_flags & CE_VALID))
1160 updated->ce_flags &= ~CE_VALID;
1162 /* istate->cache_changed is updated in the caller */
1163 return updated;
1166 static void show_file(const char * fmt, const char * name, int in_porcelain,
1167 int * first, const char *header_msg)
1169 if (in_porcelain && *first && header_msg) {
1170 printf("%s\n", header_msg);
1171 *first = 0;
1173 printf(fmt, name);
1176 int refresh_index(struct index_state *istate, unsigned int flags,
1177 const struct pathspec *pathspec,
1178 char *seen, const char *header_msg)
1180 int i;
1181 int has_errors = 0;
1182 int really = (flags & REFRESH_REALLY) != 0;
1183 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1184 int quiet = (flags & REFRESH_QUIET) != 0;
1185 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1186 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1187 int first = 1;
1188 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1189 unsigned int options = (CE_MATCH_REFRESH |
1190 (really ? CE_MATCH_IGNORE_VALID : 0) |
1191 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1192 const char *modified_fmt;
1193 const char *deleted_fmt;
1194 const char *typechange_fmt;
1195 const char *added_fmt;
1196 const char *unmerged_fmt;
1198 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1199 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1200 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1201 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1202 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1203 for (i = 0; i < istate->cache_nr; i++) {
1204 struct cache_entry *ce, *new;
1205 int cache_errno = 0;
1206 int changed = 0;
1207 int filtered = 0;
1209 ce = istate->cache[i];
1210 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1211 continue;
1213 if (pathspec && !ce_path_match(ce, pathspec, seen))
1214 filtered = 1;
1216 if (ce_stage(ce)) {
1217 while ((i < istate->cache_nr) &&
1218 ! strcmp(istate->cache[i]->name, ce->name))
1219 i++;
1220 i--;
1221 if (allow_unmerged)
1222 continue;
1223 if (!filtered)
1224 show_file(unmerged_fmt, ce->name, in_porcelain,
1225 &first, header_msg);
1226 has_errors = 1;
1227 continue;
1230 if (filtered)
1231 continue;
1233 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1234 if (new == ce)
1235 continue;
1236 if (!new) {
1237 const char *fmt;
1239 if (really && cache_errno == EINVAL) {
1240 /* If we are doing --really-refresh that
1241 * means the index is not valid anymore.
1243 ce->ce_flags &= ~CE_VALID;
1244 ce->ce_flags |= CE_UPDATE_IN_BASE;
1245 istate->cache_changed |= CE_ENTRY_CHANGED;
1247 if (quiet)
1248 continue;
1250 if (cache_errno == ENOENT)
1251 fmt = deleted_fmt;
1252 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1253 fmt = added_fmt; /* must be before other checks */
1254 else if (changed & TYPE_CHANGED)
1255 fmt = typechange_fmt;
1256 else
1257 fmt = modified_fmt;
1258 show_file(fmt,
1259 ce->name, in_porcelain, &first, header_msg);
1260 has_errors = 1;
1261 continue;
1264 replace_index_entry(istate, i, new);
1266 return has_errors;
1269 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1270 unsigned int options)
1272 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1276 /*****************************************************************
1277 * Index File I/O
1278 *****************************************************************/
1280 #define INDEX_FORMAT_DEFAULT 3
1282 static unsigned int get_index_format_default(void)
1284 char *envversion = getenv("GIT_INDEX_VERSION");
1285 char *endp;
1286 int value;
1287 unsigned int version = INDEX_FORMAT_DEFAULT;
1289 if (!envversion) {
1290 if (!git_config_get_int("index.version", &value))
1291 version = value;
1292 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1293 warning(_("index.version set, but the value is invalid.\n"
1294 "Using version %i"), INDEX_FORMAT_DEFAULT);
1295 return INDEX_FORMAT_DEFAULT;
1297 return version;
1300 version = strtoul(envversion, &endp, 10);
1301 if (*endp ||
1302 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1303 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1304 "Using version %i"), INDEX_FORMAT_DEFAULT);
1305 version = INDEX_FORMAT_DEFAULT;
1307 return version;
1311 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1312 * Again - this is just a (very strong in practice) heuristic that
1313 * the inode hasn't changed.
1315 * We save the fields in big-endian order to allow using the
1316 * index file over NFS transparently.
1318 struct ondisk_cache_entry {
1319 struct cache_time ctime;
1320 struct cache_time mtime;
1321 uint32_t dev;
1322 uint32_t ino;
1323 uint32_t mode;
1324 uint32_t uid;
1325 uint32_t gid;
1326 uint32_t size;
1327 unsigned char sha1[20];
1328 uint16_t flags;
1329 char name[FLEX_ARRAY]; /* more */
1333 * This struct is used when CE_EXTENDED bit is 1
1334 * The struct must match ondisk_cache_entry exactly from
1335 * ctime till flags
1337 struct ondisk_cache_entry_extended {
1338 struct cache_time ctime;
1339 struct cache_time mtime;
1340 uint32_t dev;
1341 uint32_t ino;
1342 uint32_t mode;
1343 uint32_t uid;
1344 uint32_t gid;
1345 uint32_t size;
1346 unsigned char sha1[20];
1347 uint16_t flags;
1348 uint16_t flags2;
1349 char name[FLEX_ARRAY]; /* more */
1352 /* These are only used for v3 or lower */
1353 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1354 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1355 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1356 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1357 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1358 ondisk_cache_entry_size(ce_namelen(ce)))
1360 static int verify_hdr(struct cache_header *hdr, unsigned long size)
1362 git_SHA_CTX c;
1363 unsigned char sha1[20];
1364 int hdr_version;
1366 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1367 return error("bad signature");
1368 hdr_version = ntohl(hdr->hdr_version);
1369 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1370 return error("bad index version %d", hdr_version);
1371 git_SHA1_Init(&c);
1372 git_SHA1_Update(&c, hdr, size - 20);
1373 git_SHA1_Final(sha1, &c);
1374 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1375 return error("bad index file sha1 signature");
1376 return 0;
1379 static int read_index_extension(struct index_state *istate,
1380 const char *ext, void *data, unsigned long sz)
1382 switch (CACHE_EXT(ext)) {
1383 case CACHE_EXT_TREE:
1384 istate->cache_tree = cache_tree_read(data, sz);
1385 break;
1386 case CACHE_EXT_RESOLVE_UNDO:
1387 istate->resolve_undo = resolve_undo_read(data, sz);
1388 break;
1389 case CACHE_EXT_LINK:
1390 if (read_link_extension(istate, data, sz))
1391 return -1;
1392 break;
1393 case CACHE_EXT_UNTRACKED:
1394 istate->untracked = read_untracked_extension(data, sz);
1395 break;
1396 default:
1397 if (*ext < 'A' || 'Z' < *ext)
1398 return error("index uses %.4s extension, which we do not understand",
1399 ext);
1400 fprintf(stderr, "ignoring %.4s extension\n", ext);
1401 break;
1403 return 0;
1406 int hold_locked_index(struct lock_file *lk, int die_on_error)
1408 return hold_lock_file_for_update(lk, get_index_file(),
1409 die_on_error
1410 ? LOCK_DIE_ON_ERROR
1411 : 0);
1414 int read_index(struct index_state *istate)
1416 return read_index_from(istate, get_index_file());
1419 static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1420 unsigned int flags,
1421 const char *name,
1422 size_t len)
1424 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1426 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1427 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1428 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1429 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1430 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1431 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1432 ce->ce_mode = get_be32(&ondisk->mode);
1433 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1434 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1435 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
1436 ce->ce_flags = flags & ~CE_NAMEMASK;
1437 ce->ce_namelen = len;
1438 ce->index = 0;
1439 hashcpy(ce->sha1, ondisk->sha1);
1440 memcpy(ce->name, name, len);
1441 ce->name[len] = '\0';
1442 return ce;
1446 * Adjacent cache entries tend to share the leading paths, so it makes
1447 * sense to only store the differences in later entries. In the v4
1448 * on-disk format of the index, each on-disk cache entry stores the
1449 * number of bytes to be stripped from the end of the previous name,
1450 * and the bytes to append to the result, to come up with its name.
1452 static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1454 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1455 size_t len = decode_varint(&cp);
1457 if (name->len < len)
1458 die("malformed name field in the index");
1459 strbuf_remove(name, name->len - len, len);
1460 for (ep = cp; *ep; ep++)
1461 ; /* find the end */
1462 strbuf_add(name, cp, ep - cp);
1463 return (const char *)ep + 1 - cp_;
1466 static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1467 unsigned long *ent_size,
1468 struct strbuf *previous_name)
1470 struct cache_entry *ce;
1471 size_t len;
1472 const char *name;
1473 unsigned int flags;
1475 /* On-disk flags are just 16 bits */
1476 flags = get_be16(&ondisk->flags);
1477 len = flags & CE_NAMEMASK;
1479 if (flags & CE_EXTENDED) {
1480 struct ondisk_cache_entry_extended *ondisk2;
1481 int extended_flags;
1482 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1483 extended_flags = get_be16(&ondisk2->flags2) << 16;
1484 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1485 if (extended_flags & ~CE_EXTENDED_FLAGS)
1486 die("Unknown index entry format %08x", extended_flags);
1487 flags |= extended_flags;
1488 name = ondisk2->name;
1490 else
1491 name = ondisk->name;
1493 if (!previous_name) {
1494 /* v3 and earlier */
1495 if (len == CE_NAMEMASK)
1496 len = strlen(name);
1497 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1499 *ent_size = ondisk_ce_size(ce);
1500 } else {
1501 unsigned long consumed;
1502 consumed = expand_name_field(previous_name, name);
1503 ce = cache_entry_from_ondisk(ondisk, flags,
1504 previous_name->buf,
1505 previous_name->len);
1507 *ent_size = (name - ((char *)ondisk)) + consumed;
1509 return ce;
1512 static void check_ce_order(struct cache_entry *ce, struct cache_entry *next_ce)
1514 int name_compare = strcmp(ce->name, next_ce->name);
1515 if (0 < name_compare)
1516 die("unordered stage entries in index");
1517 if (!name_compare) {
1518 if (!ce_stage(ce))
1519 die("multiple stage entries for merged file '%s'",
1520 ce->name);
1521 if (ce_stage(ce) > ce_stage(next_ce))
1522 die("unordered stage entries for '%s'",
1523 ce->name);
1527 /* remember to discard_cache() before reading a different cache! */
1528 int do_read_index(struct index_state *istate, const char *path, int must_exist)
1530 int fd, i;
1531 struct stat st;
1532 unsigned long src_offset;
1533 struct cache_header *hdr;
1534 void *mmap;
1535 size_t mmap_size;
1536 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1538 if (istate->initialized)
1539 return istate->cache_nr;
1541 istate->timestamp.sec = 0;
1542 istate->timestamp.nsec = 0;
1543 fd = open(path, O_RDONLY);
1544 if (fd < 0) {
1545 if (!must_exist && errno == ENOENT)
1546 return 0;
1547 die_errno("%s: index file open failed", path);
1550 if (fstat(fd, &st))
1551 die_errno("cannot stat the open index");
1553 mmap_size = xsize_t(st.st_size);
1554 if (mmap_size < sizeof(struct cache_header) + 20)
1555 die("index file smaller than expected");
1557 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1558 if (mmap == MAP_FAILED)
1559 die_errno("unable to map index file");
1560 close(fd);
1562 hdr = mmap;
1563 if (verify_hdr(hdr, mmap_size) < 0)
1564 goto unmap;
1566 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
1567 istate->version = ntohl(hdr->hdr_version);
1568 istate->cache_nr = ntohl(hdr->hdr_entries);
1569 istate->cache_alloc = alloc_nr(istate->cache_nr);
1570 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1571 istate->initialized = 1;
1573 if (istate->version == 4)
1574 previous_name = &previous_name_buf;
1575 else
1576 previous_name = NULL;
1578 src_offset = sizeof(*hdr);
1579 for (i = 0; i < istate->cache_nr; i++) {
1580 struct ondisk_cache_entry *disk_ce;
1581 struct cache_entry *ce;
1582 unsigned long consumed;
1584 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1585 ce = create_from_disk(disk_ce, &consumed, previous_name);
1586 set_index_entry(istate, i, ce);
1588 if (i > 0)
1589 check_ce_order(istate->cache[i - 1], ce);
1591 src_offset += consumed;
1593 strbuf_release(&previous_name_buf);
1594 istate->timestamp.sec = st.st_mtime;
1595 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1597 while (src_offset <= mmap_size - 20 - 8) {
1598 /* After an array of active_nr index entries,
1599 * there can be arbitrary number of extended
1600 * sections, each of which is prefixed with
1601 * extension name (4-byte) and section length
1602 * in 4-byte network byte order.
1604 uint32_t extsize;
1605 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1606 extsize = ntohl(extsize);
1607 if (read_index_extension(istate,
1608 (const char *) mmap + src_offset,
1609 (char *) mmap + src_offset + 8,
1610 extsize) < 0)
1611 goto unmap;
1612 src_offset += 8;
1613 src_offset += extsize;
1615 munmap(mmap, mmap_size);
1616 return istate->cache_nr;
1618 unmap:
1619 munmap(mmap, mmap_size);
1620 die("index file corrupt");
1623 int read_index_from(struct index_state *istate, const char *path)
1625 struct split_index *split_index;
1626 int ret;
1628 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1629 if (istate->initialized)
1630 return istate->cache_nr;
1632 ret = do_read_index(istate, path, 0);
1633 split_index = istate->split_index;
1634 if (!split_index)
1635 return ret;
1637 if (is_null_sha1(split_index->base_sha1))
1638 return ret;
1640 if (split_index->base)
1641 discard_index(split_index->base);
1642 else
1643 split_index->base = xcalloc(1, sizeof(*split_index->base));
1644 ret = do_read_index(split_index->base,
1645 git_path("sharedindex.%s",
1646 sha1_to_hex(split_index->base_sha1)), 1);
1647 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1648 die("broken index, expect %s in %s, got %s",
1649 sha1_to_hex(split_index->base_sha1),
1650 git_path("sharedindex.%s",
1651 sha1_to_hex(split_index->base_sha1)),
1652 sha1_to_hex(split_index->base->sha1));
1653 merge_base_index(istate);
1654 return ret;
1657 int is_index_unborn(struct index_state *istate)
1659 return (!istate->cache_nr && !istate->timestamp.sec);
1662 int discard_index(struct index_state *istate)
1664 int i;
1666 for (i = 0; i < istate->cache_nr; i++) {
1667 if (istate->cache[i]->index &&
1668 istate->split_index &&
1669 istate->split_index->base &&
1670 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1671 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1672 continue;
1673 free(istate->cache[i]);
1675 resolve_undo_clear_index(istate);
1676 istate->cache_nr = 0;
1677 istate->cache_changed = 0;
1678 istate->timestamp.sec = 0;
1679 istate->timestamp.nsec = 0;
1680 free_name_hash(istate);
1681 cache_tree_free(&(istate->cache_tree));
1682 istate->initialized = 0;
1683 free(istate->cache);
1684 istate->cache = NULL;
1685 istate->cache_alloc = 0;
1686 discard_split_index(istate);
1687 free_untracked_cache(istate->untracked);
1688 istate->untracked = NULL;
1689 return 0;
1692 int unmerged_index(const struct index_state *istate)
1694 int i;
1695 for (i = 0; i < istate->cache_nr; i++) {
1696 if (ce_stage(istate->cache[i]))
1697 return 1;
1699 return 0;
1702 #define WRITE_BUFFER_SIZE 8192
1703 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1704 static unsigned long write_buffer_len;
1706 static int ce_write_flush(git_SHA_CTX *context, int fd)
1708 unsigned int buffered = write_buffer_len;
1709 if (buffered) {
1710 git_SHA1_Update(context, write_buffer, buffered);
1711 if (write_in_full(fd, write_buffer, buffered) != buffered)
1712 return -1;
1713 write_buffer_len = 0;
1715 return 0;
1718 static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1720 while (len) {
1721 unsigned int buffered = write_buffer_len;
1722 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1723 if (partial > len)
1724 partial = len;
1725 memcpy(write_buffer + buffered, data, partial);
1726 buffered += partial;
1727 if (buffered == WRITE_BUFFER_SIZE) {
1728 write_buffer_len = buffered;
1729 if (ce_write_flush(context, fd))
1730 return -1;
1731 buffered = 0;
1733 write_buffer_len = buffered;
1734 len -= partial;
1735 data = (char *) data + partial;
1737 return 0;
1740 static int write_index_ext_header(git_SHA_CTX *context, int fd,
1741 unsigned int ext, unsigned int sz)
1743 ext = htonl(ext);
1744 sz = htonl(sz);
1745 return ((ce_write(context, fd, &ext, 4) < 0) ||
1746 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1749 static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
1751 unsigned int left = write_buffer_len;
1753 if (left) {
1754 write_buffer_len = 0;
1755 git_SHA1_Update(context, write_buffer, left);
1758 /* Flush first if not enough space for SHA1 signature */
1759 if (left + 20 > WRITE_BUFFER_SIZE) {
1760 if (write_in_full(fd, write_buffer, left) != left)
1761 return -1;
1762 left = 0;
1765 /* Append the SHA1 signature at the end */
1766 git_SHA1_Final(write_buffer + left, context);
1767 hashcpy(sha1, write_buffer + left);
1768 left += 20;
1769 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1772 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1775 * The only thing we care about in this function is to smudge the
1776 * falsely clean entry due to touch-update-touch race, so we leave
1777 * everything else as they are. We are called for entries whose
1778 * ce_stat_data.sd_mtime match the index file mtime.
1780 * Note that this actually does not do much for gitlinks, for
1781 * which ce_match_stat_basic() always goes to the actual
1782 * contents. The caller checks with is_racy_timestamp() which
1783 * always says "no" for gitlinks, so we are not called for them ;-)
1785 struct stat st;
1787 if (lstat(ce->name, &st) < 0)
1788 return;
1789 if (ce_match_stat_basic(ce, &st))
1790 return;
1791 if (ce_modified_check_fs(ce, &st)) {
1792 /* This is "racily clean"; smudge it. Note that this
1793 * is a tricky code. At first glance, it may appear
1794 * that it can break with this sequence:
1796 * $ echo xyzzy >frotz
1797 * $ git-update-index --add frotz
1798 * $ : >frotz
1799 * $ sleep 3
1800 * $ echo filfre >nitfol
1801 * $ git-update-index --add nitfol
1803 * but it does not. When the second update-index runs,
1804 * it notices that the entry "frotz" has the same timestamp
1805 * as index, and if we were to smudge it by resetting its
1806 * size to zero here, then the object name recorded
1807 * in index is the 6-byte file but the cached stat information
1808 * becomes zero --- which would then match what we would
1809 * obtain from the filesystem next time we stat("frotz").
1811 * However, the second update-index, before calling
1812 * this function, notices that the cached size is 6
1813 * bytes and what is on the filesystem is an empty
1814 * file, and never calls us, so the cached size information
1815 * for "frotz" stays 6 which does not match the filesystem.
1817 ce->ce_stat_data.sd_size = 0;
1821 /* Copy miscellaneous fields but not the name */
1822 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1823 struct cache_entry *ce)
1825 short flags;
1827 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1828 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1829 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1830 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1831 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1832 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
1833 ondisk->mode = htonl(ce->ce_mode);
1834 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1835 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1836 ondisk->size = htonl(ce->ce_stat_data.sd_size);
1837 hashcpy(ondisk->sha1, ce->sha1);
1839 flags = ce->ce_flags & ~CE_NAMEMASK;
1840 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1841 ondisk->flags = htons(flags);
1842 if (ce->ce_flags & CE_EXTENDED) {
1843 struct ondisk_cache_entry_extended *ondisk2;
1844 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1845 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1846 return ondisk2->name;
1848 else {
1849 return ondisk->name;
1853 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1854 struct strbuf *previous_name)
1856 int size;
1857 struct ondisk_cache_entry *ondisk;
1858 int saved_namelen = saved_namelen; /* compiler workaround */
1859 char *name;
1860 int result;
1862 if (ce->ce_flags & CE_STRIP_NAME) {
1863 saved_namelen = ce_namelen(ce);
1864 ce->ce_namelen = 0;
1867 if (!previous_name) {
1868 size = ondisk_ce_size(ce);
1869 ondisk = xcalloc(1, size);
1870 name = copy_cache_entry_to_ondisk(ondisk, ce);
1871 memcpy(name, ce->name, ce_namelen(ce));
1872 } else {
1873 int common, to_remove, prefix_size;
1874 unsigned char to_remove_vi[16];
1875 for (common = 0;
1876 (ce->name[common] &&
1877 common < previous_name->len &&
1878 ce->name[common] == previous_name->buf[common]);
1879 common++)
1880 ; /* still matching */
1881 to_remove = previous_name->len - common;
1882 prefix_size = encode_varint(to_remove, to_remove_vi);
1884 if (ce->ce_flags & CE_EXTENDED)
1885 size = offsetof(struct ondisk_cache_entry_extended, name);
1886 else
1887 size = offsetof(struct ondisk_cache_entry, name);
1888 size += prefix_size + (ce_namelen(ce) - common + 1);
1890 ondisk = xcalloc(1, size);
1891 name = copy_cache_entry_to_ondisk(ondisk, ce);
1892 memcpy(name, to_remove_vi, prefix_size);
1893 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1895 strbuf_splice(previous_name, common, to_remove,
1896 ce->name + common, ce_namelen(ce) - common);
1898 if (ce->ce_flags & CE_STRIP_NAME) {
1899 ce->ce_namelen = saved_namelen;
1900 ce->ce_flags &= ~CE_STRIP_NAME;
1903 result = ce_write(c, fd, ondisk, size);
1904 free(ondisk);
1905 return result;
1909 * This function verifies if index_state has the correct sha1 of the
1910 * index file. Don't die if we have any other failure, just return 0.
1912 static int verify_index_from(const struct index_state *istate, const char *path)
1914 int fd;
1915 ssize_t n;
1916 struct stat st;
1917 unsigned char sha1[20];
1919 if (!istate->initialized)
1920 return 0;
1922 fd = open(path, O_RDONLY);
1923 if (fd < 0)
1924 return 0;
1926 if (fstat(fd, &st))
1927 goto out;
1929 if (st.st_size < sizeof(struct cache_header) + 20)
1930 goto out;
1932 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
1933 if (n != 20)
1934 goto out;
1936 if (hashcmp(istate->sha1, sha1))
1937 goto out;
1939 close(fd);
1940 return 1;
1942 out:
1943 close(fd);
1944 return 0;
1947 static int verify_index(const struct index_state *istate)
1949 return verify_index_from(istate, get_index_file());
1952 static int has_racy_timestamp(struct index_state *istate)
1954 int entries = istate->cache_nr;
1955 int i;
1957 for (i = 0; i < entries; i++) {
1958 struct cache_entry *ce = istate->cache[i];
1959 if (is_racy_timestamp(istate, ce))
1960 return 1;
1962 return 0;
1966 * Opportunistically update the index but do not complain if we can't
1968 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1970 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1971 verify_index(istate) &&
1972 write_locked_index(istate, lockfile, COMMIT_LOCK))
1973 rollback_lock_file(lockfile);
1976 static int do_write_index(struct index_state *istate, int newfd,
1977 int strip_extensions)
1979 git_SHA_CTX c;
1980 struct cache_header hdr;
1981 int i, err, removed, extended, hdr_version;
1982 struct cache_entry **cache = istate->cache;
1983 int entries = istate->cache_nr;
1984 struct stat st;
1985 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1987 for (i = removed = extended = 0; i < entries; i++) {
1988 if (cache[i]->ce_flags & CE_REMOVE)
1989 removed++;
1991 /* reduce extended entries if possible */
1992 cache[i]->ce_flags &= ~CE_EXTENDED;
1993 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1994 extended++;
1995 cache[i]->ce_flags |= CE_EXTENDED;
1999 if (!istate->version) {
2000 istate->version = get_index_format_default();
2001 if (getenv("GIT_TEST_SPLIT_INDEX"))
2002 init_split_index(istate);
2005 /* demote version 3 to version 2 when the latter suffices */
2006 if (istate->version == 3 || istate->version == 2)
2007 istate->version = extended ? 3 : 2;
2009 hdr_version = istate->version;
2011 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
2012 hdr.hdr_version = htonl(hdr_version);
2013 hdr.hdr_entries = htonl(entries - removed);
2015 git_SHA1_Init(&c);
2016 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
2017 return -1;
2019 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2020 for (i = 0; i < entries; i++) {
2021 struct cache_entry *ce = cache[i];
2022 if (ce->ce_flags & CE_REMOVE)
2023 continue;
2024 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
2025 ce_smudge_racily_clean_entry(ce);
2026 if (is_null_sha1(ce->sha1)) {
2027 static const char msg[] = "cache entry has null sha1: %s";
2028 static int allow = -1;
2030 if (allow < 0)
2031 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2032 if (allow)
2033 warning(msg, ce->name);
2034 else
2035 return error(msg, ce->name);
2037 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
2038 return -1;
2040 strbuf_release(&previous_name_buf);
2042 /* Write extension data here */
2043 if (!strip_extensions && istate->split_index) {
2044 struct strbuf sb = STRBUF_INIT;
2046 err = write_link_extension(&sb, istate) < 0 ||
2047 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2048 sb.len) < 0 ||
2049 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2050 strbuf_release(&sb);
2051 if (err)
2052 return -1;
2054 if (!strip_extensions && istate->cache_tree) {
2055 struct strbuf sb = STRBUF_INIT;
2057 cache_tree_write(&sb, istate->cache_tree);
2058 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2059 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2060 strbuf_release(&sb);
2061 if (err)
2062 return -1;
2064 if (!strip_extensions && istate->resolve_undo) {
2065 struct strbuf sb = STRBUF_INIT;
2067 resolve_undo_write(&sb, istate->resolve_undo);
2068 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2069 sb.len) < 0
2070 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2071 strbuf_release(&sb);
2072 if (err)
2073 return -1;
2075 if (!strip_extensions && istate->untracked) {
2076 struct strbuf sb = STRBUF_INIT;
2078 write_untracked_extension(&sb, istate->untracked);
2079 err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
2080 sb.len) < 0 ||
2081 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2082 strbuf_release(&sb);
2083 if (err)
2084 return -1;
2087 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2088 return -1;
2089 istate->timestamp.sec = (unsigned int)st.st_mtime;
2090 istate->timestamp.nsec = ST_MTIME_NSEC(st);
2091 return 0;
2094 void set_alternate_index_output(const char *name)
2096 alternate_index_output = name;
2099 static int commit_locked_index(struct lock_file *lk)
2101 if (alternate_index_output)
2102 return commit_lock_file_to(lk, alternate_index_output);
2103 else
2104 return commit_lock_file(lk);
2107 static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2108 unsigned flags)
2110 int ret = do_write_index(istate, lock->fd, 0);
2111 if (ret)
2112 return ret;
2113 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2114 (COMMIT_LOCK | CLOSE_LOCK));
2115 if (flags & COMMIT_LOCK)
2116 return commit_locked_index(lock);
2117 else if (flags & CLOSE_LOCK)
2118 return close_lock_file(lock);
2119 else
2120 return ret;
2123 static int write_split_index(struct index_state *istate,
2124 struct lock_file *lock,
2125 unsigned flags)
2127 int ret;
2128 prepare_to_write_split_index(istate);
2129 ret = do_write_locked_index(istate, lock, flags);
2130 finish_writing_split_index(istate);
2131 return ret;
2134 static char *temporary_sharedindex;
2136 static void remove_temporary_sharedindex(void)
2138 if (temporary_sharedindex) {
2139 unlink_or_warn(temporary_sharedindex);
2140 free(temporary_sharedindex);
2141 temporary_sharedindex = NULL;
2145 static void remove_temporary_sharedindex_on_signal(int signo)
2147 remove_temporary_sharedindex();
2148 sigchain_pop(signo);
2149 raise(signo);
2152 static int write_shared_index(struct index_state *istate,
2153 struct lock_file *lock, unsigned flags)
2155 struct split_index *si = istate->split_index;
2156 static int installed_handler;
2157 int fd, ret;
2159 temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
2160 fd = mkstemp(temporary_sharedindex);
2161 if (fd < 0) {
2162 free(temporary_sharedindex);
2163 temporary_sharedindex = NULL;
2164 hashclr(si->base_sha1);
2165 return do_write_locked_index(istate, lock, flags);
2167 if (!installed_handler) {
2168 atexit(remove_temporary_sharedindex);
2169 sigchain_push_common(remove_temporary_sharedindex_on_signal);
2171 move_cache_to_base_index(istate);
2172 ret = do_write_index(si->base, fd, 1);
2173 close(fd);
2174 if (ret) {
2175 remove_temporary_sharedindex();
2176 return ret;
2178 ret = rename(temporary_sharedindex,
2179 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
2180 free(temporary_sharedindex);
2181 temporary_sharedindex = NULL;
2182 if (!ret)
2183 hashcpy(si->base_sha1, si->base->sha1);
2184 return ret;
2187 int write_locked_index(struct index_state *istate, struct lock_file *lock,
2188 unsigned flags)
2190 struct split_index *si = istate->split_index;
2192 if (!si || alternate_index_output ||
2193 (istate->cache_changed & ~EXTMASK)) {
2194 if (si)
2195 hashclr(si->base_sha1);
2196 return do_write_locked_index(istate, lock, flags);
2199 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2200 int v = si->base_sha1[0];
2201 if ((v & 15) < 6)
2202 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2204 if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2205 int ret = write_shared_index(istate, lock, flags);
2206 if (ret)
2207 return ret;
2210 return write_split_index(istate, lock, flags);
2214 * Read the index file that is potentially unmerged into given
2215 * index_state, dropping any unmerged entries. Returns true if
2216 * the index is unmerged. Callers who want to refuse to work
2217 * from an unmerged state can call this and check its return value,
2218 * instead of calling read_cache().
2220 int read_index_unmerged(struct index_state *istate)
2222 int i;
2223 int unmerged = 0;
2225 read_index(istate);
2226 for (i = 0; i < istate->cache_nr; i++) {
2227 struct cache_entry *ce = istate->cache[i];
2228 struct cache_entry *new_ce;
2229 int size, len;
2231 if (!ce_stage(ce))
2232 continue;
2233 unmerged = 1;
2234 len = ce_namelen(ce);
2235 size = cache_entry_size(len);
2236 new_ce = xcalloc(1, size);
2237 memcpy(new_ce->name, ce->name, len);
2238 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2239 new_ce->ce_namelen = len;
2240 new_ce->ce_mode = ce->ce_mode;
2241 if (add_index_entry(istate, new_ce, 0))
2242 return error("%s: cannot drop to stage #0",
2243 new_ce->name);
2245 return unmerged;
2249 * Returns 1 if the path is an "other" path with respect to
2250 * the index; that is, the path is not mentioned in the index at all,
2251 * either as a file, a directory with some files in the index,
2252 * or as an unmerged entry.
2254 * We helpfully remove a trailing "/" from directories so that
2255 * the output of read_directory can be used as-is.
2257 int index_name_is_other(const struct index_state *istate, const char *name,
2258 int namelen)
2260 int pos;
2261 if (namelen && name[namelen - 1] == '/')
2262 namelen--;
2263 pos = index_name_pos(istate, name, namelen);
2264 if (0 <= pos)
2265 return 0; /* exact match */
2266 pos = -pos - 1;
2267 if (pos < istate->cache_nr) {
2268 struct cache_entry *ce = istate->cache[pos];
2269 if (ce_namelen(ce) == namelen &&
2270 !memcmp(ce->name, name, namelen))
2271 return 0; /* Yup, this one exists unmerged */
2273 return 1;
2276 void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2278 int pos, len;
2279 unsigned long sz;
2280 enum object_type type;
2281 void *data;
2283 len = strlen(path);
2284 pos = index_name_pos(istate, path, len);
2285 if (pos < 0) {
2287 * We might be in the middle of a merge, in which
2288 * case we would read stage #2 (ours).
2290 int i;
2291 for (i = -pos - 1;
2292 (pos < 0 && i < istate->cache_nr &&
2293 !strcmp(istate->cache[i]->name, path));
2294 i++)
2295 if (ce_stage(istate->cache[i]) == 2)
2296 pos = i;
2298 if (pos < 0)
2299 return NULL;
2300 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2301 if (!data || type != OBJ_BLOB) {
2302 free(data);
2303 return NULL;
2305 if (size)
2306 *size = sz;
2307 return data;
2310 void stat_validity_clear(struct stat_validity *sv)
2312 free(sv->sd);
2313 sv->sd = NULL;
2316 int stat_validity_check(struct stat_validity *sv, const char *path)
2318 struct stat st;
2320 if (stat(path, &st) < 0)
2321 return sv->sd == NULL;
2322 if (!sv->sd)
2323 return 0;
2324 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2327 void stat_validity_update(struct stat_validity *sv, int fd)
2329 struct stat st;
2331 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2332 stat_validity_clear(sv);
2333 else {
2334 if (!sv->sd)
2335 sv->sd = xcalloc(1, sizeof(struct stat_data));
2336 fill_stat_data(sv->sd, &st);