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