2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
8 #include "cache-tree.h"
17 #include "resolve-undo.h"
19 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
23 * The first letter should be 'A'..'Z' for extensions that are not
24 * necessary for a correct operation (i.e. optimization data).
25 * When new extensions are added that _needs_ to be understood in
26 * order to correctly interpret the index file, pick character that
27 * is outside the range, to cause the reader to abort.
30 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
31 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
32 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUN" */
34 struct index_state the_index;
36 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
38 istate->cache[nr] = ce;
39 add_name_hash(istate, ce);
42 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
44 struct cache_entry *old = istate->cache[nr];
46 remove_name_hash(old);
47 set_index_entry(istate, nr, ce);
48 istate->cache_changed = 1;
51 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
53 struct cache_entry *old = istate->cache[nr], *new;
54 int namelen = strlen(new_name);
56 new = xmalloc(cache_entry_size(namelen));
57 copy_cache_entry(new, old);
58 new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
59 new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
60 memcpy(new->name, new_name, namelen + 1);
62 cache_tree_invalidate_path(istate->cache_tree, old->name);
63 remove_index_entry_at(istate, nr);
64 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
68 * This only updates the "non-critical" parts of the directory
69 * cache, ie the parts that aren't tracked by GIT, and only used
70 * to validate the cache.
72 void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
74 ce->ce_ctime.sec = (unsigned int)st->st_ctime;
75 ce->ce_mtime.sec = (unsigned int)st->st_mtime;
76 ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
77 ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
78 ce->ce_dev = st->st_dev;
79 ce->ce_ino = st->st_ino;
80 ce->ce_uid = st->st_uid;
81 ce->ce_gid = st->st_gid;
82 ce->ce_size = st->st_size;
85 ce->ce_flags |= CE_VALID;
87 if (S_ISREG(st->st_mode))
91 static int ce_compare_data(struct cache_entry *ce, struct stat *st)
94 int fd = open(ce->name, O_RDONLY);
97 unsigned char sha1[20];
98 if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
99 match = hashcmp(sha1, ce->sha1);
100 /* index_fd() closed the file descriptor already */
105 static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
110 enum object_type type;
111 struct strbuf sb = STRBUF_INIT;
113 if (strbuf_readlink(&sb, ce->name, expected_size))
116 buffer = read_sha1_file(ce->sha1, &type, &size);
119 match = memcmp(buffer, sb.buf, size);
126 static int ce_compare_gitlink(struct cache_entry *ce)
128 unsigned char sha1[20];
131 * We don't actually require that the .git directory
132 * under GITLINK directory be a valid git directory. It
133 * might even be missing (in case nobody populated that
136 * If so, we consider it always to match.
138 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
140 return hashcmp(sha1, ce->sha1);
143 static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
145 switch (st->st_mode & S_IFMT) {
147 if (ce_compare_data(ce, st))
151 if (ce_compare_link(ce, xsize_t(st->st_size)))
155 if (S_ISGITLINK(ce->ce_mode))
156 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
163 static int is_empty_blob_sha1(const unsigned char *sha1)
165 static const unsigned char empty_blob_sha1[20] = {
166 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
167 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
170 return !hashcmp(sha1, empty_blob_sha1);
173 static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
175 unsigned int changed = 0;
177 if (ce->ce_flags & CE_REMOVE)
178 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
180 switch (ce->ce_mode & S_IFMT) {
182 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
183 /* We consider only the owner x bit to be relevant for
186 if (trust_executable_bit &&
187 (0100 & (ce->ce_mode ^ st->st_mode)))
188 changed |= MODE_CHANGED;
191 if (!S_ISLNK(st->st_mode) &&
192 (has_symlinks || !S_ISREG(st->st_mode)))
193 changed |= TYPE_CHANGED;
196 /* We ignore most of the st_xxx fields for gitlinks */
197 if (!S_ISDIR(st->st_mode))
198 changed |= TYPE_CHANGED;
199 else if (ce_compare_gitlink(ce))
200 changed |= DATA_CHANGED;
203 die("internal error: ce_mode is %o", ce->ce_mode);
205 if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
206 changed |= MTIME_CHANGED;
207 if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
208 changed |= CTIME_CHANGED;
211 if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
212 changed |= MTIME_CHANGED;
213 if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
214 changed |= CTIME_CHANGED;
217 if (ce->ce_uid != (unsigned int) st->st_uid ||
218 ce->ce_gid != (unsigned int) st->st_gid)
219 changed |= OWNER_CHANGED;
220 if (ce->ce_ino != (unsigned int) st->st_ino)
221 changed |= INODE_CHANGED;
225 * st_dev breaks on network filesystems where different
226 * clients will have different views of what "device"
227 * the filesystem is on
229 if (ce->ce_dev != (unsigned int) st->st_dev)
230 changed |= INODE_CHANGED;
233 if (ce->ce_size != (unsigned int) st->st_size)
234 changed |= DATA_CHANGED;
236 /* Racily smudged entry? */
238 if (!is_empty_blob_sha1(ce->sha1))
239 changed |= DATA_CHANGED;
245 static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
247 return (!S_ISGITLINK(ce->ce_mode) &&
248 istate->timestamp.sec &&
250 /* nanosecond timestamped files can also be racy! */
251 (istate->timestamp.sec < ce->ce_mtime.sec ||
252 (istate->timestamp.sec == ce->ce_mtime.sec &&
253 istate->timestamp.nsec <= ce->ce_mtime.nsec))
255 istate->timestamp.sec <= ce->ce_mtime.sec
260 int ie_match_stat(const struct index_state *istate,
261 struct cache_entry *ce, struct stat *st,
262 unsigned int options)
264 unsigned int changed;
265 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
266 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
267 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
270 * If it's marked as always valid in the index, it's
271 * valid whatever the checked-out copy says.
273 * skip-worktree has the same effect with higher precedence
275 if (!ignore_skip_worktree && ce_skip_worktree(ce))
277 if (!ignore_valid && (ce->ce_flags & CE_VALID))
281 * Intent-to-add entries have not been added, so the index entry
282 * by definition never matches what is in the work tree until it
283 * actually gets added.
285 if (ce->ce_flags & CE_INTENT_TO_ADD)
286 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
288 changed = ce_match_stat_basic(ce, st);
291 * Within 1 second of this sequence:
292 * echo xyzzy >file && git-update-index --add file
293 * running this command:
295 * would give a falsely clean cache entry. The mtime and
296 * length match the cache, and other stat fields do not change.
298 * We could detect this at update-index time (the cache entry
299 * being registered/updated records the same time as "now")
300 * and delay the return from git-update-index, but that would
301 * effectively mean we can make at most one commit per second,
302 * which is not acceptable. Instead, we check cache entries
303 * whose mtime are the same as the index file timestamp more
304 * carefully than others.
306 if (!changed && is_racy_timestamp(istate, ce)) {
307 if (assume_racy_is_modified)
308 changed |= DATA_CHANGED;
310 changed |= ce_modified_check_fs(ce, st);
316 int ie_modified(const struct index_state *istate,
317 struct cache_entry *ce, struct stat *st, unsigned int options)
319 int changed, changed_fs;
321 changed = ie_match_stat(istate, ce, st, options);
325 * If the mode or type has changed, there's no point in trying
326 * to refresh the entry - it's not going to match
328 if (changed & (MODE_CHANGED | TYPE_CHANGED))
332 * Immediately after read-tree or update-index --cacheinfo,
333 * the length field is zero, as we have never even read the
334 * lstat(2) information once, and we cannot trust DATA_CHANGED
335 * returned by ie_match_stat() which in turn was returned by
336 * ce_match_stat_basic() to signal that the filesize of the
337 * blob changed. We have to actually go to the filesystem to
338 * see if the contents match, and if so, should answer "unchanged".
340 * The logic does not apply to gitlinks, as ce_match_stat_basic()
341 * already has checked the actual HEAD from the filesystem in the
342 * subproject. If ie_match_stat() already said it is different,
343 * then we know it is.
345 if ((changed & DATA_CHANGED) &&
346 (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
349 changed_fs = ce_modified_check_fs(ce, st);
351 return changed | changed_fs;
355 int base_name_compare(const char *name1, int len1, int mode1,
356 const char *name2, int len2, int mode2)
358 unsigned char c1, c2;
359 int len = len1 < len2 ? len1 : len2;
362 cmp = memcmp(name1, name2, len);
367 if (!c1 && S_ISDIR(mode1))
369 if (!c2 && S_ISDIR(mode2))
371 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
375 * df_name_compare() is identical to base_name_compare(), except it
376 * compares conflicting directory/file entries as equal. Note that
377 * while a directory name compares as equal to a regular file, they
378 * then individually compare _differently_ to a filename that has
379 * a dot after the basename (because '\0' < '.' < '/').
381 * This is used by routines that want to traverse the git namespace
382 * but then handle conflicting entries together when possible.
384 int df_name_compare(const char *name1, int len1, int mode1,
385 const char *name2, int len2, int mode2)
387 int len = len1 < len2 ? len1 : len2, cmp;
388 unsigned char c1, c2;
390 cmp = memcmp(name1, name2, len);
393 /* Directories and files compare equal (same length, same name) */
397 if (!c1 && S_ISDIR(mode1))
400 if (!c2 && S_ISDIR(mode2))
402 if (c1 == '/' && !c2)
404 if (c2 == '/' && !c1)
409 int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
411 int len1 = flags1 & CE_NAMEMASK;
412 int len2 = flags2 & CE_NAMEMASK;
413 int len = len1 < len2 ? len1 : len2;
416 cmp = memcmp(name1, name2, len);
425 flags1 &= CE_STAGEMASK;
426 flags2 &= CE_STAGEMASK;
435 int index_name_pos(const struct index_state *istate, const char *name, int namelen)
440 last = istate->cache_nr;
441 while (last > first) {
442 int next = (last + first) >> 1;
443 struct cache_entry *ce = istate->cache[next];
444 int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
456 /* Remove entry, return true if there are more entries to go.. */
457 int remove_index_entry_at(struct index_state *istate, int pos)
459 struct cache_entry *ce = istate->cache[pos];
461 record_resolve_undo(istate, ce);
462 remove_name_hash(ce);
463 istate->cache_changed = 1;
465 if (pos >= istate->cache_nr)
467 memmove(istate->cache + pos,
468 istate->cache + pos + 1,
469 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
474 * Remove all cache ententries marked for removal, that is where
475 * CE_REMOVE is set in ce_flags. This is much more effective than
476 * calling remove_index_entry_at() for each entry to be removed.
478 void remove_marked_cache_entries(struct index_state *istate)
480 struct cache_entry **ce_array = istate->cache;
483 for (i = j = 0; i < istate->cache_nr; i++) {
484 if (ce_array[i]->ce_flags & CE_REMOVE)
485 remove_name_hash(ce_array[i]);
487 ce_array[j++] = ce_array[i];
489 istate->cache_changed = 1;
490 istate->cache_nr = j;
493 int remove_file_from_index(struct index_state *istate, const char *path)
495 int pos = index_name_pos(istate, path, strlen(path));
498 cache_tree_invalidate_path(istate->cache_tree, path);
499 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
500 remove_index_entry_at(istate, pos);
504 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
506 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
509 static int index_name_pos_also_unmerged(struct index_state *istate,
510 const char *path, int namelen)
512 int pos = index_name_pos(istate, path, namelen);
513 struct cache_entry *ce;
518 /* maybe unmerged? */
520 if (pos >= istate->cache_nr ||
521 compare_name((ce = istate->cache[pos]), path, namelen))
524 /* order of preference: stage 2, 1, 3 */
525 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
526 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
527 !compare_name(ce, path, namelen))
532 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
534 int len = ce_namelen(ce);
535 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
539 * If we add a filename that aliases in the cache, we will use the
540 * name that we already have - but we don't want to update the same
541 * alias twice, because that implies that there were actually two
542 * different files with aliasing names!
544 * So we use the CE_ADDED flag to verify that the alias was an old
545 * one before we accept it as
547 static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
550 struct cache_entry *new;
552 if (alias->ce_flags & CE_ADDED)
553 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
555 /* Ok, create the new entry using the name of the existing alias */
556 len = ce_namelen(alias);
557 new = xcalloc(1, cache_entry_size(len));
558 memcpy(new->name, alias->name, len);
559 copy_cache_entry(new, ce);
564 static void record_intent_to_add(struct cache_entry *ce)
566 unsigned char sha1[20];
567 if (write_sha1_file("", 0, blob_type, sha1))
568 die("cannot create an empty blob in the object database");
569 hashcpy(ce->sha1, sha1);
572 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
574 int size, namelen, was_same;
575 mode_t st_mode = st->st_mode;
576 struct cache_entry *ce, *alias;
577 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
578 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
579 int pretend = flags & ADD_CACHE_PRETEND;
580 int intent_only = flags & ADD_CACHE_INTENT;
581 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
582 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
584 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
585 return error("%s: can only add regular files, symbolic links or git-directories", path);
587 namelen = strlen(path);
588 if (S_ISDIR(st_mode)) {
589 while (namelen && path[namelen-1] == '/')
592 size = cache_entry_size(namelen);
593 ce = xcalloc(1, size);
594 memcpy(ce->name, path, namelen);
595 ce->ce_flags = namelen;
597 fill_stat_cache_info(ce, st);
599 ce->ce_flags |= CE_INTENT_TO_ADD;
601 if (trust_executable_bit && has_symlinks)
602 ce->ce_mode = create_ce_mode(st_mode);
604 /* If there is an existing entry, pick the mode bits and type
605 * from it, otherwise assume unexecutable regular file.
607 struct cache_entry *ent;
608 int pos = index_name_pos_also_unmerged(istate, path, namelen);
610 ent = (0 <= pos) ? istate->cache[pos] : NULL;
611 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
614 alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
615 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
616 /* Nothing changed, really */
618 ce_mark_uptodate(alias);
619 alias->ce_flags |= CE_ADDED;
623 if (index_path(ce->sha1, path, st, 1))
624 return error("unable to index file %s", path);
626 record_intent_to_add(ce);
628 if (ignore_case && alias && different_name(ce, alias))
629 ce = create_alias_ce(ce, alias);
630 ce->ce_flags |= CE_ADDED;
632 /* It was suspected to be racily clean, but it turns out to be Ok */
635 !hashcmp(alias->sha1, ce->sha1) &&
636 ce->ce_mode == alias->ce_mode);
640 else if (add_index_entry(istate, ce, add_option))
641 return error("unable to add %s to index",path);
642 if (verbose && !was_same)
643 printf("add '%s'\n", path);
647 int add_file_to_index(struct index_state *istate, const char *path, int flags)
650 if (lstat(path, &st))
651 die_errno("unable to stat '%s'", path);
652 return add_to_index(istate, path, &st, flags);
655 struct cache_entry *make_cache_entry(unsigned int mode,
656 const unsigned char *sha1, const char *path, int stage,
660 struct cache_entry *ce;
662 if (!verify_path(path)) {
663 error("Invalid path '%s'", path);
668 size = cache_entry_size(len);
669 ce = xcalloc(1, size);
671 hashcpy(ce->sha1, sha1);
672 memcpy(ce->name, path, len);
673 ce->ce_flags = create_ce_flags(len, stage);
674 ce->ce_mode = create_ce_mode(mode);
677 return refresh_cache_entry(ce, 0);
682 int ce_same_name(struct cache_entry *a, struct cache_entry *b)
684 int len = ce_namelen(a);
685 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
688 int ce_path_match(const struct cache_entry *ce, const char **pathspec)
690 const char *match, *name;
696 len = ce_namelen(ce);
698 while ((match = *pathspec++) != NULL) {
699 int matchlen = strlen(match);
702 if (memcmp(name, match, matchlen))
704 if (matchlen && name[matchlen-1] == '/')
706 if (name[matchlen] == '/' || !name[matchlen])
715 * We fundamentally don't like some paths: we don't want
716 * dot or dot-dot anywhere, and for obvious reasons don't
717 * want to recurse into ".git" either.
719 * Also, we don't want double slashes or slashes at the
720 * end that can make pathnames ambiguous.
722 static int verify_dotfile(const char *rest)
725 * The first character was '.', but that
726 * has already been discarded, we now test
730 /* "." is not allowed */
735 * ".git" followed by NUL or slash is bad. This
736 * shares the path end test with the ".." case.
746 if (rest[1] == '\0' || rest[1] == '/')
752 int verify_path(const char *path)
769 if (verify_dotfile(path))
779 * Do we have another file that has the beginning components being a
780 * proper superset of the name we're trying to add?
782 static int has_file_name(struct index_state *istate,
783 const struct cache_entry *ce, int pos, int ok_to_replace)
786 int len = ce_namelen(ce);
787 int stage = ce_stage(ce);
788 const char *name = ce->name;
790 while (pos < istate->cache_nr) {
791 struct cache_entry *p = istate->cache[pos++];
793 if (len >= ce_namelen(p))
795 if (memcmp(name, p->name, len))
797 if (ce_stage(p) != stage)
799 if (p->name[len] != '/')
801 if (p->ce_flags & CE_REMOVE)
806 remove_index_entry_at(istate, --pos);
812 * Do we have another file with a pathname that is a proper
813 * subset of the name we're trying to add?
815 static int has_dir_name(struct index_state *istate,
816 const struct cache_entry *ce, int pos, int ok_to_replace)
819 int stage = ce_stage(ce);
820 const char *name = ce->name;
821 const char *slash = name + ce_namelen(ce);
829 if (slash <= ce->name)
834 pos = index_name_pos(istate, name, create_ce_flags(len, stage));
837 * Found one, but not so fast. This could
838 * be a marker that says "I was here, but
839 * I am being removed". Such an entry is
840 * not a part of the resulting tree, and
841 * it is Ok to have a directory at the same
844 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
848 remove_index_entry_at(istate, pos);
856 * Trivial optimization: if we find an entry that
857 * already matches the sub-directory, then we know
858 * we're ok, and we can exit.
860 while (pos < istate->cache_nr) {
861 struct cache_entry *p = istate->cache[pos];
862 if ((ce_namelen(p) <= len) ||
863 (p->name[len] != '/') ||
864 memcmp(p->name, name, len))
865 break; /* not our subdirectory */
866 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
868 * p is at the same stage as our entry, and
869 * is a subdirectory of what we are looking
870 * at, so we cannot have conflicts at our
871 * level or anything shorter.
880 /* We may be in a situation where we already have path/file and path
881 * is being added, or we already have path and path/file is being
882 * added. Either one would result in a nonsense tree that has path
883 * twice when git-write-tree tries to write it out. Prevent it.
885 * If ok-to-replace is specified, we remove the conflicting entries
886 * from the cache so the caller should recompute the insert position.
887 * When this happens, we return non-zero.
889 static int check_file_directory_conflict(struct index_state *istate,
890 const struct cache_entry *ce,
891 int pos, int ok_to_replace)
896 * When ce is an "I am going away" entry, we allow it to be added
898 if (ce->ce_flags & CE_REMOVE)
902 * We check if the path is a sub-path of a subsequent pathname
903 * first, since removing those will not change the position
906 retval = has_file_name(istate, ce, pos, ok_to_replace);
909 * Then check if the path might have a clashing sub-directory
912 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
915 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
918 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
919 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
920 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
921 int new_only = option & ADD_CACHE_NEW_ONLY;
923 cache_tree_invalidate_path(istate->cache_tree, ce->name);
924 pos = index_name_pos(istate, ce->name, ce->ce_flags);
926 /* existing match? Just replace it. */
929 replace_index_entry(istate, pos, ce);
935 * Inserting a merged entry ("stage 0") into the index
936 * will always replace all non-merged entries..
938 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
939 while (ce_same_name(istate->cache[pos], ce)) {
941 if (!remove_index_entry_at(istate, pos))
948 if (!verify_path(ce->name))
949 return error("Invalid path '%s'", ce->name);
951 if (!skip_df_check &&
952 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
954 return error("'%s' appears as both a file and as a directory",
956 pos = index_name_pos(istate, ce->name, ce->ce_flags);
962 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
966 if (option & ADD_CACHE_JUST_APPEND)
967 pos = istate->cache_nr;
970 ret = add_index_entry_with_check(istate, ce, option);
976 /* Make sure the array is big enough .. */
977 if (istate->cache_nr == istate->cache_alloc) {
978 istate->cache_alloc = alloc_nr(istate->cache_alloc);
979 istate->cache = xrealloc(istate->cache,
980 istate->cache_alloc * sizeof(struct cache_entry *));
985 if (istate->cache_nr > pos + 1)
986 memmove(istate->cache + pos + 1,
988 (istate->cache_nr - pos - 1) * sizeof(ce));
989 set_index_entry(istate, pos, ce);
990 istate->cache_changed = 1;
995 * "refresh" does not calculate a new sha1 file or bring the
996 * cache up-to-date for mode/content changes. But what it
997 * _does_ do is to "re-match" the stat information of a file
998 * with the cache, so that you can refresh the cache for a
999 * file that hasn't been changed but where the stat entry is
1002 * For example, you'd want to do this after doing a "git-read-tree",
1003 * to link up the stat cache details with the proper files.
1005 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1006 struct cache_entry *ce,
1007 unsigned int options, int *err)
1010 struct cache_entry *updated;
1012 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1013 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1015 if (ce_uptodate(ce))
1019 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1020 * that the change to the work tree does not matter and told
1023 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1024 ce_mark_uptodate(ce);
1027 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1028 ce_mark_uptodate(ce);
1032 if (lstat(ce->name, &st) < 0) {
1038 changed = ie_match_stat(istate, ce, &st, options);
1041 * The path is unchanged. If we were told to ignore
1042 * valid bit, then we did the actual stat check and
1043 * found that the entry is unmodified. If the entry
1044 * is not marked VALID, this is the place to mark it
1045 * valid again, under "assume unchanged" mode.
1047 if (ignore_valid && assume_unchanged &&
1048 !(ce->ce_flags & CE_VALID))
1049 ; /* mark this one VALID again */
1052 * We do not mark the index itself "modified"
1053 * because CE_UPTODATE flag is in-core only;
1054 * we are not going to write this change out.
1056 ce_mark_uptodate(ce);
1061 if (ie_modified(istate, ce, &st, options)) {
1068 updated = xmalloc(size);
1069 memcpy(updated, ce, size);
1070 fill_stat_cache_info(updated, &st);
1072 * If ignore_valid is not set, we should leave CE_VALID bit
1073 * alone. Otherwise, paths marked with --no-assume-unchanged
1074 * (i.e. things to be edited) will reacquire CE_VALID bit
1075 * automatically, which is not really what we want.
1077 if (!ignore_valid && assume_unchanged &&
1078 !(ce->ce_flags & CE_VALID))
1079 updated->ce_flags &= ~CE_VALID;
1084 static void show_file(const char * fmt, const char * name, int in_porcelain,
1085 int * first, char *header_msg)
1087 if (in_porcelain && *first && header_msg) {
1088 printf("%s\n", header_msg);
1094 int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
1095 char *seen, char *header_msg)
1099 int really = (flags & REFRESH_REALLY) != 0;
1100 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1101 int quiet = (flags & REFRESH_QUIET) != 0;
1102 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1103 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1105 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1106 unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1107 const char *needs_update_fmt;
1108 const char *needs_merge_fmt;
1110 needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1111 needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1112 for (i = 0; i < istate->cache_nr; i++) {
1113 struct cache_entry *ce, *new;
1114 int cache_errno = 0;
1116 ce = istate->cache[i];
1117 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1121 while ((i < istate->cache_nr) &&
1122 ! strcmp(istate->cache[i]->name, ce->name))
1127 show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);
1132 if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
1135 new = refresh_cache_ent(istate, ce, options, &cache_errno);
1139 if (not_new && cache_errno == ENOENT)
1141 if (really && cache_errno == EINVAL) {
1142 /* If we are doing --really-refresh that
1143 * means the index is not valid anymore.
1145 ce->ce_flags &= ~CE_VALID;
1146 istate->cache_changed = 1;
1150 show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);
1155 replace_index_entry(istate, i, new);
1160 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
1162 return refresh_cache_ent(&the_index, ce, really, NULL);
1165 static int verify_hdr(struct cache_header *hdr, unsigned long size)
1168 unsigned char sha1[20];
1170 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1171 return error("bad signature");
1172 if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
1173 return error("bad index version");
1175 git_SHA1_Update(&c, hdr, size - 20);
1176 git_SHA1_Final(sha1, &c);
1177 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1178 return error("bad index file sha1 signature");
1182 static int read_index_extension(struct index_state *istate,
1183 const char *ext, void *data, unsigned long sz)
1185 switch (CACHE_EXT(ext)) {
1186 case CACHE_EXT_TREE:
1187 istate->cache_tree = cache_tree_read(data, sz);
1189 case CACHE_EXT_RESOLVE_UNDO:
1190 istate->resolve_undo = resolve_undo_read(data, sz);
1193 if (*ext < 'A' || 'Z' < *ext)
1194 return error("index uses %.4s extension, which we do not understand",
1196 fprintf(stderr, "ignoring %.4s extension\n", ext);
1202 int read_index(struct index_state *istate)
1204 return read_index_from(istate, get_index_file());
1207 static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
1212 ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
1213 ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
1214 ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
1215 ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
1216 ce->ce_dev = ntohl(ondisk->dev);
1217 ce->ce_ino = ntohl(ondisk->ino);
1218 ce->ce_mode = ntohl(ondisk->mode);
1219 ce->ce_uid = ntohl(ondisk->uid);
1220 ce->ce_gid = ntohl(ondisk->gid);
1221 ce->ce_size = ntohl(ondisk->size);
1222 /* On-disk flags are just 16 bits */
1223 ce->ce_flags = ntohs(ondisk->flags);
1225 hashcpy(ce->sha1, ondisk->sha1);
1227 len = ce->ce_flags & CE_NAMEMASK;
1229 if (ce->ce_flags & CE_EXTENDED) {
1230 struct ondisk_cache_entry_extended *ondisk2;
1232 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1233 extended_flags = ntohs(ondisk2->flags2) << 16;
1234 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1235 if (extended_flags & ~CE_EXTENDED_FLAGS)
1236 die("Unknown index entry format %08x", extended_flags);
1237 ce->ce_flags |= extended_flags;
1238 name = ondisk2->name;
1241 name = ondisk->name;
1243 if (len == CE_NAMEMASK)
1246 * NEEDSWORK: If the original index is crafted, this copy could
1249 memcpy(ce->name, name, len + 1);
1252 static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
1256 per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);
1259 * Alignment can cause differences. This should be "alignof", but
1260 * since that's a gcc'ism, just use the size of a pointer.
1262 per_entry += sizeof(void *);
1263 return ondisk_size + entries*per_entry;
1266 /* remember to discard_cache() before reading a different cache! */
1267 int read_index_from(struct index_state *istate, const char *path)
1271 unsigned long src_offset, dst_offset;
1272 struct cache_header *hdr;
1277 if (istate->initialized)
1278 return istate->cache_nr;
1281 istate->timestamp.sec = 0;
1282 istate->timestamp.nsec = 0;
1283 fd = open(path, O_RDONLY);
1285 if (errno == ENOENT)
1287 die_errno("index file open failed");
1291 die_errno("cannot stat the open index");
1294 mmap_size = xsize_t(st.st_size);
1295 if (mmap_size < sizeof(struct cache_header) + 20)
1296 die("index file smaller than expected");
1298 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1300 if (mmap == MAP_FAILED)
1301 die_errno("unable to map index file");
1304 if (verify_hdr(hdr, mmap_size) < 0)
1307 istate->cache_nr = ntohl(hdr->hdr_entries);
1308 istate->cache_alloc = alloc_nr(istate->cache_nr);
1309 istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
1312 * The disk format is actually larger than the in-memory format,
1313 * due to space for nsec etc, so even though the in-memory one
1314 * has room for a few more flags, we can allocate using the same
1317 istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
1318 istate->initialized = 1;
1320 src_offset = sizeof(*hdr);
1322 for (i = 0; i < istate->cache_nr; i++) {
1323 struct ondisk_cache_entry *disk_ce;
1324 struct cache_entry *ce;
1326 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1327 ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
1328 convert_from_disk(disk_ce, ce);
1329 set_index_entry(istate, i, ce);
1331 src_offset += ondisk_ce_size(ce);
1332 dst_offset += ce_size(ce);
1334 istate->timestamp.sec = st.st_mtime;
1335 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1337 while (src_offset <= mmap_size - 20 - 8) {
1338 /* After an array of active_nr index entries,
1339 * there can be arbitrary number of extended
1340 * sections, each of which is prefixed with
1341 * extension name (4-byte) and section length
1342 * in 4-byte network byte order.
1345 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1346 extsize = ntohl(extsize);
1347 if (read_index_extension(istate,
1348 (const char *) mmap + src_offset,
1349 (char *) mmap + src_offset + 8,
1353 src_offset += extsize;
1355 munmap(mmap, mmap_size);
1356 return istate->cache_nr;
1359 munmap(mmap, mmap_size);
1361 die("index file corrupt");
1364 int is_index_unborn(struct index_state *istate)
1366 return (!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);
1369 int discard_index(struct index_state *istate)
1371 resolve_undo_clear_index(istate);
1372 istate->cache_nr = 0;
1373 istate->cache_changed = 0;
1374 istate->timestamp.sec = 0;
1375 istate->timestamp.nsec = 0;
1376 istate->name_hash_initialized = 0;
1377 free_hash(&istate->name_hash);
1378 cache_tree_free(&(istate->cache_tree));
1379 free(istate->alloc);
1380 istate->alloc = NULL;
1381 istate->initialized = 0;
1383 /* no need to throw away allocated active_cache */
1387 int unmerged_index(const struct index_state *istate)
1390 for (i = 0; i < istate->cache_nr; i++) {
1391 if (ce_stage(istate->cache[i]))
1397 #define WRITE_BUFFER_SIZE 8192
1398 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1399 static unsigned long write_buffer_len;
1401 static int ce_write_flush(git_SHA_CTX *context, int fd)
1403 unsigned int buffered = write_buffer_len;
1405 git_SHA1_Update(context, write_buffer, buffered);
1406 if (write_in_full(fd, write_buffer, buffered) != buffered)
1408 write_buffer_len = 0;
1413 static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1416 unsigned int buffered = write_buffer_len;
1417 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1420 memcpy(write_buffer + buffered, data, partial);
1421 buffered += partial;
1422 if (buffered == WRITE_BUFFER_SIZE) {
1423 write_buffer_len = buffered;
1424 if (ce_write_flush(context, fd))
1428 write_buffer_len = buffered;
1430 data = (char *) data + partial;
1435 static int write_index_ext_header(git_SHA_CTX *context, int fd,
1436 unsigned int ext, unsigned int sz)
1440 return ((ce_write(context, fd, &ext, 4) < 0) ||
1441 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1444 static int ce_flush(git_SHA_CTX *context, int fd)
1446 unsigned int left = write_buffer_len;
1449 write_buffer_len = 0;
1450 git_SHA1_Update(context, write_buffer, left);
1453 /* Flush first if not enough space for SHA1 signature */
1454 if (left + 20 > WRITE_BUFFER_SIZE) {
1455 if (write_in_full(fd, write_buffer, left) != left)
1460 /* Append the SHA1 signature at the end */
1461 git_SHA1_Final(write_buffer + left, context);
1463 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1466 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1469 * The only thing we care about in this function is to smudge the
1470 * falsely clean entry due to touch-update-touch race, so we leave
1471 * everything else as they are. We are called for entries whose
1472 * ce_mtime match the index file mtime.
1474 * Note that this actually does not do much for gitlinks, for
1475 * which ce_match_stat_basic() always goes to the actual
1476 * contents. The caller checks with is_racy_timestamp() which
1477 * always says "no" for gitlinks, so we are not called for them ;-)
1481 if (lstat(ce->name, &st) < 0)
1483 if (ce_match_stat_basic(ce, &st))
1485 if (ce_modified_check_fs(ce, &st)) {
1486 /* This is "racily clean"; smudge it. Note that this
1487 * is a tricky code. At first glance, it may appear
1488 * that it can break with this sequence:
1490 * $ echo xyzzy >frotz
1491 * $ git-update-index --add frotz
1494 * $ echo filfre >nitfol
1495 * $ git-update-index --add nitfol
1497 * but it does not. When the second update-index runs,
1498 * it notices that the entry "frotz" has the same timestamp
1499 * as index, and if we were to smudge it by resetting its
1500 * size to zero here, then the object name recorded
1501 * in index is the 6-byte file but the cached stat information
1502 * becomes zero --- which would then match what we would
1503 * obtain from the filesystem next time we stat("frotz").
1505 * However, the second update-index, before calling
1506 * this function, notices that the cached size is 6
1507 * bytes and what is on the filesystem is an empty
1508 * file, and never calls us, so the cached size information
1509 * for "frotz" stays 6 which does not match the filesystem.
1515 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
1517 int size = ondisk_ce_size(ce);
1518 struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1521 ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
1522 ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
1523 ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
1524 ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
1525 ondisk->dev = htonl(ce->ce_dev);
1526 ondisk->ino = htonl(ce->ce_ino);
1527 ondisk->mode = htonl(ce->ce_mode);
1528 ondisk->uid = htonl(ce->ce_uid);
1529 ondisk->gid = htonl(ce->ce_gid);
1530 ondisk->size = htonl(ce->ce_size);
1531 hashcpy(ondisk->sha1, ce->sha1);
1532 ondisk->flags = htons(ce->ce_flags);
1533 if (ce->ce_flags & CE_EXTENDED) {
1534 struct ondisk_cache_entry_extended *ondisk2;
1535 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1536 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1537 name = ondisk2->name;
1540 name = ondisk->name;
1541 memcpy(name, ce->name, ce_namelen(ce));
1543 return ce_write(c, fd, ondisk, size);
1546 int write_index(struct index_state *istate, int newfd)
1549 struct cache_header hdr;
1550 int i, err, removed, extended;
1551 struct cache_entry **cache = istate->cache;
1552 int entries = istate->cache_nr;
1555 for (i = removed = extended = 0; i < entries; i++) {
1556 if (cache[i]->ce_flags & CE_REMOVE)
1559 /* reduce extended entries if possible */
1560 cache[i]->ce_flags &= ~CE_EXTENDED;
1561 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1563 cache[i]->ce_flags |= CE_EXTENDED;
1567 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1568 /* for extended format, increase version so older git won't try to read it */
1569 hdr.hdr_version = htonl(extended ? 3 : 2);
1570 hdr.hdr_entries = htonl(entries - removed);
1573 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1576 for (i = 0; i < entries; i++) {
1577 struct cache_entry *ce = cache[i];
1578 if (ce->ce_flags & CE_REMOVE)
1580 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
1581 ce_smudge_racily_clean_entry(ce);
1582 if (ce_write_entry(&c, newfd, ce) < 0)
1586 /* Write extension data here */
1587 if (istate->cache_tree) {
1588 struct strbuf sb = STRBUF_INIT;
1590 cache_tree_write(&sb, istate->cache_tree);
1591 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1592 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1593 strbuf_release(&sb);
1597 if (istate->resolve_undo) {
1598 struct strbuf sb = STRBUF_INIT;
1600 resolve_undo_write(&sb, istate->resolve_undo);
1601 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
1603 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1604 strbuf_release(&sb);
1609 if (ce_flush(&c, newfd) || fstat(newfd, &st))
1611 istate->timestamp.sec = (unsigned int)st.st_mtime;
1612 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1617 * Read the index file that is potentially unmerged into given
1618 * index_state, dropping any unmerged entries. Returns true if
1619 * the index is unmerged. Callers who want to refuse to work
1620 * from an unmerged state can call this and check its return value,
1621 * instead of calling read_cache().
1623 int read_index_unmerged(struct index_state *istate)
1629 for (i = 0; i < istate->cache_nr; i++) {
1630 struct cache_entry *ce = istate->cache[i];
1631 struct cache_entry *new_ce;
1637 len = strlen(ce->name);
1638 size = cache_entry_size(len);
1639 new_ce = xcalloc(1, size);
1640 memcpy(new_ce->name, ce->name, len);
1641 new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;
1642 new_ce->ce_mode = ce->ce_mode;
1643 if (add_index_entry(istate, new_ce, 0))
1644 return error("%s: cannot drop to stage #0",
1646 i = index_name_pos(istate, new_ce->name, len);
1651 struct update_callback_data
1657 static void update_callback(struct diff_queue_struct *q,
1658 struct diff_options *opt, void *cbdata)
1661 struct update_callback_data *data = cbdata;
1663 for (i = 0; i < q->nr; i++) {
1664 struct diff_filepair *p = q->queue[i];
1665 const char *path = p->one->path;
1666 switch (p->status) {
1668 die("unexpected diff status %c", p->status);
1669 case DIFF_STATUS_UNMERGED:
1671 * ADD_CACHE_IGNORE_REMOVAL is unset if "git
1672 * add -u" is calling us, In such a case, a
1673 * missing work tree file needs to be removed
1674 * if there is an unmerged entry at stage #2,
1675 * but such a diff record is followed by
1676 * another with DIFF_STATUS_DELETED (and if
1677 * there is no stage #2, we won't see DELETED
1678 * nor MODIFIED). We can simply continue
1681 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
1684 * Otherwise, it is "git add path" is asking
1685 * to explicitly add it; we fall through. A
1686 * missing work tree file is an error and is
1687 * caught by add_file_to_index() in such a
1690 case DIFF_STATUS_MODIFIED:
1691 case DIFF_STATUS_TYPE_CHANGED:
1692 if (add_file_to_index(&the_index, path, data->flags)) {
1693 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
1694 die("updating files failed");
1698 case DIFF_STATUS_DELETED:
1699 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
1701 if (!(data->flags & ADD_CACHE_PRETEND))
1702 remove_file_from_index(&the_index, path);
1703 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
1704 printf("remove '%s'\n", path);
1710 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
1712 struct update_callback_data data;
1713 struct rev_info rev;
1714 init_revisions(&rev, prefix);
1715 setup_revisions(0, NULL, &rev, NULL);
1716 rev.prune_data = pathspec;
1717 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
1718 rev.diffopt.format_callback = update_callback;
1720 data.add_errors = 0;
1721 rev.diffopt.format_callback_data = &data;
1722 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
1723 return !!data.add_errors;
1727 * Returns 1 if the path is an "other" path with respect to
1728 * the index; that is, the path is not mentioned in the index at all,
1729 * either as a file, a directory with some files in the index,
1730 * or as an unmerged entry.
1732 * We helpfully remove a trailing "/" from directories so that
1733 * the output of read_directory can be used as-is.
1735 int index_name_is_other(const struct index_state *istate, const char *name,
1739 if (namelen && name[namelen - 1] == '/')
1741 pos = index_name_pos(istate, name, namelen);
1743 return 0; /* exact match */
1745 if (pos < istate->cache_nr) {
1746 struct cache_entry *ce = istate->cache[pos];
1747 if (ce_namelen(ce) == namelen &&
1748 !memcmp(ce->name, name, namelen))
1749 return 0; /* Yup, this one exists unmerged */