Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint
[git.git] / read-cache.c
blob36ff89f29e5f56a5b3dcfd803f12cd139295b8b8
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" */
43 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
44 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
45 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
46 SPLIT_INDEX_ORDERED)
48 struct index_state the_index;
49 static const char *alternate_index_output;
51 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
53 istate->cache[nr] = ce;
54 add_name_hash(istate, ce);
57 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
59 struct cache_entry *old = istate->cache[nr];
61 replace_index_entry_in_base(istate, old, ce);
62 remove_name_hash(istate, old);
63 free(old);
64 set_index_entry(istate, nr, ce);
65 ce->ce_flags |= CE_UPDATE_IN_BASE;
66 istate->cache_changed |= CE_ENTRY_CHANGED;
69 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
71 struct cache_entry *old = istate->cache[nr], *new;
72 int namelen = strlen(new_name);
74 new = xmalloc(cache_entry_size(namelen));
75 copy_cache_entry(new, old);
76 new->ce_flags &= ~CE_HASHED;
77 new->ce_namelen = namelen;
78 new->index = 0;
79 memcpy(new->name, new_name, namelen + 1);
81 cache_tree_invalidate_path(istate, old->name);
82 remove_index_entry_at(istate, nr);
83 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
86 void fill_stat_data(struct stat_data *sd, struct stat *st)
88 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
89 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
90 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
91 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
92 sd->sd_dev = st->st_dev;
93 sd->sd_ino = st->st_ino;
94 sd->sd_uid = st->st_uid;
95 sd->sd_gid = st->st_gid;
96 sd->sd_size = st->st_size;
99 int match_stat_data(const struct stat_data *sd, struct stat *st)
101 int changed = 0;
103 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
104 changed |= MTIME_CHANGED;
105 if (trust_ctime && check_stat &&
106 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
107 changed |= CTIME_CHANGED;
109 #ifdef USE_NSEC
110 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
111 changed |= MTIME_CHANGED;
112 if (trust_ctime && check_stat &&
113 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
114 changed |= CTIME_CHANGED;
115 #endif
117 if (check_stat) {
118 if (sd->sd_uid != (unsigned int) st->st_uid ||
119 sd->sd_gid != (unsigned int) st->st_gid)
120 changed |= OWNER_CHANGED;
121 if (sd->sd_ino != (unsigned int) st->st_ino)
122 changed |= INODE_CHANGED;
125 #ifdef USE_STDEV
127 * st_dev breaks on network filesystems where different
128 * clients will have different views of what "device"
129 * the filesystem is on
131 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
132 changed |= INODE_CHANGED;
133 #endif
135 if (sd->sd_size != (unsigned int) st->st_size)
136 changed |= DATA_CHANGED;
138 return changed;
142 * This only updates the "non-critical" parts of the directory
143 * cache, ie the parts that aren't tracked by GIT, and only used
144 * to validate the cache.
146 void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
148 fill_stat_data(&ce->ce_stat_data, st);
150 if (assume_unchanged)
151 ce->ce_flags |= CE_VALID;
153 if (S_ISREG(st->st_mode))
154 ce_mark_uptodate(ce);
157 static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
159 int match = -1;
160 int fd = open(ce->name, O_RDONLY);
162 if (fd >= 0) {
163 unsigned char sha1[20];
164 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
165 match = hashcmp(sha1, ce->sha1);
166 /* index_fd() closed the file descriptor already */
168 return match;
171 static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
173 int match = -1;
174 void *buffer;
175 unsigned long size;
176 enum object_type type;
177 struct strbuf sb = STRBUF_INIT;
179 if (strbuf_readlink(&sb, ce->name, expected_size))
180 return -1;
182 buffer = read_sha1_file(ce->sha1, &type, &size);
183 if (buffer) {
184 if (size == sb.len)
185 match = memcmp(buffer, sb.buf, size);
186 free(buffer);
188 strbuf_release(&sb);
189 return match;
192 static int ce_compare_gitlink(const struct cache_entry *ce)
194 unsigned char sha1[20];
197 * We don't actually require that the .git directory
198 * under GITLINK directory be a valid git directory. It
199 * might even be missing (in case nobody populated that
200 * sub-project).
202 * If so, we consider it always to match.
204 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
205 return 0;
206 return hashcmp(sha1, ce->sha1);
209 static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
211 switch (st->st_mode & S_IFMT) {
212 case S_IFREG:
213 if (ce_compare_data(ce, st))
214 return DATA_CHANGED;
215 break;
216 case S_IFLNK:
217 if (ce_compare_link(ce, xsize_t(st->st_size)))
218 return DATA_CHANGED;
219 break;
220 case S_IFDIR:
221 if (S_ISGITLINK(ce->ce_mode))
222 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
223 default:
224 return TYPE_CHANGED;
226 return 0;
229 static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
231 unsigned int changed = 0;
233 if (ce->ce_flags & CE_REMOVE)
234 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
236 switch (ce->ce_mode & S_IFMT) {
237 case S_IFREG:
238 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
239 /* We consider only the owner x bit to be relevant for
240 * "mode changes"
242 if (trust_executable_bit &&
243 (0100 & (ce->ce_mode ^ st->st_mode)))
244 changed |= MODE_CHANGED;
245 break;
246 case S_IFLNK:
247 if (!S_ISLNK(st->st_mode) &&
248 (has_symlinks || !S_ISREG(st->st_mode)))
249 changed |= TYPE_CHANGED;
250 break;
251 case S_IFGITLINK:
252 /* We ignore most of the st_xxx fields for gitlinks */
253 if (!S_ISDIR(st->st_mode))
254 changed |= TYPE_CHANGED;
255 else if (ce_compare_gitlink(ce))
256 changed |= DATA_CHANGED;
257 return changed;
258 default:
259 die("internal error: ce_mode is %o", ce->ce_mode);
262 changed |= match_stat_data(&ce->ce_stat_data, st);
264 /* Racily smudged entry? */
265 if (!ce->ce_stat_data.sd_size) {
266 if (!is_empty_blob_sha1(ce->sha1))
267 changed |= DATA_CHANGED;
270 return changed;
273 static int is_racy_timestamp(const struct index_state *istate,
274 const struct cache_entry *ce)
276 return (!S_ISGITLINK(ce->ce_mode) &&
277 istate->timestamp.sec &&
278 #ifdef USE_NSEC
279 /* nanosecond timestamped files can also be racy! */
280 (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
281 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
282 istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
283 #else
284 istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
285 #endif
289 int ie_match_stat(const struct index_state *istate,
290 const struct cache_entry *ce, struct stat *st,
291 unsigned int options)
293 unsigned int changed;
294 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
295 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
296 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
299 * If it's marked as always valid in the index, it's
300 * valid whatever the checked-out copy says.
302 * skip-worktree has the same effect with higher precedence
304 if (!ignore_skip_worktree && ce_skip_worktree(ce))
305 return 0;
306 if (!ignore_valid && (ce->ce_flags & CE_VALID))
307 return 0;
310 * Intent-to-add entries have not been added, so the index entry
311 * by definition never matches what is in the work tree until it
312 * actually gets added.
314 if (ce->ce_flags & CE_INTENT_TO_ADD)
315 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
317 changed = ce_match_stat_basic(ce, st);
320 * Within 1 second of this sequence:
321 * echo xyzzy >file && git-update-index --add file
322 * running this command:
323 * echo frotz >file
324 * would give a falsely clean cache entry. The mtime and
325 * length match the cache, and other stat fields do not change.
327 * We could detect this at update-index time (the cache entry
328 * being registered/updated records the same time as "now")
329 * and delay the return from git-update-index, but that would
330 * effectively mean we can make at most one commit per second,
331 * which is not acceptable. Instead, we check cache entries
332 * whose mtime are the same as the index file timestamp more
333 * carefully than others.
335 if (!changed && is_racy_timestamp(istate, ce)) {
336 if (assume_racy_is_modified)
337 changed |= DATA_CHANGED;
338 else
339 changed |= ce_modified_check_fs(ce, st);
342 return changed;
345 int ie_modified(const struct index_state *istate,
346 const struct cache_entry *ce,
347 struct stat *st, unsigned int options)
349 int changed, changed_fs;
351 changed = ie_match_stat(istate, ce, st, options);
352 if (!changed)
353 return 0;
355 * If the mode or type has changed, there's no point in trying
356 * to refresh the entry - it's not going to match
358 if (changed & (MODE_CHANGED | TYPE_CHANGED))
359 return changed;
362 * Immediately after read-tree or update-index --cacheinfo,
363 * the length field is zero, as we have never even read the
364 * lstat(2) information once, and we cannot trust DATA_CHANGED
365 * returned by ie_match_stat() which in turn was returned by
366 * ce_match_stat_basic() to signal that the filesize of the
367 * blob changed. We have to actually go to the filesystem to
368 * see if the contents match, and if so, should answer "unchanged".
370 * The logic does not apply to gitlinks, as ce_match_stat_basic()
371 * already has checked the actual HEAD from the filesystem in the
372 * subproject. If ie_match_stat() already said it is different,
373 * then we know it is.
375 if ((changed & DATA_CHANGED) &&
376 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
377 return changed;
379 changed_fs = ce_modified_check_fs(ce, st);
380 if (changed_fs)
381 return changed | changed_fs;
382 return 0;
385 int base_name_compare(const char *name1, int len1, int mode1,
386 const char *name2, int len2, int mode2)
388 unsigned char c1, c2;
389 int len = len1 < len2 ? len1 : len2;
390 int cmp;
392 cmp = memcmp(name1, name2, len);
393 if (cmp)
394 return cmp;
395 c1 = name1[len];
396 c2 = name2[len];
397 if (!c1 && S_ISDIR(mode1))
398 c1 = '/';
399 if (!c2 && S_ISDIR(mode2))
400 c2 = '/';
401 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
405 * df_name_compare() is identical to base_name_compare(), except it
406 * compares conflicting directory/file entries as equal. Note that
407 * while a directory name compares as equal to a regular file, they
408 * then individually compare _differently_ to a filename that has
409 * a dot after the basename (because '\0' < '.' < '/').
411 * This is used by routines that want to traverse the git namespace
412 * but then handle conflicting entries together when possible.
414 int df_name_compare(const char *name1, int len1, int mode1,
415 const char *name2, int len2, int mode2)
417 int len = len1 < len2 ? len1 : len2, cmp;
418 unsigned char c1, c2;
420 cmp = memcmp(name1, name2, len);
421 if (cmp)
422 return cmp;
423 /* Directories and files compare equal (same length, same name) */
424 if (len1 == len2)
425 return 0;
426 c1 = name1[len];
427 if (!c1 && S_ISDIR(mode1))
428 c1 = '/';
429 c2 = name2[len];
430 if (!c2 && S_ISDIR(mode2))
431 c2 = '/';
432 if (c1 == '/' && !c2)
433 return 0;
434 if (c2 == '/' && !c1)
435 return 0;
436 return c1 - c2;
439 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
441 size_t min_len = (len1 < len2) ? len1 : len2;
442 int cmp = memcmp(name1, name2, min_len);
443 if (cmp)
444 return cmp;
445 if (len1 < len2)
446 return -1;
447 if (len1 > len2)
448 return 1;
449 return 0;
452 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
454 int cmp;
456 cmp = name_compare(name1, len1, name2, len2);
457 if (cmp)
458 return cmp;
460 if (stage1 < stage2)
461 return -1;
462 if (stage1 > stage2)
463 return 1;
464 return 0;
467 static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
469 int first, last;
471 first = 0;
472 last = istate->cache_nr;
473 while (last > first) {
474 int next = (last + first) >> 1;
475 struct cache_entry *ce = istate->cache[next];
476 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
477 if (!cmp)
478 return next;
479 if (cmp < 0) {
480 last = next;
481 continue;
483 first = next+1;
485 return -first-1;
488 int index_name_pos(const struct index_state *istate, const char *name, int namelen)
490 return index_name_stage_pos(istate, name, namelen, 0);
493 /* Remove entry, return true if there are more entries to go.. */
494 int remove_index_entry_at(struct index_state *istate, int pos)
496 struct cache_entry *ce = istate->cache[pos];
498 record_resolve_undo(istate, ce);
499 remove_name_hash(istate, ce);
500 save_or_free_index_entry(istate, ce);
501 istate->cache_changed |= CE_ENTRY_REMOVED;
502 istate->cache_nr--;
503 if (pos >= istate->cache_nr)
504 return 0;
505 memmove(istate->cache + pos,
506 istate->cache + pos + 1,
507 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
508 return 1;
512 * Remove all cache entries marked for removal, that is where
513 * CE_REMOVE is set in ce_flags. This is much more effective than
514 * calling remove_index_entry_at() for each entry to be removed.
516 void remove_marked_cache_entries(struct index_state *istate)
518 struct cache_entry **ce_array = istate->cache;
519 unsigned int i, j;
521 for (i = j = 0; i < istate->cache_nr; i++) {
522 if (ce_array[i]->ce_flags & CE_REMOVE) {
523 remove_name_hash(istate, ce_array[i]);
524 save_or_free_index_entry(istate, ce_array[i]);
526 else
527 ce_array[j++] = ce_array[i];
529 if (j == istate->cache_nr)
530 return;
531 istate->cache_changed |= CE_ENTRY_REMOVED;
532 istate->cache_nr = j;
535 int remove_file_from_index(struct index_state *istate, const char *path)
537 int pos = index_name_pos(istate, path, strlen(path));
538 if (pos < 0)
539 pos = -pos-1;
540 cache_tree_invalidate_path(istate, path);
541 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
542 remove_index_entry_at(istate, pos);
543 return 0;
546 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
548 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
551 static int index_name_pos_also_unmerged(struct index_state *istate,
552 const char *path, int namelen)
554 int pos = index_name_pos(istate, path, namelen);
555 struct cache_entry *ce;
557 if (pos >= 0)
558 return pos;
560 /* maybe unmerged? */
561 pos = -1 - pos;
562 if (pos >= istate->cache_nr ||
563 compare_name((ce = istate->cache[pos]), path, namelen))
564 return -1;
566 /* order of preference: stage 2, 1, 3 */
567 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
568 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
569 !compare_name(ce, path, namelen))
570 pos++;
571 return pos;
574 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
576 int len = ce_namelen(ce);
577 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
581 * If we add a filename that aliases in the cache, we will use the
582 * name that we already have - but we don't want to update the same
583 * alias twice, because that implies that there were actually two
584 * different files with aliasing names!
586 * So we use the CE_ADDED flag to verify that the alias was an old
587 * one before we accept it as
589 static struct cache_entry *create_alias_ce(struct index_state *istate,
590 struct cache_entry *ce,
591 struct cache_entry *alias)
593 int len;
594 struct cache_entry *new;
596 if (alias->ce_flags & CE_ADDED)
597 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
599 /* Ok, create the new entry using the name of the existing alias */
600 len = ce_namelen(alias);
601 new = xcalloc(1, cache_entry_size(len));
602 memcpy(new->name, alias->name, len);
603 copy_cache_entry(new, ce);
604 save_or_free_index_entry(istate, ce);
605 return new;
608 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
610 unsigned char sha1[20];
611 if (write_sha1_file("", 0, blob_type, sha1))
612 die("cannot create an empty blob in the object database");
613 hashcpy(ce->sha1, sha1);
616 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
618 int size, namelen, was_same;
619 mode_t st_mode = st->st_mode;
620 struct cache_entry *ce, *alias;
621 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
622 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
623 int pretend = flags & ADD_CACHE_PRETEND;
624 int intent_only = flags & ADD_CACHE_INTENT;
625 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
626 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
628 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
629 return error("%s: can only add regular files, symbolic links or git-directories", path);
631 namelen = strlen(path);
632 if (S_ISDIR(st_mode)) {
633 while (namelen && path[namelen-1] == '/')
634 namelen--;
636 size = cache_entry_size(namelen);
637 ce = xcalloc(1, size);
638 memcpy(ce->name, path, namelen);
639 ce->ce_namelen = namelen;
640 if (!intent_only)
641 fill_stat_cache_info(ce, st);
642 else
643 ce->ce_flags |= CE_INTENT_TO_ADD;
645 if (trust_executable_bit && has_symlinks)
646 ce->ce_mode = create_ce_mode(st_mode);
647 else {
648 /* If there is an existing entry, pick the mode bits and type
649 * from it, otherwise assume unexecutable regular file.
651 struct cache_entry *ent;
652 int pos = index_name_pos_also_unmerged(istate, path, namelen);
654 ent = (0 <= pos) ? istate->cache[pos] : NULL;
655 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
658 /* When core.ignorecase=true, determine if a directory of the same name but differing
659 * case already exists within the Git repository. If it does, ensure the directory
660 * case of the file being added to the repository matches (is folded into) the existing
661 * entry's directory case.
663 if (ignore_case) {
664 const char *startPtr = ce->name;
665 const char *ptr = startPtr;
666 while (*ptr) {
667 while (*ptr && *ptr != '/')
668 ++ptr;
669 if (*ptr == '/') {
670 struct cache_entry *foundce;
671 ++ptr;
672 foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
673 if (foundce) {
674 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
675 startPtr = ptr;
681 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
682 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
683 /* Nothing changed, really */
684 if (!S_ISGITLINK(alias->ce_mode))
685 ce_mark_uptodate(alias);
686 alias->ce_flags |= CE_ADDED;
688 free(ce);
689 return 0;
691 if (!intent_only) {
692 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) {
693 free(ce);
694 return error("unable to index file %s", path);
696 } else
697 set_object_name_for_intent_to_add_entry(ce);
699 if (ignore_case && alias && different_name(ce, alias))
700 ce = create_alias_ce(istate, ce, alias);
701 ce->ce_flags |= CE_ADDED;
703 /* It was suspected to be racily clean, but it turns out to be Ok */
704 was_same = (alias &&
705 !ce_stage(alias) &&
706 !hashcmp(alias->sha1, ce->sha1) &&
707 ce->ce_mode == alias->ce_mode);
709 if (pretend)
710 free(ce);
711 else if (add_index_entry(istate, ce, add_option)) {
712 free(ce);
713 return error("unable to add %s to index", path);
715 if (verbose && !was_same)
716 printf("add '%s'\n", path);
717 return 0;
720 int add_file_to_index(struct index_state *istate, const char *path, int flags)
722 struct stat st;
723 if (lstat(path, &st))
724 die_errno("unable to stat '%s'", path);
725 return add_to_index(istate, path, &st, flags);
728 struct cache_entry *make_cache_entry(unsigned int mode,
729 const unsigned char *sha1, const char *path, int stage,
730 unsigned int refresh_options)
732 int size, len;
733 struct cache_entry *ce, *ret;
735 if (!verify_path(path)) {
736 error("Invalid path '%s'", path);
737 return NULL;
740 len = strlen(path);
741 size = cache_entry_size(len);
742 ce = xcalloc(1, size);
744 hashcpy(ce->sha1, sha1);
745 memcpy(ce->name, path, len);
746 ce->ce_flags = create_ce_flags(stage);
747 ce->ce_namelen = len;
748 ce->ce_mode = create_ce_mode(mode);
750 ret = refresh_cache_entry(ce, refresh_options);
751 if (ret != ce)
752 free(ce);
753 return ret;
756 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
758 int len = ce_namelen(a);
759 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
763 * We fundamentally don't like some paths: we don't want
764 * dot or dot-dot anywhere, and for obvious reasons don't
765 * want to recurse into ".git" either.
767 * Also, we don't want double slashes or slashes at the
768 * end that can make pathnames ambiguous.
770 static int verify_dotfile(const char *rest)
773 * The first character was '.', but that
774 * has already been discarded, we now test
775 * the rest.
778 /* "." is not allowed */
779 if (*rest == '\0' || is_dir_sep(*rest))
780 return 0;
782 switch (*rest) {
784 * ".git" followed by NUL or slash is bad. This
785 * shares the path end test with the ".." case.
787 case 'g':
788 case 'G':
789 if (rest[1] != 'i' && rest[1] != 'I')
790 break;
791 if (rest[2] != 't' && rest[2] != 'T')
792 break;
793 rest += 2;
794 /* fallthrough */
795 case '.':
796 if (rest[1] == '\0' || is_dir_sep(rest[1]))
797 return 0;
799 return 1;
802 int verify_path(const char *path)
804 char c;
806 if (has_dos_drive_prefix(path))
807 return 0;
809 goto inside;
810 for (;;) {
811 if (!c)
812 return 1;
813 if (is_dir_sep(c)) {
814 inside:
815 if (protect_hfs && is_hfs_dotgit(path))
816 return 0;
817 if (protect_ntfs && is_ntfs_dotgit(path))
818 return 0;
819 c = *path++;
820 if ((c == '.' && !verify_dotfile(path)) ||
821 is_dir_sep(c) || c == '\0')
822 return 0;
824 c = *path++;
829 * Do we have another file that has the beginning components being a
830 * proper superset of the name we're trying to add?
832 static int has_file_name(struct index_state *istate,
833 const struct cache_entry *ce, int pos, int ok_to_replace)
835 int retval = 0;
836 int len = ce_namelen(ce);
837 int stage = ce_stage(ce);
838 const char *name = ce->name;
840 while (pos < istate->cache_nr) {
841 struct cache_entry *p = istate->cache[pos++];
843 if (len >= ce_namelen(p))
844 break;
845 if (memcmp(name, p->name, len))
846 break;
847 if (ce_stage(p) != stage)
848 continue;
849 if (p->name[len] != '/')
850 continue;
851 if (p->ce_flags & CE_REMOVE)
852 continue;
853 retval = -1;
854 if (!ok_to_replace)
855 break;
856 remove_index_entry_at(istate, --pos);
858 return retval;
862 * Do we have another file with a pathname that is a proper
863 * subset of the name we're trying to add?
865 static int has_dir_name(struct index_state *istate,
866 const struct cache_entry *ce, int pos, int ok_to_replace)
868 int retval = 0;
869 int stage = ce_stage(ce);
870 const char *name = ce->name;
871 const char *slash = name + ce_namelen(ce);
873 for (;;) {
874 int len;
876 for (;;) {
877 if (*--slash == '/')
878 break;
879 if (slash <= ce->name)
880 return retval;
882 len = slash - name;
884 pos = index_name_stage_pos(istate, name, len, stage);
885 if (pos >= 0) {
887 * Found one, but not so fast. This could
888 * be a marker that says "I was here, but
889 * I am being removed". Such an entry is
890 * not a part of the resulting tree, and
891 * it is Ok to have a directory at the same
892 * path.
894 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
895 retval = -1;
896 if (!ok_to_replace)
897 break;
898 remove_index_entry_at(istate, pos);
899 continue;
902 else
903 pos = -pos-1;
906 * Trivial optimization: if we find an entry that
907 * already matches the sub-directory, then we know
908 * we're ok, and we can exit.
910 while (pos < istate->cache_nr) {
911 struct cache_entry *p = istate->cache[pos];
912 if ((ce_namelen(p) <= len) ||
913 (p->name[len] != '/') ||
914 memcmp(p->name, name, len))
915 break; /* not our subdirectory */
916 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
918 * p is at the same stage as our entry, and
919 * is a subdirectory of what we are looking
920 * at, so we cannot have conflicts at our
921 * level or anything shorter.
923 return retval;
924 pos++;
927 return retval;
930 /* We may be in a situation where we already have path/file and path
931 * is being added, or we already have path and path/file is being
932 * added. Either one would result in a nonsense tree that has path
933 * twice when git-write-tree tries to write it out. Prevent it.
935 * If ok-to-replace is specified, we remove the conflicting entries
936 * from the cache so the caller should recompute the insert position.
937 * When this happens, we return non-zero.
939 static int check_file_directory_conflict(struct index_state *istate,
940 const struct cache_entry *ce,
941 int pos, int ok_to_replace)
943 int retval;
946 * When ce is an "I am going away" entry, we allow it to be added
948 if (ce->ce_flags & CE_REMOVE)
949 return 0;
952 * We check if the path is a sub-path of a subsequent pathname
953 * first, since removing those will not change the position
954 * in the array.
956 retval = has_file_name(istate, ce, pos, ok_to_replace);
959 * Then check if the path might have a clashing sub-directory
960 * before it.
962 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
965 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
967 int pos;
968 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
969 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
970 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
971 int new_only = option & ADD_CACHE_NEW_ONLY;
973 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
974 cache_tree_invalidate_path(istate, ce->name);
975 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
977 /* existing match? Just replace it. */
978 if (pos >= 0) {
979 if (!new_only)
980 replace_index_entry(istate, pos, ce);
981 return 0;
983 pos = -pos-1;
986 * Inserting a merged entry ("stage 0") into the index
987 * will always replace all non-merged entries..
989 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
990 while (ce_same_name(istate->cache[pos], ce)) {
991 ok_to_add = 1;
992 if (!remove_index_entry_at(istate, pos))
993 break;
997 if (!ok_to_add)
998 return -1;
999 if (!verify_path(ce->name))
1000 return error("Invalid path '%s'", ce->name);
1002 if (!skip_df_check &&
1003 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1004 if (!ok_to_replace)
1005 return error("'%s' appears as both a file and as a directory",
1006 ce->name);
1007 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1008 pos = -pos-1;
1010 return pos + 1;
1013 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1015 int pos;
1017 if (option & ADD_CACHE_JUST_APPEND)
1018 pos = istate->cache_nr;
1019 else {
1020 int ret;
1021 ret = add_index_entry_with_check(istate, ce, option);
1022 if (ret <= 0)
1023 return ret;
1024 pos = ret - 1;
1027 /* Make sure the array is big enough .. */
1028 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1030 /* Add it in.. */
1031 istate->cache_nr++;
1032 if (istate->cache_nr > pos + 1)
1033 memmove(istate->cache + pos + 1,
1034 istate->cache + pos,
1035 (istate->cache_nr - pos - 1) * sizeof(ce));
1036 set_index_entry(istate, pos, ce);
1037 istate->cache_changed |= CE_ENTRY_ADDED;
1038 return 0;
1042 * "refresh" does not calculate a new sha1 file or bring the
1043 * cache up-to-date for mode/content changes. But what it
1044 * _does_ do is to "re-match" the stat information of a file
1045 * with the cache, so that you can refresh the cache for a
1046 * file that hasn't been changed but where the stat entry is
1047 * out of date.
1049 * For example, you'd want to do this after doing a "git-read-tree",
1050 * to link up the stat cache details with the proper files.
1052 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1053 struct cache_entry *ce,
1054 unsigned int options, int *err,
1055 int *changed_ret)
1057 struct stat st;
1058 struct cache_entry *updated;
1059 int changed, size;
1060 int refresh = options & CE_MATCH_REFRESH;
1061 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1062 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1063 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1065 if (!refresh || ce_uptodate(ce))
1066 return ce;
1069 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1070 * that the change to the work tree does not matter and told
1071 * us not to worry.
1073 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1074 ce_mark_uptodate(ce);
1075 return ce;
1077 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1078 ce_mark_uptodate(ce);
1079 return ce;
1082 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1083 if (ignore_missing)
1084 return ce;
1085 if (err)
1086 *err = ENOENT;
1087 return NULL;
1090 if (lstat(ce->name, &st) < 0) {
1091 if (ignore_missing && errno == ENOENT)
1092 return ce;
1093 if (err)
1094 *err = errno;
1095 return NULL;
1098 changed = ie_match_stat(istate, ce, &st, options);
1099 if (changed_ret)
1100 *changed_ret = changed;
1101 if (!changed) {
1103 * The path is unchanged. If we were told to ignore
1104 * valid bit, then we did the actual stat check and
1105 * found that the entry is unmodified. If the entry
1106 * is not marked VALID, this is the place to mark it
1107 * valid again, under "assume unchanged" mode.
1109 if (ignore_valid && assume_unchanged &&
1110 !(ce->ce_flags & CE_VALID))
1111 ; /* mark this one VALID again */
1112 else {
1114 * We do not mark the index itself "modified"
1115 * because CE_UPTODATE flag is in-core only;
1116 * we are not going to write this change out.
1118 if (!S_ISGITLINK(ce->ce_mode))
1119 ce_mark_uptodate(ce);
1120 return ce;
1124 if (ie_modified(istate, ce, &st, options)) {
1125 if (err)
1126 *err = EINVAL;
1127 return NULL;
1130 size = ce_size(ce);
1131 updated = xmalloc(size);
1132 memcpy(updated, ce, size);
1133 fill_stat_cache_info(updated, &st);
1135 * If ignore_valid is not set, we should leave CE_VALID bit
1136 * alone. Otherwise, paths marked with --no-assume-unchanged
1137 * (i.e. things to be edited) will reacquire CE_VALID bit
1138 * automatically, which is not really what we want.
1140 if (!ignore_valid && assume_unchanged &&
1141 !(ce->ce_flags & CE_VALID))
1142 updated->ce_flags &= ~CE_VALID;
1144 /* istate->cache_changed is updated in the caller */
1145 return updated;
1148 static void show_file(const char * fmt, const char * name, int in_porcelain,
1149 int * first, const char *header_msg)
1151 if (in_porcelain && *first && header_msg) {
1152 printf("%s\n", header_msg);
1153 *first = 0;
1155 printf(fmt, name);
1158 int refresh_index(struct index_state *istate, unsigned int flags,
1159 const struct pathspec *pathspec,
1160 char *seen, const char *header_msg)
1162 int i;
1163 int has_errors = 0;
1164 int really = (flags & REFRESH_REALLY) != 0;
1165 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1166 int quiet = (flags & REFRESH_QUIET) != 0;
1167 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1168 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1169 int first = 1;
1170 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1171 unsigned int options = (CE_MATCH_REFRESH |
1172 (really ? CE_MATCH_IGNORE_VALID : 0) |
1173 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1174 const char *modified_fmt;
1175 const char *deleted_fmt;
1176 const char *typechange_fmt;
1177 const char *added_fmt;
1178 const char *unmerged_fmt;
1180 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1181 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1182 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1183 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1184 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1185 for (i = 0; i < istate->cache_nr; i++) {
1186 struct cache_entry *ce, *new;
1187 int cache_errno = 0;
1188 int changed = 0;
1189 int filtered = 0;
1191 ce = istate->cache[i];
1192 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1193 continue;
1195 if (pathspec && !ce_path_match(ce, pathspec, seen))
1196 filtered = 1;
1198 if (ce_stage(ce)) {
1199 while ((i < istate->cache_nr) &&
1200 ! strcmp(istate->cache[i]->name, ce->name))
1201 i++;
1202 i--;
1203 if (allow_unmerged)
1204 continue;
1205 if (!filtered)
1206 show_file(unmerged_fmt, ce->name, in_porcelain,
1207 &first, header_msg);
1208 has_errors = 1;
1209 continue;
1212 if (filtered)
1213 continue;
1215 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1216 if (new == ce)
1217 continue;
1218 if (!new) {
1219 const char *fmt;
1221 if (really && cache_errno == EINVAL) {
1222 /* If we are doing --really-refresh that
1223 * means the index is not valid anymore.
1225 ce->ce_flags &= ~CE_VALID;
1226 ce->ce_flags |= CE_UPDATE_IN_BASE;
1227 istate->cache_changed |= CE_ENTRY_CHANGED;
1229 if (quiet)
1230 continue;
1232 if (cache_errno == ENOENT)
1233 fmt = deleted_fmt;
1234 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1235 fmt = added_fmt; /* must be before other checks */
1236 else if (changed & TYPE_CHANGED)
1237 fmt = typechange_fmt;
1238 else
1239 fmt = modified_fmt;
1240 show_file(fmt,
1241 ce->name, in_porcelain, &first, header_msg);
1242 has_errors = 1;
1243 continue;
1246 replace_index_entry(istate, i, new);
1248 return has_errors;
1251 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1252 unsigned int options)
1254 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1258 /*****************************************************************
1259 * Index File I/O
1260 *****************************************************************/
1262 #define INDEX_FORMAT_DEFAULT 3
1264 static unsigned int get_index_format_default(void)
1266 char *envversion = getenv("GIT_INDEX_VERSION");
1267 char *endp;
1268 int value;
1269 unsigned int version = INDEX_FORMAT_DEFAULT;
1271 if (!envversion) {
1272 if (!git_config_get_int("index.version", &value))
1273 version = value;
1274 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1275 warning(_("index.version set, but the value is invalid.\n"
1276 "Using version %i"), INDEX_FORMAT_DEFAULT);
1277 return INDEX_FORMAT_DEFAULT;
1279 return version;
1282 version = strtoul(envversion, &endp, 10);
1283 if (*endp ||
1284 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1285 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1286 "Using version %i"), INDEX_FORMAT_DEFAULT);
1287 version = INDEX_FORMAT_DEFAULT;
1289 return version;
1293 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1294 * Again - this is just a (very strong in practice) heuristic that
1295 * the inode hasn't changed.
1297 * We save the fields in big-endian order to allow using the
1298 * index file over NFS transparently.
1300 struct ondisk_cache_entry {
1301 struct cache_time ctime;
1302 struct cache_time mtime;
1303 uint32_t dev;
1304 uint32_t ino;
1305 uint32_t mode;
1306 uint32_t uid;
1307 uint32_t gid;
1308 uint32_t size;
1309 unsigned char sha1[20];
1310 uint16_t flags;
1311 char name[FLEX_ARRAY]; /* more */
1315 * This struct is used when CE_EXTENDED bit is 1
1316 * The struct must match ondisk_cache_entry exactly from
1317 * ctime till flags
1319 struct ondisk_cache_entry_extended {
1320 struct cache_time ctime;
1321 struct cache_time mtime;
1322 uint32_t dev;
1323 uint32_t ino;
1324 uint32_t mode;
1325 uint32_t uid;
1326 uint32_t gid;
1327 uint32_t size;
1328 unsigned char sha1[20];
1329 uint16_t flags;
1330 uint16_t flags2;
1331 char name[FLEX_ARRAY]; /* more */
1334 /* These are only used for v3 or lower */
1335 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1336 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1337 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1338 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1339 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1340 ondisk_cache_entry_size(ce_namelen(ce)))
1342 static int verify_hdr(struct cache_header *hdr, unsigned long size)
1344 git_SHA_CTX c;
1345 unsigned char sha1[20];
1346 int hdr_version;
1348 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1349 return error("bad signature");
1350 hdr_version = ntohl(hdr->hdr_version);
1351 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1352 return error("bad index version %d", hdr_version);
1353 git_SHA1_Init(&c);
1354 git_SHA1_Update(&c, hdr, size - 20);
1355 git_SHA1_Final(sha1, &c);
1356 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1357 return error("bad index file sha1 signature");
1358 return 0;
1361 static int read_index_extension(struct index_state *istate,
1362 const char *ext, void *data, unsigned long sz)
1364 switch (CACHE_EXT(ext)) {
1365 case CACHE_EXT_TREE:
1366 istate->cache_tree = cache_tree_read(data, sz);
1367 break;
1368 case CACHE_EXT_RESOLVE_UNDO:
1369 istate->resolve_undo = resolve_undo_read(data, sz);
1370 break;
1371 case CACHE_EXT_LINK:
1372 if (read_link_extension(istate, data, sz))
1373 return -1;
1374 break;
1375 default:
1376 if (*ext < 'A' || 'Z' < *ext)
1377 return error("index uses %.4s extension, which we do not understand",
1378 ext);
1379 fprintf(stderr, "ignoring %.4s extension\n", ext);
1380 break;
1382 return 0;
1385 int hold_locked_index(struct lock_file *lk, int die_on_error)
1387 return hold_lock_file_for_update(lk, get_index_file(),
1388 die_on_error
1389 ? LOCK_DIE_ON_ERROR
1390 : 0);
1393 int read_index(struct index_state *istate)
1395 return read_index_from(istate, get_index_file());
1398 static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1399 unsigned int flags,
1400 const char *name,
1401 size_t len)
1403 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1405 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1406 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1407 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1408 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1409 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1410 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1411 ce->ce_mode = get_be32(&ondisk->mode);
1412 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1413 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1414 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
1415 ce->ce_flags = flags & ~CE_NAMEMASK;
1416 ce->ce_namelen = len;
1417 ce->index = 0;
1418 hashcpy(ce->sha1, ondisk->sha1);
1419 memcpy(ce->name, name, len);
1420 ce->name[len] = '\0';
1421 return ce;
1425 * Adjacent cache entries tend to share the leading paths, so it makes
1426 * sense to only store the differences in later entries. In the v4
1427 * on-disk format of the index, each on-disk cache entry stores the
1428 * number of bytes to be stripped from the end of the previous name,
1429 * and the bytes to append to the result, to come up with its name.
1431 static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1433 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1434 size_t len = decode_varint(&cp);
1436 if (name->len < len)
1437 die("malformed name field in the index");
1438 strbuf_remove(name, name->len - len, len);
1439 for (ep = cp; *ep; ep++)
1440 ; /* find the end */
1441 strbuf_add(name, cp, ep - cp);
1442 return (const char *)ep + 1 - cp_;
1445 static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1446 unsigned long *ent_size,
1447 struct strbuf *previous_name)
1449 struct cache_entry *ce;
1450 size_t len;
1451 const char *name;
1452 unsigned int flags;
1454 /* On-disk flags are just 16 bits */
1455 flags = get_be16(&ondisk->flags);
1456 len = flags & CE_NAMEMASK;
1458 if (flags & CE_EXTENDED) {
1459 struct ondisk_cache_entry_extended *ondisk2;
1460 int extended_flags;
1461 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1462 extended_flags = get_be16(&ondisk2->flags2) << 16;
1463 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1464 if (extended_flags & ~CE_EXTENDED_FLAGS)
1465 die("Unknown index entry format %08x", extended_flags);
1466 flags |= extended_flags;
1467 name = ondisk2->name;
1469 else
1470 name = ondisk->name;
1472 if (!previous_name) {
1473 /* v3 and earlier */
1474 if (len == CE_NAMEMASK)
1475 len = strlen(name);
1476 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1478 *ent_size = ondisk_ce_size(ce);
1479 } else {
1480 unsigned long consumed;
1481 consumed = expand_name_field(previous_name, name);
1482 ce = cache_entry_from_ondisk(ondisk, flags,
1483 previous_name->buf,
1484 previous_name->len);
1486 *ent_size = (name - ((char *)ondisk)) + consumed;
1488 return ce;
1491 static void check_ce_order(struct index_state *istate)
1493 unsigned int i;
1495 for (i = 1; i < istate->cache_nr; i++) {
1496 struct cache_entry *ce = istate->cache[i - 1];
1497 struct cache_entry *next_ce = istate->cache[i];
1498 int name_compare = strcmp(ce->name, next_ce->name);
1500 if (0 < name_compare)
1501 die("unordered stage entries in index");
1502 if (!name_compare) {
1503 if (!ce_stage(ce))
1504 die("multiple stage entries for merged file '%s'",
1505 ce->name);
1506 if (ce_stage(ce) > ce_stage(next_ce))
1507 die("unordered stage entries for '%s'",
1508 ce->name);
1513 /* remember to discard_cache() before reading a different cache! */
1514 int do_read_index(struct index_state *istate, const char *path, int must_exist)
1516 int fd, i;
1517 struct stat st;
1518 unsigned long src_offset;
1519 struct cache_header *hdr;
1520 void *mmap;
1521 size_t mmap_size;
1522 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1524 if (istate->initialized)
1525 return istate->cache_nr;
1527 istate->timestamp.sec = 0;
1528 istate->timestamp.nsec = 0;
1529 fd = open(path, O_RDONLY);
1530 if (fd < 0) {
1531 if (!must_exist && errno == ENOENT)
1532 return 0;
1533 die_errno("%s: index file open failed", path);
1536 if (fstat(fd, &st))
1537 die_errno("cannot stat the open index");
1539 mmap_size = xsize_t(st.st_size);
1540 if (mmap_size < sizeof(struct cache_header) + 20)
1541 die("index file smaller than expected");
1543 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1544 if (mmap == MAP_FAILED)
1545 die_errno("unable to map index file");
1546 close(fd);
1548 hdr = mmap;
1549 if (verify_hdr(hdr, mmap_size) < 0)
1550 goto unmap;
1552 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
1553 istate->version = ntohl(hdr->hdr_version);
1554 istate->cache_nr = ntohl(hdr->hdr_entries);
1555 istate->cache_alloc = alloc_nr(istate->cache_nr);
1556 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1557 istate->initialized = 1;
1559 if (istate->version == 4)
1560 previous_name = &previous_name_buf;
1561 else
1562 previous_name = NULL;
1564 src_offset = sizeof(*hdr);
1565 for (i = 0; i < istate->cache_nr; i++) {
1566 struct ondisk_cache_entry *disk_ce;
1567 struct cache_entry *ce;
1568 unsigned long consumed;
1570 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1571 ce = create_from_disk(disk_ce, &consumed, previous_name);
1572 set_index_entry(istate, i, ce);
1574 src_offset += consumed;
1576 strbuf_release(&previous_name_buf);
1577 istate->timestamp.sec = st.st_mtime;
1578 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1580 while (src_offset <= mmap_size - 20 - 8) {
1581 /* After an array of active_nr index entries,
1582 * there can be arbitrary number of extended
1583 * sections, each of which is prefixed with
1584 * extension name (4-byte) and section length
1585 * in 4-byte network byte order.
1587 uint32_t extsize;
1588 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1589 extsize = ntohl(extsize);
1590 if (read_index_extension(istate,
1591 (const char *) mmap + src_offset,
1592 (char *) mmap + src_offset + 8,
1593 extsize) < 0)
1594 goto unmap;
1595 src_offset += 8;
1596 src_offset += extsize;
1598 munmap(mmap, mmap_size);
1599 return istate->cache_nr;
1601 unmap:
1602 munmap(mmap, mmap_size);
1603 die("index file corrupt");
1606 int read_index_from(struct index_state *istate, const char *path)
1608 struct split_index *split_index;
1609 int ret;
1611 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1612 if (istate->initialized)
1613 return istate->cache_nr;
1615 ret = do_read_index(istate, path, 0);
1616 split_index = istate->split_index;
1617 if (!split_index || is_null_sha1(split_index->base_sha1)) {
1618 check_ce_order(istate);
1619 return ret;
1622 if (split_index->base)
1623 discard_index(split_index->base);
1624 else
1625 split_index->base = xcalloc(1, sizeof(*split_index->base));
1626 ret = do_read_index(split_index->base,
1627 git_path("sharedindex.%s",
1628 sha1_to_hex(split_index->base_sha1)), 1);
1629 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1630 die("broken index, expect %s in %s, got %s",
1631 sha1_to_hex(split_index->base_sha1),
1632 git_path("sharedindex.%s",
1633 sha1_to_hex(split_index->base_sha1)),
1634 sha1_to_hex(split_index->base->sha1));
1635 merge_base_index(istate);
1636 check_ce_order(istate);
1637 return ret;
1640 int is_index_unborn(struct index_state *istate)
1642 return (!istate->cache_nr && !istate->timestamp.sec);
1645 int discard_index(struct index_state *istate)
1647 int i;
1649 for (i = 0; i < istate->cache_nr; i++) {
1650 if (istate->cache[i]->index &&
1651 istate->split_index &&
1652 istate->split_index->base &&
1653 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1654 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1655 continue;
1656 free(istate->cache[i]);
1658 resolve_undo_clear_index(istate);
1659 istate->cache_nr = 0;
1660 istate->cache_changed = 0;
1661 istate->timestamp.sec = 0;
1662 istate->timestamp.nsec = 0;
1663 free_name_hash(istate);
1664 cache_tree_free(&(istate->cache_tree));
1665 istate->initialized = 0;
1666 free(istate->cache);
1667 istate->cache = NULL;
1668 istate->cache_alloc = 0;
1669 discard_split_index(istate);
1670 return 0;
1673 int unmerged_index(const struct index_state *istate)
1675 int i;
1676 for (i = 0; i < istate->cache_nr; i++) {
1677 if (ce_stage(istate->cache[i]))
1678 return 1;
1680 return 0;
1683 #define WRITE_BUFFER_SIZE 8192
1684 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1685 static unsigned long write_buffer_len;
1687 static int ce_write_flush(git_SHA_CTX *context, int fd)
1689 unsigned int buffered = write_buffer_len;
1690 if (buffered) {
1691 git_SHA1_Update(context, write_buffer, buffered);
1692 if (write_in_full(fd, write_buffer, buffered) != buffered)
1693 return -1;
1694 write_buffer_len = 0;
1696 return 0;
1699 static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1701 while (len) {
1702 unsigned int buffered = write_buffer_len;
1703 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1704 if (partial > len)
1705 partial = len;
1706 memcpy(write_buffer + buffered, data, partial);
1707 buffered += partial;
1708 if (buffered == WRITE_BUFFER_SIZE) {
1709 write_buffer_len = buffered;
1710 if (ce_write_flush(context, fd))
1711 return -1;
1712 buffered = 0;
1714 write_buffer_len = buffered;
1715 len -= partial;
1716 data = (char *) data + partial;
1718 return 0;
1721 static int write_index_ext_header(git_SHA_CTX *context, int fd,
1722 unsigned int ext, unsigned int sz)
1724 ext = htonl(ext);
1725 sz = htonl(sz);
1726 return ((ce_write(context, fd, &ext, 4) < 0) ||
1727 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1730 static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
1732 unsigned int left = write_buffer_len;
1734 if (left) {
1735 write_buffer_len = 0;
1736 git_SHA1_Update(context, write_buffer, left);
1739 /* Flush first if not enough space for SHA1 signature */
1740 if (left + 20 > WRITE_BUFFER_SIZE) {
1741 if (write_in_full(fd, write_buffer, left) != left)
1742 return -1;
1743 left = 0;
1746 /* Append the SHA1 signature at the end */
1747 git_SHA1_Final(write_buffer + left, context);
1748 hashcpy(sha1, write_buffer + left);
1749 left += 20;
1750 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1753 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1756 * The only thing we care about in this function is to smudge the
1757 * falsely clean entry due to touch-update-touch race, so we leave
1758 * everything else as they are. We are called for entries whose
1759 * ce_stat_data.sd_mtime match the index file mtime.
1761 * Note that this actually does not do much for gitlinks, for
1762 * which ce_match_stat_basic() always goes to the actual
1763 * contents. The caller checks with is_racy_timestamp() which
1764 * always says "no" for gitlinks, so we are not called for them ;-)
1766 struct stat st;
1768 if (lstat(ce->name, &st) < 0)
1769 return;
1770 if (ce_match_stat_basic(ce, &st))
1771 return;
1772 if (ce_modified_check_fs(ce, &st)) {
1773 /* This is "racily clean"; smudge it. Note that this
1774 * is a tricky code. At first glance, it may appear
1775 * that it can break with this sequence:
1777 * $ echo xyzzy >frotz
1778 * $ git-update-index --add frotz
1779 * $ : >frotz
1780 * $ sleep 3
1781 * $ echo filfre >nitfol
1782 * $ git-update-index --add nitfol
1784 * but it does not. When the second update-index runs,
1785 * it notices that the entry "frotz" has the same timestamp
1786 * as index, and if we were to smudge it by resetting its
1787 * size to zero here, then the object name recorded
1788 * in index is the 6-byte file but the cached stat information
1789 * becomes zero --- which would then match what we would
1790 * obtain from the filesystem next time we stat("frotz").
1792 * However, the second update-index, before calling
1793 * this function, notices that the cached size is 6
1794 * bytes and what is on the filesystem is an empty
1795 * file, and never calls us, so the cached size information
1796 * for "frotz" stays 6 which does not match the filesystem.
1798 ce->ce_stat_data.sd_size = 0;
1802 /* Copy miscellaneous fields but not the name */
1803 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1804 struct cache_entry *ce)
1806 short flags;
1808 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1809 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1810 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1811 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1812 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1813 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
1814 ondisk->mode = htonl(ce->ce_mode);
1815 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1816 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1817 ondisk->size = htonl(ce->ce_stat_data.sd_size);
1818 hashcpy(ondisk->sha1, ce->sha1);
1820 flags = ce->ce_flags & ~CE_NAMEMASK;
1821 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1822 ondisk->flags = htons(flags);
1823 if (ce->ce_flags & CE_EXTENDED) {
1824 struct ondisk_cache_entry_extended *ondisk2;
1825 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1826 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1827 return ondisk2->name;
1829 else {
1830 return ondisk->name;
1834 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1835 struct strbuf *previous_name)
1837 int size;
1838 struct ondisk_cache_entry *ondisk;
1839 int saved_namelen = saved_namelen; /* compiler workaround */
1840 char *name;
1841 int result;
1843 if (ce->ce_flags & CE_STRIP_NAME) {
1844 saved_namelen = ce_namelen(ce);
1845 ce->ce_namelen = 0;
1848 if (!previous_name) {
1849 size = ondisk_ce_size(ce);
1850 ondisk = xcalloc(1, size);
1851 name = copy_cache_entry_to_ondisk(ondisk, ce);
1852 memcpy(name, ce->name, ce_namelen(ce));
1853 } else {
1854 int common, to_remove, prefix_size;
1855 unsigned char to_remove_vi[16];
1856 for (common = 0;
1857 (ce->name[common] &&
1858 common < previous_name->len &&
1859 ce->name[common] == previous_name->buf[common]);
1860 common++)
1861 ; /* still matching */
1862 to_remove = previous_name->len - common;
1863 prefix_size = encode_varint(to_remove, to_remove_vi);
1865 if (ce->ce_flags & CE_EXTENDED)
1866 size = offsetof(struct ondisk_cache_entry_extended, name);
1867 else
1868 size = offsetof(struct ondisk_cache_entry, name);
1869 size += prefix_size + (ce_namelen(ce) - common + 1);
1871 ondisk = xcalloc(1, size);
1872 name = copy_cache_entry_to_ondisk(ondisk, ce);
1873 memcpy(name, to_remove_vi, prefix_size);
1874 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1876 strbuf_splice(previous_name, common, to_remove,
1877 ce->name + common, ce_namelen(ce) - common);
1879 if (ce->ce_flags & CE_STRIP_NAME) {
1880 ce->ce_namelen = saved_namelen;
1881 ce->ce_flags &= ~CE_STRIP_NAME;
1884 result = ce_write(c, fd, ondisk, size);
1885 free(ondisk);
1886 return result;
1890 * This function verifies if index_state has the correct sha1 of the
1891 * index file. Don't die if we have any other failure, just return 0.
1893 static int verify_index_from(const struct index_state *istate, const char *path)
1895 int fd;
1896 ssize_t n;
1897 struct stat st;
1898 unsigned char sha1[20];
1900 if (!istate->initialized)
1901 return 0;
1903 fd = open(path, O_RDONLY);
1904 if (fd < 0)
1905 return 0;
1907 if (fstat(fd, &st))
1908 goto out;
1910 if (st.st_size < sizeof(struct cache_header) + 20)
1911 goto out;
1913 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
1914 if (n != 20)
1915 goto out;
1917 if (hashcmp(istate->sha1, sha1))
1918 goto out;
1920 close(fd);
1921 return 1;
1923 out:
1924 close(fd);
1925 return 0;
1928 static int verify_index(const struct index_state *istate)
1930 return verify_index_from(istate, get_index_file());
1933 static int has_racy_timestamp(struct index_state *istate)
1935 int entries = istate->cache_nr;
1936 int i;
1938 for (i = 0; i < entries; i++) {
1939 struct cache_entry *ce = istate->cache[i];
1940 if (is_racy_timestamp(istate, ce))
1941 return 1;
1943 return 0;
1947 * Opportunistically update the index but do not complain if we can't
1949 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1951 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1952 verify_index(istate) &&
1953 write_locked_index(istate, lockfile, COMMIT_LOCK))
1954 rollback_lock_file(lockfile);
1957 static int do_write_index(struct index_state *istate, int newfd,
1958 int strip_extensions)
1960 git_SHA_CTX c;
1961 struct cache_header hdr;
1962 int i, err, removed, extended, hdr_version;
1963 struct cache_entry **cache = istate->cache;
1964 int entries = istate->cache_nr;
1965 struct stat st;
1966 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1968 for (i = removed = extended = 0; i < entries; i++) {
1969 if (cache[i]->ce_flags & CE_REMOVE)
1970 removed++;
1972 /* reduce extended entries if possible */
1973 cache[i]->ce_flags &= ~CE_EXTENDED;
1974 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1975 extended++;
1976 cache[i]->ce_flags |= CE_EXTENDED;
1980 if (!istate->version) {
1981 istate->version = get_index_format_default();
1982 if (getenv("GIT_TEST_SPLIT_INDEX"))
1983 init_split_index(istate);
1986 /* demote version 3 to version 2 when the latter suffices */
1987 if (istate->version == 3 || istate->version == 2)
1988 istate->version = extended ? 3 : 2;
1990 hdr_version = istate->version;
1992 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1993 hdr.hdr_version = htonl(hdr_version);
1994 hdr.hdr_entries = htonl(entries - removed);
1996 git_SHA1_Init(&c);
1997 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1998 return -1;
2000 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2001 for (i = 0; i < entries; i++) {
2002 struct cache_entry *ce = cache[i];
2003 if (ce->ce_flags & CE_REMOVE)
2004 continue;
2005 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
2006 ce_smudge_racily_clean_entry(ce);
2007 if (is_null_sha1(ce->sha1)) {
2008 static const char msg[] = "cache entry has null sha1: %s";
2009 static int allow = -1;
2011 if (allow < 0)
2012 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2013 if (allow)
2014 warning(msg, ce->name);
2015 else
2016 return error(msg, ce->name);
2018 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
2019 return -1;
2021 strbuf_release(&previous_name_buf);
2023 /* Write extension data here */
2024 if (!strip_extensions && istate->split_index) {
2025 struct strbuf sb = STRBUF_INIT;
2027 err = write_link_extension(&sb, istate) < 0 ||
2028 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2029 sb.len) < 0 ||
2030 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2031 strbuf_release(&sb);
2032 if (err)
2033 return -1;
2035 if (!strip_extensions && istate->cache_tree) {
2036 struct strbuf sb = STRBUF_INIT;
2038 cache_tree_write(&sb, istate->cache_tree);
2039 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2040 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2041 strbuf_release(&sb);
2042 if (err)
2043 return -1;
2045 if (!strip_extensions && istate->resolve_undo) {
2046 struct strbuf sb = STRBUF_INIT;
2048 resolve_undo_write(&sb, istate->resolve_undo);
2049 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2050 sb.len) < 0
2051 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2052 strbuf_release(&sb);
2053 if (err)
2054 return -1;
2057 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2058 return -1;
2059 istate->timestamp.sec = (unsigned int)st.st_mtime;
2060 istate->timestamp.nsec = ST_MTIME_NSEC(st);
2061 return 0;
2064 void set_alternate_index_output(const char *name)
2066 alternate_index_output = name;
2069 static int commit_locked_index(struct lock_file *lk)
2071 if (alternate_index_output)
2072 return commit_lock_file_to(lk, alternate_index_output);
2073 else
2074 return commit_lock_file(lk);
2077 static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2078 unsigned flags)
2080 int ret = do_write_index(istate, lock->fd, 0);
2081 if (ret)
2082 return ret;
2083 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2084 (COMMIT_LOCK | CLOSE_LOCK));
2085 if (flags & COMMIT_LOCK)
2086 return commit_locked_index(lock);
2087 else if (flags & CLOSE_LOCK)
2088 return close_lock_file(lock);
2089 else
2090 return ret;
2093 static int write_split_index(struct index_state *istate,
2094 struct lock_file *lock,
2095 unsigned flags)
2097 int ret;
2098 prepare_to_write_split_index(istate);
2099 ret = do_write_locked_index(istate, lock, flags);
2100 finish_writing_split_index(istate);
2101 return ret;
2104 static char *temporary_sharedindex;
2106 static void remove_temporary_sharedindex(void)
2108 if (temporary_sharedindex) {
2109 unlink_or_warn(temporary_sharedindex);
2110 free(temporary_sharedindex);
2111 temporary_sharedindex = NULL;
2115 static void remove_temporary_sharedindex_on_signal(int signo)
2117 remove_temporary_sharedindex();
2118 sigchain_pop(signo);
2119 raise(signo);
2122 static int write_shared_index(struct index_state *istate,
2123 struct lock_file *lock, unsigned flags)
2125 struct split_index *si = istate->split_index;
2126 static int installed_handler;
2127 int fd, ret;
2129 temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
2130 fd = mkstemp(temporary_sharedindex);
2131 if (fd < 0) {
2132 free(temporary_sharedindex);
2133 temporary_sharedindex = NULL;
2134 hashclr(si->base_sha1);
2135 return do_write_locked_index(istate, lock, flags);
2137 if (!installed_handler) {
2138 atexit(remove_temporary_sharedindex);
2139 sigchain_push_common(remove_temporary_sharedindex_on_signal);
2141 move_cache_to_base_index(istate);
2142 ret = do_write_index(si->base, fd, 1);
2143 close(fd);
2144 if (ret) {
2145 remove_temporary_sharedindex();
2146 return ret;
2148 ret = rename(temporary_sharedindex,
2149 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
2150 free(temporary_sharedindex);
2151 temporary_sharedindex = NULL;
2152 if (!ret)
2153 hashcpy(si->base_sha1, si->base->sha1);
2154 return ret;
2157 int write_locked_index(struct index_state *istate, struct lock_file *lock,
2158 unsigned flags)
2160 struct split_index *si = istate->split_index;
2162 if (!si || alternate_index_output ||
2163 (istate->cache_changed & ~EXTMASK)) {
2164 if (si)
2165 hashclr(si->base_sha1);
2166 return do_write_locked_index(istate, lock, flags);
2169 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2170 int v = si->base_sha1[0];
2171 if ((v & 15) < 6)
2172 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2174 if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2175 int ret = write_shared_index(istate, lock, flags);
2176 if (ret)
2177 return ret;
2180 return write_split_index(istate, lock, flags);
2184 * Read the index file that is potentially unmerged into given
2185 * index_state, dropping any unmerged entries. Returns true if
2186 * the index is unmerged. Callers who want to refuse to work
2187 * from an unmerged state can call this and check its return value,
2188 * instead of calling read_cache().
2190 int read_index_unmerged(struct index_state *istate)
2192 int i;
2193 int unmerged = 0;
2195 read_index(istate);
2196 for (i = 0; i < istate->cache_nr; i++) {
2197 struct cache_entry *ce = istate->cache[i];
2198 struct cache_entry *new_ce;
2199 int size, len;
2201 if (!ce_stage(ce))
2202 continue;
2203 unmerged = 1;
2204 len = ce_namelen(ce);
2205 size = cache_entry_size(len);
2206 new_ce = xcalloc(1, size);
2207 memcpy(new_ce->name, ce->name, len);
2208 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2209 new_ce->ce_namelen = len;
2210 new_ce->ce_mode = ce->ce_mode;
2211 if (add_index_entry(istate, new_ce, 0))
2212 return error("%s: cannot drop to stage #0",
2213 new_ce->name);
2215 return unmerged;
2219 * Returns 1 if the path is an "other" path with respect to
2220 * the index; that is, the path is not mentioned in the index at all,
2221 * either as a file, a directory with some files in the index,
2222 * or as an unmerged entry.
2224 * We helpfully remove a trailing "/" from directories so that
2225 * the output of read_directory can be used as-is.
2227 int index_name_is_other(const struct index_state *istate, const char *name,
2228 int namelen)
2230 int pos;
2231 if (namelen && name[namelen - 1] == '/')
2232 namelen--;
2233 pos = index_name_pos(istate, name, namelen);
2234 if (0 <= pos)
2235 return 0; /* exact match */
2236 pos = -pos - 1;
2237 if (pos < istate->cache_nr) {
2238 struct cache_entry *ce = istate->cache[pos];
2239 if (ce_namelen(ce) == namelen &&
2240 !memcmp(ce->name, name, namelen))
2241 return 0; /* Yup, this one exists unmerged */
2243 return 1;
2246 void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2248 int pos, len;
2249 unsigned long sz;
2250 enum object_type type;
2251 void *data;
2253 len = strlen(path);
2254 pos = index_name_pos(istate, path, len);
2255 if (pos < 0) {
2257 * We might be in the middle of a merge, in which
2258 * case we would read stage #2 (ours).
2260 int i;
2261 for (i = -pos - 1;
2262 (pos < 0 && i < istate->cache_nr &&
2263 !strcmp(istate->cache[i]->name, path));
2264 i++)
2265 if (ce_stage(istate->cache[i]) == 2)
2266 pos = i;
2268 if (pos < 0)
2269 return NULL;
2270 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2271 if (!data || type != OBJ_BLOB) {
2272 free(data);
2273 return NULL;
2275 if (size)
2276 *size = sz;
2277 return data;
2280 void stat_validity_clear(struct stat_validity *sv)
2282 free(sv->sd);
2283 sv->sd = NULL;
2286 int stat_validity_check(struct stat_validity *sv, const char *path)
2288 struct stat st;
2290 if (stat(path, &st) < 0)
2291 return sv->sd == NULL;
2292 if (!sv->sd)
2293 return 0;
2294 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2297 void stat_validity_update(struct stat_validity *sv, int fd)
2299 struct stat st;
2301 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2302 stat_validity_clear(sv);
2303 else {
2304 if (!sv->sd)
2305 sv->sd = xcalloc(1, sizeof(struct stat_data));
2306 fill_stat_data(sv->sd, &st);