Also use unpack_trees() in do_diff_cache()
[git/git.git] / read-cache.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
4aab5b46 6#define NO_THE_INDEX_COMPATIBILITY_MACROS
e83c5163 7#include "cache.h"
bad68ec9 8#include "cache-tree.h"
f35a6d3b 9#include "refs.h"
d616813d 10#include "dir.h"
bad68ec9
JH
11
12/* Index extensions.
13 *
14 * The first letter should be 'A'..'Z' for extensions that are not
15 * necessary for a correct operation (i.e. optimization data).
16 * When new extensions are added that _needs_ to be understood in
17 * order to correctly interpret the index file, pick character that
18 * is outside the range, to cause the reader to abort.
19 */
20
21#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
22#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
e83c5163 23
228e94f9 24struct index_state the_index;
8fd2cb40 25
415e96c8
JH
26/*
27 * This only updates the "non-critical" parts of the directory
28 * cache, ie the parts that aren't tracked by GIT, and only used
29 * to validate the cache.
30 */
31void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
32{
7a51ed66
LT
33 ce->ce_ctime = st->st_ctime;
34 ce->ce_mtime = st->st_mtime;
35 ce->ce_dev = st->st_dev;
36 ce->ce_ino = st->st_ino;
37 ce->ce_uid = st->st_uid;
38 ce->ce_gid = st->st_gid;
39 ce->ce_size = st->st_size;
5f73076c
JH
40
41 if (assume_unchanged)
7a51ed66 42 ce->ce_flags |= CE_VALID;
eadb5831
JH
43
44 if (S_ISREG(st->st_mode))
45 ce_mark_uptodate(ce);
415e96c8
JH
46}
47
29e4d363
JH
48static int ce_compare_data(struct cache_entry *ce, struct stat *st)
49{
50 int match = -1;
51 int fd = open(ce->name, O_RDONLY);
52
53 if (fd >= 0) {
54 unsigned char sha1[20];
53bca91a 55 if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
a89fccd2 56 match = hashcmp(sha1, ce->sha1);
7f8508e8 57 /* index_fd() closed the file descriptor already */
29e4d363
JH
58 }
59 return match;
60}
61
dc49cd76 62static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
29e4d363
JH
63{
64 int match = -1;
65 char *target;
66 void *buffer;
67 unsigned long size;
21666f1a 68 enum object_type type;
29e4d363
JH
69 int len;
70
71 target = xmalloc(expected_size);
72 len = readlink(ce->name, target, expected_size);
73 if (len != expected_size) {
74 free(target);
75 return -1;
76 }
21666f1a 77 buffer = read_sha1_file(ce->sha1, &type, &size);
29e4d363
JH
78 if (!buffer) {
79 free(target);
80 return -1;
81 }
82 if (size == expected_size)
83 match = memcmp(buffer, target, size);
84 free(buffer);
85 free(target);
86 return match;
87}
88
f35a6d3b
LT
89static int ce_compare_gitlink(struct cache_entry *ce)
90{
91 unsigned char sha1[20];
92
93 /*
94 * We don't actually require that the .git directory
302b9282 95 * under GITLINK directory be a valid git directory. It
f35a6d3b
LT
96 * might even be missing (in case nobody populated that
97 * sub-project).
98 *
99 * If so, we consider it always to match.
100 */
101 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
102 return 0;
103 return hashcmp(sha1, ce->sha1);
104}
105
29e4d363
JH
106static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
107{
108 switch (st->st_mode & S_IFMT) {
109 case S_IFREG:
110 if (ce_compare_data(ce, st))
111 return DATA_CHANGED;
112 break;
113 case S_IFLNK:
dc49cd76 114 if (ce_compare_link(ce, xsize_t(st->st_size)))
29e4d363
JH
115 return DATA_CHANGED;
116 break;
a8ee75bc 117 case S_IFDIR:
7a51ed66 118 if (S_ISGITLINK(ce->ce_mode))
a8ee75bc 119 return 0;
29e4d363
JH
120 default:
121 return TYPE_CHANGED;
122 }
123 return 0;
124}
125
407c8eb0 126static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
734aab75
LT
127{
128 unsigned int changed = 0;
129
7a51ed66
LT
130 if (ce->ce_flags & CE_REMOVE)
131 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
132
133 switch (ce->ce_mode & S_IFMT) {
8ae0a8c5
KS
134 case S_IFREG:
135 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
3e09cdfd
JH
136 /* We consider only the owner x bit to be relevant for
137 * "mode changes"
138 */
139 if (trust_executable_bit &&
7a51ed66 140 (0100 & (ce->ce_mode ^ st->st_mode)))
ffbe1add 141 changed |= MODE_CHANGED;
8ae0a8c5
KS
142 break;
143 case S_IFLNK:
78a8d641
JS
144 if (!S_ISLNK(st->st_mode) &&
145 (has_symlinks || !S_ISREG(st->st_mode)))
146 changed |= TYPE_CHANGED;
8ae0a8c5 147 break;
302b9282 148 case S_IFGITLINK:
f35a6d3b
LT
149 if (!S_ISDIR(st->st_mode))
150 changed |= TYPE_CHANGED;
151 else if (ce_compare_gitlink(ce))
152 changed |= DATA_CHANGED;
a8ee75bc 153 return changed;
8ae0a8c5 154 default:
7a51ed66 155 die("internal error: ce_mode is %o", ce->ce_mode);
8ae0a8c5 156 }
7a51ed66 157 if (ce->ce_mtime != (unsigned int) st->st_mtime)
ccc4feb5 158 changed |= MTIME_CHANGED;
7a51ed66 159 if (ce->ce_ctime != (unsigned int) st->st_ctime)
734aab75 160 changed |= CTIME_CHANGED;
ccc4feb5 161
7a51ed66
LT
162 if (ce->ce_uid != (unsigned int) st->st_uid ||
163 ce->ce_gid != (unsigned int) st->st_gid)
734aab75 164 changed |= OWNER_CHANGED;
7a51ed66 165 if (ce->ce_ino != (unsigned int) st->st_ino)
734aab75 166 changed |= INODE_CHANGED;
2cb45e95
LT
167
168#ifdef USE_STDEV
169 /*
170 * st_dev breaks on network filesystems where different
171 * clients will have different views of what "device"
172 * the filesystem is on
173 */
7a51ed66 174 if (ce->ce_dev != (unsigned int) st->st_dev)
2cb45e95
LT
175 changed |= INODE_CHANGED;
176#endif
177
7a51ed66 178 if (ce->ce_size != (unsigned int) st->st_size)
734aab75 179 changed |= DATA_CHANGED;
b0391890 180
407c8eb0
JH
181 return changed;
182}
183
4aab5b46 184int ie_match_stat(struct index_state *istate,
4bd5b7da
JH
185 struct cache_entry *ce, struct stat *st,
186 unsigned int options)
407c8eb0 187{
5f73076c 188 unsigned int changed;
4bd5b7da
JH
189 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
190 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
5f73076c
JH
191
192 /*
193 * If it's marked as always valid in the index, it's
194 * valid whatever the checked-out copy says.
195 */
7a51ed66 196 if (!ignore_valid && (ce->ce_flags & CE_VALID))
5f73076c
JH
197 return 0;
198
199 changed = ce_match_stat_basic(ce, st);
407c8eb0 200
29e4d363
JH
201 /*
202 * Within 1 second of this sequence:
203 * echo xyzzy >file && git-update-index --add file
204 * running this command:
205 * echo frotz >file
206 * would give a falsely clean cache entry. The mtime and
207 * length match the cache, and other stat fields do not change.
208 *
209 * We could detect this at update-index time (the cache entry
210 * being registered/updated records the same time as "now")
211 * and delay the return from git-update-index, but that would
212 * effectively mean we can make at most one commit per second,
213 * which is not acceptable. Instead, we check cache entries
214 * whose mtime are the same as the index file timestamp more
5f73076c 215 * carefully than others.
29e4d363
JH
216 */
217 if (!changed &&
4aab5b46 218 istate->timestamp &&
7a51ed66 219 istate->timestamp <= ce->ce_mtime) {
42f77406
JH
220 if (assume_racy_is_modified)
221 changed |= DATA_CHANGED;
222 else
223 changed |= ce_modified_check_fs(ce, st);
224 }
b0391890 225
29e4d363 226 return changed;
b0391890
JH
227}
228
4aab5b46 229int ie_modified(struct index_state *istate,
4bd5b7da 230 struct cache_entry *ce, struct stat *st, unsigned int options)
b0391890 231{
29e4d363 232 int changed, changed_fs;
4bd5b7da
JH
233
234 changed = ie_match_stat(istate, ce, st, options);
b0391890
JH
235 if (!changed)
236 return 0;
b0391890
JH
237 /*
238 * If the mode or type has changed, there's no point in trying
239 * to refresh the entry - it's not going to match
240 */
241 if (changed & (MODE_CHANGED | TYPE_CHANGED))
242 return changed;
243
244 /* Immediately after read-tree or update-index --cacheinfo,
245 * the length field is zero. For other cases the ce_size
246 * should match the SHA1 recorded in the index entry.
247 */
7a51ed66 248 if ((changed & DATA_CHANGED) && ce->ce_size != 0)
b0391890
JH
249 return changed;
250
29e4d363
JH
251 changed_fs = ce_modified_check_fs(ce, st);
252 if (changed_fs)
253 return changed | changed_fs;
b0391890
JH
254 return 0;
255}
256
958ba6c9
LT
257int base_name_compare(const char *name1, int len1, int mode1,
258 const char *name2, int len2, int mode2)
259{
260 unsigned char c1, c2;
261 int len = len1 < len2 ? len1 : len2;
262 int cmp;
263
264 cmp = memcmp(name1, name2, len);
265 if (cmp)
266 return cmp;
267 c1 = name1[len];
268 c2 = name2[len];
1833a925 269 if (!c1 && S_ISDIR(mode1))
958ba6c9 270 c1 = '/';
1833a925 271 if (!c2 && S_ISDIR(mode2))
958ba6c9
LT
272 c2 = '/';
273 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
274}
275
95fd5bf8 276int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
eb38c22f 277{
95fd5bf8
LT
278 int len1 = flags1 & CE_NAMEMASK;
279 int len2 = flags2 & CE_NAMEMASK;
eb38c22f
LT
280 int len = len1 < len2 ? len1 : len2;
281 int cmp;
282
283 cmp = memcmp(name1, name2, len);
284 if (cmp)
285 return cmp;
286 if (len1 < len2)
287 return -1;
288 if (len1 > len2)
289 return 1;
5f73076c 290
7b80be15
JH
291 /* Compare stages */
292 flags1 &= CE_STAGEMASK;
293 flags2 &= CE_STAGEMASK;
5f73076c 294
95fd5bf8
LT
295 if (flags1 < flags2)
296 return -1;
297 if (flags1 > flags2)
298 return 1;
eb38c22f
LT
299 return 0;
300}
301
4aab5b46 302int index_name_pos(struct index_state *istate, const char *name, int namelen)
eb38c22f
LT
303{
304 int first, last;
305
306 first = 0;
4aab5b46 307 last = istate->cache_nr;
eb38c22f
LT
308 while (last > first) {
309 int next = (last + first) >> 1;
4aab5b46 310 struct cache_entry *ce = istate->cache[next];
7a51ed66 311 int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
eb38c22f 312 if (!cmp)
76e7f4ec 313 return next;
eb38c22f
LT
314 if (cmp < 0) {
315 last = next;
316 continue;
317 }
318 first = next+1;
319 }
76e7f4ec 320 return -first-1;
eb38c22f
LT
321}
322
7b937ca3 323/* Remove entry, return true if there are more entries to go.. */
4aab5b46 324int remove_index_entry_at(struct index_state *istate, int pos)
7b937ca3 325{
4aab5b46
JH
326 istate->cache_changed = 1;
327 istate->cache_nr--;
328 if (pos >= istate->cache_nr)
7b937ca3 329 return 0;
4aab5b46
JH
330 memmove(istate->cache + pos,
331 istate->cache + pos + 1,
332 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
7b937ca3
LT
333 return 1;
334}
335
4aab5b46 336int remove_file_from_index(struct index_state *istate, const char *path)
197ee8c9 337{
4aab5b46 338 int pos = index_name_pos(istate, path, strlen(path));
c4e3cca1
JH
339 if (pos < 0)
340 pos = -pos-1;
09d5dc32 341 cache_tree_invalidate_path(istate->cache_tree, path);
4aab5b46
JH
342 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
343 remove_index_entry_at(istate, pos);
197ee8c9
LT
344 return 0;
345}
346
20314271
JS
347static int compare_name(struct cache_entry *ce, const char *path, int namelen)
348{
349 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
350}
351
352static int index_name_pos_also_unmerged(struct index_state *istate,
353 const char *path, int namelen)
354{
355 int pos = index_name_pos(istate, path, namelen);
356 struct cache_entry *ce;
357
358 if (pos >= 0)
359 return pos;
360
361 /* maybe unmerged? */
362 pos = -1 - pos;
363 if (pos >= istate->cache_nr ||
364 compare_name((ce = istate->cache[pos]), path, namelen))
365 return -1;
366
367 /* order of preference: stage 2, 1, 3 */
368 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
369 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
370 !compare_name(ce, path, namelen))
371 pos++;
372 return pos;
373}
374
4aab5b46 375int add_file_to_index(struct index_state *istate, const char *path, int verbose)
11be42a4 376{
0781b8a9 377 int size, namelen, pos;
11be42a4
JS
378 struct stat st;
379 struct cache_entry *ce;
fb63d7f8 380 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
11be42a4
JS
381
382 if (lstat(path, &st))
383 die("%s: unable to stat (%s)", path, strerror(errno));
384
f35a6d3b
LT
385 if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode) && !S_ISDIR(st.st_mode))
386 die("%s: can only add regular files, symbolic links or git-directories", path);
11be42a4
JS
387
388 namelen = strlen(path);
09595258
LT
389 if (S_ISDIR(st.st_mode)) {
390 while (namelen && path[namelen-1] == '/')
391 namelen--;
392 }
11be42a4
JS
393 size = cache_entry_size(namelen);
394 ce = xcalloc(1, size);
395 memcpy(ce->name, path, namelen);
7a51ed66 396 ce->ce_flags = namelen;
11be42a4
JS
397 fill_stat_cache_info(ce, &st);
398
78a8d641 399 if (trust_executable_bit && has_symlinks)
185c975f
JH
400 ce->ce_mode = create_ce_mode(st.st_mode);
401 else {
78a8d641
JS
402 /* If there is an existing entry, pick the mode bits and type
403 * from it, otherwise assume unexecutable regular file.
11be42a4 404 */
185c975f 405 struct cache_entry *ent;
20314271 406 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 407
4aab5b46 408 ent = (0 <= pos) ? istate->cache[pos] : NULL;
185c975f 409 ce->ce_mode = ce_mode_from_stat(ent, st.st_mode);
11be42a4
JS
410 }
411
0781b8a9
JH
412 pos = index_name_pos(istate, ce->name, namelen);
413 if (0 <= pos &&
414 !ce_stage(istate->cache[pos]) &&
fb63d7f8 415 !ie_match_stat(istate, istate->cache[pos], &st, ce_option)) {
0781b8a9
JH
416 /* Nothing changed, really */
417 free(ce);
eadb5831 418 ce_mark_uptodate(istate->cache[pos]);
0781b8a9
JH
419 return 0;
420 }
421
11be42a4
JS
422 if (index_path(ce->sha1, path, &st, 1))
423 die("unable to index file %s", path);
4aab5b46 424 if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
11be42a4
JS
425 die("unable to add %s to index",path);
426 if (verbose)
427 printf("add '%s'\n", path);
11be42a4
JS
428 return 0;
429}
430
6640f881
CR
431struct cache_entry *make_cache_entry(unsigned int mode,
432 const unsigned char *sha1, const char *path, int stage,
433 int refresh)
434{
435 int size, len;
436 struct cache_entry *ce;
437
438 if (!verify_path(path))
439 return NULL;
440
441 len = strlen(path);
442 size = cache_entry_size(len);
443 ce = xcalloc(1, size);
444
445 hashcpy(ce->sha1, sha1);
446 memcpy(ce->name, path, len);
447 ce->ce_flags = create_ce_flags(len, stage);
448 ce->ce_mode = create_ce_mode(mode);
449
450 if (refresh)
451 return refresh_cache_entry(ce, 0);
452
453 return ce;
454}
455
dbbce55b 456int ce_same_name(struct cache_entry *a, struct cache_entry *b)
7b937ca3
LT
457{
458 int len = ce_namelen(a);
459 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
460}
461
c0fd1f51
LT
462int ce_path_match(const struct cache_entry *ce, const char **pathspec)
463{
464 const char *match, *name;
465 int len;
466
467 if (!pathspec)
468 return 1;
469
470 len = ce_namelen(ce);
471 name = ce->name;
472 while ((match = *pathspec++) != NULL) {
473 int matchlen = strlen(match);
474 if (matchlen > len)
475 continue;
476 if (memcmp(name, match, matchlen))
477 continue;
478 if (matchlen && name[matchlen-1] == '/')
479 return 1;
480 if (name[matchlen] == '/' || !name[matchlen])
481 return 1;
f332726e
LT
482 if (!matchlen)
483 return 1;
c0fd1f51
LT
484 }
485 return 0;
486}
487
8dcf39c4
LT
488/*
489 * We fundamentally don't like some paths: we don't want
490 * dot or dot-dot anywhere, and for obvious reasons don't
491 * want to recurse into ".git" either.
492 *
493 * Also, we don't want double slashes or slashes at the
494 * end that can make pathnames ambiguous.
495 */
496static int verify_dotfile(const char *rest)
497{
498 /*
499 * The first character was '.', but that
500 * has already been discarded, we now test
501 * the rest.
502 */
503 switch (*rest) {
504 /* "." is not allowed */
505 case '\0': case '/':
506 return 0;
507
508 /*
509 * ".git" followed by NUL or slash is bad. This
510 * shares the path end test with the ".." case.
511 */
512 case 'g':
513 if (rest[1] != 'i')
514 break;
515 if (rest[2] != 't')
516 break;
517 rest += 2;
518 /* fallthrough */
519 case '.':
520 if (rest[1] == '\0' || rest[1] == '/')
521 return 0;
522 }
523 return 1;
524}
525
526int verify_path(const char *path)
527{
528 char c;
529
530 goto inside;
531 for (;;) {
532 if (!c)
533 return 1;
534 if (c == '/') {
535inside:
536 c = *path++;
537 switch (c) {
538 default:
539 continue;
540 case '/': case '\0':
541 break;
542 case '.':
543 if (verify_dotfile(path))
544 continue;
545 }
546 return 0;
547 }
548 c = *path++;
549 }
550}
551
12676608
LT
552/*
553 * Do we have another file that has the beginning components being a
554 * proper superset of the name we're trying to add?
0f1e4f04 555 */
4aab5b46
JH
556static int has_file_name(struct index_state *istate,
557 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 558{
12676608
LT
559 int retval = 0;
560 int len = ce_namelen(ce);
b155725d 561 int stage = ce_stage(ce);
12676608 562 const char *name = ce->name;
0f1e4f04 563
4aab5b46
JH
564 while (pos < istate->cache_nr) {
565 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 566
12676608 567 if (len >= ce_namelen(p))
0f1e4f04 568 break;
12676608
LT
569 if (memcmp(name, p->name, len))
570 break;
b155725d
JH
571 if (ce_stage(p) != stage)
572 continue;
12676608
LT
573 if (p->name[len] != '/')
574 continue;
7a51ed66 575 if (p->ce_flags & CE_REMOVE)
21cd8d00 576 continue;
12676608
LT
577 retval = -1;
578 if (!ok_to_replace)
579 break;
4aab5b46 580 remove_index_entry_at(istate, --pos);
0f1e4f04 581 }
12676608
LT
582 return retval;
583}
0f1e4f04 584
12676608
LT
585/*
586 * Do we have another file with a pathname that is a proper
587 * subset of the name we're trying to add?
588 */
4aab5b46
JH
589static int has_dir_name(struct index_state *istate,
590 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
591{
592 int retval = 0;
b155725d 593 int stage = ce_stage(ce);
12676608
LT
594 const char *name = ce->name;
595 const char *slash = name + ce_namelen(ce);
0f1e4f04 596
12676608
LT
597 for (;;) {
598 int len;
0f1e4f04 599
12676608
LT
600 for (;;) {
601 if (*--slash == '/')
602 break;
603 if (slash <= ce->name)
604 return retval;
605 }
606 len = slash - name;
0f1e4f04 607
7a51ed66 608 pos = index_name_pos(istate, name, create_ce_flags(len, stage));
12676608 609 if (pos >= 0) {
21cd8d00
JH
610 /*
611 * Found one, but not so fast. This could
612 * be a marker that says "I was here, but
613 * I am being removed". Such an entry is
614 * not a part of the resulting tree, and
615 * it is Ok to have a directory at the same
616 * path.
617 */
4aab5b46 618 if (stage || istate->cache[pos]->ce_mode) {
21cd8d00
JH
619 retval = -1;
620 if (!ok_to_replace)
621 break;
4aab5b46 622 remove_index_entry_at(istate, pos);
21cd8d00
JH
623 continue;
624 }
12676608 625 }
21cd8d00
JH
626 else
627 pos = -pos-1;
12676608
LT
628
629 /*
630 * Trivial optimization: if we find an entry that
631 * already matches the sub-directory, then we know
b155725d 632 * we're ok, and we can exit.
12676608 633 */
4aab5b46
JH
634 while (pos < istate->cache_nr) {
635 struct cache_entry *p = istate->cache[pos];
b155725d
JH
636 if ((ce_namelen(p) <= len) ||
637 (p->name[len] != '/') ||
638 memcmp(p->name, name, len))
639 break; /* not our subdirectory */
21cd8d00 640 if (ce_stage(p) == stage && (stage || p->ce_mode))
b155725d
JH
641 /* p is at the same stage as our entry, and
642 * is a subdirectory of what we are looking
643 * at, so we cannot have conflicts at our
644 * level or anything shorter.
645 */
646 return retval;
647 pos++;
192268c1 648 }
0f1e4f04 649 }
12676608
LT
650 return retval;
651}
652
653/* We may be in a situation where we already have path/file and path
654 * is being added, or we already have path and path/file is being
655 * added. Either one would result in a nonsense tree that has path
656 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 657 *
12676608
LT
658 * If ok-to-replace is specified, we remove the conflicting entries
659 * from the cache so the caller should recompute the insert position.
660 * When this happens, we return non-zero.
661 */
4aab5b46
JH
662static int check_file_directory_conflict(struct index_state *istate,
663 const struct cache_entry *ce,
664 int pos, int ok_to_replace)
12676608 665{
21cd8d00
JH
666 int retval;
667
668 /*
669 * When ce is an "I am going away" entry, we allow it to be added
670 */
7a51ed66 671 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
672 return 0;
673
12676608
LT
674 /*
675 * We check if the path is a sub-path of a subsequent pathname
676 * first, since removing those will not change the position
21cd8d00 677 * in the array.
12676608 678 */
4aab5b46 679 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 680
12676608
LT
681 /*
682 * Then check if the path might have a clashing sub-directory
683 * before it.
684 */
4aab5b46 685 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
686}
687
af3785dc 688static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
689{
690 int pos;
192268c1
JH
691 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
692 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 693 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
5f73076c 694
09d5dc32 695 cache_tree_invalidate_path(istate->cache_tree, ce->name);
7a51ed66 696 pos = index_name_pos(istate, ce->name, ce->ce_flags);
197ee8c9 697
3e09cdfd 698 /* existing match? Just replace it. */
76e7f4ec 699 if (pos >= 0) {
4aab5b46
JH
700 istate->cache_changed = 1;
701 istate->cache[pos] = ce;
197ee8c9
LT
702 return 0;
703 }
76e7f4ec 704 pos = -pos-1;
197ee8c9 705
7b937ca3
LT
706 /*
707 * Inserting a merged entry ("stage 0") into the index
708 * will always replace all non-merged entries..
709 */
4aab5b46
JH
710 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
711 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 712 ok_to_add = 1;
4aab5b46 713 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
714 break;
715 }
716 }
717
121481ab
LT
718 if (!ok_to_add)
719 return -1;
8dcf39c4
LT
720 if (!verify_path(ce->name))
721 return -1;
121481ab 722
3e09cdfd 723 if (!skip_df_check &&
4aab5b46 724 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 725 if (!ok_to_replace)
4aab5b46
JH
726 return error("'%s' appears as both a file and as a directory",
727 ce->name);
7a51ed66 728 pos = index_name_pos(istate, ce->name, ce->ce_flags);
192268c1
JH
729 pos = -pos-1;
730 }
af3785dc
JH
731 return pos + 1;
732}
733
734int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
735{
736 int pos;
737
738 if (option & ADD_CACHE_JUST_APPEND)
739 pos = istate->cache_nr;
740 else {
741 int ret;
742 ret = add_index_entry_with_check(istate, ce, option);
743 if (ret <= 0)
744 return ret;
745 pos = ret - 1;
746 }
0f1e4f04 747
197ee8c9 748 /* Make sure the array is big enough .. */
4aab5b46
JH
749 if (istate->cache_nr == istate->cache_alloc) {
750 istate->cache_alloc = alloc_nr(istate->cache_alloc);
751 istate->cache = xrealloc(istate->cache,
752 istate->cache_alloc * sizeof(struct cache_entry *));
197ee8c9
LT
753 }
754
755 /* Add it in.. */
4aab5b46 756 istate->cache_nr++;
af3785dc 757 if (istate->cache_nr > pos + 1)
4aab5b46
JH
758 memmove(istate->cache + pos + 1,
759 istate->cache + pos,
760 (istate->cache_nr - pos - 1) * sizeof(ce));
761 istate->cache[pos] = ce;
762 istate->cache_changed = 1;
197ee8c9
LT
763 return 0;
764}
765
405e5b2f
LT
766/*
767 * "refresh" does not calculate a new sha1 file or bring the
768 * cache up-to-date for mode/content changes. But what it
769 * _does_ do is to "re-match" the stat information of a file
770 * with the cache, so that you can refresh the cache for a
771 * file that hasn't been changed but where the stat entry is
772 * out of date.
773 *
774 * For example, you'd want to do this after doing a "git-read-tree",
775 * to link up the stat cache details with the proper files.
776 */
4aab5b46 777static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da
JH
778 struct cache_entry *ce,
779 unsigned int options, int *err)
405e5b2f
LT
780{
781 struct stat st;
782 struct cache_entry *updated;
783 int changed, size;
4bd5b7da 784 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
405e5b2f 785
eadb5831
JH
786 if (ce_uptodate(ce))
787 return ce;
788
8fd2cb40 789 if (lstat(ce->name, &st) < 0) {
ec0cc704
JH
790 if (err)
791 *err = errno;
8fd2cb40
JS
792 return NULL;
793 }
405e5b2f 794
4bd5b7da 795 changed = ie_match_stat(istate, ce, &st, options);
405e5b2f 796 if (!changed) {
4bd5b7da
JH
797 /*
798 * The path is unchanged. If we were told to ignore
799 * valid bit, then we did the actual stat check and
800 * found that the entry is unmodified. If the entry
801 * is not marked VALID, this is the place to mark it
802 * valid again, under "assume unchanged" mode.
803 */
804 if (ignore_valid && assume_unchanged &&
7a51ed66 805 !(ce->ce_flags & CE_VALID))
405e5b2f 806 ; /* mark this one VALID again */
eadb5831
JH
807 else {
808 /*
809 * We do not mark the index itself "modified"
810 * because CE_UPTODATE flag is in-core only;
811 * we are not going to write this change out.
812 */
813 ce_mark_uptodate(ce);
8fd2cb40 814 return ce;
eadb5831 815 }
405e5b2f
LT
816 }
817
4bd5b7da 818 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
819 if (err)
820 *err = EINVAL;
8fd2cb40
JS
821 return NULL;
822 }
405e5b2f
LT
823
824 size = ce_size(ce);
825 updated = xmalloc(size);
826 memcpy(updated, ce, size);
827 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
828 /*
829 * If ignore_valid is not set, we should leave CE_VALID bit
830 * alone. Otherwise, paths marked with --no-assume-unchanged
831 * (i.e. things to be edited) will reacquire CE_VALID bit
832 * automatically, which is not really what we want.
405e5b2f 833 */
4bd5b7da 834 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
835 !(ce->ce_flags & CE_VALID))
836 updated->ce_flags &= ~CE_VALID;
405e5b2f
LT
837
838 return updated;
839}
840
d616813d 841int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen)
405e5b2f
LT
842{
843 int i;
844 int has_errors = 0;
845 int really = (flags & REFRESH_REALLY) != 0;
846 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
847 int quiet = (flags & REFRESH_QUIET) != 0;
848 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
4bd5b7da 849 unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
405e5b2f 850
4aab5b46 851 for (i = 0; i < istate->cache_nr; i++) {
405e5b2f 852 struct cache_entry *ce, *new;
ec0cc704
JH
853 int cache_errno = 0;
854
4aab5b46 855 ce = istate->cache[i];
405e5b2f 856 if (ce_stage(ce)) {
4aab5b46
JH
857 while ((i < istate->cache_nr) &&
858 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
859 i++;
860 i--;
861 if (allow_unmerged)
862 continue;
863 printf("%s: needs merge\n", ce->name);
864 has_errors = 1;
865 continue;
866 }
867
d616813d
AJ
868 if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
869 continue;
870
4bd5b7da 871 new = refresh_cache_ent(istate, ce, options, &cache_errno);
8fd2cb40 872 if (new == ce)
405e5b2f 873 continue;
8fd2cb40
JS
874 if (!new) {
875 if (not_new && cache_errno == ENOENT)
405e5b2f 876 continue;
8fd2cb40 877 if (really && cache_errno == EINVAL) {
405e5b2f
LT
878 /* If we are doing --really-refresh that
879 * means the index is not valid anymore.
880 */
7a51ed66 881 ce->ce_flags &= ~CE_VALID;
4aab5b46 882 istate->cache_changed = 1;
405e5b2f
LT
883 }
884 if (quiet)
885 continue;
886 printf("%s: needs update\n", ce->name);
887 has_errors = 1;
888 continue;
889 }
4aab5b46
JH
890 istate->cache_changed = 1;
891 /* You can NOT just free istate->cache[i] here, since it
405e5b2f
LT
892 * might not be necessarily malloc()ed but can also come
893 * from mmap(). */
4aab5b46 894 istate->cache[i] = new;
405e5b2f
LT
895 }
896 return has_errors;
897}
898
ec0cc704
JH
899struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
900{
4aab5b46 901 return refresh_cache_ent(&the_index, ce, really, NULL);
ec0cc704
JH
902}
903
bad68ec9 904static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163
LT
905{
906 SHA_CTX c;
bad68ec9 907 unsigned char sha1[20];
e83c5163 908
ccc4feb5 909 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 910 return error("bad signature");
ca9be054
LT
911 if (hdr->hdr_version != htonl(2))
912 return error("bad index version");
e83c5163 913 SHA1_Init(&c);
ca9be054 914 SHA1_Update(&c, hdr, size - 20);
e83c5163 915 SHA1_Final(sha1, &c);
a89fccd2 916 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
ca9be054 917 return error("bad index file sha1 signature");
e83c5163
LT
918 return 0;
919}
920
4aab5b46
JH
921static int read_index_extension(struct index_state *istate,
922 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
923{
924 switch (CACHE_EXT(ext)) {
925 case CACHE_EXT_TREE:
4aab5b46 926 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9
JH
927 break;
928 default:
929 if (*ext < 'A' || 'Z' < *ext)
930 return error("index uses %.4s extension, which we do not understand",
931 ext);
932 fprintf(stderr, "ignoring %.4s extension\n", ext);
933 break;
934 }
935 return 0;
936}
937
4aab5b46 938int read_index(struct index_state *istate)
8fd2cb40 939{
4aab5b46 940 return read_index_from(istate, get_index_file());
8fd2cb40
JS
941}
942
7a51ed66
LT
943static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
944{
7fec10b7
JH
945 size_t len;
946
7a51ed66
LT
947 ce->ce_ctime = ntohl(ondisk->ctime.sec);
948 ce->ce_mtime = ntohl(ondisk->mtime.sec);
949 ce->ce_dev = ntohl(ondisk->dev);
950 ce->ce_ino = ntohl(ondisk->ino);
951 ce->ce_mode = ntohl(ondisk->mode);
952 ce->ce_uid = ntohl(ondisk->uid);
953 ce->ce_gid = ntohl(ondisk->gid);
954 ce->ce_size = ntohl(ondisk->size);
955 /* On-disk flags are just 16 bits */
956 ce->ce_flags = ntohs(ondisk->flags);
957 hashcpy(ce->sha1, ondisk->sha1);
7fec10b7
JH
958
959 len = ce->ce_flags & CE_NAMEMASK;
960 if (len == CE_NAMEMASK)
961 len = strlen(ondisk->name);
962 /*
963 * NEEDSWORK: If the original index is crafted, this copy could
964 * go unchecked.
965 */
966 memcpy(ce->name, ondisk->name, len + 1);
7a51ed66
LT
967}
968
8fd2cb40 969/* remember to discard_cache() before reading a different cache! */
4aab5b46 970int read_index_from(struct index_state *istate, const char *path)
e83c5163
LT
971{
972 int fd, i;
973 struct stat st;
7a51ed66 974 unsigned long src_offset, dst_offset;
e83c5163 975 struct cache_header *hdr;
7a51ed66
LT
976 void *mmap;
977 size_t mmap_size;
e83c5163
LT
978
979 errno = EBUSY;
7a51ed66 980 if (istate->alloc)
4aab5b46 981 return istate->cache_nr;
5d1a5c02 982
e83c5163 983 errno = ENOENT;
4aab5b46 984 istate->timestamp = 0;
8fd2cb40 985 fd = open(path, O_RDONLY);
5d1a5c02
LT
986 if (fd < 0) {
987 if (errno == ENOENT)
988 return 0;
989 die("index file open failed (%s)", strerror(errno));
990 }
e83c5163 991
3511a377 992 if (fstat(fd, &st))
5fe5c830 993 die("cannot stat the open index (%s)", strerror(errno));
3511a377
LFC
994
995 errno = EINVAL;
7a51ed66
LT
996 mmap_size = xsize_t(st.st_size);
997 if (mmap_size < sizeof(struct cache_header) + 20)
3511a377
LFC
998 die("index file smaller than expected");
999
7a51ed66 1000 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
e83c5163 1001 close(fd);
7a51ed66
LT
1002 if (mmap == MAP_FAILED)
1003 die("unable to map index file");
e83c5163 1004
7a51ed66
LT
1005 hdr = mmap;
1006 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1007 goto unmap;
1008
4aab5b46
JH
1009 istate->cache_nr = ntohl(hdr->hdr_entries);
1010 istate->cache_alloc = alloc_nr(istate->cache_nr);
1011 istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
e83c5163 1012
7a51ed66
LT
1013 /*
1014 * The disk format is actually larger than the in-memory format,
1015 * due to space for nsec etc, so even though the in-memory one
1016 * has room for a few more flags, we can allocate using the same
1017 * index size
1018 */
1019 istate->alloc = xmalloc(mmap_size);
1020
1021 src_offset = sizeof(*hdr);
1022 dst_offset = 0;
4aab5b46 1023 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1024 struct ondisk_cache_entry *disk_ce;
4aab5b46
JH
1025 struct cache_entry *ce;
1026
7a51ed66
LT
1027 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1028 ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
1029 convert_from_disk(disk_ce, ce);
4aab5b46 1030 istate->cache[i] = ce;
7a51ed66
LT
1031
1032 src_offset += ondisk_ce_size(ce);
1033 dst_offset += ce_size(ce);
e83c5163 1034 }
4aab5b46 1035 istate->timestamp = st.st_mtime;
7a51ed66 1036 while (src_offset <= mmap_size - 20 - 8) {
bad68ec9
JH
1037 /* After an array of active_nr index entries,
1038 * there can be arbitrary number of extended
1039 * sections, each of which is prefixed with
1040 * extension name (4-byte) and section length
1041 * in 4-byte network byte order.
1042 */
1043 unsigned long extsize;
7a51ed66 1044 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1045 extsize = ntohl(extsize);
4aab5b46 1046 if (read_index_extension(istate,
7a51ed66
LT
1047 (const char *) mmap + src_offset,
1048 (char *) mmap + src_offset + 8,
1d7f171c 1049 extsize) < 0)
bad68ec9 1050 goto unmap;
7a51ed66
LT
1051 src_offset += 8;
1052 src_offset += extsize;
bad68ec9 1053 }
7a51ed66 1054 munmap(mmap, mmap_size);
4aab5b46 1055 return istate->cache_nr;
e83c5163
LT
1056
1057unmap:
7a51ed66 1058 munmap(mmap, mmap_size);
e83c5163 1059 errno = EINVAL;
5d1a5c02 1060 die("index file corrupt");
e83c5163
LT
1061}
1062
4aab5b46 1063int discard_index(struct index_state *istate)
6d297f81 1064{
4aab5b46
JH
1065 istate->cache_nr = 0;
1066 istate->cache_changed = 0;
1067 istate->timestamp = 0;
1068 cache_tree_free(&(istate->cache_tree));
7a51ed66
LT
1069 free(istate->alloc);
1070 istate->alloc = NULL;
6d297f81
JS
1071
1072 /* no need to throw away allocated active_cache */
7a51ed66 1073 return 0;
6d297f81
JS
1074}
1075
4990aadc 1076#define WRITE_BUFFER_SIZE 8192
bf0f910d 1077static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
1078static unsigned long write_buffer_len;
1079
6015c28b
JH
1080static int ce_write_flush(SHA_CTX *context, int fd)
1081{
1082 unsigned int buffered = write_buffer_len;
1083 if (buffered) {
1084 SHA1_Update(context, write_buffer, buffered);
93822c22 1085 if (write_in_full(fd, write_buffer, buffered) != buffered)
6015c28b
JH
1086 return -1;
1087 write_buffer_len = 0;
1088 }
1089 return 0;
1090}
1091
ca9be054 1092static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
4990aadc
LT
1093{
1094 while (len) {
1095 unsigned int buffered = write_buffer_len;
1096 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1097 if (partial > len)
1098 partial = len;
1099 memcpy(write_buffer + buffered, data, partial);
1100 buffered += partial;
1101 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
1102 write_buffer_len = buffered;
1103 if (ce_write_flush(context, fd))
4990aadc
LT
1104 return -1;
1105 buffered = 0;
1106 }
1107 write_buffer_len = buffered;
1108 len -= partial;
1d7f171c 1109 data = (char *) data + partial;
a6080a0a
JH
1110 }
1111 return 0;
4990aadc
LT
1112}
1113
bad68ec9 1114static int write_index_ext_header(SHA_CTX *context, int fd,
ac58c7b1 1115 unsigned int ext, unsigned int sz)
bad68ec9
JH
1116{
1117 ext = htonl(ext);
1118 sz = htonl(sz);
968a1d65
DR
1119 return ((ce_write(context, fd, &ext, 4) < 0) ||
1120 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
1121}
1122
1123static int ce_flush(SHA_CTX *context, int fd)
4990aadc
LT
1124{
1125 unsigned int left = write_buffer_len;
ca9be054 1126
4990aadc
LT
1127 if (left) {
1128 write_buffer_len = 0;
ca9be054 1129 SHA1_Update(context, write_buffer, left);
4990aadc 1130 }
ca9be054 1131
2c865d9a
QH
1132 /* Flush first if not enough space for SHA1 signature */
1133 if (left + 20 > WRITE_BUFFER_SIZE) {
93822c22 1134 if (write_in_full(fd, write_buffer, left) != left)
2c865d9a
QH
1135 return -1;
1136 left = 0;
1137 }
1138
ca9be054 1139 /* Append the SHA1 signature at the end */
bad68ec9 1140 SHA1_Final(write_buffer + left, context);
ca9be054 1141 left += 20;
93822c22 1142 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
4990aadc
LT
1143}
1144
407c8eb0
JH
1145static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1146{
1147 /*
1148 * The only thing we care about in this function is to smudge the
1149 * falsely clean entry due to touch-update-touch race, so we leave
1150 * everything else as they are. We are called for entries whose
1151 * ce_mtime match the index file mtime.
1152 */
1153 struct stat st;
1154
1155 if (lstat(ce->name, &st) < 0)
1156 return;
1157 if (ce_match_stat_basic(ce, &st))
1158 return;
1159 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
1160 /* This is "racily clean"; smudge it. Note that this
1161 * is a tricky code. At first glance, it may appear
1162 * that it can break with this sequence:
1163 *
1164 * $ echo xyzzy >frotz
1165 * $ git-update-index --add frotz
1166 * $ : >frotz
1167 * $ sleep 3
1168 * $ echo filfre >nitfol
1169 * $ git-update-index --add nitfol
1170 *
b7e58b17 1171 * but it does not. When the second update-index runs,
4b3511b0
JH
1172 * it notices that the entry "frotz" has the same timestamp
1173 * as index, and if we were to smudge it by resetting its
1174 * size to zero here, then the object name recorded
1175 * in index is the 6-byte file but the cached stat information
1176 * becomes zero --- which would then match what we would
a6080a0a 1177 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
1178 *
1179 * However, the second update-index, before calling
1180 * this function, notices that the cached size is 6
1181 * bytes and what is on the filesystem is an empty
1182 * file, and never calls us, so the cached size information
1183 * for "frotz" stays 6 which does not match the filesystem.
1184 */
7a51ed66 1185 ce->ce_size = 0;
407c8eb0
JH
1186 }
1187}
1188
7a51ed66
LT
1189static int ce_write_entry(SHA_CTX *c, int fd, struct cache_entry *ce)
1190{
1191 int size = ondisk_ce_size(ce);
1192 struct ondisk_cache_entry *ondisk = xcalloc(1, size);
1193
1194 ondisk->ctime.sec = htonl(ce->ce_ctime);
1195 ondisk->ctime.nsec = 0;
1196 ondisk->mtime.sec = htonl(ce->ce_mtime);
1197 ondisk->mtime.nsec = 0;
1198 ondisk->dev = htonl(ce->ce_dev);
1199 ondisk->ino = htonl(ce->ce_ino);
1200 ondisk->mode = htonl(ce->ce_mode);
1201 ondisk->uid = htonl(ce->ce_uid);
1202 ondisk->gid = htonl(ce->ce_gid);
1203 ondisk->size = htonl(ce->ce_size);
1204 hashcpy(ondisk->sha1, ce->sha1);
1205 ondisk->flags = htons(ce->ce_flags);
1206 memcpy(ondisk->name, ce->name, ce_namelen(ce));
1207
1208 return ce_write(c, fd, ondisk, size);
1209}
1210
4aab5b46 1211int write_index(struct index_state *istate, int newfd)
197ee8c9
LT
1212{
1213 SHA_CTX c;
1214 struct cache_header hdr;
1dffb8fa 1215 int i, err, removed;
4aab5b46
JH
1216 struct cache_entry **cache = istate->cache;
1217 int entries = istate->cache_nr;
025a0709
JH
1218
1219 for (i = removed = 0; i < entries; i++)
7a51ed66 1220 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 1221 removed++;
197ee8c9 1222
ccc4feb5 1223 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
ca9be054 1224 hdr.hdr_version = htonl(2);
025a0709 1225 hdr.hdr_entries = htonl(entries - removed);
197ee8c9
LT
1226
1227 SHA1_Init(&c);
ca9be054 1228 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
1229 return -1;
1230
1231 for (i = 0; i < entries; i++) {
1232 struct cache_entry *ce = cache[i];
7a51ed66 1233 if (ce->ce_flags & CE_REMOVE)
aa16021e 1234 continue;
4aab5b46 1235 if (istate->timestamp &&
7a51ed66 1236 istate->timestamp <= ce->ce_mtime)
407c8eb0 1237 ce_smudge_racily_clean_entry(ce);
7a51ed66 1238 if (ce_write_entry(&c, newfd, ce) < 0)
197ee8c9
LT
1239 return -1;
1240 }
1af1c2b6 1241
bad68ec9 1242 /* Write extension data here */
4aab5b46 1243 if (istate->cache_tree) {
1dffb8fa
PH
1244 struct strbuf sb;
1245
1246 strbuf_init(&sb, 0);
1247 cache_tree_write(&sb, istate->cache_tree);
1248 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1249 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1250 strbuf_release(&sb);
1251 if (err)
bad68ec9 1252 return -1;
bad68ec9
JH
1253 }
1254 return ce_flush(&c, newfd);
197ee8c9 1255}