2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define NO_THE_INDEX_COMPATIBILITY_MACROS
8 #include "cache-tree.h"
14 #include "resolve-undo.h"
16 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
, int really
);
20 * The first letter should be 'A'..'Z' for extensions that are not
21 * necessary for a correct operation (i.e. optimization data).
22 * When new extensions are added that _needs_ to be understood in
23 * order to correctly interpret the index file, pick character that
24 * is outside the range, to cause the reader to abort.
27 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
28 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
29 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
31 struct index_state the_index
;
33 static void set_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
35 istate
->cache
[nr
] = ce
;
36 add_name_hash(istate
, ce
);
39 static void replace_index_entry(struct index_state
*istate
, int nr
, struct cache_entry
*ce
)
41 struct cache_entry
*old
= istate
->cache
[nr
];
43 remove_name_hash(old
);
44 set_index_entry(istate
, nr
, ce
);
45 istate
->cache_changed
= 1;
48 void rename_index_entry_at(struct index_state
*istate
, int nr
, const char *new_name
)
50 struct cache_entry
*old
= istate
->cache
[nr
], *new;
51 int namelen
= strlen(new_name
);
53 new = xmalloc(cache_entry_size(namelen
));
54 copy_cache_entry(new, old
);
55 new->ce_flags
&= ~(CE_STATE_MASK
| CE_NAMEMASK
);
56 new->ce_flags
|= (namelen
>= CE_NAMEMASK
? CE_NAMEMASK
: namelen
);
57 memcpy(new->name
, new_name
, namelen
+ 1);
59 cache_tree_invalidate_path(istate
->cache_tree
, old
->name
);
60 remove_index_entry_at(istate
, nr
);
61 add_index_entry(istate
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
65 * This only updates the "non-critical" parts of the directory
66 * cache, ie the parts that aren't tracked by GIT, and only used
67 * to validate the cache.
69 void fill_stat_cache_info(struct cache_entry
*ce
, struct stat
*st
)
71 ce
->ce_ctime
.sec
= (unsigned int)st
->st_ctime
;
72 ce
->ce_mtime
.sec
= (unsigned int)st
->st_mtime
;
73 ce
->ce_ctime
.nsec
= ST_CTIME_NSEC(*st
);
74 ce
->ce_mtime
.nsec
= ST_MTIME_NSEC(*st
);
75 ce
->ce_dev
= st
->st_dev
;
76 ce
->ce_ino
= st
->st_ino
;
77 ce
->ce_uid
= st
->st_uid
;
78 ce
->ce_gid
= st
->st_gid
;
79 ce
->ce_size
= st
->st_size
;
82 ce
->ce_flags
|= CE_VALID
;
84 if (S_ISREG(st
->st_mode
))
88 static int ce_compare_data(struct cache_entry
*ce
, struct stat
*st
)
91 int fd
= open(ce
->name
, O_RDONLY
);
94 unsigned char sha1
[20];
95 if (!index_fd(sha1
, fd
, st
, 0, OBJ_BLOB
, ce
->name
))
96 match
= hashcmp(sha1
, ce
->sha1
);
97 /* index_fd() closed the file descriptor already */
102 static int ce_compare_link(struct cache_entry
*ce
, size_t expected_size
)
107 enum object_type type
;
108 struct strbuf sb
= STRBUF_INIT
;
110 if (strbuf_readlink(&sb
, ce
->name
, expected_size
))
113 buffer
= read_sha1_file(ce
->sha1
, &type
, &size
);
116 match
= memcmp(buffer
, sb
.buf
, size
);
123 static int ce_compare_gitlink(struct cache_entry
*ce
)
125 unsigned char sha1
[20];
128 * We don't actually require that the .git directory
129 * under GITLINK directory be a valid git directory. It
130 * might even be missing (in case nobody populated that
133 * If so, we consider it always to match.
135 if (resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) < 0)
137 return hashcmp(sha1
, ce
->sha1
);
140 static int ce_modified_check_fs(struct cache_entry
*ce
, struct stat
*st
)
142 switch (st
->st_mode
& S_IFMT
) {
144 if (ce_compare_data(ce
, st
))
148 if (ce_compare_link(ce
, xsize_t(st
->st_size
)))
152 if (S_ISGITLINK(ce
->ce_mode
))
153 return ce_compare_gitlink(ce
) ? DATA_CHANGED
: 0;
160 static int is_empty_blob_sha1(const unsigned char *sha1
)
162 static const unsigned char empty_blob_sha1
[20] = {
163 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
164 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
167 return !hashcmp(sha1
, empty_blob_sha1
);
170 static int ce_match_stat_basic(struct cache_entry
*ce
, struct stat
*st
)
172 unsigned int changed
= 0;
174 if (ce
->ce_flags
& CE_REMOVE
)
175 return MODE_CHANGED
| DATA_CHANGED
| TYPE_CHANGED
;
177 switch (ce
->ce_mode
& S_IFMT
) {
179 changed
|= !S_ISREG(st
->st_mode
) ? TYPE_CHANGED
: 0;
180 /* We consider only the owner x bit to be relevant for
183 if (trust_executable_bit
&&
184 (0100 & (ce
->ce_mode
^ st
->st_mode
)))
185 changed
|= MODE_CHANGED
;
188 if (!S_ISLNK(st
->st_mode
) &&
189 (has_symlinks
|| !S_ISREG(st
->st_mode
)))
190 changed
|= TYPE_CHANGED
;
193 /* We ignore most of the st_xxx fields for gitlinks */
194 if (!S_ISDIR(st
->st_mode
))
195 changed
|= TYPE_CHANGED
;
196 else if (ce_compare_gitlink(ce
))
197 changed
|= DATA_CHANGED
;
200 die("internal error: ce_mode is %o", ce
->ce_mode
);
202 if (ce
->ce_mtime
.sec
!= (unsigned int)st
->st_mtime
)
203 changed
|= MTIME_CHANGED
;
204 if (trust_ctime
&& ce
->ce_ctime
.sec
!= (unsigned int)st
->st_ctime
)
205 changed
|= CTIME_CHANGED
;
208 if (ce
->ce_mtime
.nsec
!= ST_MTIME_NSEC(*st
))
209 changed
|= MTIME_CHANGED
;
210 if (trust_ctime
&& ce
->ce_ctime
.nsec
!= ST_CTIME_NSEC(*st
))
211 changed
|= CTIME_CHANGED
;
214 if (ce
->ce_uid
!= (unsigned int) st
->st_uid
||
215 ce
->ce_gid
!= (unsigned int) st
->st_gid
)
216 changed
|= OWNER_CHANGED
;
217 if (ce
->ce_ino
!= (unsigned int) st
->st_ino
)
218 changed
|= INODE_CHANGED
;
222 * st_dev breaks on network filesystems where different
223 * clients will have different views of what "device"
224 * the filesystem is on
226 if (ce
->ce_dev
!= (unsigned int) st
->st_dev
)
227 changed
|= INODE_CHANGED
;
230 if (ce
->ce_size
!= (unsigned int) st
->st_size
)
231 changed
|= DATA_CHANGED
;
233 /* Racily smudged entry? */
235 if (!is_empty_blob_sha1(ce
->sha1
))
236 changed
|= DATA_CHANGED
;
242 static int is_racy_timestamp(const struct index_state
*istate
, struct cache_entry
*ce
)
244 return (!S_ISGITLINK(ce
->ce_mode
) &&
245 istate
->timestamp
.sec
&&
247 /* nanosecond timestamped files can also be racy! */
248 (istate
->timestamp
.sec
< ce
->ce_mtime
.sec
||
249 (istate
->timestamp
.sec
== ce
->ce_mtime
.sec
&&
250 istate
->timestamp
.nsec
<= ce
->ce_mtime
.nsec
))
252 istate
->timestamp
.sec
<= ce
->ce_mtime
.sec
257 int ie_match_stat(const struct index_state
*istate
,
258 struct cache_entry
*ce
, struct stat
*st
,
259 unsigned int options
)
261 unsigned int changed
;
262 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
263 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
264 int assume_racy_is_modified
= options
& CE_MATCH_RACY_IS_DIRTY
;
267 * If it's marked as always valid in the index, it's
268 * valid whatever the checked-out copy says.
270 * skip-worktree has the same effect with higher precedence
272 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
))
274 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
))
278 * Intent-to-add entries have not been added, so the index entry
279 * by definition never matches what is in the work tree until it
280 * actually gets added.
282 if (ce
->ce_flags
& CE_INTENT_TO_ADD
)
283 return DATA_CHANGED
| TYPE_CHANGED
| MODE_CHANGED
;
285 changed
= ce_match_stat_basic(ce
, st
);
288 * Within 1 second of this sequence:
289 * echo xyzzy >file && git-update-index --add file
290 * running this command:
292 * would give a falsely clean cache entry. The mtime and
293 * length match the cache, and other stat fields do not change.
295 * We could detect this at update-index time (the cache entry
296 * being registered/updated records the same time as "now")
297 * and delay the return from git-update-index, but that would
298 * effectively mean we can make at most one commit per second,
299 * which is not acceptable. Instead, we check cache entries
300 * whose mtime are the same as the index file timestamp more
301 * carefully than others.
303 if (!changed
&& is_racy_timestamp(istate
, ce
)) {
304 if (assume_racy_is_modified
)
305 changed
|= DATA_CHANGED
;
307 changed
|= ce_modified_check_fs(ce
, st
);
313 int ie_modified(const struct index_state
*istate
,
314 struct cache_entry
*ce
, struct stat
*st
, unsigned int options
)
316 int changed
, changed_fs
;
318 changed
= ie_match_stat(istate
, ce
, st
, options
);
322 * If the mode or type has changed, there's no point in trying
323 * to refresh the entry - it's not going to match
325 if (changed
& (MODE_CHANGED
| TYPE_CHANGED
))
329 * Immediately after read-tree or update-index --cacheinfo,
330 * the length field is zero, as we have never even read the
331 * lstat(2) information once, and we cannot trust DATA_CHANGED
332 * returned by ie_match_stat() which in turn was returned by
333 * ce_match_stat_basic() to signal that the filesize of the
334 * blob changed. We have to actually go to the filesystem to
335 * see if the contents match, and if so, should answer "unchanged".
337 * The logic does not apply to gitlinks, as ce_match_stat_basic()
338 * already has checked the actual HEAD from the filesystem in the
339 * subproject. If ie_match_stat() already said it is different,
340 * then we know it is.
342 if ((changed
& DATA_CHANGED
) &&
343 (S_ISGITLINK(ce
->ce_mode
) || ce
->ce_size
!= 0))
346 changed_fs
= ce_modified_check_fs(ce
, st
);
348 return changed
| changed_fs
;
352 int base_name_compare(const char *name1
, int len1
, int mode1
,
353 const char *name2
, int len2
, int mode2
)
355 unsigned char c1
, c2
;
356 int len
= len1
< len2
? len1
: len2
;
359 cmp
= memcmp(name1
, name2
, len
);
364 if (!c1
&& S_ISDIR(mode1
))
366 if (!c2
&& S_ISDIR(mode2
))
368 return (c1
< c2
) ? -1 : (c1
> c2
) ? 1 : 0;
372 * df_name_compare() is identical to base_name_compare(), except it
373 * compares conflicting directory/file entries as equal. Note that
374 * while a directory name compares as equal to a regular file, they
375 * then individually compare _differently_ to a filename that has
376 * a dot after the basename (because '\0' < '.' < '/').
378 * This is used by routines that want to traverse the git namespace
379 * but then handle conflicting entries together when possible.
381 int df_name_compare(const char *name1
, int len1
, int mode1
,
382 const char *name2
, int len2
, int mode2
)
384 int len
= len1
< len2
? len1
: len2
, cmp
;
385 unsigned char c1
, c2
;
387 cmp
= memcmp(name1
, name2
, len
);
390 /* Directories and files compare equal (same length, same name) */
394 if (!c1
&& S_ISDIR(mode1
))
397 if (!c2
&& S_ISDIR(mode2
))
399 if (c1
== '/' && !c2
)
401 if (c2
== '/' && !c1
)
406 int cache_name_compare(const char *name1
, int flags1
, const char *name2
, int flags2
)
408 int len1
= flags1
& CE_NAMEMASK
;
409 int len2
= flags2
& CE_NAMEMASK
;
410 int len
= len1
< len2
? len1
: len2
;
413 cmp
= memcmp(name1
, name2
, len
);
422 flags1
&= CE_STAGEMASK
;
423 flags2
&= CE_STAGEMASK
;
432 int index_name_pos(const struct index_state
*istate
, const char *name
, int namelen
)
437 last
= istate
->cache_nr
;
438 while (last
> first
) {
439 int next
= (last
+ first
) >> 1;
440 struct cache_entry
*ce
= istate
->cache
[next
];
441 int cmp
= cache_name_compare(name
, namelen
, ce
->name
, ce
->ce_flags
);
453 /* Remove entry, return true if there are more entries to go.. */
454 int remove_index_entry_at(struct index_state
*istate
, int pos
)
456 struct cache_entry
*ce
= istate
->cache
[pos
];
458 record_resolve_undo(istate
, ce
);
459 remove_name_hash(ce
);
460 istate
->cache_changed
= 1;
462 if (pos
>= istate
->cache_nr
)
464 memmove(istate
->cache
+ pos
,
465 istate
->cache
+ pos
+ 1,
466 (istate
->cache_nr
- pos
) * sizeof(struct cache_entry
*));
471 * Remove all cache ententries marked for removal, that is where
472 * CE_REMOVE is set in ce_flags. This is much more effective than
473 * calling remove_index_entry_at() for each entry to be removed.
475 void remove_marked_cache_entries(struct index_state
*istate
)
477 struct cache_entry
**ce_array
= istate
->cache
;
480 for (i
= j
= 0; i
< istate
->cache_nr
; i
++) {
481 if (ce_array
[i
]->ce_flags
& CE_REMOVE
)
482 remove_name_hash(ce_array
[i
]);
484 ce_array
[j
++] = ce_array
[i
];
486 istate
->cache_changed
= 1;
487 istate
->cache_nr
= j
;
490 int remove_file_from_index(struct index_state
*istate
, const char *path
)
492 int pos
= index_name_pos(istate
, path
, strlen(path
));
495 cache_tree_invalidate_path(istate
->cache_tree
, path
);
496 while (pos
< istate
->cache_nr
&& !strcmp(istate
->cache
[pos
]->name
, path
))
497 remove_index_entry_at(istate
, pos
);
501 static int compare_name(struct cache_entry
*ce
, const char *path
, int namelen
)
503 return namelen
!= ce_namelen(ce
) || memcmp(path
, ce
->name
, namelen
);
506 static int index_name_pos_also_unmerged(struct index_state
*istate
,
507 const char *path
, int namelen
)
509 int pos
= index_name_pos(istate
, path
, namelen
);
510 struct cache_entry
*ce
;
515 /* maybe unmerged? */
517 if (pos
>= istate
->cache_nr
||
518 compare_name((ce
= istate
->cache
[pos
]), path
, namelen
))
521 /* order of preference: stage 2, 1, 3 */
522 if (ce_stage(ce
) == 1 && pos
+ 1 < istate
->cache_nr
&&
523 ce_stage((ce
= istate
->cache
[pos
+ 1])) == 2 &&
524 !compare_name(ce
, path
, namelen
))
529 static int different_name(struct cache_entry
*ce
, struct cache_entry
*alias
)
531 int len
= ce_namelen(ce
);
532 return ce_namelen(alias
) != len
|| memcmp(ce
->name
, alias
->name
, len
);
536 * If we add a filename that aliases in the cache, we will use the
537 * name that we already have - but we don't want to update the same
538 * alias twice, because that implies that there were actually two
539 * different files with aliasing names!
541 * So we use the CE_ADDED flag to verify that the alias was an old
542 * one before we accept it as
544 static struct cache_entry
*create_alias_ce(struct cache_entry
*ce
, struct cache_entry
*alias
)
547 struct cache_entry
*new;
549 if (alias
->ce_flags
& CE_ADDED
)
550 die("Will not add file alias '%s' ('%s' already exists in index)", ce
->name
, alias
->name
);
552 /* Ok, create the new entry using the name of the existing alias */
553 len
= ce_namelen(alias
);
554 new = xcalloc(1, cache_entry_size(len
));
555 memcpy(new->name
, alias
->name
, len
);
556 copy_cache_entry(new, ce
);
561 static void record_intent_to_add(struct cache_entry
*ce
)
563 unsigned char sha1
[20];
564 if (write_sha1_file("", 0, blob_type
, sha1
))
565 die("cannot create an empty blob in the object database");
566 hashcpy(ce
->sha1
, sha1
);
569 int add_to_index(struct index_state
*istate
, const char *path
, struct stat
*st
, int flags
)
571 int size
, namelen
, was_same
;
572 mode_t st_mode
= st
->st_mode
;
573 struct cache_entry
*ce
, *alias
;
574 unsigned ce_option
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
|CE_MATCH_RACY_IS_DIRTY
;
575 int verbose
= flags
& (ADD_CACHE_VERBOSE
| ADD_CACHE_PRETEND
);
576 int pretend
= flags
& ADD_CACHE_PRETEND
;
577 int intent_only
= flags
& ADD_CACHE_INTENT
;
578 int add_option
= (ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
|
579 (intent_only
? ADD_CACHE_NEW_ONLY
: 0));
581 if (!S_ISREG(st_mode
) && !S_ISLNK(st_mode
) && !S_ISDIR(st_mode
))
582 return error("%s: can only add regular files, symbolic links or git-directories", path
);
584 namelen
= strlen(path
);
585 if (S_ISDIR(st_mode
)) {
586 while (namelen
&& path
[namelen
-1] == '/')
589 size
= cache_entry_size(namelen
);
590 ce
= xcalloc(1, size
);
591 memcpy(ce
->name
, path
, namelen
);
592 ce
->ce_flags
= namelen
;
594 fill_stat_cache_info(ce
, st
);
596 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
598 if (trust_executable_bit
&& has_symlinks
)
599 ce
->ce_mode
= create_ce_mode(st_mode
);
601 /* If there is an existing entry, pick the mode bits and type
602 * from it, otherwise assume unexecutable regular file.
604 struct cache_entry
*ent
;
605 int pos
= index_name_pos_also_unmerged(istate
, path
, namelen
);
607 ent
= (0 <= pos
) ? istate
->cache
[pos
] : NULL
;
608 ce
->ce_mode
= ce_mode_from_stat(ent
, st_mode
);
611 alias
= index_name_exists(istate
, ce
->name
, ce_namelen(ce
), ignore_case
);
612 if (alias
&& !ce_stage(alias
) && !ie_match_stat(istate
, alias
, st
, ce_option
)) {
613 /* Nothing changed, really */
615 if (!S_ISGITLINK(alias
->ce_mode
))
616 ce_mark_uptodate(alias
);
617 alias
->ce_flags
|= CE_ADDED
;
621 if (index_path(ce
->sha1
, path
, st
, 1))
622 return error("unable to index file %s", path
);
624 record_intent_to_add(ce
);
626 if (ignore_case
&& alias
&& different_name(ce
, alias
))
627 ce
= create_alias_ce(ce
, alias
);
628 ce
->ce_flags
|= CE_ADDED
;
630 /* It was suspected to be racily clean, but it turns out to be Ok */
633 !hashcmp(alias
->sha1
, ce
->sha1
) &&
634 ce
->ce_mode
== alias
->ce_mode
);
638 else if (add_index_entry(istate
, ce
, add_option
))
639 return error("unable to add %s to index",path
);
640 if (verbose
&& !was_same
)
641 printf("add '%s'\n", path
);
645 int add_file_to_index(struct index_state
*istate
, const char *path
, int flags
)
648 if (lstat(path
, &st
))
649 die_errno("unable to stat '%s'", path
);
650 return add_to_index(istate
, path
, &st
, flags
);
653 struct cache_entry
*make_cache_entry(unsigned int mode
,
654 const unsigned char *sha1
, const char *path
, int stage
,
658 struct cache_entry
*ce
;
660 if (!verify_path(path
)) {
661 error("Invalid path '%s'", path
);
666 size
= cache_entry_size(len
);
667 ce
= xcalloc(1, size
);
669 hashcpy(ce
->sha1
, sha1
);
670 memcpy(ce
->name
, path
, len
);
671 ce
->ce_flags
= create_ce_flags(len
, stage
);
672 ce
->ce_mode
= create_ce_mode(mode
);
675 return refresh_cache_entry(ce
, 0);
680 int ce_same_name(struct cache_entry
*a
, struct cache_entry
*b
)
682 int len
= ce_namelen(a
);
683 return ce_namelen(b
) == len
&& !memcmp(a
->name
, b
->name
, len
);
686 int ce_path_match(const struct cache_entry
*ce
, const char **pathspec
)
688 const char *match
, *name
;
694 len
= ce_namelen(ce
);
696 while ((match
= *pathspec
++) != NULL
) {
697 int matchlen
= strlen(match
);
700 if (memcmp(name
, match
, matchlen
))
702 if (matchlen
&& name
[matchlen
-1] == '/')
704 if (name
[matchlen
] == '/' || !name
[matchlen
])
713 * We fundamentally don't like some paths: we don't want
714 * dot or dot-dot anywhere, and for obvious reasons don't
715 * want to recurse into ".git" either.
717 * Also, we don't want double slashes or slashes at the
718 * end that can make pathnames ambiguous.
720 static int verify_dotfile(const char *rest
)
723 * The first character was '.', but that
724 * has already been discarded, we now test
728 /* "." is not allowed */
733 * ".git" followed by NUL or slash is bad. This
734 * shares the path end test with the ".." case.
744 if (rest
[1] == '\0' || rest
[1] == '/')
750 int verify_path(const char *path
)
767 if (verify_dotfile(path
))
777 * Do we have another file that has the beginning components being a
778 * proper superset of the name we're trying to add?
780 static int has_file_name(struct index_state
*istate
,
781 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
784 int len
= ce_namelen(ce
);
785 int stage
= ce_stage(ce
);
786 const char *name
= ce
->name
;
788 while (pos
< istate
->cache_nr
) {
789 struct cache_entry
*p
= istate
->cache
[pos
++];
791 if (len
>= ce_namelen(p
))
793 if (memcmp(name
, p
->name
, len
))
795 if (ce_stage(p
) != stage
)
797 if (p
->name
[len
] != '/')
799 if (p
->ce_flags
& CE_REMOVE
)
804 remove_index_entry_at(istate
, --pos
);
810 * Do we have another file with a pathname that is a proper
811 * subset of the name we're trying to add?
813 static int has_dir_name(struct index_state
*istate
,
814 const struct cache_entry
*ce
, int pos
, int ok_to_replace
)
817 int stage
= ce_stage(ce
);
818 const char *name
= ce
->name
;
819 const char *slash
= name
+ ce_namelen(ce
);
827 if (slash
<= ce
->name
)
832 pos
= index_name_pos(istate
, name
, create_ce_flags(len
, stage
));
835 * Found one, but not so fast. This could
836 * be a marker that says "I was here, but
837 * I am being removed". Such an entry is
838 * not a part of the resulting tree, and
839 * it is Ok to have a directory at the same
842 if (!(istate
->cache
[pos
]->ce_flags
& CE_REMOVE
)) {
846 remove_index_entry_at(istate
, pos
);
854 * Trivial optimization: if we find an entry that
855 * already matches the sub-directory, then we know
856 * we're ok, and we can exit.
858 while (pos
< istate
->cache_nr
) {
859 struct cache_entry
*p
= istate
->cache
[pos
];
860 if ((ce_namelen(p
) <= len
) ||
861 (p
->name
[len
] != '/') ||
862 memcmp(p
->name
, name
, len
))
863 break; /* not our subdirectory */
864 if (ce_stage(p
) == stage
&& !(p
->ce_flags
& CE_REMOVE
))
866 * p is at the same stage as our entry, and
867 * is a subdirectory of what we are looking
868 * at, so we cannot have conflicts at our
869 * level or anything shorter.
878 /* We may be in a situation where we already have path/file and path
879 * is being added, or we already have path and path/file is being
880 * added. Either one would result in a nonsense tree that has path
881 * twice when git-write-tree tries to write it out. Prevent it.
883 * If ok-to-replace is specified, we remove the conflicting entries
884 * from the cache so the caller should recompute the insert position.
885 * When this happens, we return non-zero.
887 static int check_file_directory_conflict(struct index_state
*istate
,
888 const struct cache_entry
*ce
,
889 int pos
, int ok_to_replace
)
894 * When ce is an "I am going away" entry, we allow it to be added
896 if (ce
->ce_flags
& CE_REMOVE
)
900 * We check if the path is a sub-path of a subsequent pathname
901 * first, since removing those will not change the position
904 retval
= has_file_name(istate
, ce
, pos
, ok_to_replace
);
907 * Then check if the path might have a clashing sub-directory
910 return retval
+ has_dir_name(istate
, ce
, pos
, ok_to_replace
);
913 static int add_index_entry_with_check(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
916 int ok_to_add
= option
& ADD_CACHE_OK_TO_ADD
;
917 int ok_to_replace
= option
& ADD_CACHE_OK_TO_REPLACE
;
918 int skip_df_check
= option
& ADD_CACHE_SKIP_DFCHECK
;
919 int new_only
= option
& ADD_CACHE_NEW_ONLY
;
921 cache_tree_invalidate_path(istate
->cache_tree
, ce
->name
);
922 pos
= index_name_pos(istate
, ce
->name
, ce
->ce_flags
);
924 /* existing match? Just replace it. */
927 replace_index_entry(istate
, pos
, ce
);
933 * Inserting a merged entry ("stage 0") into the index
934 * will always replace all non-merged entries..
936 if (pos
< istate
->cache_nr
&& ce_stage(ce
) == 0) {
937 while (ce_same_name(istate
->cache
[pos
], ce
)) {
939 if (!remove_index_entry_at(istate
, pos
))
946 if (!verify_path(ce
->name
))
947 return error("Invalid path '%s'", ce
->name
);
949 if (!skip_df_check
&&
950 check_file_directory_conflict(istate
, ce
, pos
, ok_to_replace
)) {
952 return error("'%s' appears as both a file and as a directory",
954 pos
= index_name_pos(istate
, ce
->name
, ce
->ce_flags
);
960 int add_index_entry(struct index_state
*istate
, struct cache_entry
*ce
, int option
)
964 if (option
& ADD_CACHE_JUST_APPEND
)
965 pos
= istate
->cache_nr
;
968 ret
= add_index_entry_with_check(istate
, ce
, option
);
974 /* Make sure the array is big enough .. */
975 if (istate
->cache_nr
== istate
->cache_alloc
) {
976 istate
->cache_alloc
= alloc_nr(istate
->cache_alloc
);
977 istate
->cache
= xrealloc(istate
->cache
,
978 istate
->cache_alloc
* sizeof(struct cache_entry
*));
983 if (istate
->cache_nr
> pos
+ 1)
984 memmove(istate
->cache
+ pos
+ 1,
986 (istate
->cache_nr
- pos
- 1) * sizeof(ce
));
987 set_index_entry(istate
, pos
, ce
);
988 istate
->cache_changed
= 1;
993 * "refresh" does not calculate a new sha1 file or bring the
994 * cache up-to-date for mode/content changes. But what it
995 * _does_ do is to "re-match" the stat information of a file
996 * with the cache, so that you can refresh the cache for a
997 * file that hasn't been changed but where the stat entry is
1000 * For example, you'd want to do this after doing a "git-read-tree",
1001 * to link up the stat cache details with the proper files.
1003 static struct cache_entry
*refresh_cache_ent(struct index_state
*istate
,
1004 struct cache_entry
*ce
,
1005 unsigned int options
, int *err
)
1008 struct cache_entry
*updated
;
1010 int ignore_valid
= options
& CE_MATCH_IGNORE_VALID
;
1011 int ignore_skip_worktree
= options
& CE_MATCH_IGNORE_SKIP_WORKTREE
;
1013 if (ce_uptodate(ce
))
1017 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1018 * that the change to the work tree does not matter and told
1021 if (!ignore_skip_worktree
&& ce_skip_worktree(ce
)) {
1022 ce_mark_uptodate(ce
);
1025 if (!ignore_valid
&& (ce
->ce_flags
& CE_VALID
)) {
1026 ce_mark_uptodate(ce
);
1030 if (lstat(ce
->name
, &st
) < 0) {
1036 changed
= ie_match_stat(istate
, ce
, &st
, options
);
1039 * The path is unchanged. If we were told to ignore
1040 * valid bit, then we did the actual stat check and
1041 * found that the entry is unmodified. If the entry
1042 * is not marked VALID, this is the place to mark it
1043 * valid again, under "assume unchanged" mode.
1045 if (ignore_valid
&& assume_unchanged
&&
1046 !(ce
->ce_flags
& CE_VALID
))
1047 ; /* mark this one VALID again */
1050 * We do not mark the index itself "modified"
1051 * because CE_UPTODATE flag is in-core only;
1052 * we are not going to write this change out.
1054 if (!S_ISGITLINK(ce
->ce_mode
))
1055 ce_mark_uptodate(ce
);
1060 if (ie_modified(istate
, ce
, &st
, options
)) {
1067 updated
= xmalloc(size
);
1068 memcpy(updated
, ce
, size
);
1069 fill_stat_cache_info(updated
, &st
);
1071 * If ignore_valid is not set, we should leave CE_VALID bit
1072 * alone. Otherwise, paths marked with --no-assume-unchanged
1073 * (i.e. things to be edited) will reacquire CE_VALID bit
1074 * automatically, which is not really what we want.
1076 if (!ignore_valid
&& assume_unchanged
&&
1077 !(ce
->ce_flags
& CE_VALID
))
1078 updated
->ce_flags
&= ~CE_VALID
;
1083 static void show_file(const char * fmt
, const char * name
, int in_porcelain
,
1084 int * first
, char *header_msg
)
1086 if (in_porcelain
&& *first
&& header_msg
) {
1087 printf("%s\n", header_msg
);
1093 int refresh_index(struct index_state
*istate
, unsigned int flags
, const char **pathspec
,
1094 char *seen
, char *header_msg
)
1098 int really
= (flags
& REFRESH_REALLY
) != 0;
1099 int allow_unmerged
= (flags
& REFRESH_UNMERGED
) != 0;
1100 int quiet
= (flags
& REFRESH_QUIET
) != 0;
1101 int not_new
= (flags
& REFRESH_IGNORE_MISSING
) != 0;
1102 int ignore_submodules
= (flags
& REFRESH_IGNORE_SUBMODULES
) != 0;
1104 int in_porcelain
= (flags
& REFRESH_IN_PORCELAIN
);
1105 unsigned int options
= really
? CE_MATCH_IGNORE_VALID
: 0;
1106 const char *needs_update_fmt
;
1107 const char *needs_merge_fmt
;
1109 needs_update_fmt
= (in_porcelain
? "M\t%s\n" : "%s: needs update\n");
1110 needs_merge_fmt
= (in_porcelain
? "U\t%s\n" : "%s: needs merge\n");
1111 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1112 struct cache_entry
*ce
, *new;
1113 int cache_errno
= 0;
1115 ce
= istate
->cache
[i
];
1116 if (ignore_submodules
&& S_ISGITLINK(ce
->ce_mode
))
1120 while ((i
< istate
->cache_nr
) &&
1121 ! strcmp(istate
->cache
[i
]->name
, ce
->name
))
1126 show_file(needs_merge_fmt
, ce
->name
, in_porcelain
, &first
, header_msg
);
1131 if (pathspec
&& !match_pathspec(pathspec
, ce
->name
, strlen(ce
->name
), 0, seen
))
1134 new = refresh_cache_ent(istate
, ce
, options
, &cache_errno
);
1138 if (not_new
&& cache_errno
== ENOENT
)
1140 if (really
&& cache_errno
== EINVAL
) {
1141 /* If we are doing --really-refresh that
1142 * means the index is not valid anymore.
1144 ce
->ce_flags
&= ~CE_VALID
;
1145 istate
->cache_changed
= 1;
1149 show_file(needs_update_fmt
, ce
->name
, in_porcelain
, &first
, header_msg
);
1154 replace_index_entry(istate
, i
, new);
1159 static struct cache_entry
*refresh_cache_entry(struct cache_entry
*ce
, int really
)
1161 return refresh_cache_ent(&the_index
, ce
, really
, NULL
);
1164 static int verify_hdr(struct cache_header
*hdr
, unsigned long size
)
1167 unsigned char sha1
[20];
1169 if (hdr
->hdr_signature
!= htonl(CACHE_SIGNATURE
))
1170 return error("bad signature");
1171 if (hdr
->hdr_version
!= htonl(2) && hdr
->hdr_version
!= htonl(3))
1172 return error("bad index version");
1174 git_SHA1_Update(&c
, hdr
, size
- 20);
1175 git_SHA1_Final(sha1
, &c
);
1176 if (hashcmp(sha1
, (unsigned char *)hdr
+ size
- 20))
1177 return error("bad index file sha1 signature");
1181 static int read_index_extension(struct index_state
*istate
,
1182 const char *ext
, void *data
, unsigned long sz
)
1184 switch (CACHE_EXT(ext
)) {
1185 case CACHE_EXT_TREE
:
1186 istate
->cache_tree
= cache_tree_read(data
, sz
);
1188 case CACHE_EXT_RESOLVE_UNDO
:
1189 istate
->resolve_undo
= resolve_undo_read(data
, sz
);
1192 if (*ext
< 'A' || 'Z' < *ext
)
1193 return error("index uses %.4s extension, which we do not understand",
1195 fprintf(stderr
, "ignoring %.4s extension\n", ext
);
1201 int read_index(struct index_state
*istate
)
1203 return read_index_from(istate
, get_index_file());
1206 static void convert_from_disk(struct ondisk_cache_entry
*ondisk
, struct cache_entry
*ce
)
1211 ce
->ce_ctime
.sec
= ntohl(ondisk
->ctime
.sec
);
1212 ce
->ce_mtime
.sec
= ntohl(ondisk
->mtime
.sec
);
1213 ce
->ce_ctime
.nsec
= ntohl(ondisk
->ctime
.nsec
);
1214 ce
->ce_mtime
.nsec
= ntohl(ondisk
->mtime
.nsec
);
1215 ce
->ce_dev
= ntohl(ondisk
->dev
);
1216 ce
->ce_ino
= ntohl(ondisk
->ino
);
1217 ce
->ce_mode
= ntohl(ondisk
->mode
);
1218 ce
->ce_uid
= ntohl(ondisk
->uid
);
1219 ce
->ce_gid
= ntohl(ondisk
->gid
);
1220 ce
->ce_size
= ntohl(ondisk
->size
);
1221 /* On-disk flags are just 16 bits */
1222 ce
->ce_flags
= ntohs(ondisk
->flags
);
1224 hashcpy(ce
->sha1
, ondisk
->sha1
);
1226 len
= ce
->ce_flags
& CE_NAMEMASK
;
1228 if (ce
->ce_flags
& CE_EXTENDED
) {
1229 struct ondisk_cache_entry_extended
*ondisk2
;
1231 ondisk2
= (struct ondisk_cache_entry_extended
*)ondisk
;
1232 extended_flags
= ntohs(ondisk2
->flags2
) << 16;
1233 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1234 if (extended_flags
& ~CE_EXTENDED_FLAGS
)
1235 die("Unknown index entry format %08x", extended_flags
);
1236 ce
->ce_flags
|= extended_flags
;
1237 name
= ondisk2
->name
;
1240 name
= ondisk
->name
;
1242 if (len
== CE_NAMEMASK
)
1245 * NEEDSWORK: If the original index is crafted, this copy could
1248 memcpy(ce
->name
, name
, len
+ 1);
1251 static inline size_t estimate_cache_size(size_t ondisk_size
, unsigned int entries
)
1255 per_entry
= sizeof(struct cache_entry
) - sizeof(struct ondisk_cache_entry
);
1258 * Alignment can cause differences. This should be "alignof", but
1259 * since that's a gcc'ism, just use the size of a pointer.
1261 per_entry
+= sizeof(void *);
1262 return ondisk_size
+ entries
*per_entry
;
1265 /* remember to discard_cache() before reading a different cache! */
1266 int read_index_from(struct index_state
*istate
, const char *path
)
1270 unsigned long src_offset
, dst_offset
;
1271 struct cache_header
*hdr
;
1276 if (istate
->initialized
)
1277 return istate
->cache_nr
;
1280 istate
->timestamp
.sec
= 0;
1281 istate
->timestamp
.nsec
= 0;
1282 fd
= open(path
, O_RDONLY
);
1284 if (errno
== ENOENT
)
1286 die_errno("index file open failed");
1290 die_errno("cannot stat the open index");
1293 mmap_size
= xsize_t(st
.st_size
);
1294 if (mmap_size
< sizeof(struct cache_header
) + 20)
1295 die("index file smaller than expected");
1297 mmap
= xmmap(NULL
, mmap_size
, PROT_READ
| PROT_WRITE
, MAP_PRIVATE
, fd
, 0);
1299 if (mmap
== MAP_FAILED
)
1300 die_errno("unable to map index file");
1303 if (verify_hdr(hdr
, mmap_size
) < 0)
1306 istate
->cache_nr
= ntohl(hdr
->hdr_entries
);
1307 istate
->cache_alloc
= alloc_nr(istate
->cache_nr
);
1308 istate
->cache
= xcalloc(istate
->cache_alloc
, sizeof(struct cache_entry
*));
1311 * The disk format is actually larger than the in-memory format,
1312 * due to space for nsec etc, so even though the in-memory one
1313 * has room for a few more flags, we can allocate using the same
1316 istate
->alloc
= xmalloc(estimate_cache_size(mmap_size
, istate
->cache_nr
));
1317 istate
->initialized
= 1;
1319 src_offset
= sizeof(*hdr
);
1321 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1322 struct ondisk_cache_entry
*disk_ce
;
1323 struct cache_entry
*ce
;
1325 disk_ce
= (struct ondisk_cache_entry
*)((char *)mmap
+ src_offset
);
1326 ce
= (struct cache_entry
*)((char *)istate
->alloc
+ dst_offset
);
1327 convert_from_disk(disk_ce
, ce
);
1328 set_index_entry(istate
, i
, ce
);
1330 src_offset
+= ondisk_ce_size(ce
);
1331 dst_offset
+= ce_size(ce
);
1333 istate
->timestamp
.sec
= st
.st_mtime
;
1334 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1336 while (src_offset
<= mmap_size
- 20 - 8) {
1337 /* After an array of active_nr index entries,
1338 * there can be arbitrary number of extended
1339 * sections, each of which is prefixed with
1340 * extension name (4-byte) and section length
1341 * in 4-byte network byte order.
1344 memcpy(&extsize
, (char *)mmap
+ src_offset
+ 4, 4);
1345 extsize
= ntohl(extsize
);
1346 if (read_index_extension(istate
,
1347 (const char *) mmap
+ src_offset
,
1348 (char *) mmap
+ src_offset
+ 8,
1352 src_offset
+= extsize
;
1354 munmap(mmap
, mmap_size
);
1355 return istate
->cache_nr
;
1358 munmap(mmap
, mmap_size
);
1360 die("index file corrupt");
1363 int is_index_unborn(struct index_state
*istate
)
1365 return (!istate
->cache_nr
&& !istate
->alloc
&& !istate
->timestamp
.sec
);
1368 int discard_index(struct index_state
*istate
)
1370 resolve_undo_clear_index(istate
);
1371 istate
->cache_nr
= 0;
1372 istate
->cache_changed
= 0;
1373 istate
->timestamp
.sec
= 0;
1374 istate
->timestamp
.nsec
= 0;
1375 istate
->name_hash_initialized
= 0;
1376 free_hash(&istate
->name_hash
);
1377 cache_tree_free(&(istate
->cache_tree
));
1378 free(istate
->alloc
);
1379 istate
->alloc
= NULL
;
1380 istate
->initialized
= 0;
1382 /* no need to throw away allocated active_cache */
1386 int unmerged_index(const struct index_state
*istate
)
1389 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1390 if (ce_stage(istate
->cache
[i
]))
1396 #define WRITE_BUFFER_SIZE 8192
1397 static unsigned char write_buffer
[WRITE_BUFFER_SIZE
];
1398 static unsigned long write_buffer_len
;
1400 static int ce_write_flush(git_SHA_CTX
*context
, int fd
)
1402 unsigned int buffered
= write_buffer_len
;
1404 git_SHA1_Update(context
, write_buffer
, buffered
);
1405 if (write_in_full(fd
, write_buffer
, buffered
) != buffered
)
1407 write_buffer_len
= 0;
1412 static int ce_write(git_SHA_CTX
*context
, int fd
, void *data
, unsigned int len
)
1415 unsigned int buffered
= write_buffer_len
;
1416 unsigned int partial
= WRITE_BUFFER_SIZE
- buffered
;
1419 memcpy(write_buffer
+ buffered
, data
, partial
);
1420 buffered
+= partial
;
1421 if (buffered
== WRITE_BUFFER_SIZE
) {
1422 write_buffer_len
= buffered
;
1423 if (ce_write_flush(context
, fd
))
1427 write_buffer_len
= buffered
;
1429 data
= (char *) data
+ partial
;
1434 static int write_index_ext_header(git_SHA_CTX
*context
, int fd
,
1435 unsigned int ext
, unsigned int sz
)
1439 return ((ce_write(context
, fd
, &ext
, 4) < 0) ||
1440 (ce_write(context
, fd
, &sz
, 4) < 0)) ? -1 : 0;
1443 static int ce_flush(git_SHA_CTX
*context
, int fd
)
1445 unsigned int left
= write_buffer_len
;
1448 write_buffer_len
= 0;
1449 git_SHA1_Update(context
, write_buffer
, left
);
1452 /* Flush first if not enough space for SHA1 signature */
1453 if (left
+ 20 > WRITE_BUFFER_SIZE
) {
1454 if (write_in_full(fd
, write_buffer
, left
) != left
)
1459 /* Append the SHA1 signature at the end */
1460 git_SHA1_Final(write_buffer
+ left
, context
);
1462 return (write_in_full(fd
, write_buffer
, left
) != left
) ? -1 : 0;
1465 static void ce_smudge_racily_clean_entry(struct cache_entry
*ce
)
1468 * The only thing we care about in this function is to smudge the
1469 * falsely clean entry due to touch-update-touch race, so we leave
1470 * everything else as they are. We are called for entries whose
1471 * ce_mtime match the index file mtime.
1473 * Note that this actually does not do much for gitlinks, for
1474 * which ce_match_stat_basic() always goes to the actual
1475 * contents. The caller checks with is_racy_timestamp() which
1476 * always says "no" for gitlinks, so we are not called for them ;-)
1480 if (lstat(ce
->name
, &st
) < 0)
1482 if (ce_match_stat_basic(ce
, &st
))
1484 if (ce_modified_check_fs(ce
, &st
)) {
1485 /* This is "racily clean"; smudge it. Note that this
1486 * is a tricky code. At first glance, it may appear
1487 * that it can break with this sequence:
1489 * $ echo xyzzy >frotz
1490 * $ git-update-index --add frotz
1493 * $ echo filfre >nitfol
1494 * $ git-update-index --add nitfol
1496 * but it does not. When the second update-index runs,
1497 * it notices that the entry "frotz" has the same timestamp
1498 * as index, and if we were to smudge it by resetting its
1499 * size to zero here, then the object name recorded
1500 * in index is the 6-byte file but the cached stat information
1501 * becomes zero --- which would then match what we would
1502 * obtain from the filesystem next time we stat("frotz").
1504 * However, the second update-index, before calling
1505 * this function, notices that the cached size is 6
1506 * bytes and what is on the filesystem is an empty
1507 * file, and never calls us, so the cached size information
1508 * for "frotz" stays 6 which does not match the filesystem.
1514 static int ce_write_entry(git_SHA_CTX
*c
, int fd
, struct cache_entry
*ce
)
1516 int size
= ondisk_ce_size(ce
);
1517 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 result
= ce_write(c
, fd
, ondisk
, size
);
1548 static int has_racy_timestamp(struct index_state
*istate
)
1550 int entries
= istate
->cache_nr
;
1553 for (i
= 0; i
< entries
; i
++) {
1554 struct cache_entry
*ce
= istate
->cache
[i
];
1555 if (is_racy_timestamp(istate
, ce
))
1562 * Opportunisticly update the index but do not complain if we can't
1564 void update_index_if_able(struct index_state
*istate
, struct lock_file
*lockfile
)
1566 if ((istate
->cache_changed
|| has_racy_timestamp(istate
)) &&
1567 !write_index(istate
, lockfile
->fd
))
1568 commit_locked_index(lockfile
);
1570 rollback_lock_file(lockfile
);
1573 int write_index(struct index_state
*istate
, int newfd
)
1576 struct cache_header hdr
;
1577 int i
, err
, removed
, extended
;
1578 struct cache_entry
**cache
= istate
->cache
;
1579 int entries
= istate
->cache_nr
;
1582 for (i
= removed
= extended
= 0; i
< entries
; i
++) {
1583 if (cache
[i
]->ce_flags
& CE_REMOVE
)
1586 /* reduce extended entries if possible */
1587 cache
[i
]->ce_flags
&= ~CE_EXTENDED
;
1588 if (cache
[i
]->ce_flags
& CE_EXTENDED_FLAGS
) {
1590 cache
[i
]->ce_flags
|= CE_EXTENDED
;
1594 hdr
.hdr_signature
= htonl(CACHE_SIGNATURE
);
1595 /* for extended format, increase version so older git won't try to read it */
1596 hdr
.hdr_version
= htonl(extended
? 3 : 2);
1597 hdr
.hdr_entries
= htonl(entries
- removed
);
1600 if (ce_write(&c
, newfd
, &hdr
, sizeof(hdr
)) < 0)
1603 for (i
= 0; i
< entries
; i
++) {
1604 struct cache_entry
*ce
= cache
[i
];
1605 if (ce
->ce_flags
& CE_REMOVE
)
1607 if (!ce_uptodate(ce
) && is_racy_timestamp(istate
, ce
))
1608 ce_smudge_racily_clean_entry(ce
);
1609 if (ce_write_entry(&c
, newfd
, ce
) < 0)
1613 /* Write extension data here */
1614 if (istate
->cache_tree
) {
1615 struct strbuf sb
= STRBUF_INIT
;
1617 cache_tree_write(&sb
, istate
->cache_tree
);
1618 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_TREE
, sb
.len
) < 0
1619 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
1620 strbuf_release(&sb
);
1624 if (istate
->resolve_undo
) {
1625 struct strbuf sb
= STRBUF_INIT
;
1627 resolve_undo_write(&sb
, istate
->resolve_undo
);
1628 err
= write_index_ext_header(&c
, newfd
, CACHE_EXT_RESOLVE_UNDO
,
1630 || ce_write(&c
, newfd
, sb
.buf
, sb
.len
) < 0;
1631 strbuf_release(&sb
);
1636 if (ce_flush(&c
, newfd
) || fstat(newfd
, &st
))
1638 istate
->timestamp
.sec
= (unsigned int)st
.st_mtime
;
1639 istate
->timestamp
.nsec
= ST_MTIME_NSEC(st
);
1644 * Read the index file that is potentially unmerged into given
1645 * index_state, dropping any unmerged entries. Returns true if
1646 * the index is unmerged. Callers who want to refuse to work
1647 * from an unmerged state can call this and check its return value,
1648 * instead of calling read_cache().
1650 int read_index_unmerged(struct index_state
*istate
)
1656 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1657 struct cache_entry
*ce
= istate
->cache
[i
];
1658 struct cache_entry
*new_ce
;
1664 len
= strlen(ce
->name
);
1665 size
= cache_entry_size(len
);
1666 new_ce
= xcalloc(1, size
);
1667 memcpy(new_ce
->name
, ce
->name
, len
);
1668 new_ce
->ce_flags
= create_ce_flags(len
, 0) | CE_CONFLICTED
;
1669 new_ce
->ce_mode
= ce
->ce_mode
;
1670 if (add_index_entry(istate
, new_ce
, 0))
1671 return error("%s: cannot drop to stage #0",
1673 i
= index_name_pos(istate
, new_ce
->name
, len
);
1679 * Returns 1 if the path is an "other" path with respect to
1680 * the index; that is, the path is not mentioned in the index at all,
1681 * either as a file, a directory with some files in the index,
1682 * or as an unmerged entry.
1684 * We helpfully remove a trailing "/" from directories so that
1685 * the output of read_directory can be used as-is.
1687 int index_name_is_other(const struct index_state
*istate
, const char *name
,
1691 if (namelen
&& name
[namelen
- 1] == '/')
1693 pos
= index_name_pos(istate
, name
, namelen
);
1695 return 0; /* exact match */
1697 if (pos
< istate
->cache_nr
) {
1698 struct cache_entry
*ce
= istate
->cache
[pos
];
1699 if (ce_namelen(ce
) == namelen
&&
1700 !memcmp(ce
->name
, name
, namelen
))
1701 return 0; /* Yup, this one exists unmerged */