]> git.ipfire.org Git - thirdparty/git.git/blob - read-cache.c
add_to_index(): free unused cache-entry
[thirdparty/git.git] / read-cache.c
1 /*
2 * GIT - The information manager from hell
3 *
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"
21
22 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
23 unsigned int options);
24
25 /* Mask for the name length in ce_flags in the on-disk index */
26
27 #define CE_NAMEMASK (0x0fff)
28
29 /* Index extensions.
30 *
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.
36 */
37
38 #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
39 #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
40 #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
41 #define CACHE_EXT_LINK 0x6c696e6b /* "link" */
42
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)
47
48 struct index_state the_index;
49 static const char *alternate_index_output;
50
51 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
52 {
53 istate->cache[nr] = ce;
54 add_name_hash(istate, ce);
55 }
56
57 static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
58 {
59 struct cache_entry *old = istate->cache[nr];
60
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;
67 }
68
69 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
70 {
71 struct cache_entry *old = istate->cache[nr], *new;
72 int namelen = strlen(new_name);
73
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);
80
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);
84 }
85
86 void fill_stat_data(struct stat_data *sd, struct stat *st)
87 {
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;
97 }
98
99 int match_stat_data(const struct stat_data *sd, struct stat *st)
100 {
101 int changed = 0;
102
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;
108
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
116
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;
123 }
124
125 #ifdef USE_STDEV
126 /*
127 * st_dev breaks on network filesystems where different
128 * clients will have different views of what "device"
129 * the filesystem is on
130 */
131 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
132 changed |= INODE_CHANGED;
133 #endif
134
135 if (sd->sd_size != (unsigned int) st->st_size)
136 changed |= DATA_CHANGED;
137
138 return changed;
139 }
140
141 /*
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.
145 */
146 void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
147 {
148 fill_stat_data(&ce->ce_stat_data, st);
149
150 if (assume_unchanged)
151 ce->ce_flags |= CE_VALID;
152
153 if (S_ISREG(st->st_mode))
154 ce_mark_uptodate(ce);
155 }
156
157 static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
158 {
159 int match = -1;
160 int fd = open(ce->name, O_RDONLY);
161
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 */
167 }
168 return match;
169 }
170
171 static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
172 {
173 int match = -1;
174 void *buffer;
175 unsigned long size;
176 enum object_type type;
177 struct strbuf sb = STRBUF_INIT;
178
179 if (strbuf_readlink(&sb, ce->name, expected_size))
180 return -1;
181
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);
187 }
188 strbuf_release(&sb);
189 return match;
190 }
191
192 static int ce_compare_gitlink(const struct cache_entry *ce)
193 {
194 unsigned char sha1[20];
195
196 /*
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).
201 *
202 * If so, we consider it always to match.
203 */
204 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
205 return 0;
206 return hashcmp(sha1, ce->sha1);
207 }
208
209 static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
210 {
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;
225 }
226 return 0;
227 }
228
229 static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
230 {
231 unsigned int changed = 0;
232
233 if (ce->ce_flags & CE_REMOVE)
234 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
235
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"
241 */
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);
260 }
261
262 changed |= match_stat_data(&ce->ce_stat_data, st);
263
264 /* Racily smudged entry? */
265 if (!ce->ce_stat_data.sd_size) {
266 if (!is_empty_blob_sha1(ce->sha1))
267 changed |= DATA_CHANGED;
268 }
269
270 return changed;
271 }
272
273 static int is_racy_timestamp(const struct index_state *istate,
274 const struct cache_entry *ce)
275 {
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
286 );
287 }
288
289 int ie_match_stat(const struct index_state *istate,
290 const struct cache_entry *ce, struct stat *st,
291 unsigned int options)
292 {
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;
297
298 /*
299 * If it's marked as always valid in the index, it's
300 * valid whatever the checked-out copy says.
301 *
302 * skip-worktree has the same effect with higher precedence
303 */
304 if (!ignore_skip_worktree && ce_skip_worktree(ce))
305 return 0;
306 if (!ignore_valid && (ce->ce_flags & CE_VALID))
307 return 0;
308
309 /*
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.
313 */
314 if (ce->ce_flags & CE_INTENT_TO_ADD)
315 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
316
317 changed = ce_match_stat_basic(ce, st);
318
319 /*
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.
326 *
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.
334 */
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);
340 }
341
342 return changed;
343 }
344
345 int ie_modified(const struct index_state *istate,
346 const struct cache_entry *ce,
347 struct stat *st, unsigned int options)
348 {
349 int changed, changed_fs;
350
351 changed = ie_match_stat(istate, ce, st, options);
352 if (!changed)
353 return 0;
354 /*
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
357 */
358 if (changed & (MODE_CHANGED | TYPE_CHANGED))
359 return changed;
360
361 /*
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".
369 *
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.
374 */
375 if ((changed & DATA_CHANGED) &&
376 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
377 return changed;
378
379 changed_fs = ce_modified_check_fs(ce, st);
380 if (changed_fs)
381 return changed | changed_fs;
382 return 0;
383 }
384
385 int base_name_compare(const char *name1, int len1, int mode1,
386 const char *name2, int len2, int mode2)
387 {
388 unsigned char c1, c2;
389 int len = len1 < len2 ? len1 : len2;
390 int cmp;
391
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;
402 }
403
404 /*
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' < '.' < '/').
410 *
411 * This is used by routines that want to traverse the git namespace
412 * but then handle conflicting entries together when possible.
413 */
414 int df_name_compare(const char *name1, int len1, int mode1,
415 const char *name2, int len2, int mode2)
416 {
417 int len = len1 < len2 ? len1 : len2, cmp;
418 unsigned char c1, c2;
419
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;
437 }
438
439 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
440 {
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;
450 }
451
452 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
453 {
454 int cmp;
455
456 cmp = name_compare(name1, len1, name2, len2);
457 if (cmp)
458 return cmp;
459
460 if (stage1 < stage2)
461 return -1;
462 if (stage1 > stage2)
463 return 1;
464 return 0;
465 }
466
467 static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
468 {
469 int first, last;
470
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;
482 }
483 first = next+1;
484 }
485 return -first-1;
486 }
487
488 int index_name_pos(const struct index_state *istate, const char *name, int namelen)
489 {
490 return index_name_stage_pos(istate, name, namelen, 0);
491 }
492
493 /* Remove entry, return true if there are more entries to go.. */
494 int remove_index_entry_at(struct index_state *istate, int pos)
495 {
496 struct cache_entry *ce = istate->cache[pos];
497
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;
509 }
510
511 /*
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.
515 */
516 void remove_marked_cache_entries(struct index_state *istate)
517 {
518 struct cache_entry **ce_array = istate->cache;
519 unsigned int i, j;
520
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]);
525 }
526 else
527 ce_array[j++] = ce_array[i];
528 }
529 if (j == istate->cache_nr)
530 return;
531 istate->cache_changed |= CE_ENTRY_REMOVED;
532 istate->cache_nr = j;
533 }
534
535 int remove_file_from_index(struct index_state *istate, const char *path)
536 {
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;
544 }
545
546 static int compare_name(struct cache_entry *ce, const char *path, int namelen)
547 {
548 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
549 }
550
551 static int index_name_pos_also_unmerged(struct index_state *istate,
552 const char *path, int namelen)
553 {
554 int pos = index_name_pos(istate, path, namelen);
555 struct cache_entry *ce;
556
557 if (pos >= 0)
558 return pos;
559
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;
565
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;
572 }
573
574 static int different_name(struct cache_entry *ce, struct cache_entry *alias)
575 {
576 int len = ce_namelen(ce);
577 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
578 }
579
580 /*
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!
585 *
586 * So we use the CE_ADDED flag to verify that the alias was an old
587 * one before we accept it as
588 */
589 static struct cache_entry *create_alias_ce(struct index_state *istate,
590 struct cache_entry *ce,
591 struct cache_entry *alias)
592 {
593 int len;
594 struct cache_entry *new;
595
596 if (alias->ce_flags & CE_ADDED)
597 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
598
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;
606 }
607
608 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
609 {
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);
614 }
615
616 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
617 {
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));
627
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);
630
631 namelen = strlen(path);
632 if (S_ISDIR(st_mode)) {
633 while (namelen && path[namelen-1] == '/')
634 namelen--;
635 }
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;
644
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.
650 */
651 struct cache_entry *ent;
652 int pos = index_name_pos_also_unmerged(istate, path, namelen);
653
654 ent = (0 <= pos) ? istate->cache[pos] : NULL;
655 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
656 }
657
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.
662 */
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;
676 }
677 }
678 }
679 }
680
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;
687
688 free(ce);
689 return 0;
690 }
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);
695 }
696 } else
697 set_object_name_for_intent_to_add_entry(ce);
698
699 if (ignore_case && alias && different_name(ce, alias))
700 ce = create_alias_ce(istate, ce, alias);
701 ce->ce_flags |= CE_ADDED;
702
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);
708
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);
714 }
715 if (verbose && !was_same)
716 printf("add '%s'\n", path);
717 return 0;
718 }
719
720 int add_file_to_index(struct index_state *istate, const char *path, int flags)
721 {
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);
726 }
727
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)
731 {
732 int size, len;
733 struct cache_entry *ce, *ret;
734
735 if (!verify_path(path)) {
736 error("Invalid path '%s'", path);
737 return NULL;
738 }
739
740 len = strlen(path);
741 size = cache_entry_size(len);
742 ce = xcalloc(1, size);
743
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);
749
750 ret = refresh_cache_entry(ce, refresh_options);
751 if (!ret) {
752 free(ce);
753 return NULL;
754 } else {
755 return ret;
756 }
757 }
758
759 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
760 {
761 int len = ce_namelen(a);
762 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
763 }
764
765 /*
766 * We fundamentally don't like some paths: we don't want
767 * dot or dot-dot anywhere, and for obvious reasons don't
768 * want to recurse into ".git" either.
769 *
770 * Also, we don't want double slashes or slashes at the
771 * end that can make pathnames ambiguous.
772 */
773 static int verify_dotfile(const char *rest)
774 {
775 /*
776 * The first character was '.', but that
777 * has already been discarded, we now test
778 * the rest.
779 */
780
781 /* "." is not allowed */
782 if (*rest == '\0' || is_dir_sep(*rest))
783 return 0;
784
785 switch (*rest) {
786 /*
787 * ".git" followed by NUL or slash is bad. This
788 * shares the path end test with the ".." case.
789 */
790 case 'g':
791 case 'G':
792 if (rest[1] != 'i' && rest[1] != 'I')
793 break;
794 if (rest[2] != 't' && rest[2] != 'T')
795 break;
796 rest += 2;
797 /* fallthrough */
798 case '.':
799 if (rest[1] == '\0' || is_dir_sep(rest[1]))
800 return 0;
801 }
802 return 1;
803 }
804
805 int verify_path(const char *path)
806 {
807 char c;
808
809 if (has_dos_drive_prefix(path))
810 return 0;
811
812 goto inside;
813 for (;;) {
814 if (!c)
815 return 1;
816 if (is_dir_sep(c)) {
817 inside:
818 if (protect_hfs && is_hfs_dotgit(path))
819 return 0;
820 if (protect_ntfs && is_ntfs_dotgit(path))
821 return 0;
822 c = *path++;
823 if ((c == '.' && !verify_dotfile(path)) ||
824 is_dir_sep(c) || c == '\0')
825 return 0;
826 }
827 c = *path++;
828 }
829 }
830
831 /*
832 * Do we have another file that has the beginning components being a
833 * proper superset of the name we're trying to add?
834 */
835 static int has_file_name(struct index_state *istate,
836 const struct cache_entry *ce, int pos, int ok_to_replace)
837 {
838 int retval = 0;
839 int len = ce_namelen(ce);
840 int stage = ce_stage(ce);
841 const char *name = ce->name;
842
843 while (pos < istate->cache_nr) {
844 struct cache_entry *p = istate->cache[pos++];
845
846 if (len >= ce_namelen(p))
847 break;
848 if (memcmp(name, p->name, len))
849 break;
850 if (ce_stage(p) != stage)
851 continue;
852 if (p->name[len] != '/')
853 continue;
854 if (p->ce_flags & CE_REMOVE)
855 continue;
856 retval = -1;
857 if (!ok_to_replace)
858 break;
859 remove_index_entry_at(istate, --pos);
860 }
861 return retval;
862 }
863
864 /*
865 * Do we have another file with a pathname that is a proper
866 * subset of the name we're trying to add?
867 */
868 static int has_dir_name(struct index_state *istate,
869 const struct cache_entry *ce, int pos, int ok_to_replace)
870 {
871 int retval = 0;
872 int stage = ce_stage(ce);
873 const char *name = ce->name;
874 const char *slash = name + ce_namelen(ce);
875
876 for (;;) {
877 int len;
878
879 for (;;) {
880 if (*--slash == '/')
881 break;
882 if (slash <= ce->name)
883 return retval;
884 }
885 len = slash - name;
886
887 pos = index_name_stage_pos(istate, name, len, stage);
888 if (pos >= 0) {
889 /*
890 * Found one, but not so fast. This could
891 * be a marker that says "I was here, but
892 * I am being removed". Such an entry is
893 * not a part of the resulting tree, and
894 * it is Ok to have a directory at the same
895 * path.
896 */
897 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
898 retval = -1;
899 if (!ok_to_replace)
900 break;
901 remove_index_entry_at(istate, pos);
902 continue;
903 }
904 }
905 else
906 pos = -pos-1;
907
908 /*
909 * Trivial optimization: if we find an entry that
910 * already matches the sub-directory, then we know
911 * we're ok, and we can exit.
912 */
913 while (pos < istate->cache_nr) {
914 struct cache_entry *p = istate->cache[pos];
915 if ((ce_namelen(p) <= len) ||
916 (p->name[len] != '/') ||
917 memcmp(p->name, name, len))
918 break; /* not our subdirectory */
919 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
920 /*
921 * p is at the same stage as our entry, and
922 * is a subdirectory of what we are looking
923 * at, so we cannot have conflicts at our
924 * level or anything shorter.
925 */
926 return retval;
927 pos++;
928 }
929 }
930 return retval;
931 }
932
933 /* We may be in a situation where we already have path/file and path
934 * is being added, or we already have path and path/file is being
935 * added. Either one would result in a nonsense tree that has path
936 * twice when git-write-tree tries to write it out. Prevent it.
937 *
938 * If ok-to-replace is specified, we remove the conflicting entries
939 * from the cache so the caller should recompute the insert position.
940 * When this happens, we return non-zero.
941 */
942 static int check_file_directory_conflict(struct index_state *istate,
943 const struct cache_entry *ce,
944 int pos, int ok_to_replace)
945 {
946 int retval;
947
948 /*
949 * When ce is an "I am going away" entry, we allow it to be added
950 */
951 if (ce->ce_flags & CE_REMOVE)
952 return 0;
953
954 /*
955 * We check if the path is a sub-path of a subsequent pathname
956 * first, since removing those will not change the position
957 * in the array.
958 */
959 retval = has_file_name(istate, ce, pos, ok_to_replace);
960
961 /*
962 * Then check if the path might have a clashing sub-directory
963 * before it.
964 */
965 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
966 }
967
968 static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
969 {
970 int pos;
971 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
972 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
973 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
974 int new_only = option & ADD_CACHE_NEW_ONLY;
975
976 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
977 cache_tree_invalidate_path(istate, ce->name);
978 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
979
980 /* existing match? Just replace it. */
981 if (pos >= 0) {
982 if (!new_only)
983 replace_index_entry(istate, pos, ce);
984 return 0;
985 }
986 pos = -pos-1;
987
988 /*
989 * Inserting a merged entry ("stage 0") into the index
990 * will always replace all non-merged entries..
991 */
992 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
993 while (ce_same_name(istate->cache[pos], ce)) {
994 ok_to_add = 1;
995 if (!remove_index_entry_at(istate, pos))
996 break;
997 }
998 }
999
1000 if (!ok_to_add)
1001 return -1;
1002 if (!verify_path(ce->name))
1003 return error("Invalid path '%s'", ce->name);
1004
1005 if (!skip_df_check &&
1006 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
1007 if (!ok_to_replace)
1008 return error("'%s' appears as both a file and as a directory",
1009 ce->name);
1010 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
1011 pos = -pos-1;
1012 }
1013 return pos + 1;
1014 }
1015
1016 int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1017 {
1018 int pos;
1019
1020 if (option & ADD_CACHE_JUST_APPEND)
1021 pos = istate->cache_nr;
1022 else {
1023 int ret;
1024 ret = add_index_entry_with_check(istate, ce, option);
1025 if (ret <= 0)
1026 return ret;
1027 pos = ret - 1;
1028 }
1029
1030 /* Make sure the array is big enough .. */
1031 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
1032
1033 /* Add it in.. */
1034 istate->cache_nr++;
1035 if (istate->cache_nr > pos + 1)
1036 memmove(istate->cache + pos + 1,
1037 istate->cache + pos,
1038 (istate->cache_nr - pos - 1) * sizeof(ce));
1039 set_index_entry(istate, pos, ce);
1040 istate->cache_changed |= CE_ENTRY_ADDED;
1041 return 0;
1042 }
1043
1044 /*
1045 * "refresh" does not calculate a new sha1 file or bring the
1046 * cache up-to-date for mode/content changes. But what it
1047 * _does_ do is to "re-match" the stat information of a file
1048 * with the cache, so that you can refresh the cache for a
1049 * file that hasn't been changed but where the stat entry is
1050 * out of date.
1051 *
1052 * For example, you'd want to do this after doing a "git-read-tree",
1053 * to link up the stat cache details with the proper files.
1054 */
1055 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1056 struct cache_entry *ce,
1057 unsigned int options, int *err,
1058 int *changed_ret)
1059 {
1060 struct stat st;
1061 struct cache_entry *updated;
1062 int changed, size;
1063 int refresh = options & CE_MATCH_REFRESH;
1064 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1065 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1066 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1067
1068 if (!refresh || ce_uptodate(ce))
1069 return ce;
1070
1071 /*
1072 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1073 * that the change to the work tree does not matter and told
1074 * us not to worry.
1075 */
1076 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1077 ce_mark_uptodate(ce);
1078 return ce;
1079 }
1080 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1081 ce_mark_uptodate(ce);
1082 return ce;
1083 }
1084
1085 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1086 if (ignore_missing)
1087 return ce;
1088 if (err)
1089 *err = ENOENT;
1090 return NULL;
1091 }
1092
1093 if (lstat(ce->name, &st) < 0) {
1094 if (ignore_missing && errno == ENOENT)
1095 return ce;
1096 if (err)
1097 *err = errno;
1098 return NULL;
1099 }
1100
1101 changed = ie_match_stat(istate, ce, &st, options);
1102 if (changed_ret)
1103 *changed_ret = changed;
1104 if (!changed) {
1105 /*
1106 * The path is unchanged. If we were told to ignore
1107 * valid bit, then we did the actual stat check and
1108 * found that the entry is unmodified. If the entry
1109 * is not marked VALID, this is the place to mark it
1110 * valid again, under "assume unchanged" mode.
1111 */
1112 if (ignore_valid && assume_unchanged &&
1113 !(ce->ce_flags & CE_VALID))
1114 ; /* mark this one VALID again */
1115 else {
1116 /*
1117 * We do not mark the index itself "modified"
1118 * because CE_UPTODATE flag is in-core only;
1119 * we are not going to write this change out.
1120 */
1121 if (!S_ISGITLINK(ce->ce_mode))
1122 ce_mark_uptodate(ce);
1123 return ce;
1124 }
1125 }
1126
1127 if (ie_modified(istate, ce, &st, options)) {
1128 if (err)
1129 *err = EINVAL;
1130 return NULL;
1131 }
1132
1133 size = ce_size(ce);
1134 updated = xmalloc(size);
1135 memcpy(updated, ce, size);
1136 fill_stat_cache_info(updated, &st);
1137 /*
1138 * If ignore_valid is not set, we should leave CE_VALID bit
1139 * alone. Otherwise, paths marked with --no-assume-unchanged
1140 * (i.e. things to be edited) will reacquire CE_VALID bit
1141 * automatically, which is not really what we want.
1142 */
1143 if (!ignore_valid && assume_unchanged &&
1144 !(ce->ce_flags & CE_VALID))
1145 updated->ce_flags &= ~CE_VALID;
1146
1147 /* istate->cache_changed is updated in the caller */
1148 return updated;
1149 }
1150
1151 static void show_file(const char * fmt, const char * name, int in_porcelain,
1152 int * first, const char *header_msg)
1153 {
1154 if (in_porcelain && *first && header_msg) {
1155 printf("%s\n", header_msg);
1156 *first = 0;
1157 }
1158 printf(fmt, name);
1159 }
1160
1161 int refresh_index(struct index_state *istate, unsigned int flags,
1162 const struct pathspec *pathspec,
1163 char *seen, const char *header_msg)
1164 {
1165 int i;
1166 int has_errors = 0;
1167 int really = (flags & REFRESH_REALLY) != 0;
1168 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1169 int quiet = (flags & REFRESH_QUIET) != 0;
1170 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1171 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1172 int first = 1;
1173 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1174 unsigned int options = (CE_MATCH_REFRESH |
1175 (really ? CE_MATCH_IGNORE_VALID : 0) |
1176 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1177 const char *modified_fmt;
1178 const char *deleted_fmt;
1179 const char *typechange_fmt;
1180 const char *added_fmt;
1181 const char *unmerged_fmt;
1182
1183 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1184 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1185 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1186 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1187 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1188 for (i = 0; i < istate->cache_nr; i++) {
1189 struct cache_entry *ce, *new;
1190 int cache_errno = 0;
1191 int changed = 0;
1192 int filtered = 0;
1193
1194 ce = istate->cache[i];
1195 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1196 continue;
1197
1198 if (pathspec && !ce_path_match(ce, pathspec, seen))
1199 filtered = 1;
1200
1201 if (ce_stage(ce)) {
1202 while ((i < istate->cache_nr) &&
1203 ! strcmp(istate->cache[i]->name, ce->name))
1204 i++;
1205 i--;
1206 if (allow_unmerged)
1207 continue;
1208 if (!filtered)
1209 show_file(unmerged_fmt, ce->name, in_porcelain,
1210 &first, header_msg);
1211 has_errors = 1;
1212 continue;
1213 }
1214
1215 if (filtered)
1216 continue;
1217
1218 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1219 if (new == ce)
1220 continue;
1221 if (!new) {
1222 const char *fmt;
1223
1224 if (really && cache_errno == EINVAL) {
1225 /* If we are doing --really-refresh that
1226 * means the index is not valid anymore.
1227 */
1228 ce->ce_flags &= ~CE_VALID;
1229 ce->ce_flags |= CE_UPDATE_IN_BASE;
1230 istate->cache_changed |= CE_ENTRY_CHANGED;
1231 }
1232 if (quiet)
1233 continue;
1234
1235 if (cache_errno == ENOENT)
1236 fmt = deleted_fmt;
1237 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1238 fmt = added_fmt; /* must be before other checks */
1239 else if (changed & TYPE_CHANGED)
1240 fmt = typechange_fmt;
1241 else
1242 fmt = modified_fmt;
1243 show_file(fmt,
1244 ce->name, in_porcelain, &first, header_msg);
1245 has_errors = 1;
1246 continue;
1247 }
1248
1249 replace_index_entry(istate, i, new);
1250 }
1251 return has_errors;
1252 }
1253
1254 static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1255 unsigned int options)
1256 {
1257 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1258 }
1259
1260
1261 /*****************************************************************
1262 * Index File I/O
1263 *****************************************************************/
1264
1265 #define INDEX_FORMAT_DEFAULT 3
1266
1267 static unsigned int get_index_format_default(void)
1268 {
1269 char *envversion = getenv("GIT_INDEX_VERSION");
1270 char *endp;
1271 int value;
1272 unsigned int version = INDEX_FORMAT_DEFAULT;
1273
1274 if (!envversion) {
1275 if (!git_config_get_int("index.version", &value))
1276 version = value;
1277 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1278 warning(_("index.version set, but the value is invalid.\n"
1279 "Using version %i"), INDEX_FORMAT_DEFAULT);
1280 return INDEX_FORMAT_DEFAULT;
1281 }
1282 return version;
1283 }
1284
1285 version = strtoul(envversion, &endp, 10);
1286 if (*endp ||
1287 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1288 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1289 "Using version %i"), INDEX_FORMAT_DEFAULT);
1290 version = INDEX_FORMAT_DEFAULT;
1291 }
1292 return version;
1293 }
1294
1295 /*
1296 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1297 * Again - this is just a (very strong in practice) heuristic that
1298 * the inode hasn't changed.
1299 *
1300 * We save the fields in big-endian order to allow using the
1301 * index file over NFS transparently.
1302 */
1303 struct ondisk_cache_entry {
1304 struct cache_time ctime;
1305 struct cache_time mtime;
1306 uint32_t dev;
1307 uint32_t ino;
1308 uint32_t mode;
1309 uint32_t uid;
1310 uint32_t gid;
1311 uint32_t size;
1312 unsigned char sha1[20];
1313 uint16_t flags;
1314 char name[FLEX_ARRAY]; /* more */
1315 };
1316
1317 /*
1318 * This struct is used when CE_EXTENDED bit is 1
1319 * The struct must match ondisk_cache_entry exactly from
1320 * ctime till flags
1321 */
1322 struct ondisk_cache_entry_extended {
1323 struct cache_time ctime;
1324 struct cache_time mtime;
1325 uint32_t dev;
1326 uint32_t ino;
1327 uint32_t mode;
1328 uint32_t uid;
1329 uint32_t gid;
1330 uint32_t size;
1331 unsigned char sha1[20];
1332 uint16_t flags;
1333 uint16_t flags2;
1334 char name[FLEX_ARRAY]; /* more */
1335 };
1336
1337 /* These are only used for v3 or lower */
1338 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1339 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1340 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1341 #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1342 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1343 ondisk_cache_entry_size(ce_namelen(ce)))
1344
1345 static int verify_hdr(struct cache_header *hdr, unsigned long size)
1346 {
1347 git_SHA_CTX c;
1348 unsigned char sha1[20];
1349 int hdr_version;
1350
1351 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1352 return error("bad signature");
1353 hdr_version = ntohl(hdr->hdr_version);
1354 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1355 return error("bad index version %d", hdr_version);
1356 git_SHA1_Init(&c);
1357 git_SHA1_Update(&c, hdr, size - 20);
1358 git_SHA1_Final(sha1, &c);
1359 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1360 return error("bad index file sha1 signature");
1361 return 0;
1362 }
1363
1364 static int read_index_extension(struct index_state *istate,
1365 const char *ext, void *data, unsigned long sz)
1366 {
1367 switch (CACHE_EXT(ext)) {
1368 case CACHE_EXT_TREE:
1369 istate->cache_tree = cache_tree_read(data, sz);
1370 break;
1371 case CACHE_EXT_RESOLVE_UNDO:
1372 istate->resolve_undo = resolve_undo_read(data, sz);
1373 break;
1374 case CACHE_EXT_LINK:
1375 if (read_link_extension(istate, data, sz))
1376 return -1;
1377 break;
1378 default:
1379 if (*ext < 'A' || 'Z' < *ext)
1380 return error("index uses %.4s extension, which we do not understand",
1381 ext);
1382 fprintf(stderr, "ignoring %.4s extension\n", ext);
1383 break;
1384 }
1385 return 0;
1386 }
1387
1388 int hold_locked_index(struct lock_file *lk, int die_on_error)
1389 {
1390 return hold_lock_file_for_update(lk, get_index_file(),
1391 die_on_error
1392 ? LOCK_DIE_ON_ERROR
1393 : 0);
1394 }
1395
1396 int read_index(struct index_state *istate)
1397 {
1398 return read_index_from(istate, get_index_file());
1399 }
1400
1401 static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1402 unsigned int flags,
1403 const char *name,
1404 size_t len)
1405 {
1406 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1407
1408 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1409 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1410 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1411 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1412 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1413 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1414 ce->ce_mode = get_be32(&ondisk->mode);
1415 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1416 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1417 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
1418 ce->ce_flags = flags & ~CE_NAMEMASK;
1419 ce->ce_namelen = len;
1420 ce->index = 0;
1421 hashcpy(ce->sha1, ondisk->sha1);
1422 memcpy(ce->name, name, len);
1423 ce->name[len] = '\0';
1424 return ce;
1425 }
1426
1427 /*
1428 * Adjacent cache entries tend to share the leading paths, so it makes
1429 * sense to only store the differences in later entries. In the v4
1430 * on-disk format of the index, each on-disk cache entry stores the
1431 * number of bytes to be stripped from the end of the previous name,
1432 * and the bytes to append to the result, to come up with its name.
1433 */
1434 static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1435 {
1436 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1437 size_t len = decode_varint(&cp);
1438
1439 if (name->len < len)
1440 die("malformed name field in the index");
1441 strbuf_remove(name, name->len - len, len);
1442 for (ep = cp; *ep; ep++)
1443 ; /* find the end */
1444 strbuf_add(name, cp, ep - cp);
1445 return (const char *)ep + 1 - cp_;
1446 }
1447
1448 static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1449 unsigned long *ent_size,
1450 struct strbuf *previous_name)
1451 {
1452 struct cache_entry *ce;
1453 size_t len;
1454 const char *name;
1455 unsigned int flags;
1456
1457 /* On-disk flags are just 16 bits */
1458 flags = get_be16(&ondisk->flags);
1459 len = flags & CE_NAMEMASK;
1460
1461 if (flags & CE_EXTENDED) {
1462 struct ondisk_cache_entry_extended *ondisk2;
1463 int extended_flags;
1464 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1465 extended_flags = get_be16(&ondisk2->flags2) << 16;
1466 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1467 if (extended_flags & ~CE_EXTENDED_FLAGS)
1468 die("Unknown index entry format %08x", extended_flags);
1469 flags |= extended_flags;
1470 name = ondisk2->name;
1471 }
1472 else
1473 name = ondisk->name;
1474
1475 if (!previous_name) {
1476 /* v3 and earlier */
1477 if (len == CE_NAMEMASK)
1478 len = strlen(name);
1479 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1480
1481 *ent_size = ondisk_ce_size(ce);
1482 } else {
1483 unsigned long consumed;
1484 consumed = expand_name_field(previous_name, name);
1485 ce = cache_entry_from_ondisk(ondisk, flags,
1486 previous_name->buf,
1487 previous_name->len);
1488
1489 *ent_size = (name - ((char *)ondisk)) + consumed;
1490 }
1491 return ce;
1492 }
1493
1494 static void check_ce_order(struct cache_entry *ce, struct cache_entry *next_ce)
1495 {
1496 int name_compare = strcmp(ce->name, next_ce->name);
1497 if (0 < name_compare)
1498 die("unordered stage entries in index");
1499 if (!name_compare) {
1500 if (!ce_stage(ce))
1501 die("multiple stage entries for merged file '%s'",
1502 ce->name);
1503 if (ce_stage(ce) > ce_stage(next_ce))
1504 die("unordered stage entries for '%s'",
1505 ce->name);
1506 }
1507 }
1508
1509 /* remember to discard_cache() before reading a different cache! */
1510 int do_read_index(struct index_state *istate, const char *path, int must_exist)
1511 {
1512 int fd, i;
1513 struct stat st;
1514 unsigned long src_offset;
1515 struct cache_header *hdr;
1516 void *mmap;
1517 size_t mmap_size;
1518 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1519
1520 if (istate->initialized)
1521 return istate->cache_nr;
1522
1523 istate->timestamp.sec = 0;
1524 istate->timestamp.nsec = 0;
1525 fd = open(path, O_RDONLY);
1526 if (fd < 0) {
1527 if (!must_exist && errno == ENOENT)
1528 return 0;
1529 die_errno("%s: index file open failed", path);
1530 }
1531
1532 if (fstat(fd, &st))
1533 die_errno("cannot stat the open index");
1534
1535 mmap_size = xsize_t(st.st_size);
1536 if (mmap_size < sizeof(struct cache_header) + 20)
1537 die("index file smaller than expected");
1538
1539 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1540 if (mmap == MAP_FAILED)
1541 die_errno("unable to map index file");
1542 close(fd);
1543
1544 hdr = mmap;
1545 if (verify_hdr(hdr, mmap_size) < 0)
1546 goto unmap;
1547
1548 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
1549 istate->version = ntohl(hdr->hdr_version);
1550 istate->cache_nr = ntohl(hdr->hdr_entries);
1551 istate->cache_alloc = alloc_nr(istate->cache_nr);
1552 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1553 istate->initialized = 1;
1554
1555 if (istate->version == 4)
1556 previous_name = &previous_name_buf;
1557 else
1558 previous_name = NULL;
1559
1560 src_offset = sizeof(*hdr);
1561 for (i = 0; i < istate->cache_nr; i++) {
1562 struct ondisk_cache_entry *disk_ce;
1563 struct cache_entry *ce;
1564 unsigned long consumed;
1565
1566 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1567 ce = create_from_disk(disk_ce, &consumed, previous_name);
1568 set_index_entry(istate, i, ce);
1569
1570 if (i > 0)
1571 check_ce_order(istate->cache[i - 1], ce);
1572
1573 src_offset += consumed;
1574 }
1575 strbuf_release(&previous_name_buf);
1576 istate->timestamp.sec = st.st_mtime;
1577 istate->timestamp.nsec = ST_MTIME_NSEC(st);
1578
1579 while (src_offset <= mmap_size - 20 - 8) {
1580 /* After an array of active_nr index entries,
1581 * there can be arbitrary number of extended
1582 * sections, each of which is prefixed with
1583 * extension name (4-byte) and section length
1584 * in 4-byte network byte order.
1585 */
1586 uint32_t extsize;
1587 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1588 extsize = ntohl(extsize);
1589 if (read_index_extension(istate,
1590 (const char *) mmap + src_offset,
1591 (char *) mmap + src_offset + 8,
1592 extsize) < 0)
1593 goto unmap;
1594 src_offset += 8;
1595 src_offset += extsize;
1596 }
1597 munmap(mmap, mmap_size);
1598 return istate->cache_nr;
1599
1600 unmap:
1601 munmap(mmap, mmap_size);
1602 die("index file corrupt");
1603 }
1604
1605 int read_index_from(struct index_state *istate, const char *path)
1606 {
1607 struct split_index *split_index;
1608 int ret;
1609
1610 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1611 if (istate->initialized)
1612 return istate->cache_nr;
1613
1614 ret = do_read_index(istate, path, 0);
1615 split_index = istate->split_index;
1616 if (!split_index)
1617 return ret;
1618
1619 if (is_null_sha1(split_index->base_sha1))
1620 return ret;
1621
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 return ret;
1637 }
1638
1639 int is_index_unborn(struct index_state *istate)
1640 {
1641 return (!istate->cache_nr && !istate->timestamp.sec);
1642 }
1643
1644 int discard_index(struct index_state *istate)
1645 {
1646 int i;
1647
1648 for (i = 0; i < istate->cache_nr; i++) {
1649 if (istate->cache[i]->index &&
1650 istate->split_index &&
1651 istate->split_index->base &&
1652 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1653 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1654 continue;
1655 free(istate->cache[i]);
1656 }
1657 resolve_undo_clear_index(istate);
1658 istate->cache_nr = 0;
1659 istate->cache_changed = 0;
1660 istate->timestamp.sec = 0;
1661 istate->timestamp.nsec = 0;
1662 free_name_hash(istate);
1663 cache_tree_free(&(istate->cache_tree));
1664 istate->initialized = 0;
1665 free(istate->cache);
1666 istate->cache = NULL;
1667 istate->cache_alloc = 0;
1668 discard_split_index(istate);
1669 return 0;
1670 }
1671
1672 int unmerged_index(const struct index_state *istate)
1673 {
1674 int i;
1675 for (i = 0; i < istate->cache_nr; i++) {
1676 if (ce_stage(istate->cache[i]))
1677 return 1;
1678 }
1679 return 0;
1680 }
1681
1682 #define WRITE_BUFFER_SIZE 8192
1683 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1684 static unsigned long write_buffer_len;
1685
1686 static int ce_write_flush(git_SHA_CTX *context, int fd)
1687 {
1688 unsigned int buffered = write_buffer_len;
1689 if (buffered) {
1690 git_SHA1_Update(context, write_buffer, buffered);
1691 if (write_in_full(fd, write_buffer, buffered) != buffered)
1692 return -1;
1693 write_buffer_len = 0;
1694 }
1695 return 0;
1696 }
1697
1698 static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1699 {
1700 while (len) {
1701 unsigned int buffered = write_buffer_len;
1702 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1703 if (partial > len)
1704 partial = len;
1705 memcpy(write_buffer + buffered, data, partial);
1706 buffered += partial;
1707 if (buffered == WRITE_BUFFER_SIZE) {
1708 write_buffer_len = buffered;
1709 if (ce_write_flush(context, fd))
1710 return -1;
1711 buffered = 0;
1712 }
1713 write_buffer_len = buffered;
1714 len -= partial;
1715 data = (char *) data + partial;
1716 }
1717 return 0;
1718 }
1719
1720 static int write_index_ext_header(git_SHA_CTX *context, int fd,
1721 unsigned int ext, unsigned int sz)
1722 {
1723 ext = htonl(ext);
1724 sz = htonl(sz);
1725 return ((ce_write(context, fd, &ext, 4) < 0) ||
1726 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1727 }
1728
1729 static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
1730 {
1731 unsigned int left = write_buffer_len;
1732
1733 if (left) {
1734 write_buffer_len = 0;
1735 git_SHA1_Update(context, write_buffer, left);
1736 }
1737
1738 /* Flush first if not enough space for SHA1 signature */
1739 if (left + 20 > WRITE_BUFFER_SIZE) {
1740 if (write_in_full(fd, write_buffer, left) != left)
1741 return -1;
1742 left = 0;
1743 }
1744
1745 /* Append the SHA1 signature at the end */
1746 git_SHA1_Final(write_buffer + left, context);
1747 hashcpy(sha1, write_buffer + left);
1748 left += 20;
1749 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1750 }
1751
1752 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1753 {
1754 /*
1755 * The only thing we care about in this function is to smudge the
1756 * falsely clean entry due to touch-update-touch race, so we leave
1757 * everything else as they are. We are called for entries whose
1758 * ce_stat_data.sd_mtime match the index file mtime.
1759 *
1760 * Note that this actually does not do much for gitlinks, for
1761 * which ce_match_stat_basic() always goes to the actual
1762 * contents. The caller checks with is_racy_timestamp() which
1763 * always says "no" for gitlinks, so we are not called for them ;-)
1764 */
1765 struct stat st;
1766
1767 if (lstat(ce->name, &st) < 0)
1768 return;
1769 if (ce_match_stat_basic(ce, &st))
1770 return;
1771 if (ce_modified_check_fs(ce, &st)) {
1772 /* This is "racily clean"; smudge it. Note that this
1773 * is a tricky code. At first glance, it may appear
1774 * that it can break with this sequence:
1775 *
1776 * $ echo xyzzy >frotz
1777 * $ git-update-index --add frotz
1778 * $ : >frotz
1779 * $ sleep 3
1780 * $ echo filfre >nitfol
1781 * $ git-update-index --add nitfol
1782 *
1783 * but it does not. When the second update-index runs,
1784 * it notices that the entry "frotz" has the same timestamp
1785 * as index, and if we were to smudge it by resetting its
1786 * size to zero here, then the object name recorded
1787 * in index is the 6-byte file but the cached stat information
1788 * becomes zero --- which would then match what we would
1789 * obtain from the filesystem next time we stat("frotz").
1790 *
1791 * However, the second update-index, before calling
1792 * this function, notices that the cached size is 6
1793 * bytes and what is on the filesystem is an empty
1794 * file, and never calls us, so the cached size information
1795 * for "frotz" stays 6 which does not match the filesystem.
1796 */
1797 ce->ce_stat_data.sd_size = 0;
1798 }
1799 }
1800
1801 /* Copy miscellaneous fields but not the name */
1802 static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1803 struct cache_entry *ce)
1804 {
1805 short flags;
1806
1807 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1808 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1809 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1810 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1811 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1812 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
1813 ondisk->mode = htonl(ce->ce_mode);
1814 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1815 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1816 ondisk->size = htonl(ce->ce_stat_data.sd_size);
1817 hashcpy(ondisk->sha1, ce->sha1);
1818
1819 flags = ce->ce_flags & ~CE_NAMEMASK;
1820 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1821 ondisk->flags = htons(flags);
1822 if (ce->ce_flags & CE_EXTENDED) {
1823 struct ondisk_cache_entry_extended *ondisk2;
1824 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1825 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1826 return ondisk2->name;
1827 }
1828 else {
1829 return ondisk->name;
1830 }
1831 }
1832
1833 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1834 struct strbuf *previous_name)
1835 {
1836 int size;
1837 struct ondisk_cache_entry *ondisk;
1838 int saved_namelen = saved_namelen; /* compiler workaround */
1839 char *name;
1840 int result;
1841
1842 if (ce->ce_flags & CE_STRIP_NAME) {
1843 saved_namelen = ce_namelen(ce);
1844 ce->ce_namelen = 0;
1845 }
1846
1847 if (!previous_name) {
1848 size = ondisk_ce_size(ce);
1849 ondisk = xcalloc(1, size);
1850 name = copy_cache_entry_to_ondisk(ondisk, ce);
1851 memcpy(name, ce->name, ce_namelen(ce));
1852 } else {
1853 int common, to_remove, prefix_size;
1854 unsigned char to_remove_vi[16];
1855 for (common = 0;
1856 (ce->name[common] &&
1857 common < previous_name->len &&
1858 ce->name[common] == previous_name->buf[common]);
1859 common++)
1860 ; /* still matching */
1861 to_remove = previous_name->len - common;
1862 prefix_size = encode_varint(to_remove, to_remove_vi);
1863
1864 if (ce->ce_flags & CE_EXTENDED)
1865 size = offsetof(struct ondisk_cache_entry_extended, name);
1866 else
1867 size = offsetof(struct ondisk_cache_entry, name);
1868 size += prefix_size + (ce_namelen(ce) - common + 1);
1869
1870 ondisk = xcalloc(1, size);
1871 name = copy_cache_entry_to_ondisk(ondisk, ce);
1872 memcpy(name, to_remove_vi, prefix_size);
1873 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1874
1875 strbuf_splice(previous_name, common, to_remove,
1876 ce->name + common, ce_namelen(ce) - common);
1877 }
1878 if (ce->ce_flags & CE_STRIP_NAME) {
1879 ce->ce_namelen = saved_namelen;
1880 ce->ce_flags &= ~CE_STRIP_NAME;
1881 }
1882
1883 result = ce_write(c, fd, ondisk, size);
1884 free(ondisk);
1885 return result;
1886 }
1887
1888 /*
1889 * This function verifies if index_state has the correct sha1 of the
1890 * index file. Don't die if we have any other failure, just return 0.
1891 */
1892 static int verify_index_from(const struct index_state *istate, const char *path)
1893 {
1894 int fd;
1895 ssize_t n;
1896 struct stat st;
1897 unsigned char sha1[20];
1898
1899 if (!istate->initialized)
1900 return 0;
1901
1902 fd = open(path, O_RDONLY);
1903 if (fd < 0)
1904 return 0;
1905
1906 if (fstat(fd, &st))
1907 goto out;
1908
1909 if (st.st_size < sizeof(struct cache_header) + 20)
1910 goto out;
1911
1912 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
1913 if (n != 20)
1914 goto out;
1915
1916 if (hashcmp(istate->sha1, sha1))
1917 goto out;
1918
1919 close(fd);
1920 return 1;
1921
1922 out:
1923 close(fd);
1924 return 0;
1925 }
1926
1927 static int verify_index(const struct index_state *istate)
1928 {
1929 return verify_index_from(istate, get_index_file());
1930 }
1931
1932 static int has_racy_timestamp(struct index_state *istate)
1933 {
1934 int entries = istate->cache_nr;
1935 int i;
1936
1937 for (i = 0; i < entries; i++) {
1938 struct cache_entry *ce = istate->cache[i];
1939 if (is_racy_timestamp(istate, ce))
1940 return 1;
1941 }
1942 return 0;
1943 }
1944
1945 /*
1946 * Opportunistically update the index but do not complain if we can't
1947 */
1948 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1949 {
1950 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1951 verify_index(istate) &&
1952 write_locked_index(istate, lockfile, COMMIT_LOCK))
1953 rollback_lock_file(lockfile);
1954 }
1955
1956 static int do_write_index(struct index_state *istate, int newfd,
1957 int strip_extensions)
1958 {
1959 git_SHA_CTX c;
1960 struct cache_header hdr;
1961 int i, err, removed, extended, hdr_version;
1962 struct cache_entry **cache = istate->cache;
1963 int entries = istate->cache_nr;
1964 struct stat st;
1965 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1966
1967 for (i = removed = extended = 0; i < entries; i++) {
1968 if (cache[i]->ce_flags & CE_REMOVE)
1969 removed++;
1970
1971 /* reduce extended entries if possible */
1972 cache[i]->ce_flags &= ~CE_EXTENDED;
1973 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1974 extended++;
1975 cache[i]->ce_flags |= CE_EXTENDED;
1976 }
1977 }
1978
1979 if (!istate->version) {
1980 istate->version = get_index_format_default();
1981 if (getenv("GIT_TEST_SPLIT_INDEX"))
1982 init_split_index(istate);
1983 }
1984
1985 /* demote version 3 to version 2 when the latter suffices */
1986 if (istate->version == 3 || istate->version == 2)
1987 istate->version = extended ? 3 : 2;
1988
1989 hdr_version = istate->version;
1990
1991 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1992 hdr.hdr_version = htonl(hdr_version);
1993 hdr.hdr_entries = htonl(entries - removed);
1994
1995 git_SHA1_Init(&c);
1996 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1997 return -1;
1998
1999 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
2000 for (i = 0; i < entries; i++) {
2001 struct cache_entry *ce = cache[i];
2002 if (ce->ce_flags & CE_REMOVE)
2003 continue;
2004 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
2005 ce_smudge_racily_clean_entry(ce);
2006 if (is_null_sha1(ce->sha1)) {
2007 static const char msg[] = "cache entry has null sha1: %s";
2008 static int allow = -1;
2009
2010 if (allow < 0)
2011 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2012 if (allow)
2013 warning(msg, ce->name);
2014 else
2015 return error(msg, ce->name);
2016 }
2017 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
2018 return -1;
2019 }
2020 strbuf_release(&previous_name_buf);
2021
2022 /* Write extension data here */
2023 if (!strip_extensions && istate->split_index) {
2024 struct strbuf sb = STRBUF_INIT;
2025
2026 err = write_link_extension(&sb, istate) < 0 ||
2027 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2028 sb.len) < 0 ||
2029 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2030 strbuf_release(&sb);
2031 if (err)
2032 return -1;
2033 }
2034 if (!strip_extensions && istate->cache_tree) {
2035 struct strbuf sb = STRBUF_INIT;
2036
2037 cache_tree_write(&sb, istate->cache_tree);
2038 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2039 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2040 strbuf_release(&sb);
2041 if (err)
2042 return -1;
2043 }
2044 if (!strip_extensions && istate->resolve_undo) {
2045 struct strbuf sb = STRBUF_INIT;
2046
2047 resolve_undo_write(&sb, istate->resolve_undo);
2048 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2049 sb.len) < 0
2050 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2051 strbuf_release(&sb);
2052 if (err)
2053 return -1;
2054 }
2055
2056 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
2057 return -1;
2058 istate->timestamp.sec = (unsigned int)st.st_mtime;
2059 istate->timestamp.nsec = ST_MTIME_NSEC(st);
2060 return 0;
2061 }
2062
2063 void set_alternate_index_output(const char *name)
2064 {
2065 alternate_index_output = name;
2066 }
2067
2068 static int commit_locked_index(struct lock_file *lk)
2069 {
2070 if (alternate_index_output)
2071 return commit_lock_file_to(lk, alternate_index_output);
2072 else
2073 return commit_lock_file(lk);
2074 }
2075
2076 static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2077 unsigned flags)
2078 {
2079 int ret = do_write_index(istate, lock->fd, 0);
2080 if (ret)
2081 return ret;
2082 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2083 (COMMIT_LOCK | CLOSE_LOCK));
2084 if (flags & COMMIT_LOCK)
2085 return commit_locked_index(lock);
2086 else if (flags & CLOSE_LOCK)
2087 return close_lock_file(lock);
2088 else
2089 return ret;
2090 }
2091
2092 static int write_split_index(struct index_state *istate,
2093 struct lock_file *lock,
2094 unsigned flags)
2095 {
2096 int ret;
2097 prepare_to_write_split_index(istate);
2098 ret = do_write_locked_index(istate, lock, flags);
2099 finish_writing_split_index(istate);
2100 return ret;
2101 }
2102
2103 static char *temporary_sharedindex;
2104
2105 static void remove_temporary_sharedindex(void)
2106 {
2107 if (temporary_sharedindex) {
2108 unlink_or_warn(temporary_sharedindex);
2109 free(temporary_sharedindex);
2110 temporary_sharedindex = NULL;
2111 }
2112 }
2113
2114 static void remove_temporary_sharedindex_on_signal(int signo)
2115 {
2116 remove_temporary_sharedindex();
2117 sigchain_pop(signo);
2118 raise(signo);
2119 }
2120
2121 static int write_shared_index(struct index_state *istate,
2122 struct lock_file *lock, unsigned flags)
2123 {
2124 struct split_index *si = istate->split_index;
2125 static int installed_handler;
2126 int fd, ret;
2127
2128 temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
2129 fd = mkstemp(temporary_sharedindex);
2130 if (fd < 0) {
2131 free(temporary_sharedindex);
2132 temporary_sharedindex = NULL;
2133 hashclr(si->base_sha1);
2134 return do_write_locked_index(istate, lock, flags);
2135 }
2136 if (!installed_handler) {
2137 atexit(remove_temporary_sharedindex);
2138 sigchain_push_common(remove_temporary_sharedindex_on_signal);
2139 }
2140 move_cache_to_base_index(istate);
2141 ret = do_write_index(si->base, fd, 1);
2142 close(fd);
2143 if (ret) {
2144 remove_temporary_sharedindex();
2145 return ret;
2146 }
2147 ret = rename(temporary_sharedindex,
2148 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
2149 free(temporary_sharedindex);
2150 temporary_sharedindex = NULL;
2151 if (!ret)
2152 hashcpy(si->base_sha1, si->base->sha1);
2153 return ret;
2154 }
2155
2156 int write_locked_index(struct index_state *istate, struct lock_file *lock,
2157 unsigned flags)
2158 {
2159 struct split_index *si = istate->split_index;
2160
2161 if (!si || alternate_index_output ||
2162 (istate->cache_changed & ~EXTMASK)) {
2163 if (si)
2164 hashclr(si->base_sha1);
2165 return do_write_locked_index(istate, lock, flags);
2166 }
2167
2168 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2169 int v = si->base_sha1[0];
2170 if ((v & 15) < 6)
2171 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2172 }
2173 if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
2174 int ret = write_shared_index(istate, lock, flags);
2175 if (ret)
2176 return ret;
2177 }
2178
2179 return write_split_index(istate, lock, flags);
2180 }
2181
2182 /*
2183 * Read the index file that is potentially unmerged into given
2184 * index_state, dropping any unmerged entries. Returns true if
2185 * the index is unmerged. Callers who want to refuse to work
2186 * from an unmerged state can call this and check its return value,
2187 * instead of calling read_cache().
2188 */
2189 int read_index_unmerged(struct index_state *istate)
2190 {
2191 int i;
2192 int unmerged = 0;
2193
2194 read_index(istate);
2195 for (i = 0; i < istate->cache_nr; i++) {
2196 struct cache_entry *ce = istate->cache[i];
2197 struct cache_entry *new_ce;
2198 int size, len;
2199
2200 if (!ce_stage(ce))
2201 continue;
2202 unmerged = 1;
2203 len = ce_namelen(ce);
2204 size = cache_entry_size(len);
2205 new_ce = xcalloc(1, size);
2206 memcpy(new_ce->name, ce->name, len);
2207 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2208 new_ce->ce_namelen = len;
2209 new_ce->ce_mode = ce->ce_mode;
2210 if (add_index_entry(istate, new_ce, 0))
2211 return error("%s: cannot drop to stage #0",
2212 new_ce->name);
2213 }
2214 return unmerged;
2215 }
2216
2217 /*
2218 * Returns 1 if the path is an "other" path with respect to
2219 * the index; that is, the path is not mentioned in the index at all,
2220 * either as a file, a directory with some files in the index,
2221 * or as an unmerged entry.
2222 *
2223 * We helpfully remove a trailing "/" from directories so that
2224 * the output of read_directory can be used as-is.
2225 */
2226 int index_name_is_other(const struct index_state *istate, const char *name,
2227 int namelen)
2228 {
2229 int pos;
2230 if (namelen && name[namelen - 1] == '/')
2231 namelen--;
2232 pos = index_name_pos(istate, name, namelen);
2233 if (0 <= pos)
2234 return 0; /* exact match */
2235 pos = -pos - 1;
2236 if (pos < istate->cache_nr) {
2237 struct cache_entry *ce = istate->cache[pos];
2238 if (ce_namelen(ce) == namelen &&
2239 !memcmp(ce->name, name, namelen))
2240 return 0; /* Yup, this one exists unmerged */
2241 }
2242 return 1;
2243 }
2244
2245 void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
2246 {
2247 int pos, len;
2248 unsigned long sz;
2249 enum object_type type;
2250 void *data;
2251
2252 len = strlen(path);
2253 pos = index_name_pos(istate, path, len);
2254 if (pos < 0) {
2255 /*
2256 * We might be in the middle of a merge, in which
2257 * case we would read stage #2 (ours).
2258 */
2259 int i;
2260 for (i = -pos - 1;
2261 (pos < 0 && i < istate->cache_nr &&
2262 !strcmp(istate->cache[i]->name, path));
2263 i++)
2264 if (ce_stage(istate->cache[i]) == 2)
2265 pos = i;
2266 }
2267 if (pos < 0)
2268 return NULL;
2269 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2270 if (!data || type != OBJ_BLOB) {
2271 free(data);
2272 return NULL;
2273 }
2274 if (size)
2275 *size = sz;
2276 return data;
2277 }
2278
2279 void stat_validity_clear(struct stat_validity *sv)
2280 {
2281 free(sv->sd);
2282 sv->sd = NULL;
2283 }
2284
2285 int stat_validity_check(struct stat_validity *sv, const char *path)
2286 {
2287 struct stat st;
2288
2289 if (stat(path, &st) < 0)
2290 return sv->sd == NULL;
2291 if (!sv->sd)
2292 return 0;
2293 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2294 }
2295
2296 void stat_validity_update(struct stat_validity *sv, int fd)
2297 {
2298 struct stat st;
2299
2300 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2301 stat_validity_clear(sv);
2302 else {
2303 if (!sv->sd)
2304 sv->sd = xcalloc(1, sizeof(struct stat_data));
2305 fill_stat_data(sv->sd, &st);
2306 }
2307 }