]> git.ipfire.org Git - thirdparty/git.git/blame - read-cache.c
read-cache: relocate and unexport commit_locked_index()
[thirdparty/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"
041aee31
JH
11#include "tree.h"
12#include "commit.h"
39425819 13#include "blob.h"
cfc5789a 14#include "resolve-undo.h"
6c9cd161
JH
15#include "strbuf.h"
16#include "varint.h"
bad68ec9 17
25762726
BK
18static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
19 unsigned int options);
87b29e5a 20
b60e188c
TG
21/* Mask for the name length in ce_flags in the on-disk index */
22
23#define CE_NAMEMASK (0x0fff)
24
bad68ec9
JH
25/* Index extensions.
26 *
27 * The first letter should be 'A'..'Z' for extensions that are not
28 * necessary for a correct operation (i.e. optimization data).
29 * When new extensions are added that _needs_ to be understood in
30 * order to correctly interpret the index file, pick character that
31 * is outside the range, to cause the reader to abort.
32 */
33
34#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
35#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
b659b49b 36#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
e83c5163 37
228e94f9 38struct index_state the_index;
626f35c8 39static const char *alternate_index_output;
8fd2cb40 40
9cb76b8c
JH
41static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
42{
43 istate->cache[nr] = ce;
96872bc2 44 add_name_hash(istate, ce);
9cb76b8c
JH
45}
46
cf558704
LT
47static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
48{
49 struct cache_entry *old = istate->cache[nr];
50
2092678c 51 remove_name_hash(istate, old);
5699d17e 52 free(old);
a22c6371 53 set_index_entry(istate, nr, ce);
cf558704
LT
54 istate->cache_changed = 1;
55}
56
81dc2307
PB
57void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
58{
59 struct cache_entry *old = istate->cache[nr], *new;
60 int namelen = strlen(new_name);
61
62 new = xmalloc(cache_entry_size(namelen));
63 copy_cache_entry(new, old);
419a597f 64 new->ce_flags &= ~CE_HASHED;
b60e188c 65 new->ce_namelen = namelen;
81dc2307
PB
66 memcpy(new->name, new_name, namelen + 1);
67
68 cache_tree_invalidate_path(istate->cache_tree, old->name);
69 remove_index_entry_at(istate, nr);
70 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
71}
72
c21d39d7
MH
73void fill_stat_data(struct stat_data *sd, struct stat *st)
74{
75 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
76 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
77 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
78 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
79 sd->sd_dev = st->st_dev;
80 sd->sd_ino = st->st_ino;
81 sd->sd_uid = st->st_uid;
82 sd->sd_gid = st->st_gid;
83 sd->sd_size = st->st_size;
84}
85
86int match_stat_data(const struct stat_data *sd, struct stat *st)
87{
88 int changed = 0;
89
90 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
91 changed |= MTIME_CHANGED;
92 if (trust_ctime && check_stat &&
93 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
94 changed |= CTIME_CHANGED;
95
96#ifdef USE_NSEC
97 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
98 changed |= MTIME_CHANGED;
99 if (trust_ctime && check_stat &&
100 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
101 changed |= CTIME_CHANGED;
102#endif
103
104 if (check_stat) {
105 if (sd->sd_uid != (unsigned int) st->st_uid ||
106 sd->sd_gid != (unsigned int) st->st_gid)
107 changed |= OWNER_CHANGED;
108 if (sd->sd_ino != (unsigned int) st->st_ino)
109 changed |= INODE_CHANGED;
110 }
111
112#ifdef USE_STDEV
113 /*
114 * st_dev breaks on network filesystems where different
115 * clients will have different views of what "device"
116 * the filesystem is on
117 */
118 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
119 changed |= INODE_CHANGED;
120#endif
121
122 if (sd->sd_size != (unsigned int) st->st_size)
123 changed |= DATA_CHANGED;
124
125 return changed;
126}
127
415e96c8
JH
128/*
129 * This only updates the "non-critical" parts of the directory
130 * cache, ie the parts that aren't tracked by GIT, and only used
131 * to validate the cache.
132 */
133void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
134{
c21d39d7 135 fill_stat_data(&ce->ce_stat_data, st);
5f73076c
JH
136
137 if (assume_unchanged)
7a51ed66 138 ce->ce_flags |= CE_VALID;
eadb5831
JH
139
140 if (S_ISREG(st->st_mode))
141 ce_mark_uptodate(ce);
415e96c8
JH
142}
143
21a6b9fa 144static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
29e4d363
JH
145{
146 int match = -1;
147 int fd = open(ce->name, O_RDONLY);
148
149 if (fd >= 0) {
150 unsigned char sha1[20];
c4ce46fc 151 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
a89fccd2 152 match = hashcmp(sha1, ce->sha1);
7f8508e8 153 /* index_fd() closed the file descriptor already */
29e4d363
JH
154 }
155 return match;
156}
157
21a6b9fa 158static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
29e4d363
JH
159{
160 int match = -1;
29e4d363
JH
161 void *buffer;
162 unsigned long size;
21666f1a 163 enum object_type type;
a60272b3 164 struct strbuf sb = STRBUF_INIT;
29e4d363 165
a60272b3 166 if (strbuf_readlink(&sb, ce->name, expected_size))
29e4d363 167 return -1;
a60272b3 168
21666f1a 169 buffer = read_sha1_file(ce->sha1, &type, &size);
a60272b3
LT
170 if (buffer) {
171 if (size == sb.len)
172 match = memcmp(buffer, sb.buf, size);
173 free(buffer);
29e4d363 174 }
a60272b3 175 strbuf_release(&sb);
29e4d363
JH
176 return match;
177}
178
21a6b9fa 179static int ce_compare_gitlink(const struct cache_entry *ce)
f35a6d3b
LT
180{
181 unsigned char sha1[20];
182
183 /*
184 * We don't actually require that the .git directory
302b9282 185 * under GITLINK directory be a valid git directory. It
f35a6d3b
LT
186 * might even be missing (in case nobody populated that
187 * sub-project).
188 *
189 * If so, we consider it always to match.
190 */
191 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
192 return 0;
193 return hashcmp(sha1, ce->sha1);
194}
195
21a6b9fa 196static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
29e4d363
JH
197{
198 switch (st->st_mode & S_IFMT) {
199 case S_IFREG:
200 if (ce_compare_data(ce, st))
201 return DATA_CHANGED;
202 break;
203 case S_IFLNK:
dc49cd76 204 if (ce_compare_link(ce, xsize_t(st->st_size)))
29e4d363
JH
205 return DATA_CHANGED;
206 break;
a8ee75bc 207 case S_IFDIR:
7a51ed66 208 if (S_ISGITLINK(ce->ce_mode))
c70115b4 209 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
29e4d363
JH
210 default:
211 return TYPE_CHANGED;
212 }
213 return 0;
214}
215
21a6b9fa 216static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
734aab75
LT
217{
218 unsigned int changed = 0;
219
7a51ed66
LT
220 if (ce->ce_flags & CE_REMOVE)
221 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
222
223 switch (ce->ce_mode & S_IFMT) {
8ae0a8c5
KS
224 case S_IFREG:
225 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
3e09cdfd
JH
226 /* We consider only the owner x bit to be relevant for
227 * "mode changes"
228 */
229 if (trust_executable_bit &&
7a51ed66 230 (0100 & (ce->ce_mode ^ st->st_mode)))
ffbe1add 231 changed |= MODE_CHANGED;
8ae0a8c5
KS
232 break;
233 case S_IFLNK:
78a8d641
JS
234 if (!S_ISLNK(st->st_mode) &&
235 (has_symlinks || !S_ISREG(st->st_mode)))
236 changed |= TYPE_CHANGED;
8ae0a8c5 237 break;
302b9282 238 case S_IFGITLINK:
c70115b4 239 /* We ignore most of the st_xxx fields for gitlinks */
f35a6d3b
LT
240 if (!S_ISDIR(st->st_mode))
241 changed |= TYPE_CHANGED;
242 else if (ce_compare_gitlink(ce))
243 changed |= DATA_CHANGED;
a8ee75bc 244 return changed;
8ae0a8c5 245 default:
7a51ed66 246 die("internal error: ce_mode is %o", ce->ce_mode);
8ae0a8c5 247 }
2cb45e95 248
c21d39d7 249 changed |= match_stat_data(&ce->ce_stat_data, st);
b0391890 250
f49c2c22 251 /* Racily smudged entry? */
c21d39d7 252 if (!ce->ce_stat_data.sd_size) {
f49c2c22
LT
253 if (!is_empty_blob_sha1(ce->sha1))
254 changed |= DATA_CHANGED;
255 }
256
407c8eb0
JH
257 return changed;
258}
259
21a6b9fa
RS
260static int is_racy_timestamp(const struct index_state *istate,
261 const struct cache_entry *ce)
6d91da6d 262{
050288d5 263 return (!S_ISGITLINK(ce->ce_mode) &&
fba2f38a
KB
264 istate->timestamp.sec &&
265#ifdef USE_NSEC
266 /* nanosecond timestamped files can also be racy! */
c21d39d7
MH
267 (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
268 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
269 istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
fba2f38a 270#else
c21d39d7 271 istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
fba2f38a
KB
272#endif
273 );
6d91da6d
JH
274}
275
d1f128b0 276int ie_match_stat(const struct index_state *istate,
21a6b9fa 277 const struct cache_entry *ce, struct stat *st,
4bd5b7da 278 unsigned int options)
407c8eb0 279{
5f73076c 280 unsigned int changed;
4bd5b7da 281 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 282 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
4bd5b7da 283 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
5f73076c
JH
284
285 /*
286 * If it's marked as always valid in the index, it's
287 * valid whatever the checked-out copy says.
56cac48c
NTND
288 *
289 * skip-worktree has the same effect with higher precedence
5f73076c 290 */
56cac48c
NTND
291 if (!ignore_skip_worktree && ce_skip_worktree(ce))
292 return 0;
7a51ed66 293 if (!ignore_valid && (ce->ce_flags & CE_VALID))
5f73076c
JH
294 return 0;
295
331fcb59
JH
296 /*
297 * Intent-to-add entries have not been added, so the index entry
298 * by definition never matches what is in the work tree until it
299 * actually gets added.
300 */
301 if (ce->ce_flags & CE_INTENT_TO_ADD)
302 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
303
5f73076c 304 changed = ce_match_stat_basic(ce, st);
407c8eb0 305
29e4d363
JH
306 /*
307 * Within 1 second of this sequence:
308 * echo xyzzy >file && git-update-index --add file
309 * running this command:
310 * echo frotz >file
311 * would give a falsely clean cache entry. The mtime and
312 * length match the cache, and other stat fields do not change.
313 *
314 * We could detect this at update-index time (the cache entry
315 * being registered/updated records the same time as "now")
316 * and delay the return from git-update-index, but that would
317 * effectively mean we can make at most one commit per second,
318 * which is not acceptable. Instead, we check cache entries
319 * whose mtime are the same as the index file timestamp more
5f73076c 320 * carefully than others.
29e4d363 321 */
6d91da6d 322 if (!changed && is_racy_timestamp(istate, ce)) {
42f77406
JH
323 if (assume_racy_is_modified)
324 changed |= DATA_CHANGED;
325 else
326 changed |= ce_modified_check_fs(ce, st);
327 }
b0391890 328
29e4d363 329 return changed;
b0391890
JH
330}
331
d1f128b0 332int ie_modified(const struct index_state *istate,
21a6b9fa
RS
333 const struct cache_entry *ce,
334 struct stat *st, unsigned int options)
b0391890 335{
29e4d363 336 int changed, changed_fs;
4bd5b7da
JH
337
338 changed = ie_match_stat(istate, ce, st, options);
b0391890
JH
339 if (!changed)
340 return 0;
b0391890
JH
341 /*
342 * If the mode or type has changed, there's no point in trying
343 * to refresh the entry - it's not going to match
344 */
345 if (changed & (MODE_CHANGED | TYPE_CHANGED))
346 return changed;
347
c70115b4
JH
348 /*
349 * Immediately after read-tree or update-index --cacheinfo,
350 * the length field is zero, as we have never even read the
351 * lstat(2) information once, and we cannot trust DATA_CHANGED
352 * returned by ie_match_stat() which in turn was returned by
353 * ce_match_stat_basic() to signal that the filesize of the
354 * blob changed. We have to actually go to the filesystem to
355 * see if the contents match, and if so, should answer "unchanged".
356 *
357 * The logic does not apply to gitlinks, as ce_match_stat_basic()
358 * already has checked the actual HEAD from the filesystem in the
359 * subproject. If ie_match_stat() already said it is different,
360 * then we know it is.
b0391890 361 */
c70115b4 362 if ((changed & DATA_CHANGED) &&
c21d39d7 363 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
b0391890
JH
364 return changed;
365
29e4d363
JH
366 changed_fs = ce_modified_check_fs(ce, st);
367 if (changed_fs)
368 return changed | changed_fs;
b0391890
JH
369 return 0;
370}
371
958ba6c9
LT
372int base_name_compare(const char *name1, int len1, int mode1,
373 const char *name2, int len2, int mode2)
374{
375 unsigned char c1, c2;
376 int len = len1 < len2 ? len1 : len2;
377 int cmp;
378
379 cmp = memcmp(name1, name2, len);
380 if (cmp)
381 return cmp;
382 c1 = name1[len];
383 c2 = name2[len];
1833a925 384 if (!c1 && S_ISDIR(mode1))
958ba6c9 385 c1 = '/';
1833a925 386 if (!c2 && S_ISDIR(mode2))
958ba6c9
LT
387 c2 = '/';
388 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
389}
390
0ab9e1e8
LT
391/*
392 * df_name_compare() is identical to base_name_compare(), except it
393 * compares conflicting directory/file entries as equal. Note that
394 * while a directory name compares as equal to a regular file, they
395 * then individually compare _differently_ to a filename that has
396 * a dot after the basename (because '\0' < '.' < '/').
397 *
398 * This is used by routines that want to traverse the git namespace
399 * but then handle conflicting entries together when possible.
400 */
401int df_name_compare(const char *name1, int len1, int mode1,
402 const char *name2, int len2, int mode2)
403{
404 int len = len1 < len2 ? len1 : len2, cmp;
405 unsigned char c1, c2;
406
407 cmp = memcmp(name1, name2, len);
408 if (cmp)
409 return cmp;
410 /* Directories and files compare equal (same length, same name) */
411 if (len1 == len2)
412 return 0;
413 c1 = name1[len];
414 if (!c1 && S_ISDIR(mode1))
415 c1 = '/';
416 c2 = name2[len];
417 if (!c2 && S_ISDIR(mode2))
418 c2 = '/';
419 if (c1 == '/' && !c2)
420 return 0;
421 if (c2 == '/' && !c1)
422 return 0;
423 return c1 - c2;
424}
425
b60e188c 426int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
eb38c22f 427{
b60e188c
TG
428 int len = len1 < len2 ? len1 : len2;
429 int cmp;
eb38c22f
LT
430
431 cmp = memcmp(name1, name2, len);
432 if (cmp)
433 return cmp;
434 if (len1 < len2)
435 return -1;
436 if (len1 > len2)
437 return 1;
5f73076c 438
b60e188c 439 if (stage1 < stage2)
95fd5bf8 440 return -1;
b60e188c 441 if (stage1 > stage2)
95fd5bf8 442 return 1;
eb38c22f
LT
443 return 0;
444}
445
b60e188c
TG
446int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
447{
448 return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
449}
450
357e9c69 451static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
eb38c22f
LT
452{
453 int first, last;
454
455 first = 0;
4aab5b46 456 last = istate->cache_nr;
eb38c22f
LT
457 while (last > first) {
458 int next = (last + first) >> 1;
4aab5b46 459 struct cache_entry *ce = istate->cache[next];
b60e188c 460 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
eb38c22f 461 if (!cmp)
76e7f4ec 462 return next;
eb38c22f
LT
463 if (cmp < 0) {
464 last = next;
465 continue;
466 }
467 first = next+1;
468 }
76e7f4ec 469 return -first-1;
eb38c22f
LT
470}
471
b60e188c
TG
472int index_name_pos(const struct index_state *istate, const char *name, int namelen)
473{
474 return index_name_stage_pos(istate, name, namelen, 0);
475}
476
7b937ca3 477/* Remove entry, return true if there are more entries to go.. */
4aab5b46 478int remove_index_entry_at(struct index_state *istate, int pos)
7b937ca3 479{
cf558704
LT
480 struct cache_entry *ce = istate->cache[pos];
481
cfc5789a 482 record_resolve_undo(istate, ce);
2092678c 483 remove_name_hash(istate, ce);
5699d17e 484 free(ce);
4aab5b46
JH
485 istate->cache_changed = 1;
486 istate->cache_nr--;
487 if (pos >= istate->cache_nr)
7b937ca3 488 return 0;
4aab5b46
JH
489 memmove(istate->cache + pos,
490 istate->cache + pos + 1,
491 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
7b937ca3
LT
492 return 1;
493}
494
36419c8e 495/*
98e023de 496 * Remove all cache entries marked for removal, that is where
36419c8e
KB
497 * CE_REMOVE is set in ce_flags. This is much more effective than
498 * calling remove_index_entry_at() for each entry to be removed.
499 */
500void remove_marked_cache_entries(struct index_state *istate)
501{
502 struct cache_entry **ce_array = istate->cache;
503 unsigned int i, j;
504
505 for (i = j = 0; i < istate->cache_nr; i++) {
5699d17e 506 if (ce_array[i]->ce_flags & CE_REMOVE) {
2092678c 507 remove_name_hash(istate, ce_array[i]);
5699d17e
KB
508 free(ce_array[i]);
509 }
36419c8e
KB
510 else
511 ce_array[j++] = ce_array[i];
512 }
513 istate->cache_changed = 1;
514 istate->cache_nr = j;
515}
516
4aab5b46 517int remove_file_from_index(struct index_state *istate, const char *path)
197ee8c9 518{
4aab5b46 519 int pos = index_name_pos(istate, path, strlen(path));
c4e3cca1
JH
520 if (pos < 0)
521 pos = -pos-1;
09d5dc32 522 cache_tree_invalidate_path(istate->cache_tree, path);
4aab5b46
JH
523 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
524 remove_index_entry_at(istate, pos);
197ee8c9
LT
525 return 0;
526}
527
20314271
JS
528static int compare_name(struct cache_entry *ce, const char *path, int namelen)
529{
530 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
531}
532
533static int index_name_pos_also_unmerged(struct index_state *istate,
534 const char *path, int namelen)
535{
536 int pos = index_name_pos(istate, path, namelen);
537 struct cache_entry *ce;
538
539 if (pos >= 0)
540 return pos;
541
542 /* maybe unmerged? */
543 pos = -1 - pos;
544 if (pos >= istate->cache_nr ||
545 compare_name((ce = istate->cache[pos]), path, namelen))
546 return -1;
547
548 /* order of preference: stage 2, 1, 3 */
549 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
550 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
551 !compare_name(ce, path, namelen))
552 pos++;
553 return pos;
554}
555
1102952b
LT
556static int different_name(struct cache_entry *ce, struct cache_entry *alias)
557{
558 int len = ce_namelen(ce);
559 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
560}
561
562/*
563 * If we add a filename that aliases in the cache, we will use the
564 * name that we already have - but we don't want to update the same
565 * alias twice, because that implies that there were actually two
566 * different files with aliasing names!
567 *
568 * So we use the CE_ADDED flag to verify that the alias was an old
569 * one before we accept it as
570 */
571static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
572{
573 int len;
574 struct cache_entry *new;
575
576 if (alias->ce_flags & CE_ADDED)
577 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
578
579 /* Ok, create the new entry using the name of the existing alias */
580 len = ce_namelen(alias);
581 new = xcalloc(1, cache_entry_size(len));
582 memcpy(new->name, alias->name, len);
583 copy_cache_entry(new, ce);
584 free(ce);
585 return new;
586}
587
b4b313f9 588void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
39425819
JH
589{
590 unsigned char sha1[20];
591 if (write_sha1_file("", 0, blob_type, sha1))
592 die("cannot create an empty blob in the object database");
593 hashcpy(ce->sha1, sha1);
594}
595
38ed1d89 596int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
11be42a4 597{
38ed1d89 598 int size, namelen, was_same;
d177cab0 599 mode_t st_mode = st->st_mode;
6835550d 600 struct cache_entry *ce, *alias;
56cac48c 601 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
38ed1d89
JH
602 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
603 int pretend = flags & ADD_CACHE_PRETEND;
39425819
JH
604 int intent_only = flags & ADD_CACHE_INTENT;
605 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
606 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
11be42a4 607
d177cab0 608 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
960b8ad1 609 return error("%s: can only add regular files, symbolic links or git-directories", path);
11be42a4
JS
610
611 namelen = strlen(path);
d177cab0 612 if (S_ISDIR(st_mode)) {
09595258
LT
613 while (namelen && path[namelen-1] == '/')
614 namelen--;
615 }
11be42a4
JS
616 size = cache_entry_size(namelen);
617 ce = xcalloc(1, size);
618 memcpy(ce->name, path, namelen);
b60e188c 619 ce->ce_namelen = namelen;
39425819
JH
620 if (!intent_only)
621 fill_stat_cache_info(ce, st);
388b2acd
JH
622 else
623 ce->ce_flags |= CE_INTENT_TO_ADD;
11be42a4 624
78a8d641 625 if (trust_executable_bit && has_symlinks)
d177cab0 626 ce->ce_mode = create_ce_mode(st_mode);
185c975f 627 else {
78a8d641
JS
628 /* If there is an existing entry, pick the mode bits and type
629 * from it, otherwise assume unexecutable regular file.
11be42a4 630 */
185c975f 631 struct cache_entry *ent;
20314271 632 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 633
4aab5b46 634 ent = (0 <= pos) ? istate->cache[pos] : NULL;
d177cab0 635 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
11be42a4
JS
636 }
637
dc1ae704
JJ
638 /* When core.ignorecase=true, determine if a directory of the same name but differing
639 * case already exists within the Git repository. If it does, ensure the directory
640 * case of the file being added to the repository matches (is folded into) the existing
641 * entry's directory case.
642 */
643 if (ignore_case) {
644 const char *startPtr = ce->name;
645 const char *ptr = startPtr;
646 while (*ptr) {
647 while (*ptr && *ptr != '/')
648 ++ptr;
649 if (*ptr == '/') {
650 struct cache_entry *foundce;
651 ++ptr;
d28eec26 652 foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
dc1ae704
JJ
653 if (foundce) {
654 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
655 startPtr = ptr;
656 }
657 }
658 }
659 }
660
ebbd7439 661 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
d177cab0 662 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
0781b8a9
JH
663 /* Nothing changed, really */
664 free(ce);
125fd984
JH
665 if (!S_ISGITLINK(alias->ce_mode))
666 ce_mark_uptodate(alias);
1102952b 667 alias->ce_flags |= CE_ADDED;
0781b8a9
JH
668 return 0;
669 }
39425819 670 if (!intent_only) {
c4ce46fc 671 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
39425819
JH
672 return error("unable to index file %s", path);
673 } else
b4b313f9 674 set_object_name_for_intent_to_add_entry(ce);
39425819 675
1102952b
LT
676 if (ignore_case && alias && different_name(ce, alias))
677 ce = create_alias_ce(ce, alias);
678 ce->ce_flags |= CE_ADDED;
38ed1d89 679
3bf0dd1f 680 /* It was suspected to be racily clean, but it turns out to be Ok */
38ed1d89
JH
681 was_same = (alias &&
682 !ce_stage(alias) &&
683 !hashcmp(alias->sha1, ce->sha1) &&
684 ce->ce_mode == alias->ce_mode);
685
686 if (pretend)
687 ;
39425819 688 else if (add_index_entry(istate, ce, add_option))
960b8ad1 689 return error("unable to add %s to index",path);
38ed1d89 690 if (verbose && !was_same)
11be42a4 691 printf("add '%s'\n", path);
11be42a4
JS
692 return 0;
693}
694
38ed1d89 695int add_file_to_index(struct index_state *istate, const char *path, int flags)
d177cab0
LT
696{
697 struct stat st;
698 if (lstat(path, &st))
d824cbba 699 die_errno("unable to stat '%s'", path);
38ed1d89 700 return add_to_index(istate, path, &st, flags);
d177cab0
LT
701}
702
6640f881
CR
703struct cache_entry *make_cache_entry(unsigned int mode,
704 const unsigned char *sha1, const char *path, int stage,
25762726 705 unsigned int refresh_options)
6640f881
CR
706{
707 int size, len;
708 struct cache_entry *ce;
709
7e7abea9
DP
710 if (!verify_path(path)) {
711 error("Invalid path '%s'", path);
6640f881 712 return NULL;
7e7abea9 713 }
6640f881
CR
714
715 len = strlen(path);
716 size = cache_entry_size(len);
717 ce = xcalloc(1, size);
718
719 hashcpy(ce->sha1, sha1);
720 memcpy(ce->name, path, len);
b60e188c
TG
721 ce->ce_flags = create_ce_flags(stage);
722 ce->ce_namelen = len;
6640f881
CR
723 ce->ce_mode = create_ce_mode(mode);
724
25762726 725 return refresh_cache_entry(ce, refresh_options);
6640f881
CR
726}
727
9c5e6c80 728int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
7b937ca3
LT
729{
730 int len = ce_namelen(a);
731 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
732}
733
8dcf39c4
LT
734/*
735 * We fundamentally don't like some paths: we don't want
736 * dot or dot-dot anywhere, and for obvious reasons don't
737 * want to recurse into ".git" either.
738 *
739 * Also, we don't want double slashes or slashes at the
740 * end that can make pathnames ambiguous.
741 */
742static int verify_dotfile(const char *rest)
743{
744 /*
745 * The first character was '.', but that
746 * has already been discarded, we now test
747 * the rest.
748 */
e0f530ff 749
8dcf39c4 750 /* "." is not allowed */
e0f530ff 751 if (*rest == '\0' || is_dir_sep(*rest))
8dcf39c4
LT
752 return 0;
753
e0f530ff 754 switch (*rest) {
8dcf39c4
LT
755 /*
756 * ".git" followed by NUL or slash is bad. This
757 * shares the path end test with the ".." case.
758 */
759 case 'g':
760 if (rest[1] != 'i')
761 break;
762 if (rest[2] != 't')
763 break;
764 rest += 2;
765 /* fallthrough */
766 case '.':
e0f530ff 767 if (rest[1] == '\0' || is_dir_sep(rest[1]))
8dcf39c4
LT
768 return 0;
769 }
770 return 1;
771}
772
773int verify_path(const char *path)
774{
775 char c;
776
56948cb6
EFL
777 if (has_dos_drive_prefix(path))
778 return 0;
779
8dcf39c4
LT
780 goto inside;
781 for (;;) {
782 if (!c)
783 return 1;
56948cb6 784 if (is_dir_sep(c)) {
8dcf39c4
LT
785inside:
786 c = *path++;
3bdf09c7
JH
787 if ((c == '.' && !verify_dotfile(path)) ||
788 is_dir_sep(c) || c == '\0')
789 return 0;
8dcf39c4
LT
790 }
791 c = *path++;
792 }
793}
794
12676608
LT
795/*
796 * Do we have another file that has the beginning components being a
797 * proper superset of the name we're trying to add?
0f1e4f04 798 */
4aab5b46
JH
799static int has_file_name(struct index_state *istate,
800 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 801{
12676608
LT
802 int retval = 0;
803 int len = ce_namelen(ce);
b155725d 804 int stage = ce_stage(ce);
12676608 805 const char *name = ce->name;
0f1e4f04 806
4aab5b46
JH
807 while (pos < istate->cache_nr) {
808 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 809
12676608 810 if (len >= ce_namelen(p))
0f1e4f04 811 break;
12676608
LT
812 if (memcmp(name, p->name, len))
813 break;
b155725d
JH
814 if (ce_stage(p) != stage)
815 continue;
12676608
LT
816 if (p->name[len] != '/')
817 continue;
7a51ed66 818 if (p->ce_flags & CE_REMOVE)
21cd8d00 819 continue;
12676608
LT
820 retval = -1;
821 if (!ok_to_replace)
822 break;
4aab5b46 823 remove_index_entry_at(istate, --pos);
0f1e4f04 824 }
12676608
LT
825 return retval;
826}
0f1e4f04 827
12676608
LT
828/*
829 * Do we have another file with a pathname that is a proper
830 * subset of the name we're trying to add?
831 */
4aab5b46
JH
832static int has_dir_name(struct index_state *istate,
833 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
834{
835 int retval = 0;
b155725d 836 int stage = ce_stage(ce);
12676608
LT
837 const char *name = ce->name;
838 const char *slash = name + ce_namelen(ce);
0f1e4f04 839
12676608
LT
840 for (;;) {
841 int len;
0f1e4f04 842
12676608
LT
843 for (;;) {
844 if (*--slash == '/')
845 break;
846 if (slash <= ce->name)
847 return retval;
848 }
849 len = slash - name;
0f1e4f04 850
b60e188c 851 pos = index_name_stage_pos(istate, name, len, stage);
12676608 852 if (pos >= 0) {
21cd8d00
JH
853 /*
854 * Found one, but not so fast. This could
855 * be a marker that says "I was here, but
856 * I am being removed". Such an entry is
857 * not a part of the resulting tree, and
858 * it is Ok to have a directory at the same
859 * path.
860 */
077c48df 861 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
862 retval = -1;
863 if (!ok_to_replace)
864 break;
4aab5b46 865 remove_index_entry_at(istate, pos);
21cd8d00
JH
866 continue;
867 }
12676608 868 }
21cd8d00
JH
869 else
870 pos = -pos-1;
12676608
LT
871
872 /*
873 * Trivial optimization: if we find an entry that
874 * already matches the sub-directory, then we know
b155725d 875 * we're ok, and we can exit.
12676608 876 */
4aab5b46
JH
877 while (pos < istate->cache_nr) {
878 struct cache_entry *p = istate->cache[pos];
b155725d
JH
879 if ((ce_namelen(p) <= len) ||
880 (p->name[len] != '/') ||
881 memcmp(p->name, name, len))
882 break; /* not our subdirectory */
077c48df
JH
883 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
884 /*
885 * p is at the same stage as our entry, and
b155725d
JH
886 * is a subdirectory of what we are looking
887 * at, so we cannot have conflicts at our
888 * level or anything shorter.
889 */
890 return retval;
891 pos++;
192268c1 892 }
0f1e4f04 893 }
12676608
LT
894 return retval;
895}
896
897/* We may be in a situation where we already have path/file and path
898 * is being added, or we already have path and path/file is being
899 * added. Either one would result in a nonsense tree that has path
900 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 901 *
12676608
LT
902 * If ok-to-replace is specified, we remove the conflicting entries
903 * from the cache so the caller should recompute the insert position.
904 * When this happens, we return non-zero.
905 */
4aab5b46
JH
906static int check_file_directory_conflict(struct index_state *istate,
907 const struct cache_entry *ce,
908 int pos, int ok_to_replace)
12676608 909{
21cd8d00
JH
910 int retval;
911
912 /*
913 * When ce is an "I am going away" entry, we allow it to be added
914 */
7a51ed66 915 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
916 return 0;
917
12676608
LT
918 /*
919 * We check if the path is a sub-path of a subsequent pathname
920 * first, since removing those will not change the position
21cd8d00 921 * in the array.
12676608 922 */
4aab5b46 923 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 924
12676608
LT
925 /*
926 * Then check if the path might have a clashing sub-directory
927 * before it.
928 */
4aab5b46 929 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
930}
931
af3785dc 932static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
933{
934 int pos;
192268c1
JH
935 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
936 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 937 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 938 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 939
09d5dc32 940 cache_tree_invalidate_path(istate->cache_tree, ce->name);
b60e188c 941 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
197ee8c9 942
3e09cdfd 943 /* existing match? Just replace it. */
76e7f4ec 944 if (pos >= 0) {
39425819
JH
945 if (!new_only)
946 replace_index_entry(istate, pos, ce);
197ee8c9
LT
947 return 0;
948 }
76e7f4ec 949 pos = -pos-1;
197ee8c9 950
7b937ca3
LT
951 /*
952 * Inserting a merged entry ("stage 0") into the index
953 * will always replace all non-merged entries..
954 */
4aab5b46
JH
955 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
956 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 957 ok_to_add = 1;
4aab5b46 958 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
959 break;
960 }
961 }
962
121481ab
LT
963 if (!ok_to_add)
964 return -1;
8dcf39c4 965 if (!verify_path(ce->name))
7e7abea9 966 return error("Invalid path '%s'", ce->name);
121481ab 967
3e09cdfd 968 if (!skip_df_check &&
4aab5b46 969 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 970 if (!ok_to_replace)
4aab5b46
JH
971 return error("'%s' appears as both a file and as a directory",
972 ce->name);
b60e188c 973 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
192268c1
JH
974 pos = -pos-1;
975 }
af3785dc
JH
976 return pos + 1;
977}
978
979int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
980{
981 int pos;
982
983 if (option & ADD_CACHE_JUST_APPEND)
984 pos = istate->cache_nr;
985 else {
986 int ret;
987 ret = add_index_entry_with_check(istate, ce, option);
988 if (ret <= 0)
989 return ret;
990 pos = ret - 1;
991 }
0f1e4f04 992
197ee8c9 993 /* Make sure the array is big enough .. */
999f5660 994 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
197ee8c9
LT
995
996 /* Add it in.. */
4aab5b46 997 istate->cache_nr++;
af3785dc 998 if (istate->cache_nr > pos + 1)
4aab5b46
JH
999 memmove(istate->cache + pos + 1,
1000 istate->cache + pos,
1001 (istate->cache_nr - pos - 1) * sizeof(ce));
cf558704 1002 set_index_entry(istate, pos, ce);
4aab5b46 1003 istate->cache_changed = 1;
197ee8c9
LT
1004 return 0;
1005}
1006
405e5b2f
LT
1007/*
1008 * "refresh" does not calculate a new sha1 file or bring the
1009 * cache up-to-date for mode/content changes. But what it
1010 * _does_ do is to "re-match" the stat information of a file
1011 * with the cache, so that you can refresh the cache for a
1012 * file that hasn't been changed but where the stat entry is
1013 * out of date.
1014 *
1015 * For example, you'd want to do this after doing a "git-read-tree",
1016 * to link up the stat cache details with the proper files.
1017 */
4aab5b46 1018static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da 1019 struct cache_entry *ce,
d05e6970
JK
1020 unsigned int options, int *err,
1021 int *changed_ret)
405e5b2f
LT
1022{
1023 struct stat st;
1024 struct cache_entry *updated;
1025 int changed, size;
25762726 1026 int refresh = options & CE_MATCH_REFRESH;
4bd5b7da 1027 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 1028 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
2e2e7ec1 1029 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
405e5b2f 1030
25762726 1031 if (!refresh || ce_uptodate(ce))
eadb5831
JH
1032 return ce;
1033
aa9349d4 1034 /*
56cac48c
NTND
1035 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1036 * that the change to the work tree does not matter and told
1037 * us not to worry.
aa9349d4 1038 */
56cac48c
NTND
1039 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1040 ce_mark_uptodate(ce);
1041 return ce;
1042 }
aa9349d4
MSO
1043 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1044 ce_mark_uptodate(ce);
1045 return ce;
1046 }
1047
8fd2cb40 1048 if (lstat(ce->name, &st) < 0) {
2e2e7ec1
BK
1049 if (ignore_missing && errno == ENOENT)
1050 return ce;
ec0cc704
JH
1051 if (err)
1052 *err = errno;
8fd2cb40
JS
1053 return NULL;
1054 }
405e5b2f 1055
4bd5b7da 1056 changed = ie_match_stat(istate, ce, &st, options);
d05e6970
JK
1057 if (changed_ret)
1058 *changed_ret = changed;
405e5b2f 1059 if (!changed) {
4bd5b7da
JH
1060 /*
1061 * The path is unchanged. If we were told to ignore
1062 * valid bit, then we did the actual stat check and
1063 * found that the entry is unmodified. If the entry
1064 * is not marked VALID, this is the place to mark it
1065 * valid again, under "assume unchanged" mode.
1066 */
1067 if (ignore_valid && assume_unchanged &&
7a51ed66 1068 !(ce->ce_flags & CE_VALID))
405e5b2f 1069 ; /* mark this one VALID again */
eadb5831
JH
1070 else {
1071 /*
1072 * We do not mark the index itself "modified"
1073 * because CE_UPTODATE flag is in-core only;
1074 * we are not going to write this change out.
1075 */
125fd984
JH
1076 if (!S_ISGITLINK(ce->ce_mode))
1077 ce_mark_uptodate(ce);
8fd2cb40 1078 return ce;
eadb5831 1079 }
405e5b2f
LT
1080 }
1081
4bd5b7da 1082 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1083 if (err)
1084 *err = EINVAL;
8fd2cb40
JS
1085 return NULL;
1086 }
405e5b2f
LT
1087
1088 size = ce_size(ce);
1089 updated = xmalloc(size);
1090 memcpy(updated, ce, size);
1091 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
1092 /*
1093 * If ignore_valid is not set, we should leave CE_VALID bit
1094 * alone. Otherwise, paths marked with --no-assume-unchanged
1095 * (i.e. things to be edited) will reacquire CE_VALID bit
1096 * automatically, which is not really what we want.
405e5b2f 1097 */
4bd5b7da 1098 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1099 !(ce->ce_flags & CE_VALID))
1100 updated->ce_flags &= ~CE_VALID;
405e5b2f
LT
1101
1102 return updated;
1103}
1104
3deffc52 1105static void show_file(const char * fmt, const char * name, int in_porcelain,
046613c5 1106 int * first, const char *header_msg)
3deffc52
MM
1107{
1108 if (in_porcelain && *first && header_msg) {
1109 printf("%s\n", header_msg);
cd2b8ae9 1110 *first = 0;
3deffc52
MM
1111 }
1112 printf(fmt, name);
1113}
1114
9b2d6149
NTND
1115int refresh_index(struct index_state *istate, unsigned int flags,
1116 const struct pathspec *pathspec,
046613c5 1117 char *seen, const char *header_msg)
405e5b2f
LT
1118{
1119 int i;
1120 int has_errors = 0;
1121 int really = (flags & REFRESH_REALLY) != 0;
1122 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1123 int quiet = (flags & REFRESH_QUIET) != 0;
1124 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1125 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
3deffc52
MM
1126 int first = 1;
1127 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
25762726
BK
1128 unsigned int options = (CE_MATCH_REFRESH |
1129 (really ? CE_MATCH_IGNORE_VALID : 0) |
2e2e7ec1 1130 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
4bd4e730 1131 const char *modified_fmt;
73b7eae6
JK
1132 const char *deleted_fmt;
1133 const char *typechange_fmt;
1134 const char *added_fmt;
4bd4e730 1135 const char *unmerged_fmt;
405e5b2f 1136
4bd4e730 1137 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
73b7eae6
JK
1138 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1139 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1140 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
4bd4e730 1141 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
4aab5b46 1142 for (i = 0; i < istate->cache_nr; i++) {
405e5b2f 1143 struct cache_entry *ce, *new;
ec0cc704 1144 int cache_errno = 0;
73b7eae6 1145 int changed = 0;
3d1f148c 1146 int filtered = 0;
ec0cc704 1147
4aab5b46 1148 ce = istate->cache[i];
5fdeacb0
JS
1149 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1150 continue;
1151
429bb40a 1152 if (pathspec && !ce_path_match(ce, pathspec, seen))
3d1f148c
JH
1153 filtered = 1;
1154
405e5b2f 1155 if (ce_stage(ce)) {
4aab5b46
JH
1156 while ((i < istate->cache_nr) &&
1157 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1158 i++;
1159 i--;
1160 if (allow_unmerged)
1161 continue;
3d1f148c
JH
1162 if (!filtered)
1163 show_file(unmerged_fmt, ce->name, in_porcelain,
1164 &first, header_msg);
405e5b2f
LT
1165 has_errors = 1;
1166 continue;
1167 }
1168
3d1f148c 1169 if (filtered)
d616813d
AJ
1170 continue;
1171
73b7eae6 1172 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
8fd2cb40 1173 if (new == ce)
405e5b2f 1174 continue;
8fd2cb40 1175 if (!new) {
73b7eae6
JK
1176 const char *fmt;
1177
8fd2cb40 1178 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1179 /* If we are doing --really-refresh that
1180 * means the index is not valid anymore.
1181 */
7a51ed66 1182 ce->ce_flags &= ~CE_VALID;
4aab5b46 1183 istate->cache_changed = 1;
405e5b2f
LT
1184 }
1185 if (quiet)
1186 continue;
73b7eae6
JK
1187
1188 if (cache_errno == ENOENT)
1189 fmt = deleted_fmt;
1190 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1191 fmt = added_fmt; /* must be before other checks */
1192 else if (changed & TYPE_CHANGED)
1193 fmt = typechange_fmt;
1194 else
1195 fmt = modified_fmt;
1196 show_file(fmt,
1197 ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1198 has_errors = 1;
1199 continue;
1200 }
cf558704
LT
1201
1202 replace_index_entry(istate, i, new);
405e5b2f
LT
1203 }
1204 return has_errors;
1205}
1206
25762726
BK
1207static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1208 unsigned int options)
ec0cc704 1209{
25762726 1210 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
ec0cc704
JH
1211}
1212
db3b313c
JH
1213
1214/*****************************************************************
1215 * Index File I/O
1216 *****************************************************************/
1217
9d227781
JH
1218#define INDEX_FORMAT_DEFAULT 3
1219
3c09d684
TG
1220static int index_format_config(const char *var, const char *value, void *cb)
1221{
1222 unsigned int *version = cb;
1223 if (!strcmp(var, "index.version")) {
1224 *version = git_config_int(var, value);
1225 return 0;
1226 }
1227 return 1;
1228}
1229
136347d7
TG
1230static unsigned int get_index_format_default(void)
1231{
1232 char *envversion = getenv("GIT_INDEX_VERSION");
3c09d684
TG
1233 char *endp;
1234 unsigned int version = INDEX_FORMAT_DEFAULT;
1235
136347d7 1236 if (!envversion) {
3c09d684
TG
1237 git_config(index_format_config, &version);
1238 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1239 warning(_("index.version set, but the value is invalid.\n"
136347d7 1240 "Using version %i"), INDEX_FORMAT_DEFAULT);
3c09d684 1241 return INDEX_FORMAT_DEFAULT;
136347d7
TG
1242 }
1243 return version;
1244 }
3c09d684
TG
1245
1246 version = strtoul(envversion, &endp, 10);
1247 if (*endp ||
1248 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1249 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1250 "Using version %i"), INDEX_FORMAT_DEFAULT);
1251 version = INDEX_FORMAT_DEFAULT;
1252 }
1253 return version;
136347d7
TG
1254}
1255
db3b313c
JH
1256/*
1257 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1258 * Again - this is just a (very strong in practice) heuristic that
1259 * the inode hasn't changed.
1260 *
1261 * We save the fields in big-endian order to allow using the
1262 * index file over NFS transparently.
1263 */
1264struct ondisk_cache_entry {
1265 struct cache_time ctime;
1266 struct cache_time mtime;
7800c1eb
TG
1267 uint32_t dev;
1268 uint32_t ino;
1269 uint32_t mode;
1270 uint32_t uid;
1271 uint32_t gid;
1272 uint32_t size;
db3b313c 1273 unsigned char sha1[20];
7800c1eb 1274 uint16_t flags;
db3b313c
JH
1275 char name[FLEX_ARRAY]; /* more */
1276};
1277
1278/*
1279 * This struct is used when CE_EXTENDED bit is 1
1280 * The struct must match ondisk_cache_entry exactly from
1281 * ctime till flags
1282 */
1283struct ondisk_cache_entry_extended {
1284 struct cache_time ctime;
1285 struct cache_time mtime;
7800c1eb
TG
1286 uint32_t dev;
1287 uint32_t ino;
1288 uint32_t mode;
1289 uint32_t uid;
1290 uint32_t gid;
1291 uint32_t size;
db3b313c 1292 unsigned char sha1[20];
7800c1eb
TG
1293 uint16_t flags;
1294 uint16_t flags2;
db3b313c
JH
1295 char name[FLEX_ARRAY]; /* more */
1296};
1297
6c9cd161 1298/* These are only used for v3 or lower */
db3b313c
JH
1299#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1300#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1301#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1302#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1303 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1304 ondisk_cache_entry_size(ce_namelen(ce)))
1305
bad68ec9 1306static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163 1307{
9126f009 1308 git_SHA_CTX c;
bad68ec9 1309 unsigned char sha1[20];
0136bac9 1310 int hdr_version;
e83c5163 1311
ccc4feb5 1312 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 1313 return error("bad signature");
0136bac9 1314 hdr_version = ntohl(hdr->hdr_version);
b82a7b5b 1315 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
0136bac9 1316 return error("bad index version %d", hdr_version);
9126f009
NP
1317 git_SHA1_Init(&c);
1318 git_SHA1_Update(&c, hdr, size - 20);
1319 git_SHA1_Final(sha1, &c);
a89fccd2 1320 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
ca9be054 1321 return error("bad index file sha1 signature");
e83c5163
LT
1322 return 0;
1323}
1324
4aab5b46
JH
1325static int read_index_extension(struct index_state *istate,
1326 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
1327{
1328 switch (CACHE_EXT(ext)) {
1329 case CACHE_EXT_TREE:
4aab5b46 1330 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9 1331 break;
cfc5789a
JH
1332 case CACHE_EXT_RESOLVE_UNDO:
1333 istate->resolve_undo = resolve_undo_read(data, sz);
1334 break;
bad68ec9
JH
1335 default:
1336 if (*ext < 'A' || 'Z' < *ext)
1337 return error("index uses %.4s extension, which we do not understand",
1338 ext);
1339 fprintf(stderr, "ignoring %.4s extension\n", ext);
1340 break;
1341 }
1342 return 0;
1343}
1344
4aab5b46 1345int read_index(struct index_state *istate)
8fd2cb40 1346{
4aab5b46 1347 return read_index_from(istate, get_index_file());
8fd2cb40
JS
1348}
1349
3fc22b53
JH
1350static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1351 unsigned int flags,
1352 const char *name,
1353 size_t len)
1354{
1355 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1356
c3d8da57
JK
1357 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1358 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1359 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1360 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1361 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1362 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1363 ce->ce_mode = get_be32(&ondisk->mode);
1364 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1365 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1366 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
b60e188c
TG
1367 ce->ce_flags = flags & ~CE_NAMEMASK;
1368 ce->ce_namelen = len;
3fc22b53
JH
1369 hashcpy(ce->sha1, ondisk->sha1);
1370 memcpy(ce->name, name, len);
1371 ce->name[len] = '\0';
1372 return ce;
1373}
1374
6c9cd161
JH
1375/*
1376 * Adjacent cache entries tend to share the leading paths, so it makes
1377 * sense to only store the differences in later entries. In the v4
1378 * on-disk format of the index, each on-disk cache entry stores the
1379 * number of bytes to be stripped from the end of the previous name,
1380 * and the bytes to append to the result, to come up with its name.
1381 */
1382static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1383{
1384 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1385 size_t len = decode_varint(&cp);
1386
1387 if (name->len < len)
1388 die("malformed name field in the index");
1389 strbuf_remove(name, name->len - len, len);
1390 for (ep = cp; *ep; ep++)
1391 ; /* find the end */
1392 strbuf_add(name, cp, ep - cp);
1393 return (const char *)ep + 1 - cp_;
1394}
1395
936f53d0 1396static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
6c9cd161
JH
1397 unsigned long *ent_size,
1398 struct strbuf *previous_name)
7a51ed66 1399{
debed2a6 1400 struct cache_entry *ce;
7fec10b7 1401 size_t len;
06aaaa0b 1402 const char *name;
debed2a6 1403 unsigned int flags;
7fec10b7 1404
7a51ed66 1405 /* On-disk flags are just 16 bits */
c3d8da57 1406 flags = get_be16(&ondisk->flags);
debed2a6 1407 len = flags & CE_NAMEMASK;
7fec10b7 1408
debed2a6 1409 if (flags & CE_EXTENDED) {
06aaaa0b
NTND
1410 struct ondisk_cache_entry_extended *ondisk2;
1411 int extended_flags;
1412 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
c3d8da57 1413 extended_flags = get_be16(&ondisk2->flags2) << 16;
06aaaa0b
NTND
1414 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1415 if (extended_flags & ~CE_EXTENDED_FLAGS)
1416 die("Unknown index entry format %08x", extended_flags);
debed2a6 1417 flags |= extended_flags;
06aaaa0b
NTND
1418 name = ondisk2->name;
1419 }
1420 else
1421 name = ondisk->name;
1422
6c9cd161
JH
1423 if (!previous_name) {
1424 /* v3 and earlier */
1425 if (len == CE_NAMEMASK)
1426 len = strlen(name);
1427 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1428
1429 *ent_size = ondisk_ce_size(ce);
1430 } else {
1431 unsigned long consumed;
1432 consumed = expand_name_field(previous_name, name);
1433 ce = cache_entry_from_ondisk(ondisk, flags,
1434 previous_name->buf,
1435 previous_name->len);
1436
1437 *ent_size = (name - ((char *)ondisk)) + consumed;
1438 }
debed2a6 1439 return ce;
cf558704
LT
1440}
1441
8fd2cb40 1442/* remember to discard_cache() before reading a different cache! */
4aab5b46 1443int read_index_from(struct index_state *istate, const char *path)
e83c5163
LT
1444{
1445 int fd, i;
1446 struct stat st;
debed2a6 1447 unsigned long src_offset;
e83c5163 1448 struct cache_header *hdr;
7a51ed66
LT
1449 void *mmap;
1450 size_t mmap_size;
6c9cd161 1451 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
e83c5163 1452
913e0e99 1453 if (istate->initialized)
4aab5b46 1454 return istate->cache_nr;
5d1a5c02 1455
fba2f38a
KB
1456 istate->timestamp.sec = 0;
1457 istate->timestamp.nsec = 0;
8fd2cb40 1458 fd = open(path, O_RDONLY);
5d1a5c02
LT
1459 if (fd < 0) {
1460 if (errno == ENOENT)
1461 return 0;
d824cbba 1462 die_errno("index file open failed");
5d1a5c02 1463 }
e83c5163 1464
3511a377 1465 if (fstat(fd, &st))
d824cbba 1466 die_errno("cannot stat the open index");
3511a377 1467
7a51ed66
LT
1468 mmap_size = xsize_t(st.st_size);
1469 if (mmap_size < sizeof(struct cache_header) + 20)
3511a377
LFC
1470 die("index file smaller than expected");
1471
7a51ed66 1472 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
7a51ed66 1473 if (mmap == MAP_FAILED)
0721c314 1474 die_errno("unable to map index file");
57d84f8d 1475 close(fd);
e83c5163 1476
7a51ed66
LT
1477 hdr = mmap;
1478 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1479 goto unmap;
1480
9d227781 1481 istate->version = ntohl(hdr->hdr_version);
4aab5b46
JH
1482 istate->cache_nr = ntohl(hdr->hdr_entries);
1483 istate->cache_alloc = alloc_nr(istate->cache_nr);
c4aa3167 1484 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
913e0e99 1485 istate->initialized = 1;
7a51ed66 1486
9d227781 1487 if (istate->version == 4)
6c9cd161
JH
1488 previous_name = &previous_name_buf;
1489 else
1490 previous_name = NULL;
1491
7a51ed66 1492 src_offset = sizeof(*hdr);
4aab5b46 1493 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1494 struct ondisk_cache_entry *disk_ce;
4aab5b46 1495 struct cache_entry *ce;
936f53d0 1496 unsigned long consumed;
4aab5b46 1497
7a51ed66 1498 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
6c9cd161 1499 ce = create_from_disk(disk_ce, &consumed, previous_name);
cf558704 1500 set_index_entry(istate, i, ce);
7a51ed66 1501
936f53d0 1502 src_offset += consumed;
e83c5163 1503 }
6c9cd161 1504 strbuf_release(&previous_name_buf);
fba2f38a 1505 istate->timestamp.sec = st.st_mtime;
c06ff490 1506 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 1507
7a51ed66 1508 while (src_offset <= mmap_size - 20 - 8) {
bad68ec9
JH
1509 /* After an array of active_nr index entries,
1510 * there can be arbitrary number of extended
1511 * sections, each of which is prefixed with
1512 * extension name (4-byte) and section length
1513 * in 4-byte network byte order.
1514 */
07cc8eca 1515 uint32_t extsize;
7a51ed66 1516 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1517 extsize = ntohl(extsize);
4aab5b46 1518 if (read_index_extension(istate,
7a51ed66
LT
1519 (const char *) mmap + src_offset,
1520 (char *) mmap + src_offset + 8,
1d7f171c 1521 extsize) < 0)
bad68ec9 1522 goto unmap;
7a51ed66
LT
1523 src_offset += 8;
1524 src_offset += extsize;
bad68ec9 1525 }
7a51ed66 1526 munmap(mmap, mmap_size);
4aab5b46 1527 return istate->cache_nr;
e83c5163
LT
1528
1529unmap:
7a51ed66 1530 munmap(mmap, mmap_size);
5d1a5c02 1531 die("index file corrupt");
e83c5163
LT
1532}
1533
fa7b3c2f
JH
1534int is_index_unborn(struct index_state *istate)
1535{
debed2a6 1536 return (!istate->cache_nr && !istate->timestamp.sec);
fa7b3c2f
JH
1537}
1538
4aab5b46 1539int discard_index(struct index_state *istate)
6d297f81 1540{
debed2a6
RS
1541 int i;
1542
1543 for (i = 0; i < istate->cache_nr; i++)
1544 free(istate->cache[i]);
cfc5789a 1545 resolve_undo_clear_index(istate);
4aab5b46
JH
1546 istate->cache_nr = 0;
1547 istate->cache_changed = 0;
fba2f38a
KB
1548 istate->timestamp.sec = 0;
1549 istate->timestamp.nsec = 0;
2092678c 1550 free_name_hash(istate);
4aab5b46 1551 cache_tree_free(&(istate->cache_tree));
913e0e99 1552 istate->initialized = 0;
a0fc4db0
RS
1553 free(istate->cache);
1554 istate->cache = NULL;
1555 istate->cache_alloc = 0;
7a51ed66 1556 return 0;
6d297f81
JS
1557}
1558
d1f128b0 1559int unmerged_index(const struct index_state *istate)
94a5728c
DB
1560{
1561 int i;
1562 for (i = 0; i < istate->cache_nr; i++) {
1563 if (ce_stage(istate->cache[i]))
1564 return 1;
1565 }
1566 return 0;
1567}
1568
4990aadc 1569#define WRITE_BUFFER_SIZE 8192
bf0f910d 1570static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
1571static unsigned long write_buffer_len;
1572
9126f009 1573static int ce_write_flush(git_SHA_CTX *context, int fd)
6015c28b
JH
1574{
1575 unsigned int buffered = write_buffer_len;
1576 if (buffered) {
9126f009 1577 git_SHA1_Update(context, write_buffer, buffered);
93822c22 1578 if (write_in_full(fd, write_buffer, buffered) != buffered)
6015c28b
JH
1579 return -1;
1580 write_buffer_len = 0;
1581 }
1582 return 0;
1583}
1584
9126f009 1585static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
4990aadc
LT
1586{
1587 while (len) {
1588 unsigned int buffered = write_buffer_len;
1589 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1590 if (partial > len)
1591 partial = len;
1592 memcpy(write_buffer + buffered, data, partial);
1593 buffered += partial;
1594 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
1595 write_buffer_len = buffered;
1596 if (ce_write_flush(context, fd))
4990aadc
LT
1597 return -1;
1598 buffered = 0;
1599 }
1600 write_buffer_len = buffered;
1601 len -= partial;
1d7f171c 1602 data = (char *) data + partial;
a6080a0a
JH
1603 }
1604 return 0;
4990aadc
LT
1605}
1606
9126f009 1607static int write_index_ext_header(git_SHA_CTX *context, int fd,
ac58c7b1 1608 unsigned int ext, unsigned int sz)
bad68ec9
JH
1609{
1610 ext = htonl(ext);
1611 sz = htonl(sz);
968a1d65
DR
1612 return ((ce_write(context, fd, &ext, 4) < 0) ||
1613 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
1614}
1615
9126f009 1616static int ce_flush(git_SHA_CTX *context, int fd)
4990aadc
LT
1617{
1618 unsigned int left = write_buffer_len;
ca9be054 1619
4990aadc
LT
1620 if (left) {
1621 write_buffer_len = 0;
9126f009 1622 git_SHA1_Update(context, write_buffer, left);
4990aadc 1623 }
ca9be054 1624
2c865d9a
QH
1625 /* Flush first if not enough space for SHA1 signature */
1626 if (left + 20 > WRITE_BUFFER_SIZE) {
93822c22 1627 if (write_in_full(fd, write_buffer, left) != left)
2c865d9a
QH
1628 return -1;
1629 left = 0;
1630 }
1631
ca9be054 1632 /* Append the SHA1 signature at the end */
9126f009 1633 git_SHA1_Final(write_buffer + left, context);
ca9be054 1634 left += 20;
93822c22 1635 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
4990aadc
LT
1636}
1637
407c8eb0
JH
1638static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1639{
1640 /*
1641 * The only thing we care about in this function is to smudge the
1642 * falsely clean entry due to touch-update-touch race, so we leave
1643 * everything else as they are. We are called for entries whose
c21d39d7 1644 * ce_stat_data.sd_mtime match the index file mtime.
c70115b4
JH
1645 *
1646 * Note that this actually does not do much for gitlinks, for
1647 * which ce_match_stat_basic() always goes to the actual
1648 * contents. The caller checks with is_racy_timestamp() which
1649 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
1650 */
1651 struct stat st;
1652
1653 if (lstat(ce->name, &st) < 0)
1654 return;
1655 if (ce_match_stat_basic(ce, &st))
1656 return;
1657 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
1658 /* This is "racily clean"; smudge it. Note that this
1659 * is a tricky code. At first glance, it may appear
1660 * that it can break with this sequence:
1661 *
1662 * $ echo xyzzy >frotz
1663 * $ git-update-index --add frotz
1664 * $ : >frotz
1665 * $ sleep 3
1666 * $ echo filfre >nitfol
1667 * $ git-update-index --add nitfol
1668 *
b7e58b17 1669 * but it does not. When the second update-index runs,
4b3511b0
JH
1670 * it notices that the entry "frotz" has the same timestamp
1671 * as index, and if we were to smudge it by resetting its
1672 * size to zero here, then the object name recorded
1673 * in index is the 6-byte file but the cached stat information
1674 * becomes zero --- which would then match what we would
a6080a0a 1675 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
1676 *
1677 * However, the second update-index, before calling
1678 * this function, notices that the cached size is 6
1679 * bytes and what is on the filesystem is an empty
1680 * file, and never calls us, so the cached size information
1681 * for "frotz" stays 6 which does not match the filesystem.
1682 */
c21d39d7 1683 ce->ce_stat_data.sd_size = 0;
407c8eb0
JH
1684 }
1685}
1686
f136f7bf
JH
1687/* Copy miscellaneous fields but not the name */
1688static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1689 struct cache_entry *ce)
7a51ed66 1690{
b60e188c
TG
1691 short flags;
1692
c21d39d7
MH
1693 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1694 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1695 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1696 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1697 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1698 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
7a51ed66 1699 ondisk->mode = htonl(ce->ce_mode);
c21d39d7
MH
1700 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1701 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1702 ondisk->size = htonl(ce->ce_stat_data.sd_size);
7a51ed66 1703 hashcpy(ondisk->sha1, ce->sha1);
b60e188c
TG
1704
1705 flags = ce->ce_flags;
1706 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1707 ondisk->flags = htons(flags);
06aaaa0b
NTND
1708 if (ce->ce_flags & CE_EXTENDED) {
1709 struct ondisk_cache_entry_extended *ondisk2;
1710 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1711 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
f136f7bf 1712 return ondisk2->name;
06aaaa0b 1713 }
f136f7bf
JH
1714 else {
1715 return ondisk->name;
1716 }
1717}
1718
9d227781
JH
1719static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1720 struct strbuf *previous_name)
f136f7bf 1721{
9d227781
JH
1722 int size;
1723 struct ondisk_cache_entry *ondisk;
f136f7bf
JH
1724 char *name;
1725 int result;
1726
9d227781
JH
1727 if (!previous_name) {
1728 size = ondisk_ce_size(ce);
1729 ondisk = xcalloc(1, size);
1730 name = copy_cache_entry_to_ondisk(ondisk, ce);
1731 memcpy(name, ce->name, ce_namelen(ce));
1732 } else {
1733 int common, to_remove, prefix_size;
1734 unsigned char to_remove_vi[16];
1735 for (common = 0;
1736 (ce->name[common] &&
1737 common < previous_name->len &&
1738 ce->name[common] == previous_name->buf[common]);
1739 common++)
1740 ; /* still matching */
1741 to_remove = previous_name->len - common;
1742 prefix_size = encode_varint(to_remove, to_remove_vi);
1743
1744 if (ce->ce_flags & CE_EXTENDED)
1745 size = offsetof(struct ondisk_cache_entry_extended, name);
1746 else
1747 size = offsetof(struct ondisk_cache_entry, name);
1748 size += prefix_size + (ce_namelen(ce) - common + 1);
1749
1750 ondisk = xcalloc(1, size);
1751 name = copy_cache_entry_to_ondisk(ondisk, ce);
1752 memcpy(name, to_remove_vi, prefix_size);
1753 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1754
1755 strbuf_splice(previous_name, common, to_remove,
1756 ce->name + common, ce_namelen(ce) - common);
06aaaa0b 1757 }
7a51ed66 1758
59efba64
JN
1759 result = ce_write(c, fd, ondisk, size);
1760 free(ondisk);
1761 return result;
7a51ed66
LT
1762}
1763
483fbe2b
JH
1764static int has_racy_timestamp(struct index_state *istate)
1765{
1766 int entries = istate->cache_nr;
1767 int i;
1768
1769 for (i = 0; i < entries; i++) {
1770 struct cache_entry *ce = istate->cache[i];
1771 if (is_racy_timestamp(istate, ce))
1772 return 1;
1773 }
1774 return 0;
1775}
1776
ccdc4ec3 1777/*
98e023de 1778 * Opportunistically update the index but do not complain if we can't
ccdc4ec3
JH
1779 */
1780void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1781{
483fbe2b 1782 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
03b86647 1783 write_locked_index(istate, lockfile, COMMIT_LOCK))
ccdc4ec3
JH
1784 rollback_lock_file(lockfile);
1785}
1786
03b86647 1787static int do_write_index(struct index_state *istate, int newfd)
197ee8c9 1788{
9126f009 1789 git_SHA_CTX c;
197ee8c9 1790 struct cache_header hdr;
9d227781 1791 int i, err, removed, extended, hdr_version;
4aab5b46
JH
1792 struct cache_entry **cache = istate->cache;
1793 int entries = istate->cache_nr;
e1afca4f 1794 struct stat st;
9d227781 1795 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
025a0709 1796
06aaaa0b 1797 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 1798 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 1799 removed++;
197ee8c9 1800
06aaaa0b
NTND
1801 /* reduce extended entries if possible */
1802 cache[i]->ce_flags &= ~CE_EXTENDED;
1803 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1804 extended++;
1805 cache[i]->ce_flags |= CE_EXTENDED;
1806 }
1807 }
1808
9d227781 1809 if (!istate->version)
136347d7 1810 istate->version = get_index_format_default();
9d227781
JH
1811
1812 /* demote version 3 to version 2 when the latter suffices */
1813 if (istate->version == 3 || istate->version == 2)
1814 istate->version = extended ? 3 : 2;
1815
1816 hdr_version = istate->version;
1817
ccc4feb5 1818 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
9d227781 1819 hdr.hdr_version = htonl(hdr_version);
025a0709 1820 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 1821
9126f009 1822 git_SHA1_Init(&c);
ca9be054 1823 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
1824 return -1;
1825
9d227781 1826 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
197ee8c9
LT
1827 for (i = 0; i < entries; i++) {
1828 struct cache_entry *ce = cache[i];
7a51ed66 1829 if (ce->ce_flags & CE_REMOVE)
aa16021e 1830 continue;
e06c43c7 1831 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
407c8eb0 1832 ce_smudge_racily_clean_entry(ce);
83bd7437
JK
1833 if (is_null_sha1(ce->sha1)) {
1834 static const char msg[] = "cache entry has null sha1: %s";
1835 static int allow = -1;
1836
1837 if (allow < 0)
1838 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1839 if (allow)
1840 warning(msg, ce->name);
1841 else
1842 return error(msg, ce->name);
1843 }
9d227781 1844 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
197ee8c9
LT
1845 return -1;
1846 }
9d227781 1847 strbuf_release(&previous_name_buf);
1af1c2b6 1848
bad68ec9 1849 /* Write extension data here */
4aab5b46 1850 if (istate->cache_tree) {
f285a2d7 1851 struct strbuf sb = STRBUF_INIT;
1dffb8fa 1852
1dffb8fa
PH
1853 cache_tree_write(&sb, istate->cache_tree);
1854 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1855 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1856 strbuf_release(&sb);
1857 if (err)
bad68ec9 1858 return -1;
bad68ec9 1859 }
cfc5789a
JH
1860 if (istate->resolve_undo) {
1861 struct strbuf sb = STRBUF_INIT;
1862
1863 resolve_undo_write(&sb, istate->resolve_undo);
1864 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
1865 sb.len) < 0
1866 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1867 strbuf_release(&sb);
1868 if (err)
1869 return -1;
1870 }
e1afca4f
KB
1871
1872 if (ce_flush(&c, newfd) || fstat(newfd, &st))
1873 return -1;
5bcf109c
KB
1874 istate->timestamp.sec = (unsigned int)st.st_mtime;
1875 istate->timestamp.nsec = ST_MTIME_NSEC(st);
e1afca4f 1876 return 0;
197ee8c9 1877}
e46bbcf6 1878
626f35c8
NTND
1879void set_alternate_index_output(const char *name)
1880{
1881 alternate_index_output = name;
1882}
1883
1884static int commit_locked_index(struct lock_file *lk)
1885{
1886 if (alternate_index_output) {
1887 if (lk->fd >= 0 && close_lock_file(lk))
1888 return -1;
1889 if (rename(lk->filename, alternate_index_output))
1890 return -1;
1891 lk->filename[0] = 0;
1892 return 0;
1893 } else {
1894 return commit_lock_file(lk);
1895 }
1896}
1897
03b86647
NTND
1898static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
1899 unsigned flags)
1900{
1901 int ret = do_write_index(istate, lock->fd);
1902 if (ret)
1903 return ret;
1904 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
1905 (COMMIT_LOCK | CLOSE_LOCK));
1906 if (flags & COMMIT_LOCK)
1907 return commit_locked_index(lock);
1908 else if (flags & CLOSE_LOCK)
1909 return close_lock_file(lock);
1910 else
1911 return ret;
1912}
1913
1914int write_locked_index(struct index_state *istate, struct lock_file *lock,
1915 unsigned flags)
1916{
1917 return do_write_locked_index(istate, lock, flags);
1918}
1919
e46bbcf6
MV
1920/*
1921 * Read the index file that is potentially unmerged into given
63e8dc5b 1922 * index_state, dropping any unmerged entries. Returns true if
e46bbcf6
MV
1923 * the index is unmerged. Callers who want to refuse to work
1924 * from an unmerged state can call this and check its return value,
1925 * instead of calling read_cache().
1926 */
1927int read_index_unmerged(struct index_state *istate)
1928{
1929 int i;
d1a43f2a 1930 int unmerged = 0;
e46bbcf6
MV
1931
1932 read_index(istate);
e46bbcf6
MV
1933 for (i = 0; i < istate->cache_nr; i++) {
1934 struct cache_entry *ce = istate->cache[i];
d1a43f2a
JH
1935 struct cache_entry *new_ce;
1936 int size, len;
1937
1938 if (!ce_stage(ce))
e46bbcf6 1939 continue;
d1a43f2a 1940 unmerged = 1;
68c4f6a5 1941 len = ce_namelen(ce);
d1a43f2a
JH
1942 size = cache_entry_size(len);
1943 new_ce = xcalloc(1, size);
d1a43f2a 1944 memcpy(new_ce->name, ce->name, len);
b60e188c
TG
1945 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
1946 new_ce->ce_namelen = len;
d1a43f2a
JH
1947 new_ce->ce_mode = ce->ce_mode;
1948 if (add_index_entry(istate, new_ce, 0))
1949 return error("%s: cannot drop to stage #0",
5699d17e 1950 new_ce->name);
d1a43f2a 1951 i = index_name_pos(istate, new_ce->name, len);
e46bbcf6 1952 }
d1a43f2a 1953 return unmerged;
e46bbcf6 1954}
041aee31 1955
98fa4738
JK
1956/*
1957 * Returns 1 if the path is an "other" path with respect to
1958 * the index; that is, the path is not mentioned in the index at all,
1959 * either as a file, a directory with some files in the index,
1960 * or as an unmerged entry.
1961 *
1962 * We helpfully remove a trailing "/" from directories so that
1963 * the output of read_directory can be used as-is.
1964 */
1965int index_name_is_other(const struct index_state *istate, const char *name,
1966 int namelen)
1967{
1968 int pos;
1969 if (namelen && name[namelen - 1] == '/')
1970 namelen--;
1971 pos = index_name_pos(istate, name, namelen);
1972 if (0 <= pos)
1973 return 0; /* exact match */
1974 pos = -pos - 1;
1975 if (pos < istate->cache_nr) {
1976 struct cache_entry *ce = istate->cache[pos];
1977 if (ce_namelen(ce) == namelen &&
1978 !memcmp(ce->name, name, namelen))
1979 return 0; /* Yup, this one exists unmerged */
1980 }
1981 return 1;
1982}
29fb37b2 1983
ff366825 1984void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
29fb37b2
LF
1985{
1986 int pos, len;
1987 unsigned long sz;
1988 enum object_type type;
1989 void *data;
1990
1991 len = strlen(path);
1992 pos = index_name_pos(istate, path, len);
1993 if (pos < 0) {
1994 /*
1995 * We might be in the middle of a merge, in which
1996 * case we would read stage #2 (ours).
1997 */
1998 int i;
1999 for (i = -pos - 1;
2000 (pos < 0 && i < istate->cache_nr &&
2001 !strcmp(istate->cache[i]->name, path));
2002 i++)
2003 if (ce_stage(istate->cache[i]) == 2)
2004 pos = i;
2005 }
2006 if (pos < 0)
2007 return NULL;
2008 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2009 if (!data || type != OBJ_BLOB) {
2010 free(data);
2011 return NULL;
2012 }
ff366825
LF
2013 if (size)
2014 *size = sz;
29fb37b2
LF
2015 return data;
2016}
38612532
MH
2017
2018void stat_validity_clear(struct stat_validity *sv)
2019{
2020 free(sv->sd);
2021 sv->sd = NULL;
2022}
2023
2024int stat_validity_check(struct stat_validity *sv, const char *path)
2025{
2026 struct stat st;
2027
2028 if (stat(path, &st) < 0)
2029 return sv->sd == NULL;
2030 if (!sv->sd)
2031 return 0;
2032 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2033}
2034
2035void stat_validity_update(struct stat_validity *sv, int fd)
2036{
2037 struct stat st;
2038
2039 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2040 stat_validity_clear(sv);
2041 else {
2042 if (!sv->sd)
2043 sv->sd = xcalloc(1, sizeof(struct stat_data));
2044 fill_stat_data(sv->sd, &st);
2045 }
2046}