]> git.ipfire.org Git - thirdparty/git.git/blame - read-cache.c
Sync with 2.16.6
[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"
b2141fc1 8#include "config.h"
f6ecc62d 9#include "tempfile.h"
697cc8ef 10#include "lockfile.h"
bad68ec9 11#include "cache-tree.h"
f35a6d3b 12#include "refs.h"
d616813d 13#include "dir.h"
041aee31
JH
14#include "tree.h"
15#include "commit.h"
39425819 16#include "blob.h"
cfc5789a 17#include "resolve-undo.h"
6c9cd161
JH
18#include "strbuf.h"
19#include "varint.h"
5fc2fc8f 20#include "split-index.h"
a42643aa 21#include "utf8.h"
883e248b 22#include "fsmonitor.h"
bad68ec9 23
b60e188c
TG
24/* Mask for the name length in ce_flags in the on-disk index */
25
26#define CE_NAMEMASK (0x0fff)
27
bad68ec9
JH
28/* Index extensions.
29 *
30 * The first letter should be 'A'..'Z' for extensions that are not
31 * necessary for a correct operation (i.e. optimization data).
32 * When new extensions are added that _needs_ to be understood in
33 * order to correctly interpret the index file, pick character that
34 * is outside the range, to cause the reader to abort.
35 */
36
37#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
38#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
b659b49b 39#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
5fc2fc8f 40#define CACHE_EXT_LINK 0x6c696e6b /* "link" */
83c094ad 41#define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
883e248b 42#define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
5fc2fc8f
NTND
43
44/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
e0cf0d7d 45#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
c18b80a0 46 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
883e248b 47 SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
e83c5163 48
228e94f9 49struct index_state the_index;
626f35c8 50static const char *alternate_index_output;
8fd2cb40 51
9cb76b8c
JH
52static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
53{
54 istate->cache[nr] = ce;
96872bc2 55 add_name_hash(istate, ce);
9cb76b8c
JH
56}
57
cf558704
LT
58static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
59{
60 struct cache_entry *old = istate->cache[nr];
61
078a58e8 62 replace_index_entry_in_base(istate, old, ce);
2092678c 63 remove_name_hash(istate, old);
5699d17e 64 free(old);
0e267b7a 65 ce->ce_flags &= ~CE_HASHED;
a22c6371 66 set_index_entry(istate, nr, ce);
078a58e8 67 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 68 mark_fsmonitor_invalid(istate, ce);
e636a7b4 69 istate->cache_changed |= CE_ENTRY_CHANGED;
cf558704
LT
70}
71
81dc2307
PB
72void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
73{
285c2e25 74 struct cache_entry *old_entry = istate->cache[nr], *new_entry;
81dc2307
PB
75 int namelen = strlen(new_name);
76
285c2e25
BW
77 new_entry = xmalloc(cache_entry_size(namelen));
78 copy_cache_entry(new_entry, old_entry);
79 new_entry->ce_flags &= ~CE_HASHED;
80 new_entry->ce_namelen = namelen;
81 new_entry->index = 0;
82 memcpy(new_entry->name, new_name, namelen + 1);
81dc2307 83
285c2e25
BW
84 cache_tree_invalidate_path(istate, old_entry->name);
85 untracked_cache_remove_from_index(istate, old_entry->name);
81dc2307 86 remove_index_entry_at(istate, nr);
285c2e25 87 add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
81dc2307
PB
88}
89
c21d39d7
MH
90void fill_stat_data(struct stat_data *sd, struct stat *st)
91{
92 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
93 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
94 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
95 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
96 sd->sd_dev = st->st_dev;
97 sd->sd_ino = st->st_ino;
98 sd->sd_uid = st->st_uid;
99 sd->sd_gid = st->st_gid;
100 sd->sd_size = st->st_size;
101}
102
103int match_stat_data(const struct stat_data *sd, struct stat *st)
104{
105 int changed = 0;
106
107 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
108 changed |= MTIME_CHANGED;
109 if (trust_ctime && check_stat &&
110 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
111 changed |= CTIME_CHANGED;
112
113#ifdef USE_NSEC
114 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
115 changed |= MTIME_CHANGED;
116 if (trust_ctime && check_stat &&
117 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
118 changed |= CTIME_CHANGED;
119#endif
120
121 if (check_stat) {
122 if (sd->sd_uid != (unsigned int) st->st_uid ||
123 sd->sd_gid != (unsigned int) st->st_gid)
124 changed |= OWNER_CHANGED;
125 if (sd->sd_ino != (unsigned int) st->st_ino)
126 changed |= INODE_CHANGED;
127 }
128
129#ifdef USE_STDEV
130 /*
131 * st_dev breaks on network filesystems where different
132 * clients will have different views of what "device"
133 * the filesystem is on
134 */
135 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
136 changed |= INODE_CHANGED;
137#endif
138
139 if (sd->sd_size != (unsigned int) st->st_size)
140 changed |= DATA_CHANGED;
141
142 return changed;
143}
144
415e96c8
JH
145/*
146 * This only updates the "non-critical" parts of the directory
147 * cache, ie the parts that aren't tracked by GIT, and only used
148 * to validate the cache.
149 */
150void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
151{
c21d39d7 152 fill_stat_data(&ce->ce_stat_data, st);
5f73076c
JH
153
154 if (assume_unchanged)
7a51ed66 155 ce->ce_flags |= CE_VALID;
eadb5831 156
883e248b 157 if (S_ISREG(st->st_mode)) {
eadb5831 158 ce_mark_uptodate(ce);
883e248b
BP
159 mark_fsmonitor_valid(ce);
160 }
415e96c8
JH
161}
162
21a6b9fa 163static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
29e4d363
JH
164{
165 int match = -1;
1b8ac5ea 166 int fd = git_open_cloexec(ce->name, O_RDONLY);
29e4d363
JH
167
168 if (fd >= 0) {
bebfecb9 169 struct object_id oid;
e3506559 170 if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
bebfecb9 171 match = oidcmp(&oid, &ce->oid);
7f8508e8 172 /* index_fd() closed the file descriptor already */
29e4d363
JH
173 }
174 return match;
175}
176
21a6b9fa 177static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
29e4d363
JH
178{
179 int match = -1;
29e4d363
JH
180 void *buffer;
181 unsigned long size;
21666f1a 182 enum object_type type;
a60272b3 183 struct strbuf sb = STRBUF_INIT;
29e4d363 184
a60272b3 185 if (strbuf_readlink(&sb, ce->name, expected_size))
29e4d363 186 return -1;
a60272b3 187
99d1a986 188 buffer = read_sha1_file(ce->oid.hash, &type, &size);
a60272b3
LT
189 if (buffer) {
190 if (size == sb.len)
191 match = memcmp(buffer, sb.buf, size);
192 free(buffer);
29e4d363 193 }
a60272b3 194 strbuf_release(&sb);
29e4d363
JH
195 return match;
196}
197
21a6b9fa 198static int ce_compare_gitlink(const struct cache_entry *ce)
f35a6d3b 199{
1053fe82 200 struct object_id oid;
f35a6d3b
LT
201
202 /*
203 * We don't actually require that the .git directory
302b9282 204 * under GITLINK directory be a valid git directory. It
f35a6d3b
LT
205 * might even be missing (in case nobody populated that
206 * sub-project).
207 *
208 * If so, we consider it always to match.
209 */
a98e6101 210 if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0)
f35a6d3b 211 return 0;
1053fe82 212 return oidcmp(&oid, &ce->oid);
f35a6d3b
LT
213}
214
21a6b9fa 215static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
29e4d363
JH
216{
217 switch (st->st_mode & S_IFMT) {
218 case S_IFREG:
219 if (ce_compare_data(ce, st))
220 return DATA_CHANGED;
221 break;
222 case S_IFLNK:
dc49cd76 223 if (ce_compare_link(ce, xsize_t(st->st_size)))
29e4d363
JH
224 return DATA_CHANGED;
225 break;
a8ee75bc 226 case S_IFDIR:
7a51ed66 227 if (S_ISGITLINK(ce->ce_mode))
c70115b4 228 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
1cf01a34 229 /* else fallthrough */
29e4d363
JH
230 default:
231 return TYPE_CHANGED;
232 }
233 return 0;
234}
235
21a6b9fa 236static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
734aab75
LT
237{
238 unsigned int changed = 0;
239
7a51ed66
LT
240 if (ce->ce_flags & CE_REMOVE)
241 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
242
243 switch (ce->ce_mode & S_IFMT) {
8ae0a8c5
KS
244 case S_IFREG:
245 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
3e09cdfd
JH
246 /* We consider only the owner x bit to be relevant for
247 * "mode changes"
248 */
249 if (trust_executable_bit &&
7a51ed66 250 (0100 & (ce->ce_mode ^ st->st_mode)))
ffbe1add 251 changed |= MODE_CHANGED;
8ae0a8c5
KS
252 break;
253 case S_IFLNK:
78a8d641
JS
254 if (!S_ISLNK(st->st_mode) &&
255 (has_symlinks || !S_ISREG(st->st_mode)))
256 changed |= TYPE_CHANGED;
8ae0a8c5 257 break;
302b9282 258 case S_IFGITLINK:
c70115b4 259 /* We ignore most of the st_xxx fields for gitlinks */
f35a6d3b
LT
260 if (!S_ISDIR(st->st_mode))
261 changed |= TYPE_CHANGED;
262 else if (ce_compare_gitlink(ce))
263 changed |= DATA_CHANGED;
a8ee75bc 264 return changed;
8ae0a8c5 265 default:
7a51ed66 266 die("internal error: ce_mode is %o", ce->ce_mode);
8ae0a8c5 267 }
2cb45e95 268
c21d39d7 269 changed |= match_stat_data(&ce->ce_stat_data, st);
b0391890 270
f49c2c22 271 /* Racily smudged entry? */
c21d39d7 272 if (!ce->ce_stat_data.sd_size) {
99d1a986 273 if (!is_empty_blob_sha1(ce->oid.hash))
f49c2c22
LT
274 changed |= DATA_CHANGED;
275 }
276
407c8eb0
JH
277 return changed;
278}
279
2bb4cda1
NTND
280static int is_racy_stat(const struct index_state *istate,
281 const struct stat_data *sd)
6d91da6d 282{
2bb4cda1 283 return (istate->timestamp.sec &&
fba2f38a
KB
284#ifdef USE_NSEC
285 /* nanosecond timestamped files can also be racy! */
2bb4cda1
NTND
286 (istate->timestamp.sec < sd->sd_mtime.sec ||
287 (istate->timestamp.sec == sd->sd_mtime.sec &&
288 istate->timestamp.nsec <= sd->sd_mtime.nsec))
fba2f38a 289#else
2bb4cda1 290 istate->timestamp.sec <= sd->sd_mtime.sec
fba2f38a 291#endif
2bb4cda1
NTND
292 );
293}
294
295static int is_racy_timestamp(const struct index_state *istate,
296 const struct cache_entry *ce)
297{
298 return (!S_ISGITLINK(ce->ce_mode) &&
299 is_racy_stat(istate, &ce->ce_stat_data));
6d91da6d
JH
300}
301
ed4efab1
NTND
302int match_stat_data_racy(const struct index_state *istate,
303 const struct stat_data *sd, struct stat *st)
304{
305 if (is_racy_stat(istate, sd))
306 return MTIME_CHANGED;
307 return match_stat_data(sd, st);
6d91da6d
JH
308}
309
883e248b 310int ie_match_stat(struct index_state *istate,
21a6b9fa 311 const struct cache_entry *ce, struct stat *st,
4bd5b7da 312 unsigned int options)
407c8eb0 313{
5f73076c 314 unsigned int changed;
4bd5b7da 315 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 316 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
4bd5b7da 317 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
883e248b 318 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
5f73076c 319
883e248b
BP
320 if (!ignore_fsmonitor)
321 refresh_fsmonitor(istate);
5f73076c
JH
322 /*
323 * If it's marked as always valid in the index, it's
324 * valid whatever the checked-out copy says.
56cac48c
NTND
325 *
326 * skip-worktree has the same effect with higher precedence
5f73076c 327 */
56cac48c
NTND
328 if (!ignore_skip_worktree && ce_skip_worktree(ce))
329 return 0;
7a51ed66 330 if (!ignore_valid && (ce->ce_flags & CE_VALID))
5f73076c 331 return 0;
883e248b
BP
332 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID))
333 return 0;
5f73076c 334
331fcb59
JH
335 /*
336 * Intent-to-add entries have not been added, so the index entry
337 * by definition never matches what is in the work tree until it
338 * actually gets added.
339 */
895ff3b2 340 if (ce_intent_to_add(ce))
331fcb59
JH
341 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
342
5f73076c 343 changed = ce_match_stat_basic(ce, st);
407c8eb0 344
29e4d363
JH
345 /*
346 * Within 1 second of this sequence:
347 * echo xyzzy >file && git-update-index --add file
348 * running this command:
349 * echo frotz >file
350 * would give a falsely clean cache entry. The mtime and
351 * length match the cache, and other stat fields do not change.
352 *
353 * We could detect this at update-index time (the cache entry
354 * being registered/updated records the same time as "now")
355 * and delay the return from git-update-index, but that would
356 * effectively mean we can make at most one commit per second,
357 * which is not acceptable. Instead, we check cache entries
358 * whose mtime are the same as the index file timestamp more
5f73076c 359 * carefully than others.
29e4d363 360 */
6d91da6d 361 if (!changed && is_racy_timestamp(istate, ce)) {
42f77406
JH
362 if (assume_racy_is_modified)
363 changed |= DATA_CHANGED;
364 else
365 changed |= ce_modified_check_fs(ce, st);
366 }
b0391890 367
29e4d363 368 return changed;
b0391890
JH
369}
370
883e248b 371int ie_modified(struct index_state *istate,
21a6b9fa
RS
372 const struct cache_entry *ce,
373 struct stat *st, unsigned int options)
b0391890 374{
29e4d363 375 int changed, changed_fs;
4bd5b7da
JH
376
377 changed = ie_match_stat(istate, ce, st, options);
b0391890
JH
378 if (!changed)
379 return 0;
b0391890
JH
380 /*
381 * If the mode or type has changed, there's no point in trying
382 * to refresh the entry - it's not going to match
383 */
384 if (changed & (MODE_CHANGED | TYPE_CHANGED))
385 return changed;
386
c70115b4
JH
387 /*
388 * Immediately after read-tree or update-index --cacheinfo,
389 * the length field is zero, as we have never even read the
390 * lstat(2) information once, and we cannot trust DATA_CHANGED
391 * returned by ie_match_stat() which in turn was returned by
392 * ce_match_stat_basic() to signal that the filesize of the
393 * blob changed. We have to actually go to the filesystem to
394 * see if the contents match, and if so, should answer "unchanged".
395 *
396 * The logic does not apply to gitlinks, as ce_match_stat_basic()
397 * already has checked the actual HEAD from the filesystem in the
398 * subproject. If ie_match_stat() already said it is different,
399 * then we know it is.
b0391890 400 */
c70115b4 401 if ((changed & DATA_CHANGED) &&
c21d39d7 402 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
b0391890
JH
403 return changed;
404
29e4d363
JH
405 changed_fs = ce_modified_check_fs(ce, st);
406 if (changed_fs)
407 return changed | changed_fs;
b0391890
JH
408 return 0;
409}
410
958ba6c9
LT
411int base_name_compare(const char *name1, int len1, int mode1,
412 const char *name2, int len2, int mode2)
413{
414 unsigned char c1, c2;
415 int len = len1 < len2 ? len1 : len2;
416 int cmp;
417
418 cmp = memcmp(name1, name2, len);
419 if (cmp)
420 return cmp;
421 c1 = name1[len];
422 c2 = name2[len];
1833a925 423 if (!c1 && S_ISDIR(mode1))
958ba6c9 424 c1 = '/';
1833a925 425 if (!c2 && S_ISDIR(mode2))
958ba6c9
LT
426 c2 = '/';
427 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
428}
429
0ab9e1e8
LT
430/*
431 * df_name_compare() is identical to base_name_compare(), except it
432 * compares conflicting directory/file entries as equal. Note that
433 * while a directory name compares as equal to a regular file, they
434 * then individually compare _differently_ to a filename that has
435 * a dot after the basename (because '\0' < '.' < '/').
436 *
437 * This is used by routines that want to traverse the git namespace
438 * but then handle conflicting entries together when possible.
439 */
440int df_name_compare(const char *name1, int len1, int mode1,
441 const char *name2, int len2, int mode2)
442{
443 int len = len1 < len2 ? len1 : len2, cmp;
444 unsigned char c1, c2;
445
446 cmp = memcmp(name1, name2, len);
447 if (cmp)
448 return cmp;
449 /* Directories and files compare equal (same length, same name) */
450 if (len1 == len2)
451 return 0;
452 c1 = name1[len];
453 if (!c1 && S_ISDIR(mode1))
454 c1 = '/';
455 c2 = name2[len];
456 if (!c2 && S_ISDIR(mode2))
457 c2 = '/';
458 if (c1 == '/' && !c2)
459 return 0;
460 if (c2 == '/' && !c1)
461 return 0;
462 return c1 - c2;
463}
464
ccdd4a0f 465int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
eb38c22f 466{
ccdd4a0f
JM
467 size_t min_len = (len1 < len2) ? len1 : len2;
468 int cmp = memcmp(name1, name2, min_len);
eb38c22f
LT
469 if (cmp)
470 return cmp;
471 if (len1 < len2)
472 return -1;
473 if (len1 > len2)
474 return 1;
ccdd4a0f
JM
475 return 0;
476}
477
478int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
479{
480 int cmp;
481
482 cmp = name_compare(name1, len1, name2, len2);
483 if (cmp)
484 return cmp;
5f73076c 485
b60e188c 486 if (stage1 < stage2)
95fd5bf8 487 return -1;
b60e188c 488 if (stage1 > stage2)
95fd5bf8 489 return 1;
eb38c22f
LT
490 return 0;
491}
492
357e9c69 493static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
eb38c22f
LT
494{
495 int first, last;
496
497 first = 0;
4aab5b46 498 last = istate->cache_nr;
eb38c22f
LT
499 while (last > first) {
500 int next = (last + first) >> 1;
4aab5b46 501 struct cache_entry *ce = istate->cache[next];
b60e188c 502 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
eb38c22f 503 if (!cmp)
76e7f4ec 504 return next;
eb38c22f
LT
505 if (cmp < 0) {
506 last = next;
507 continue;
508 }
509 first = next+1;
510 }
76e7f4ec 511 return -first-1;
eb38c22f
LT
512}
513
b60e188c
TG
514int index_name_pos(const struct index_state *istate, const char *name, int namelen)
515{
516 return index_name_stage_pos(istate, name, namelen, 0);
517}
518
4aab5b46 519int remove_index_entry_at(struct index_state *istate, int pos)
7b937ca3 520{
cf558704
LT
521 struct cache_entry *ce = istate->cache[pos];
522
cfc5789a 523 record_resolve_undo(istate, ce);
2092678c 524 remove_name_hash(istate, ce);
045113a5 525 save_or_free_index_entry(istate, ce);
e636a7b4 526 istate->cache_changed |= CE_ENTRY_REMOVED;
4aab5b46
JH
527 istate->cache_nr--;
528 if (pos >= istate->cache_nr)
7b937ca3 529 return 0;
f331ab9d
RS
530 MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1,
531 istate->cache_nr - pos);
7b937ca3
LT
532 return 1;
533}
534
36419c8e 535/*
98e023de 536 * Remove all cache entries marked for removal, that is where
36419c8e
KB
537 * CE_REMOVE is set in ce_flags. This is much more effective than
538 * calling remove_index_entry_at() for each entry to be removed.
539 */
540void remove_marked_cache_entries(struct index_state *istate)
541{
542 struct cache_entry **ce_array = istate->cache;
543 unsigned int i, j;
544
545 for (i = j = 0; i < istate->cache_nr; i++) {
5699d17e 546 if (ce_array[i]->ce_flags & CE_REMOVE) {
2092678c 547 remove_name_hash(istate, ce_array[i]);
045113a5 548 save_or_free_index_entry(istate, ce_array[i]);
5699d17e 549 }
36419c8e
KB
550 else
551 ce_array[j++] = ce_array[i];
552 }
ad837d9e
NTND
553 if (j == istate->cache_nr)
554 return;
e636a7b4 555 istate->cache_changed |= CE_ENTRY_REMOVED;
36419c8e
KB
556 istate->cache_nr = j;
557}
558
4aab5b46 559int remove_file_from_index(struct index_state *istate, const char *path)
197ee8c9 560{
4aab5b46 561 int pos = index_name_pos(istate, path, strlen(path));
c4e3cca1
JH
562 if (pos < 0)
563 pos = -pos-1;
a5400efe 564 cache_tree_invalidate_path(istate, path);
e931371a 565 untracked_cache_remove_from_index(istate, path);
4aab5b46
JH
566 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
567 remove_index_entry_at(istate, pos);
197ee8c9
LT
568 return 0;
569}
570
20314271
JS
571static int compare_name(struct cache_entry *ce, const char *path, int namelen)
572{
573 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
574}
575
576static int index_name_pos_also_unmerged(struct index_state *istate,
577 const char *path, int namelen)
578{
579 int pos = index_name_pos(istate, path, namelen);
580 struct cache_entry *ce;
581
582 if (pos >= 0)
583 return pos;
584
585 /* maybe unmerged? */
586 pos = -1 - pos;
587 if (pos >= istate->cache_nr ||
588 compare_name((ce = istate->cache[pos]), path, namelen))
589 return -1;
590
591 /* order of preference: stage 2, 1, 3 */
592 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
593 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
594 !compare_name(ce, path, namelen))
595 pos++;
596 return pos;
597}
598
1102952b
LT
599static int different_name(struct cache_entry *ce, struct cache_entry *alias)
600{
601 int len = ce_namelen(ce);
602 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
603}
604
605/*
606 * If we add a filename that aliases in the cache, we will use the
607 * name that we already have - but we don't want to update the same
608 * alias twice, because that implies that there were actually two
609 * different files with aliasing names!
610 *
611 * So we use the CE_ADDED flag to verify that the alias was an old
612 * one before we accept it as
613 */
045113a5
NTND
614static struct cache_entry *create_alias_ce(struct index_state *istate,
615 struct cache_entry *ce,
616 struct cache_entry *alias)
1102952b
LT
617{
618 int len;
285c2e25 619 struct cache_entry *new_entry;
1102952b
LT
620
621 if (alias->ce_flags & CE_ADDED)
622 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
623
624 /* Ok, create the new entry using the name of the existing alias */
625 len = ce_namelen(alias);
285c2e25
BW
626 new_entry = xcalloc(1, cache_entry_size(len));
627 memcpy(new_entry->name, alias->name, len);
628 copy_cache_entry(new_entry, ce);
045113a5 629 save_or_free_index_entry(istate, ce);
285c2e25 630 return new_entry;
1102952b
LT
631}
632
b4b313f9 633void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
39425819 634{
a09c985e
PO
635 struct object_id oid;
636 if (write_object_file("", 0, blob_type, &oid))
39425819 637 die("cannot create an empty blob in the object database");
a09c985e 638 oidcpy(&ce->oid, &oid);
39425819
JH
639}
640
610d55af 641int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
11be42a4 642{
38ed1d89 643 int size, namelen, was_same;
d177cab0 644 mode_t st_mode = st->st_mode;
9472935d 645 struct cache_entry *ce, *alias = NULL;
56cac48c 646 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
38ed1d89
JH
647 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
648 int pretend = flags & ADD_CACHE_PRETEND;
39425819
JH
649 int intent_only = flags & ADD_CACHE_INTENT;
650 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
651 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
9472935d
TB
652 int newflags = HASH_WRITE_OBJECT;
653
654 if (flags & HASH_RENORMALIZE)
655 newflags |= HASH_RENORMALIZE;
11be42a4 656
d177cab0 657 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
960b8ad1 658 return error("%s: can only add regular files, symbolic links or git-directories", path);
11be42a4
JS
659
660 namelen = strlen(path);
d177cab0 661 if (S_ISDIR(st_mode)) {
09595258
LT
662 while (namelen && path[namelen-1] == '/')
663 namelen--;
664 }
11be42a4
JS
665 size = cache_entry_size(namelen);
666 ce = xcalloc(1, size);
667 memcpy(ce->name, path, namelen);
b60e188c 668 ce->ce_namelen = namelen;
39425819
JH
669 if (!intent_only)
670 fill_stat_cache_info(ce, st);
388b2acd
JH
671 else
672 ce->ce_flags |= CE_INTENT_TO_ADD;
11be42a4 673
610d55af
TG
674
675 if (trust_executable_bit && has_symlinks) {
d177cab0 676 ce->ce_mode = create_ce_mode(st_mode);
610d55af 677 } else {
78a8d641
JS
678 /* If there is an existing entry, pick the mode bits and type
679 * from it, otherwise assume unexecutable regular file.
11be42a4 680 */
185c975f 681 struct cache_entry *ent;
20314271 682 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 683
4aab5b46 684 ent = (0 <= pos) ? istate->cache[pos] : NULL;
d177cab0 685 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
11be42a4
JS
686 }
687
dc1ae704
JJ
688 /* When core.ignorecase=true, determine if a directory of the same name but differing
689 * case already exists within the Git repository. If it does, ensure the directory
690 * case of the file being added to the repository matches (is folded into) the existing
691 * entry's directory case.
692 */
693 if (ignore_case) {
41284eb0 694 adjust_dirname_case(istate, ce->name);
dc1ae704 695 }
9472935d
TB
696 if (!(flags & HASH_RENORMALIZE)) {
697 alias = index_file_exists(istate, ce->name,
698 ce_namelen(ce), ignore_case);
699 if (alias &&
700 !ce_stage(alias) &&
701 !ie_match_stat(istate, alias, st, ce_option)) {
702 /* Nothing changed, really */
703 if (!S_ISGITLINK(alias->ce_mode))
704 ce_mark_uptodate(alias);
705 alias->ce_flags |= CE_ADDED;
dc1ae704 706
9472935d
TB
707 free(ce);
708 return 0;
709 }
0781b8a9 710 }
39425819 711 if (!intent_only) {
9472935d 712 if (index_path(&ce->oid, path, st, newflags)) {
2d9426b0 713 free(ce);
39425819 714 return error("unable to index file %s", path);
2d9426b0 715 }
39425819 716 } else
b4b313f9 717 set_object_name_for_intent_to_add_entry(ce);
39425819 718
1102952b 719 if (ignore_case && alias && different_name(ce, alias))
045113a5 720 ce = create_alias_ce(istate, ce, alias);
1102952b 721 ce->ce_flags |= CE_ADDED;
38ed1d89 722
3bf0dd1f 723 /* It was suspected to be racily clean, but it turns out to be Ok */
38ed1d89
JH
724 was_same = (alias &&
725 !ce_stage(alias) &&
99d1a986 726 !oidcmp(&alias->oid, &ce->oid) &&
38ed1d89
JH
727 ce->ce_mode == alias->ce_mode);
728
729 if (pretend)
067178ed
JH
730 free(ce);
731 else if (add_index_entry(istate, ce, add_option)) {
732 free(ce);
733 return error("unable to add %s to index", path);
734 }
38ed1d89 735 if (verbose && !was_same)
11be42a4 736 printf("add '%s'\n", path);
11be42a4
JS
737 return 0;
738}
739
610d55af 740int add_file_to_index(struct index_state *istate, const char *path, int flags)
d177cab0
LT
741{
742 struct stat st;
743 if (lstat(path, &st))
d824cbba 744 die_errno("unable to stat '%s'", path);
610d55af 745 return add_to_index(istate, path, &st, flags);
d177cab0
LT
746}
747
6640f881
CR
748struct cache_entry *make_cache_entry(unsigned int mode,
749 const unsigned char *sha1, const char *path, int stage,
25762726 750 unsigned int refresh_options)
6640f881
CR
751{
752 int size, len;
bc1c2caa 753 struct cache_entry *ce, *ret;
6640f881 754
10ecfa76 755 if (!verify_path(path, mode)) {
7e7abea9 756 error("Invalid path '%s'", path);
6640f881 757 return NULL;
7e7abea9 758 }
6640f881
CR
759
760 len = strlen(path);
761 size = cache_entry_size(len);
762 ce = xcalloc(1, size);
763
99d1a986 764 hashcpy(ce->oid.hash, sha1);
6640f881 765 memcpy(ce->name, path, len);
b60e188c
TG
766 ce->ce_flags = create_ce_flags(stage);
767 ce->ce_namelen = len;
6640f881
CR
768 ce->ce_mode = create_ce_mode(mode);
769
bc1c2caa 770 ret = refresh_cache_entry(ce, refresh_options);
915e44c6 771 if (ret != ce)
bc1c2caa 772 free(ce);
915e44c6 773 return ret;
6640f881
CR
774}
775
d9d70966
TG
776/*
777 * Chmod an index entry with either +x or -x.
778 *
779 * Returns -1 if the chmod for the particular cache entry failed (if it's
780 * not a regular file), -2 if an invalid flip argument is passed in, 0
781 * otherwise.
782 */
783int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
784 char flip)
785{
786 if (!S_ISREG(ce->ce_mode))
787 return -1;
788 switch (flip) {
789 case '+':
790 ce->ce_mode |= 0111;
791 break;
792 case '-':
793 ce->ce_mode &= ~0111;
794 break;
795 default:
796 return -2;
797 }
798 cache_tree_invalidate_path(istate, ce->name);
799 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 800 mark_fsmonitor_invalid(istate, ce);
d9d70966
TG
801 istate->cache_changed |= CE_ENTRY_CHANGED;
802
803 return 0;
804}
805
9c5e6c80 806int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
7b937ca3
LT
807{
808 int len = ce_namelen(a);
809 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
810}
811
8dcf39c4
LT
812/*
813 * We fundamentally don't like some paths: we don't want
814 * dot or dot-dot anywhere, and for obvious reasons don't
815 * want to recurse into ".git" either.
816 *
817 * Also, we don't want double slashes or slashes at the
818 * end that can make pathnames ambiguous.
819 */
10ecfa76 820static int verify_dotfile(const char *rest, unsigned mode)
8dcf39c4
LT
821{
822 /*
823 * The first character was '.', but that
824 * has already been discarded, we now test
825 * the rest.
826 */
e0f530ff 827
8dcf39c4 828 /* "." is not allowed */
e0f530ff 829 if (*rest == '\0' || is_dir_sep(*rest))
8dcf39c4
LT
830 return 0;
831
e0f530ff 832 switch (*rest) {
8dcf39c4 833 /*
641084b6
JK
834 * ".git" followed by NUL or slash is bad. Note that we match
835 * case-insensitively here, even if ignore_case is not set.
836 * This outlaws ".GIT" everywhere out of an abundance of caution,
837 * since there's really no good reason to allow it.
10ecfa76
JK
838 *
839 * Once we've seen ".git", we can also find ".gitmodules", etc (also
840 * case-insensitively).
8dcf39c4
LT
841 */
842 case 'g':
cc2fc7c2
JK
843 case 'G':
844 if (rest[1] != 'i' && rest[1] != 'I')
8dcf39c4 845 break;
cc2fc7c2 846 if (rest[2] != 't' && rest[2] != 'T')
8dcf39c4 847 break;
e19e5e66
JK
848 if (rest[3] == '\0' || is_dir_sep(rest[3]))
849 return 0;
10ecfa76
JK
850 if (S_ISLNK(mode)) {
851 rest += 3;
852 if (skip_iprefix(rest, "modules", &rest) &&
853 (*rest == '\0' || is_dir_sep(*rest)))
854 return 0;
855 }
e19e5e66 856 break;
8dcf39c4 857 case '.':
e0f530ff 858 if (rest[1] == '\0' || is_dir_sep(rest[1]))
8dcf39c4
LT
859 return 0;
860 }
861 return 1;
862}
863
10ecfa76 864int verify_path(const char *path, unsigned mode)
8dcf39c4
LT
865{
866 char c;
867
56948cb6
EFL
868 if (has_dos_drive_prefix(path))
869 return 0;
870
d2c84dad
JS
871 if (!is_valid_path(path))
872 return 0;
873
8dcf39c4
LT
874 goto inside;
875 for (;;) {
876 if (!c)
877 return 1;
56948cb6 878 if (is_dir_sep(c)) {
8dcf39c4 879inside:
10ecfa76
JK
880 if (protect_hfs) {
881 if (is_hfs_dotgit(path))
882 return 0;
883 if (S_ISLNK(mode)) {
884 if (is_hfs_dotgitmodules(path))
885 return 0;
886 }
887 }
888 if (protect_ntfs) {
889 if (is_ntfs_dotgit(path))
890 return 0;
891 if (S_ISLNK(mode)) {
892 if (is_ntfs_dotgitmodules(path))
893 return 0;
894 }
895 }
896
8dcf39c4 897 c = *path++;
10ecfa76 898 if ((c == '.' && !verify_dotfile(path, mode)) ||
3bdf09c7
JH
899 is_dir_sep(c) || c == '\0')
900 return 0;
288a74bc
JS
901 } else if (c == '\\' && protect_ntfs) {
902 if (is_ntfs_dotgit(path))
903 return 0;
904 if (S_ISLNK(mode)) {
905 if (is_ntfs_dotgitmodules(path))
906 return 0;
907 }
8dcf39c4 908 }
288a74bc 909
8dcf39c4
LT
910 c = *path++;
911 }
912}
913
12676608
LT
914/*
915 * Do we have another file that has the beginning components being a
916 * proper superset of the name we're trying to add?
0f1e4f04 917 */
4aab5b46
JH
918static int has_file_name(struct index_state *istate,
919 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 920{
12676608
LT
921 int retval = 0;
922 int len = ce_namelen(ce);
b155725d 923 int stage = ce_stage(ce);
12676608 924 const char *name = ce->name;
0f1e4f04 925
4aab5b46
JH
926 while (pos < istate->cache_nr) {
927 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 928
12676608 929 if (len >= ce_namelen(p))
0f1e4f04 930 break;
12676608
LT
931 if (memcmp(name, p->name, len))
932 break;
b155725d
JH
933 if (ce_stage(p) != stage)
934 continue;
12676608
LT
935 if (p->name[len] != '/')
936 continue;
7a51ed66 937 if (p->ce_flags & CE_REMOVE)
21cd8d00 938 continue;
12676608
LT
939 retval = -1;
940 if (!ok_to_replace)
941 break;
4aab5b46 942 remove_index_entry_at(istate, --pos);
0f1e4f04 943 }
12676608
LT
944 return retval;
945}
0f1e4f04 946
a6db3fbb
JH
947
948/*
949 * Like strcmp(), but also return the offset of the first change.
950 * If strings are equal, return the length.
951 */
952int strcmp_offset(const char *s1, const char *s2, size_t *first_change)
953{
954 size_t k;
955
956 if (!first_change)
957 return strcmp(s1, s2);
958
959 for (k = 0; s1[k] == s2[k]; k++)
960 if (s1[k] == '\0')
961 break;
962
963 *first_change = k;
964 return (unsigned char)s1[k] - (unsigned char)s2[k];
965}
966
12676608
LT
967/*
968 * Do we have another file with a pathname that is a proper
969 * subset of the name we're trying to add?
06b6d81b
JH
970 *
971 * That is, is there another file in the index with a path
972 * that matches a sub-directory in the given entry?
12676608 973 */
4aab5b46
JH
974static int has_dir_name(struct index_state *istate,
975 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
976{
977 int retval = 0;
b155725d 978 int stage = ce_stage(ce);
12676608
LT
979 const char *name = ce->name;
980 const char *slash = name + ce_namelen(ce);
06b6d81b
JH
981 size_t len_eq_last;
982 int cmp_last = 0;
983
984 /*
985 * We are frequently called during an iteration on a sorted
986 * list of pathnames and while building a new index. Therefore,
987 * there is a high probability that this entry will eventually
988 * be appended to the index, rather than inserted in the middle.
989 * If we can confirm that, we can avoid binary searches on the
990 * components of the pathname.
991 *
992 * Compare the entry's full path with the last path in the index.
993 */
994 if (istate->cache_nr > 0) {
995 cmp_last = strcmp_offset(name,
996 istate->cache[istate->cache_nr - 1]->name,
997 &len_eq_last);
998 if (cmp_last > 0) {
999 if (len_eq_last == 0) {
1000 /*
1001 * The entry sorts AFTER the last one in the
1002 * index and their paths have no common prefix,
1003 * so there cannot be a F/D conflict.
1004 */
1005 return retval;
1006 } else {
1007 /*
1008 * The entry sorts AFTER the last one in the
1009 * index, but has a common prefix. Fall through
1010 * to the loop below to disect the entry's path
1011 * and see where the difference is.
1012 */
1013 }
1014 } else if (cmp_last == 0) {
1015 /*
1016 * The entry exactly matches the last one in the
1017 * index, but because of multiple stage and CE_REMOVE
1018 * items, we fall through and let the regular search
1019 * code handle it.
1020 */
1021 }
1022 }
0f1e4f04 1023
12676608 1024 for (;;) {
b986df5c 1025 size_t len;
0f1e4f04 1026
12676608
LT
1027 for (;;) {
1028 if (*--slash == '/')
1029 break;
1030 if (slash <= ce->name)
1031 return retval;
1032 }
1033 len = slash - name;
0f1e4f04 1034
b986df5c
JH
1035 if (cmp_last > 0) {
1036 /*
1037 * (len + 1) is a directory boundary (including
1038 * the trailing slash). And since the loop is
1039 * decrementing "slash", the first iteration is
1040 * the longest directory prefix; subsequent
1041 * iterations consider parent directories.
1042 */
1043
1044 if (len + 1 <= len_eq_last) {
1045 /*
1046 * The directory prefix (including the trailing
1047 * slash) also appears as a prefix in the last
1048 * entry, so the remainder cannot collide (because
1049 * strcmp said the whole path was greater).
1050 *
1051 * EQ: last: xxx/A
1052 * this: xxx/B
1053 *
1054 * LT: last: xxx/file_A
1055 * this: xxx/file_B
1056 */
1057 return retval;
1058 }
1059
1060 if (len > len_eq_last) {
1061 /*
1062 * This part of the directory prefix (excluding
1063 * the trailing slash) is longer than the known
1064 * equal portions, so this sub-directory cannot
1065 * collide with a file.
1066 *
1067 * GT: last: xxxA
1068 * this: xxxB/file
1069 */
1070 return retval;
1071 }
1072
1073 if (istate->cache_nr > 0 &&
1074 ce_namelen(istate->cache[istate->cache_nr - 1]) > len) {
1075 /*
1076 * The directory prefix lines up with part of
1077 * a longer file or directory name, but sorts
1078 * after it, so this sub-directory cannot
1079 * collide with a file.
1080 *
1081 * last: xxx/yy-file (because '-' sorts before '/')
1082 * this: xxx/yy/abc
1083 */
1084 return retval;
1085 }
1086
1087 /*
1088 * This is a possible collision. Fall through and
1089 * let the regular search code handle it.
1090 *
1091 * last: xxx
1092 * this: xxx/file
1093 */
1094 }
1095
b60e188c 1096 pos = index_name_stage_pos(istate, name, len, stage);
12676608 1097 if (pos >= 0) {
21cd8d00
JH
1098 /*
1099 * Found one, but not so fast. This could
1100 * be a marker that says "I was here, but
1101 * I am being removed". Such an entry is
1102 * not a part of the resulting tree, and
1103 * it is Ok to have a directory at the same
1104 * path.
1105 */
077c48df 1106 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
1107 retval = -1;
1108 if (!ok_to_replace)
1109 break;
4aab5b46 1110 remove_index_entry_at(istate, pos);
21cd8d00
JH
1111 continue;
1112 }
12676608 1113 }
21cd8d00
JH
1114 else
1115 pos = -pos-1;
12676608
LT
1116
1117 /*
1118 * Trivial optimization: if we find an entry that
1119 * already matches the sub-directory, then we know
b155725d 1120 * we're ok, and we can exit.
12676608 1121 */
4aab5b46
JH
1122 while (pos < istate->cache_nr) {
1123 struct cache_entry *p = istate->cache[pos];
b155725d
JH
1124 if ((ce_namelen(p) <= len) ||
1125 (p->name[len] != '/') ||
1126 memcmp(p->name, name, len))
1127 break; /* not our subdirectory */
077c48df
JH
1128 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
1129 /*
1130 * p is at the same stage as our entry, and
b155725d
JH
1131 * is a subdirectory of what we are looking
1132 * at, so we cannot have conflicts at our
1133 * level or anything shorter.
1134 */
1135 return retval;
1136 pos++;
192268c1 1137 }
0f1e4f04 1138 }
12676608
LT
1139 return retval;
1140}
1141
1142/* We may be in a situation where we already have path/file and path
1143 * is being added, or we already have path and path/file is being
1144 * added. Either one would result in a nonsense tree that has path
1145 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 1146 *
12676608
LT
1147 * If ok-to-replace is specified, we remove the conflicting entries
1148 * from the cache so the caller should recompute the insert position.
1149 * When this happens, we return non-zero.
1150 */
4aab5b46
JH
1151static int check_file_directory_conflict(struct index_state *istate,
1152 const struct cache_entry *ce,
1153 int pos, int ok_to_replace)
12676608 1154{
21cd8d00
JH
1155 int retval;
1156
1157 /*
1158 * When ce is an "I am going away" entry, we allow it to be added
1159 */
7a51ed66 1160 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
1161 return 0;
1162
12676608
LT
1163 /*
1164 * We check if the path is a sub-path of a subsequent pathname
1165 * first, since removing those will not change the position
21cd8d00 1166 * in the array.
12676608 1167 */
4aab5b46 1168 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 1169
12676608
LT
1170 /*
1171 * Then check if the path might have a clashing sub-directory
1172 * before it.
1173 */
4aab5b46 1174 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
1175}
1176
af3785dc 1177static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
1178{
1179 int pos;
192268c1
JH
1180 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1181 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 1182 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 1183 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 1184
ce7c614b
NTND
1185 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1186 cache_tree_invalidate_path(istate, ce->name);
e5494631
JH
1187
1188 /*
1189 * If this entry's path sorts after the last entry in the index,
1190 * we can avoid searching for it.
1191 */
1192 if (istate->cache_nr > 0 &&
1193 strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
1194 pos = -istate->cache_nr - 1;
1195 else
1196 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
197ee8c9 1197
3e09cdfd 1198 /* existing match? Just replace it. */
76e7f4ec 1199 if (pos >= 0) {
39425819
JH
1200 if (!new_only)
1201 replace_index_entry(istate, pos, ce);
197ee8c9
LT
1202 return 0;
1203 }
76e7f4ec 1204 pos = -pos-1;
197ee8c9 1205
ffcc9ba7
NTND
1206 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1207 untracked_cache_add_to_index(istate, ce->name);
e931371a 1208
7b937ca3
LT
1209 /*
1210 * Inserting a merged entry ("stage 0") into the index
1211 * will always replace all non-merged entries..
1212 */
4aab5b46
JH
1213 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1214 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 1215 ok_to_add = 1;
4aab5b46 1216 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
1217 break;
1218 }
1219 }
1220
121481ab
LT
1221 if (!ok_to_add)
1222 return -1;
10ecfa76 1223 if (!verify_path(ce->name, ce->ce_mode))
7e7abea9 1224 return error("Invalid path '%s'", ce->name);
121481ab 1225
3e09cdfd 1226 if (!skip_df_check &&
4aab5b46 1227 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 1228 if (!ok_to_replace)
4aab5b46
JH
1229 return error("'%s' appears as both a file and as a directory",
1230 ce->name);
b60e188c 1231 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
192268c1
JH
1232 pos = -pos-1;
1233 }
af3785dc
JH
1234 return pos + 1;
1235}
1236
1237int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1238{
1239 int pos;
1240
1241 if (option & ADD_CACHE_JUST_APPEND)
1242 pos = istate->cache_nr;
1243 else {
1244 int ret;
1245 ret = add_index_entry_with_check(istate, ce, option);
1246 if (ret <= 0)
1247 return ret;
1248 pos = ret - 1;
1249 }
0f1e4f04 1250
197ee8c9 1251 /* Make sure the array is big enough .. */
999f5660 1252 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
197ee8c9
LT
1253
1254 /* Add it in.. */
4aab5b46 1255 istate->cache_nr++;
af3785dc 1256 if (istate->cache_nr > pos + 1)
f919ffeb
SG
1257 MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos,
1258 istate->cache_nr - pos - 1);
cf558704 1259 set_index_entry(istate, pos, ce);
e636a7b4 1260 istate->cache_changed |= CE_ENTRY_ADDED;
197ee8c9
LT
1261 return 0;
1262}
1263
405e5b2f
LT
1264/*
1265 * "refresh" does not calculate a new sha1 file or bring the
1266 * cache up-to-date for mode/content changes. But what it
1267 * _does_ do is to "re-match" the stat information of a file
1268 * with the cache, so that you can refresh the cache for a
1269 * file that hasn't been changed but where the stat entry is
1270 * out of date.
1271 *
1272 * For example, you'd want to do this after doing a "git-read-tree",
1273 * to link up the stat cache details with the proper files.
1274 */
4aab5b46 1275static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da 1276 struct cache_entry *ce,
d05e6970
JK
1277 unsigned int options, int *err,
1278 int *changed_ret)
405e5b2f
LT
1279{
1280 struct stat st;
1281 struct cache_entry *updated;
1282 int changed, size;
25762726 1283 int refresh = options & CE_MATCH_REFRESH;
4bd5b7da 1284 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 1285 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
2e2e7ec1 1286 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
883e248b 1287 int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
405e5b2f 1288
25762726 1289 if (!refresh || ce_uptodate(ce))
eadb5831
JH
1290 return ce;
1291
883e248b
BP
1292 if (!ignore_fsmonitor)
1293 refresh_fsmonitor(istate);
aa9349d4 1294 /*
56cac48c
NTND
1295 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1296 * that the change to the work tree does not matter and told
1297 * us not to worry.
aa9349d4 1298 */
56cac48c
NTND
1299 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1300 ce_mark_uptodate(ce);
1301 return ce;
1302 }
aa9349d4
MSO
1303 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1304 ce_mark_uptodate(ce);
1305 return ce;
1306 }
883e248b
BP
1307 if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) {
1308 ce_mark_uptodate(ce);
1309 return ce;
1310 }
aa9349d4 1311
ccad42d4
RS
1312 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1313 if (ignore_missing)
1314 return ce;
1315 if (err)
1316 *err = ENOENT;
1317 return NULL;
1318 }
1319
8fd2cb40 1320 if (lstat(ce->name, &st) < 0) {
2e2e7ec1
BK
1321 if (ignore_missing && errno == ENOENT)
1322 return ce;
ec0cc704
JH
1323 if (err)
1324 *err = errno;
8fd2cb40
JS
1325 return NULL;
1326 }
405e5b2f 1327
4bd5b7da 1328 changed = ie_match_stat(istate, ce, &st, options);
d05e6970
JK
1329 if (changed_ret)
1330 *changed_ret = changed;
405e5b2f 1331 if (!changed) {
4bd5b7da
JH
1332 /*
1333 * The path is unchanged. If we were told to ignore
1334 * valid bit, then we did the actual stat check and
1335 * found that the entry is unmodified. If the entry
1336 * is not marked VALID, this is the place to mark it
1337 * valid again, under "assume unchanged" mode.
1338 */
1339 if (ignore_valid && assume_unchanged &&
7a51ed66 1340 !(ce->ce_flags & CE_VALID))
405e5b2f 1341 ; /* mark this one VALID again */
eadb5831
JH
1342 else {
1343 /*
1344 * We do not mark the index itself "modified"
1345 * because CE_UPTODATE flag is in-core only;
1346 * we are not going to write this change out.
1347 */
883e248b 1348 if (!S_ISGITLINK(ce->ce_mode)) {
125fd984 1349 ce_mark_uptodate(ce);
883e248b
BP
1350 mark_fsmonitor_valid(ce);
1351 }
8fd2cb40 1352 return ce;
eadb5831 1353 }
405e5b2f
LT
1354 }
1355
4bd5b7da 1356 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1357 if (err)
1358 *err = EINVAL;
8fd2cb40
JS
1359 return NULL;
1360 }
405e5b2f
LT
1361
1362 size = ce_size(ce);
1363 updated = xmalloc(size);
0e267b7a
BP
1364 copy_cache_entry(updated, ce);
1365 memcpy(updated->name, ce->name, ce->ce_namelen + 1);
405e5b2f 1366 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
1367 /*
1368 * If ignore_valid is not set, we should leave CE_VALID bit
1369 * alone. Otherwise, paths marked with --no-assume-unchanged
1370 * (i.e. things to be edited) will reacquire CE_VALID bit
1371 * automatically, which is not really what we want.
405e5b2f 1372 */
4bd5b7da 1373 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1374 !(ce->ce_flags & CE_VALID))
1375 updated->ce_flags &= ~CE_VALID;
405e5b2f 1376
e636a7b4 1377 /* istate->cache_changed is updated in the caller */
405e5b2f
LT
1378 return updated;
1379}
1380
3deffc52 1381static void show_file(const char * fmt, const char * name, int in_porcelain,
046613c5 1382 int * first, const char *header_msg)
3deffc52
MM
1383{
1384 if (in_porcelain && *first && header_msg) {
1385 printf("%s\n", header_msg);
cd2b8ae9 1386 *first = 0;
3deffc52
MM
1387 }
1388 printf(fmt, name);
1389}
1390
9b2d6149
NTND
1391int refresh_index(struct index_state *istate, unsigned int flags,
1392 const struct pathspec *pathspec,
046613c5 1393 char *seen, const char *header_msg)
405e5b2f
LT
1394{
1395 int i;
1396 int has_errors = 0;
1397 int really = (flags & REFRESH_REALLY) != 0;
1398 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1399 int quiet = (flags & REFRESH_QUIET) != 0;
1400 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1401 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
3deffc52
MM
1402 int first = 1;
1403 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
25762726
BK
1404 unsigned int options = (CE_MATCH_REFRESH |
1405 (really ? CE_MATCH_IGNORE_VALID : 0) |
2e2e7ec1 1406 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
4bd4e730 1407 const char *modified_fmt;
73b7eae6
JK
1408 const char *deleted_fmt;
1409 const char *typechange_fmt;
1410 const char *added_fmt;
4bd4e730 1411 const char *unmerged_fmt;
ca54d9ba 1412 uint64_t start = getnanotime();
405e5b2f 1413
4bd4e730 1414 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
73b7eae6
JK
1415 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1416 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1417 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
4bd4e730 1418 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
4aab5b46 1419 for (i = 0; i < istate->cache_nr; i++) {
285c2e25 1420 struct cache_entry *ce, *new_entry;
ec0cc704 1421 int cache_errno = 0;
73b7eae6 1422 int changed = 0;
3d1f148c 1423 int filtered = 0;
ec0cc704 1424
4aab5b46 1425 ce = istate->cache[i];
5fdeacb0
JS
1426 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1427 continue;
1428
429bb40a 1429 if (pathspec && !ce_path_match(ce, pathspec, seen))
3d1f148c
JH
1430 filtered = 1;
1431
405e5b2f 1432 if (ce_stage(ce)) {
4aab5b46
JH
1433 while ((i < istate->cache_nr) &&
1434 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1435 i++;
1436 i--;
1437 if (allow_unmerged)
1438 continue;
3d1f148c
JH
1439 if (!filtered)
1440 show_file(unmerged_fmt, ce->name, in_porcelain,
1441 &first, header_msg);
405e5b2f
LT
1442 has_errors = 1;
1443 continue;
1444 }
1445
3d1f148c 1446 if (filtered)
d616813d
AJ
1447 continue;
1448
285c2e25
BW
1449 new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1450 if (new_entry == ce)
405e5b2f 1451 continue;
285c2e25 1452 if (!new_entry) {
73b7eae6
JK
1453 const char *fmt;
1454
8fd2cb40 1455 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1456 /* If we are doing --really-refresh that
1457 * means the index is not valid anymore.
1458 */
7a51ed66 1459 ce->ce_flags &= ~CE_VALID;
078a58e8 1460 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 1461 mark_fsmonitor_invalid(istate, ce);
e636a7b4 1462 istate->cache_changed |= CE_ENTRY_CHANGED;
405e5b2f
LT
1463 }
1464 if (quiet)
1465 continue;
73b7eae6
JK
1466
1467 if (cache_errno == ENOENT)
1468 fmt = deleted_fmt;
895ff3b2 1469 else if (ce_intent_to_add(ce))
73b7eae6
JK
1470 fmt = added_fmt; /* must be before other checks */
1471 else if (changed & TYPE_CHANGED)
1472 fmt = typechange_fmt;
1473 else
1474 fmt = modified_fmt;
1475 show_file(fmt,
1476 ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1477 has_errors = 1;
1478 continue;
1479 }
cf558704 1480
285c2e25 1481 replace_index_entry(istate, i, new_entry);
405e5b2f 1482 }
ca54d9ba 1483 trace_performance_since(start, "refresh index");
405e5b2f
LT
1484 return has_errors;
1485}
1486
1335d76e 1487struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
25762726 1488 unsigned int options)
ec0cc704 1489{
25762726 1490 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
ec0cc704
JH
1491}
1492
db3b313c
JH
1493
1494/*****************************************************************
1495 * Index File I/O
1496 *****************************************************************/
1497
9d227781
JH
1498#define INDEX_FORMAT_DEFAULT 3
1499
136347d7
TG
1500static unsigned int get_index_format_default(void)
1501{
1502 char *envversion = getenv("GIT_INDEX_VERSION");
3c09d684 1503 char *endp;
b27a5720 1504 int value;
3c09d684
TG
1505 unsigned int version = INDEX_FORMAT_DEFAULT;
1506
136347d7 1507 if (!envversion) {
b27a5720
TA
1508 if (!git_config_get_int("index.version", &value))
1509 version = value;
3c09d684
TG
1510 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1511 warning(_("index.version set, but the value is invalid.\n"
136347d7 1512 "Using version %i"), INDEX_FORMAT_DEFAULT);
3c09d684 1513 return INDEX_FORMAT_DEFAULT;
136347d7
TG
1514 }
1515 return version;
1516 }
3c09d684
TG
1517
1518 version = strtoul(envversion, &endp, 10);
1519 if (*endp ||
1520 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1521 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1522 "Using version %i"), INDEX_FORMAT_DEFAULT);
1523 version = INDEX_FORMAT_DEFAULT;
1524 }
1525 return version;
136347d7
TG
1526}
1527
db3b313c
JH
1528/*
1529 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1530 * Again - this is just a (very strong in practice) heuristic that
1531 * the inode hasn't changed.
1532 *
1533 * We save the fields in big-endian order to allow using the
1534 * index file over NFS transparently.
1535 */
1536struct ondisk_cache_entry {
1537 struct cache_time ctime;
1538 struct cache_time mtime;
7800c1eb
TG
1539 uint32_t dev;
1540 uint32_t ino;
1541 uint32_t mode;
1542 uint32_t uid;
1543 uint32_t gid;
1544 uint32_t size;
db3b313c 1545 unsigned char sha1[20];
7800c1eb 1546 uint16_t flags;
db3b313c
JH
1547 char name[FLEX_ARRAY]; /* more */
1548};
1549
1550/*
1551 * This struct is used when CE_EXTENDED bit is 1
1552 * The struct must match ondisk_cache_entry exactly from
1553 * ctime till flags
1554 */
1555struct ondisk_cache_entry_extended {
1556 struct cache_time ctime;
1557 struct cache_time mtime;
7800c1eb
TG
1558 uint32_t dev;
1559 uint32_t ino;
1560 uint32_t mode;
1561 uint32_t uid;
1562 uint32_t gid;
1563 uint32_t size;
db3b313c 1564 unsigned char sha1[20];
7800c1eb
TG
1565 uint16_t flags;
1566 uint16_t flags2;
db3b313c
JH
1567 char name[FLEX_ARRAY]; /* more */
1568};
1569
6c9cd161 1570/* These are only used for v3 or lower */
ce012deb 1571#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
db3b313c
JH
1572#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1573#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1574#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1575#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1576 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1577 ondisk_cache_entry_size(ce_namelen(ce)))
1578
a33fc72f
JH
1579/* Allow fsck to force verification of the index checksum. */
1580int verify_index_checksum;
1581
00ec50e5
BP
1582/* Allow fsck to force verification of the cache entry order. */
1583int verify_ce_order;
1584
bad68ec9 1585static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163 1586{
aab61359 1587 git_hash_ctx c;
1588 unsigned char hash[GIT_MAX_RAWSZ];
0136bac9 1589 int hdr_version;
e83c5163 1590
ccc4feb5 1591 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 1592 return error("bad signature");
0136bac9 1593 hdr_version = ntohl(hdr->hdr_version);
b82a7b5b 1594 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
0136bac9 1595 return error("bad index version %d", hdr_version);
a33fc72f
JH
1596
1597 if (!verify_index_checksum)
1598 return 0;
1599
aab61359 1600 the_hash_algo->init_fn(&c);
1601 the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
1602 the_hash_algo->final_fn(hash, &c);
1603 if (hashcmp(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz))
ca9be054 1604 return error("bad index file sha1 signature");
e83c5163
LT
1605 return 0;
1606}
1607
4aab5b46
JH
1608static int read_index_extension(struct index_state *istate,
1609 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
1610{
1611 switch (CACHE_EXT(ext)) {
1612 case CACHE_EXT_TREE:
4aab5b46 1613 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9 1614 break;
cfc5789a
JH
1615 case CACHE_EXT_RESOLVE_UNDO:
1616 istate->resolve_undo = resolve_undo_read(data, sz);
1617 break;
5fc2fc8f
NTND
1618 case CACHE_EXT_LINK:
1619 if (read_link_extension(istate, data, sz))
1620 return -1;
1621 break;
f9e6c649
NTND
1622 case CACHE_EXT_UNTRACKED:
1623 istate->untracked = read_untracked_extension(data, sz);
1624 break;
883e248b
BP
1625 case CACHE_EXT_FSMONITOR:
1626 read_fsmonitor_extension(istate, data, sz);
1627 break;
bad68ec9
JH
1628 default:
1629 if (*ext < 'A' || 'Z' < *ext)
1630 return error("index uses %.4s extension, which we do not understand",
1631 ext);
1632 fprintf(stderr, "ignoring %.4s extension\n", ext);
1633 break;
1634 }
1635 return 0;
1636}
1637
b3e83cc7 1638int hold_locked_index(struct lock_file *lk, int lock_flags)
216aab1e 1639{
b3e83cc7 1640 return hold_lock_file_for_update(lk, get_index_file(), lock_flags);
216aab1e
MH
1641}
1642
4aab5b46 1643int read_index(struct index_state *istate)
8fd2cb40 1644{
a125a223 1645 return read_index_from(istate, get_index_file(), get_git_dir());
8fd2cb40
JS
1646}
1647
3fc22b53
JH
1648static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1649 unsigned int flags,
1650 const char *name,
1651 size_t len)
1652{
1653 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1654
c3d8da57
JK
1655 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1656 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1657 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1658 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1659 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1660 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1661 ce->ce_mode = get_be32(&ondisk->mode);
1662 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1663 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1664 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
b60e188c
TG
1665 ce->ce_flags = flags & ~CE_NAMEMASK;
1666 ce->ce_namelen = len;
5fc2fc8f 1667 ce->index = 0;
99d1a986 1668 hashcpy(ce->oid.hash, ondisk->sha1);
3fc22b53
JH
1669 memcpy(ce->name, name, len);
1670 ce->name[len] = '\0';
1671 return ce;
1672}
1673
6c9cd161
JH
1674/*
1675 * Adjacent cache entries tend to share the leading paths, so it makes
1676 * sense to only store the differences in later entries. In the v4
1677 * on-disk format of the index, each on-disk cache entry stores the
1678 * number of bytes to be stripped from the end of the previous name,
1679 * and the bytes to append to the result, to come up with its name.
1680 */
1681static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1682{
1683 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1684 size_t len = decode_varint(&cp);
1685
1686 if (name->len < len)
1687 die("malformed name field in the index");
1688 strbuf_remove(name, name->len - len, len);
1689 for (ep = cp; *ep; ep++)
1690 ; /* find the end */
1691 strbuf_add(name, cp, ep - cp);
1692 return (const char *)ep + 1 - cp_;
1693}
1694
936f53d0 1695static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
6c9cd161
JH
1696 unsigned long *ent_size,
1697 struct strbuf *previous_name)
7a51ed66 1698{
debed2a6 1699 struct cache_entry *ce;
7fec10b7 1700 size_t len;
06aaaa0b 1701 const char *name;
debed2a6 1702 unsigned int flags;
7fec10b7 1703
7a51ed66 1704 /* On-disk flags are just 16 bits */
c3d8da57 1705 flags = get_be16(&ondisk->flags);
debed2a6 1706 len = flags & CE_NAMEMASK;
7fec10b7 1707
debed2a6 1708 if (flags & CE_EXTENDED) {
06aaaa0b
NTND
1709 struct ondisk_cache_entry_extended *ondisk2;
1710 int extended_flags;
1711 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
c3d8da57 1712 extended_flags = get_be16(&ondisk2->flags2) << 16;
06aaaa0b
NTND
1713 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1714 if (extended_flags & ~CE_EXTENDED_FLAGS)
1715 die("Unknown index entry format %08x", extended_flags);
debed2a6 1716 flags |= extended_flags;
06aaaa0b
NTND
1717 name = ondisk2->name;
1718 }
1719 else
1720 name = ondisk->name;
1721
6c9cd161
JH
1722 if (!previous_name) {
1723 /* v3 and earlier */
1724 if (len == CE_NAMEMASK)
1725 len = strlen(name);
1726 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1727
1728 *ent_size = ondisk_ce_size(ce);
1729 } else {
1730 unsigned long consumed;
1731 consumed = expand_name_field(previous_name, name);
1732 ce = cache_entry_from_ondisk(ondisk, flags,
1733 previous_name->buf,
1734 previous_name->len);
1735
1736 *ent_size = (name - ((char *)ondisk)) + consumed;
1737 }
debed2a6 1738 return ce;
cf558704
LT
1739}
1740
03f15a79 1741static void check_ce_order(struct index_state *istate)
15999d0b 1742{
03f15a79
TG
1743 unsigned int i;
1744
00ec50e5
BP
1745 if (!verify_ce_order)
1746 return;
1747
03f15a79
TG
1748 for (i = 1; i < istate->cache_nr; i++) {
1749 struct cache_entry *ce = istate->cache[i - 1];
1750 struct cache_entry *next_ce = istate->cache[i];
1751 int name_compare = strcmp(ce->name, next_ce->name);
1752
1753 if (0 < name_compare)
1754 die("unordered stage entries in index");
1755 if (!name_compare) {
1756 if (!ce_stage(ce))
1757 die("multiple stage entries for merged file '%s'",
1758 ce->name);
1759 if (ce_stage(ce) > ce_stage(next_ce))
1760 die("unordered stage entries for '%s'",
1761 ce->name);
1762 }
15999d0b
JSP
1763 }
1764}
1765
435ec090
CC
1766static void tweak_untracked_cache(struct index_state *istate)
1767{
1768 switch (git_config_get_untracked_cache()) {
1769 case -1: /* keep: do nothing */
1770 break;
1771 case 0: /* false */
1772 remove_untracked_cache(istate);
1773 break;
1774 case 1: /* true */
1775 add_untracked_cache(istate);
1776 break;
1777 default: /* unknown value: do nothing */
1778 break;
1779 }
1780}
1781
43925312
CC
1782static void tweak_split_index(struct index_state *istate)
1783{
1784 switch (git_config_get_split_index()) {
1785 case -1: /* unset: do nothing */
1786 break;
1787 case 0: /* false */
1788 remove_split_index(istate);
1789 break;
1790 case 1: /* true */
1791 add_split_index(istate);
1792 break;
1793 default: /* unknown value: do nothing */
1794 break;
1795 }
1796}
1797
435ec090
CC
1798static void post_read_index_from(struct index_state *istate)
1799{
1800 check_ce_order(istate);
1801 tweak_untracked_cache(istate);
43925312 1802 tweak_split_index(istate);
883e248b 1803 tweak_fsmonitor(istate);
435ec090
CC
1804}
1805
8fd2cb40 1806/* remember to discard_cache() before reading a different cache! */
3e52f70b 1807int do_read_index(struct index_state *istate, const char *path, int must_exist)
e83c5163
LT
1808{
1809 int fd, i;
1810 struct stat st;
debed2a6 1811 unsigned long src_offset;
e83c5163 1812 struct cache_header *hdr;
7a51ed66
LT
1813 void *mmap;
1814 size_t mmap_size;
6c9cd161 1815 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
e83c5163 1816
913e0e99 1817 if (istate->initialized)
4aab5b46 1818 return istate->cache_nr;
5d1a5c02 1819
fba2f38a
KB
1820 istate->timestamp.sec = 0;
1821 istate->timestamp.nsec = 0;
8fd2cb40 1822 fd = open(path, O_RDONLY);
5d1a5c02 1823 if (fd < 0) {
5fc2fc8f 1824 if (!must_exist && errno == ENOENT)
5d1a5c02 1825 return 0;
5fc2fc8f 1826 die_errno("%s: index file open failed", path);
5d1a5c02 1827 }
e83c5163 1828
3511a377 1829 if (fstat(fd, &st))
d824cbba 1830 die_errno("cannot stat the open index");
3511a377 1831
7a51ed66 1832 mmap_size = xsize_t(st.st_size);
aab61359 1833 if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
3511a377
LFC
1834 die("index file smaller than expected");
1835
a1293ef7 1836 mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
7a51ed66 1837 if (mmap == MAP_FAILED)
0721c314 1838 die_errno("unable to map index file");
57d84f8d 1839 close(fd);
e83c5163 1840
7a51ed66
LT
1841 hdr = mmap;
1842 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1843 goto unmap;
1844
aab61359 1845 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
9d227781 1846 istate->version = ntohl(hdr->hdr_version);
4aab5b46
JH
1847 istate->cache_nr = ntohl(hdr->hdr_entries);
1848 istate->cache_alloc = alloc_nr(istate->cache_nr);
c4aa3167 1849 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
913e0e99 1850 istate->initialized = 1;
7a51ed66 1851
9d227781 1852 if (istate->version == 4)
6c9cd161
JH
1853 previous_name = &previous_name_buf;
1854 else
1855 previous_name = NULL;
1856
7a51ed66 1857 src_offset = sizeof(*hdr);
4aab5b46 1858 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1859 struct ondisk_cache_entry *disk_ce;
4aab5b46 1860 struct cache_entry *ce;
936f53d0 1861 unsigned long consumed;
4aab5b46 1862
7a51ed66 1863 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
6c9cd161 1864 ce = create_from_disk(disk_ce, &consumed, previous_name);
cf558704 1865 set_index_entry(istate, i, ce);
7a51ed66 1866
936f53d0 1867 src_offset += consumed;
e83c5163 1868 }
6c9cd161 1869 strbuf_release(&previous_name_buf);
fba2f38a 1870 istate->timestamp.sec = st.st_mtime;
c06ff490 1871 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 1872
aab61359 1873 while (src_offset <= mmap_size - the_hash_algo->rawsz - 8) {
bad68ec9
JH
1874 /* After an array of active_nr index entries,
1875 * there can be arbitrary number of extended
1876 * sections, each of which is prefixed with
1877 * extension name (4-byte) and section length
1878 * in 4-byte network byte order.
1879 */
07cc8eca 1880 uint32_t extsize;
7a51ed66 1881 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1882 extsize = ntohl(extsize);
4aab5b46 1883 if (read_index_extension(istate,
7a51ed66
LT
1884 (const char *) mmap + src_offset,
1885 (char *) mmap + src_offset + 8,
1d7f171c 1886 extsize) < 0)
bad68ec9 1887 goto unmap;
7a51ed66
LT
1888 src_offset += 8;
1889 src_offset += extsize;
bad68ec9 1890 }
7a51ed66 1891 munmap(mmap, mmap_size);
4aab5b46 1892 return istate->cache_nr;
e83c5163
LT
1893
1894unmap:
7a51ed66 1895 munmap(mmap, mmap_size);
5d1a5c02 1896 die("index file corrupt");
e83c5163
LT
1897}
1898
0d59ffb4
CC
1899/*
1900 * Signal that the shared index is used by updating its mtime.
1901 *
1902 * This way, shared index can be removed if they have not been used
1903 * for some time.
1904 */
a125a223 1905static void freshen_shared_index(const char *shared_index, int warn)
0d59ffb4 1906{
0d59ffb4
CC
1907 if (!check_and_freshen_file(shared_index, 1) && warn)
1908 warning("could not freshen shared index '%s'", shared_index);
1909}
1910
a125a223
TG
1911int read_index_from(struct index_state *istate, const char *path,
1912 const char *gitdir)
5fc2fc8f 1913{
ca54d9ba 1914 uint64_t start = getnanotime();
5fc2fc8f
NTND
1915 struct split_index *split_index;
1916 int ret;
de6ae5f9 1917 char *base_sha1_hex;
a125a223 1918 char *base_path;
5fc2fc8f
NTND
1919
1920 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1921 if (istate->initialized)
1922 return istate->cache_nr;
1923
1924 ret = do_read_index(istate, path, 0);
ca54d9ba 1925 trace_performance_since(start, "read cache %s", path);
435ec090 1926
5fc2fc8f 1927 split_index = istate->split_index;
03f15a79 1928 if (!split_index || is_null_sha1(split_index->base_sha1)) {
435ec090 1929 post_read_index_from(istate);
5fc2fc8f 1930 return ret;
03f15a79 1931 }
5fc2fc8f
NTND
1932
1933 if (split_index->base)
1934 discard_index(split_index->base);
1935 else
1936 split_index->base = xcalloc(1, sizeof(*split_index->base));
de6ae5f9
CC
1937
1938 base_sha1_hex = sha1_to_hex(split_index->base_sha1);
a125a223 1939 base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_sha1_hex);
de6ae5f9 1940 ret = do_read_index(split_index->base, base_path, 1);
5fc2fc8f
NTND
1941 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1942 die("broken index, expect %s in %s, got %s",
de6ae5f9 1943 base_sha1_hex, base_path,
5fc2fc8f 1944 sha1_to_hex(split_index->base->sha1));
de6ae5f9 1945
a125a223 1946 freshen_shared_index(base_path, 0);
5fc2fc8f 1947 merge_base_index(istate);
435ec090 1948 post_read_index_from(istate);
ca54d9ba 1949 trace_performance_since(start, "read cache %s", base_path);
a125a223 1950 free(base_path);
5fc2fc8f
NTND
1951 return ret;
1952}
1953
fa7b3c2f
JH
1954int is_index_unborn(struct index_state *istate)
1955{
debed2a6 1956 return (!istate->cache_nr && !istate->timestamp.sec);
fa7b3c2f
JH
1957}
1958
4aab5b46 1959int discard_index(struct index_state *istate)
6d297f81 1960{
debed2a6
RS
1961 int i;
1962
64719b11
JH
1963 for (i = 0; i < istate->cache_nr; i++) {
1964 if (istate->cache[i]->index &&
1965 istate->split_index &&
1966 istate->split_index->base &&
1967 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1968 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1969 continue;
debed2a6 1970 free(istate->cache[i]);
64719b11 1971 }
cfc5789a 1972 resolve_undo_clear_index(istate);
4aab5b46
JH
1973 istate->cache_nr = 0;
1974 istate->cache_changed = 0;
fba2f38a
KB
1975 istate->timestamp.sec = 0;
1976 istate->timestamp.nsec = 0;
2092678c 1977 free_name_hash(istate);
4aab5b46 1978 cache_tree_free(&(istate->cache_tree));
913e0e99 1979 istate->initialized = 0;
6a83d902 1980 FREE_AND_NULL(istate->cache);
a0fc4db0 1981 istate->cache_alloc = 0;
5fc2fc8f 1982 discard_split_index(istate);
f9e6c649
NTND
1983 free_untracked_cache(istate->untracked);
1984 istate->untracked = NULL;
7a51ed66 1985 return 0;
6d297f81
JS
1986}
1987
d1f128b0 1988int unmerged_index(const struct index_state *istate)
94a5728c
DB
1989{
1990 int i;
1991 for (i = 0; i < istate->cache_nr; i++) {
1992 if (ce_stage(istate->cache[i]))
1993 return 1;
1994 }
1995 return 0;
1996}
1997
4990aadc 1998#define WRITE_BUFFER_SIZE 8192
bf0f910d 1999static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
2000static unsigned long write_buffer_len;
2001
aab61359 2002static int ce_write_flush(git_hash_ctx *context, int fd)
6015c28b
JH
2003{
2004 unsigned int buffered = write_buffer_len;
2005 if (buffered) {
aab61359 2006 the_hash_algo->update_fn(context, write_buffer, buffered);
06f46f23 2007 if (write_in_full(fd, write_buffer, buffered) < 0)
6015c28b
JH
2008 return -1;
2009 write_buffer_len = 0;
2010 }
2011 return 0;
2012}
2013
aab61359 2014static int ce_write(git_hash_ctx *context, int fd, void *data, unsigned int len)
4990aadc
LT
2015{
2016 while (len) {
2017 unsigned int buffered = write_buffer_len;
2018 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
2019 if (partial > len)
2020 partial = len;
2021 memcpy(write_buffer + buffered, data, partial);
2022 buffered += partial;
2023 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
2024 write_buffer_len = buffered;
2025 if (ce_write_flush(context, fd))
4990aadc
LT
2026 return -1;
2027 buffered = 0;
2028 }
2029 write_buffer_len = buffered;
2030 len -= partial;
1d7f171c 2031 data = (char *) data + partial;
a6080a0a
JH
2032 }
2033 return 0;
4990aadc
LT
2034}
2035
aab61359 2036static int write_index_ext_header(git_hash_ctx *context, int fd,
ac58c7b1 2037 unsigned int ext, unsigned int sz)
bad68ec9
JH
2038{
2039 ext = htonl(ext);
2040 sz = htonl(sz);
968a1d65
DR
2041 return ((ce_write(context, fd, &ext, 4) < 0) ||
2042 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
2043}
2044
aab61359 2045static int ce_flush(git_hash_ctx *context, int fd, unsigned char *hash)
4990aadc
LT
2046{
2047 unsigned int left = write_buffer_len;
ca9be054 2048
4990aadc
LT
2049 if (left) {
2050 write_buffer_len = 0;
aab61359 2051 the_hash_algo->update_fn(context, write_buffer, left);
4990aadc 2052 }
ca9be054 2053
aab61359 2054 /* Flush first if not enough space for hash signature */
2055 if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) {
06f46f23 2056 if (write_in_full(fd, write_buffer, left) < 0)
2c865d9a
QH
2057 return -1;
2058 left = 0;
2059 }
2060
aab61359 2061 /* Append the hash signature at the end */
2062 the_hash_algo->final_fn(write_buffer + left, context);
2063 hashcpy(hash, write_buffer + left);
2064 left += the_hash_algo->rawsz;
06f46f23 2065 return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0;
4990aadc
LT
2066}
2067
407c8eb0
JH
2068static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
2069{
2070 /*
2071 * The only thing we care about in this function is to smudge the
2072 * falsely clean entry due to touch-update-touch race, so we leave
2073 * everything else as they are. We are called for entries whose
c21d39d7 2074 * ce_stat_data.sd_mtime match the index file mtime.
c70115b4
JH
2075 *
2076 * Note that this actually does not do much for gitlinks, for
2077 * which ce_match_stat_basic() always goes to the actual
2078 * contents. The caller checks with is_racy_timestamp() which
2079 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
2080 */
2081 struct stat st;
2082
2083 if (lstat(ce->name, &st) < 0)
2084 return;
2085 if (ce_match_stat_basic(ce, &st))
2086 return;
2087 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
2088 /* This is "racily clean"; smudge it. Note that this
2089 * is a tricky code. At first glance, it may appear
2090 * that it can break with this sequence:
2091 *
2092 * $ echo xyzzy >frotz
2093 * $ git-update-index --add frotz
2094 * $ : >frotz
2095 * $ sleep 3
2096 * $ echo filfre >nitfol
2097 * $ git-update-index --add nitfol
2098 *
b7e58b17 2099 * but it does not. When the second update-index runs,
4b3511b0
JH
2100 * it notices that the entry "frotz" has the same timestamp
2101 * as index, and if we were to smudge it by resetting its
2102 * size to zero here, then the object name recorded
2103 * in index is the 6-byte file but the cached stat information
2104 * becomes zero --- which would then match what we would
a6080a0a 2105 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
2106 *
2107 * However, the second update-index, before calling
2108 * this function, notices that the cached size is 6
2109 * bytes and what is on the filesystem is an empty
2110 * file, and never calls us, so the cached size information
2111 * for "frotz" stays 6 which does not match the filesystem.
2112 */
c21d39d7 2113 ce->ce_stat_data.sd_size = 0;
407c8eb0
JH
2114 }
2115}
2116
f136f7bf 2117/* Copy miscellaneous fields but not the name */
ce012deb 2118static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
f136f7bf 2119 struct cache_entry *ce)
7a51ed66 2120{
b60e188c
TG
2121 short flags;
2122
c21d39d7
MH
2123 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
2124 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
2125 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
2126 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
2127 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
2128 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
7a51ed66 2129 ondisk->mode = htonl(ce->ce_mode);
c21d39d7
MH
2130 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
2131 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
2132 ondisk->size = htonl(ce->ce_stat_data.sd_size);
99d1a986 2133 hashcpy(ondisk->sha1, ce->oid.hash);
b60e188c 2134
ce51bf09 2135 flags = ce->ce_flags & ~CE_NAMEMASK;
b60e188c
TG
2136 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
2137 ondisk->flags = htons(flags);
06aaaa0b
NTND
2138 if (ce->ce_flags & CE_EXTENDED) {
2139 struct ondisk_cache_entry_extended *ondisk2;
2140 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
2141 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
f136f7bf
JH
2142 }
2143}
2144
aab61359 2145static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
ce012deb 2146 struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
f136f7bf 2147{
9d227781 2148 int size;
f136f7bf 2149 int result;
00a4b035
RJ
2150 unsigned int saved_namelen;
2151 int stripped_name = 0;
ce012deb 2152 static unsigned char padding[8] = { 0x00 };
f136f7bf 2153
b3c96fb1
NTND
2154 if (ce->ce_flags & CE_STRIP_NAME) {
2155 saved_namelen = ce_namelen(ce);
2156 ce->ce_namelen = 0;
00a4b035 2157 stripped_name = 1;
b3c96fb1
NTND
2158 }
2159
ce012deb
KW
2160 if (ce->ce_flags & CE_EXTENDED)
2161 size = offsetof(struct ondisk_cache_entry_extended, name);
2162 else
2163 size = offsetof(struct ondisk_cache_entry, name);
2164
9d227781 2165 if (!previous_name) {
ce012deb
KW
2166 int len = ce_namelen(ce);
2167 copy_cache_entry_to_ondisk(ondisk, ce);
2168 result = ce_write(c, fd, ondisk, size);
2169 if (!result)
2170 result = ce_write(c, fd, ce->name, len);
2171 if (!result)
2172 result = ce_write(c, fd, padding, align_padding_size(size, len));
9d227781
JH
2173 } else {
2174 int common, to_remove, prefix_size;
2175 unsigned char to_remove_vi[16];
2176 for (common = 0;
2177 (ce->name[common] &&
2178 common < previous_name->len &&
2179 ce->name[common] == previous_name->buf[common]);
2180 common++)
2181 ; /* still matching */
2182 to_remove = previous_name->len - common;
2183 prefix_size = encode_varint(to_remove, to_remove_vi);
2184
ce012deb
KW
2185 copy_cache_entry_to_ondisk(ondisk, ce);
2186 result = ce_write(c, fd, ondisk, size);
2187 if (!result)
2188 result = ce_write(c, fd, to_remove_vi, prefix_size);
2189 if (!result)
0b90b881
TG
2190 result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
2191 if (!result)
2192 result = ce_write(c, fd, padding, 1);
9d227781
JH
2193
2194 strbuf_splice(previous_name, common, to_remove,
2195 ce->name + common, ce_namelen(ce) - common);
06aaaa0b 2196 }
00a4b035 2197 if (stripped_name) {
b3c96fb1
NTND
2198 ce->ce_namelen = saved_namelen;
2199 ce->ce_flags &= ~CE_STRIP_NAME;
2200 }
7a51ed66 2201
59efba64 2202 return result;
7a51ed66
LT
2203}
2204
426ddeea
YM
2205/*
2206 * This function verifies if index_state has the correct sha1 of the
2207 * index file. Don't die if we have any other failure, just return 0.
2208 */
2209static int verify_index_from(const struct index_state *istate, const char *path)
2210{
2211 int fd;
2212 ssize_t n;
2213 struct stat st;
aab61359 2214 unsigned char hash[GIT_MAX_RAWSZ];
426ddeea
YM
2215
2216 if (!istate->initialized)
2217 return 0;
2218
2219 fd = open(path, O_RDONLY);
2220 if (fd < 0)
2221 return 0;
2222
2223 if (fstat(fd, &st))
2224 goto out;
2225
aab61359 2226 if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
426ddeea
YM
2227 goto out;
2228
aab61359 2229 n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz);
2230 if (n != the_hash_algo->rawsz)
426ddeea
YM
2231 goto out;
2232
aab61359 2233 if (hashcmp(istate->sha1, hash))
426ddeea
YM
2234 goto out;
2235
2236 close(fd);
2237 return 1;
2238
2239out:
2240 close(fd);
2241 return 0;
2242}
2243
2244static int verify_index(const struct index_state *istate)
2245{
2246 return verify_index_from(istate, get_index_file());
2247}
2248
483fbe2b
JH
2249static int has_racy_timestamp(struct index_state *istate)
2250{
2251 int entries = istate->cache_nr;
2252 int i;
2253
2254 for (i = 0; i < entries; i++) {
2255 struct cache_entry *ce = istate->cache[i];
2256 if (is_racy_timestamp(istate, ce))
2257 return 1;
2258 }
2259 return 0;
2260}
2261
ccdc4ec3
JH
2262void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
2263{
483fbe2b 2264 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
df60cf57
2265 verify_index(istate))
2266 write_locked_index(istate, lockfile, COMMIT_LOCK);
b74c90fb
2267 else
2268 rollback_lock_file(lockfile);
ccdc4ec3
JH
2269}
2270
812d6b00
2271/*
2272 * On success, `tempfile` is closed. If it is the temporary file
2273 * of a `struct lock_file`, we will therefore effectively perform
2274 * a 'close_lock_file_gently()`. Since that is an implementation
2275 * detail of lockfiles, callers of `do_write_index()` should not
2276 * rely on it.
2277 */
9f41c7a6 2278static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
c18b80a0 2279 int strip_extensions)
197ee8c9 2280{
ca54d9ba 2281 uint64_t start = getnanotime();
9f41c7a6 2282 int newfd = tempfile->fd;
aab61359 2283 git_hash_ctx c;
197ee8c9 2284 struct cache_header hdr;
b50386c7 2285 int i, err = 0, removed, extended, hdr_version;
4aab5b46
JH
2286 struct cache_entry **cache = istate->cache;
2287 int entries = istate->cache_nr;
e1afca4f 2288 struct stat st;
ce012deb 2289 struct ondisk_cache_entry_extended ondisk;
9d227781 2290 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
4bddd983 2291 int drop_cache_tree = istate->drop_cache_tree;
025a0709 2292
06aaaa0b 2293 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 2294 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 2295 removed++;
197ee8c9 2296
06aaaa0b
NTND
2297 /* reduce extended entries if possible */
2298 cache[i]->ce_flags &= ~CE_EXTENDED;
2299 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2300 extended++;
2301 cache[i]->ce_flags |= CE_EXTENDED;
2302 }
2303 }
2304
d6e3c181 2305 if (!istate->version) {
136347d7 2306 istate->version = get_index_format_default();
d6e3c181
NTND
2307 if (getenv("GIT_TEST_SPLIT_INDEX"))
2308 init_split_index(istate);
2309 }
9d227781
JH
2310
2311 /* demote version 3 to version 2 when the latter suffices */
2312 if (istate->version == 3 || istate->version == 2)
2313 istate->version = extended ? 3 : 2;
2314
2315 hdr_version = istate->version;
2316
ccc4feb5 2317 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
9d227781 2318 hdr.hdr_version = htonl(hdr_version);
025a0709 2319 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 2320
aab61359 2321 the_hash_algo->init_fn(&c);
ca9be054 2322 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
2323 return -1;
2324
9d227781 2325 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
ce012deb 2326
197ee8c9
LT
2327 for (i = 0; i < entries; i++) {
2328 struct cache_entry *ce = cache[i];
7a51ed66 2329 if (ce->ce_flags & CE_REMOVE)
aa16021e 2330 continue;
e06c43c7 2331 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
407c8eb0 2332 ce_smudge_racily_clean_entry(ce);
99d1a986 2333 if (is_null_oid(&ce->oid)) {
83bd7437
JK
2334 static const char msg[] = "cache entry has null sha1: %s";
2335 static int allow = -1;
2336
2337 if (allow < 0)
2338 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2339 if (allow)
2340 warning(msg, ce->name);
2341 else
b50386c7 2342 err = error(msg, ce->name);
a96d3cc3
JK
2343
2344 drop_cache_tree = 1;
83bd7437 2345 }
ce012deb 2346 if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
b50386c7
KW
2347 err = -1;
2348
2349 if (err)
2350 break;
197ee8c9 2351 }
9d227781 2352 strbuf_release(&previous_name_buf);
1af1c2b6 2353
b50386c7
KW
2354 if (err)
2355 return err;
2356
bad68ec9 2357 /* Write extension data here */
c18b80a0 2358 if (!strip_extensions && istate->split_index) {
5fc2fc8f
NTND
2359 struct strbuf sb = STRBUF_INIT;
2360
2361 err = write_link_extension(&sb, istate) < 0 ||
2362 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2363 sb.len) < 0 ||
2364 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2365 strbuf_release(&sb);
2366 if (err)
2367 return -1;
2368 }
a96d3cc3 2369 if (!strip_extensions && !drop_cache_tree && istate->cache_tree) {
f285a2d7 2370 struct strbuf sb = STRBUF_INIT;
1dffb8fa 2371
1dffb8fa
PH
2372 cache_tree_write(&sb, istate->cache_tree);
2373 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2374 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2375 strbuf_release(&sb);
2376 if (err)
bad68ec9 2377 return -1;
bad68ec9 2378 }
c18b80a0 2379 if (!strip_extensions && istate->resolve_undo) {
cfc5789a
JH
2380 struct strbuf sb = STRBUF_INIT;
2381
2382 resolve_undo_write(&sb, istate->resolve_undo);
2383 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2384 sb.len) < 0
2385 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2386 strbuf_release(&sb);
2387 if (err)
2388 return -1;
2389 }
83c094ad
NTND
2390 if (!strip_extensions && istate->untracked) {
2391 struct strbuf sb = STRBUF_INIT;
2392
2393 write_untracked_extension(&sb, istate->untracked);
2394 err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
2395 sb.len) < 0 ||
2396 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2397 strbuf_release(&sb);
2398 if (err)
2399 return -1;
2400 }
883e248b
BP
2401 if (!strip_extensions && istate->fsmonitor_last_update) {
2402 struct strbuf sb = STRBUF_INIT;
2403
2404 write_fsmonitor_extension(&sb, istate);
2405 err = write_index_ext_header(&c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0
2406 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2407 strbuf_release(&sb);
2408 if (err)
2409 return -1;
2410 }
e1afca4f 2411
9f41c7a6
JH
2412 if (ce_flush(&c, newfd, istate->sha1))
2413 return -1;
49bd0fc2
JK
2414 if (close_tempfile_gently(tempfile)) {
2415 error(_("could not close '%s'"), tempfile->filename.buf);
49bd0fc2
JK
2416 return -1;
2417 }
9f41c7a6 2418 if (stat(tempfile->filename.buf, &st))
e1afca4f 2419 return -1;
5bcf109c
KB
2420 istate->timestamp.sec = (unsigned int)st.st_mtime;
2421 istate->timestamp.nsec = ST_MTIME_NSEC(st);
ca54d9ba 2422 trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
e1afca4f 2423 return 0;
197ee8c9 2424}
e46bbcf6 2425
626f35c8
NTND
2426void set_alternate_index_output(const char *name)
2427{
2428 alternate_index_output = name;
2429}
2430
2431static int commit_locked_index(struct lock_file *lk)
2432{
751baced
MH
2433 if (alternate_index_output)
2434 return commit_lock_file_to(lk, alternate_index_output);
2435 else
626f35c8 2436 return commit_lock_file(lk);
626f35c8
NTND
2437}
2438
03b86647
NTND
2439static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2440 unsigned flags)
2441{
076aa2cb 2442 int ret = do_write_index(istate, lock->tempfile, 0);
03b86647
NTND
2443 if (ret)
2444 return ret;
03b86647
NTND
2445 if (flags & COMMIT_LOCK)
2446 return commit_locked_index(lock);
812d6b00 2447 return close_lock_file_gently(lock);
03b86647
NTND
2448}
2449
5fc2fc8f
NTND
2450static int write_split_index(struct index_state *istate,
2451 struct lock_file *lock,
2452 unsigned flags)
2453{
2454 int ret;
2455 prepare_to_write_split_index(istate);
2456 ret = do_write_locked_index(istate, lock, flags);
2457 finish_writing_split_index(istate);
2458 return ret;
2459}
2460
b9683722
CC
2461static const char *shared_index_expire = "2.weeks.ago";
2462
2463static unsigned long get_shared_index_expire_date(void)
2464{
2465 static unsigned long shared_index_expire_date;
2466 static int shared_index_expire_date_prepared;
2467
2468 if (!shared_index_expire_date_prepared) {
2469 git_config_get_expiry("splitindex.sharedindexexpire",
2470 &shared_index_expire);
2471 shared_index_expire_date = approxidate(shared_index_expire);
2472 shared_index_expire_date_prepared = 1;
2473 }
2474
2475 return shared_index_expire_date;
2476}
2477
2478static int should_delete_shared_index(const char *shared_index_path)
2479{
2480 struct stat st;
2481 unsigned long expiration;
2482
2483 /* Check timestamp */
2484 expiration = get_shared_index_expire_date();
2485 if (!expiration)
2486 return 0;
2487 if (stat(shared_index_path, &st))
78bde923 2488 return error_errno(_("could not stat '%s'"), shared_index_path);
b9683722
CC
2489 if (st.st_mtime > expiration)
2490 return 0;
2491
2492 return 1;
2493}
2494
2495static int clean_shared_index_files(const char *current_hex)
2496{
2497 struct dirent *de;
2498 DIR *dir = opendir(get_git_dir());
2499
2500 if (!dir)
2501 return error_errno(_("unable to open git dir: %s"), get_git_dir());
2502
2503 while ((de = readdir(dir)) != NULL) {
2504 const char *sha1_hex;
2505 const char *shared_index_path;
2506 if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
2507 continue;
2508 if (!strcmp(sha1_hex, current_hex))
2509 continue;
2510 shared_index_path = git_path("%s", de->d_name);
2511 if (should_delete_shared_index(shared_index_path) > 0 &&
2512 unlink(shared_index_path))
2513 warning_errno(_("unable to unlink: %s"), shared_index_path);
2514 }
2515 closedir(dir);
2516
2517 return 0;
2518}
2519
a0a96756 2520static int write_shared_index(struct index_state *istate,
59f9d2dd 2521 struct tempfile **temp)
c18b80a0
NTND
2522{
2523 struct split_index *si = istate->split_index;
076aa2cb 2524 int ret;
c18b80a0 2525
c18b80a0 2526 move_cache_to_base_index(istate);
7db2d08c 2527 ret = do_write_index(si->base, *temp, 1);
59f9d2dd 2528 if (ret)
c18b80a0 2529 return ret;
7db2d08c 2530 ret = adjust_shared_perm(get_tempfile_path(*temp));
df801f3f 2531 if (ret) {
7db2d08c 2532 error("cannot fix permission bits on %s", get_tempfile_path(*temp));
df801f3f
CC
2533 return ret;
2534 }
7db2d08c 2535 ret = rename_tempfile(temp,
f6ecc62d 2536 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
b9683722 2537 if (!ret) {
c18b80a0 2538 hashcpy(si->base_sha1, si->base->sha1);
b9683722
CC
2539 clean_shared_index_files(sha1_to_hex(si->base->sha1));
2540 }
2541
c18b80a0
NTND
2542 return ret;
2543}
2544
e6a1dd77
CC
2545static const int default_max_percent_split_change = 20;
2546
2547static int too_many_not_shared_entries(struct index_state *istate)
2548{
2549 int i, not_shared = 0;
2550 int max_split = git_config_get_max_percent_split_change();
2551
2552 switch (max_split) {
2553 case -1:
2554 /* not or badly configured: use the default value */
2555 max_split = default_max_percent_split_change;
2556 break;
2557 case 0:
2558 return 1; /* 0% means always write a new shared index */
2559 case 100:
2560 return 0; /* 100% means never write a new shared index */
2561 default:
2562 break; /* just use the configured value */
2563 }
2564
2565 /* Count not shared entries */
2566 for (i = 0; i < istate->cache_nr; i++) {
2567 struct cache_entry *ce = istate->cache[i];
2568 if (!ce->index)
2569 not_shared++;
2570 }
2571
2572 return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100;
2573}
2574
03b86647
NTND
2575int write_locked_index(struct index_state *istate, struct lock_file *lock,
2576 unsigned flags)
2577{
0d59ffb4 2578 int new_shared_index, ret;
5fc2fc8f
NTND
2579 struct split_index *si = istate->split_index;
2580
61000814
2581 if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
2582 if (flags & COMMIT_LOCK)
2583 rollback_lock_file(lock);
2584 return 0;
2585 }
2586
3bd28eb2
AV
2587 if (istate->fsmonitor_last_update)
2588 fill_fsmonitor_bitmap(istate);
2589
5165dd59
NTND
2590 if (!si || alternate_index_output ||
2591 (istate->cache_changed & ~EXTMASK)) {
5fc2fc8f
NTND
2592 if (si)
2593 hashclr(si->base_sha1);
df60cf57
2594 ret = do_write_locked_index(istate, lock, flags);
2595 goto out;
5fc2fc8f
NTND
2596 }
2597
d6e3c181
NTND
2598 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2599 int v = si->base_sha1[0];
2600 if ((v & 15) < 6)
2601 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2602 }
e6a1dd77
CC
2603 if (too_many_not_shared_entries(istate))
2604 istate->cache_changed |= SPLIT_INDEX_ORDERED;
0d59ffb4
CC
2605
2606 new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
2607
2608 if (new_shared_index) {
59f9d2dd
NTND
2609 struct tempfile *temp;
2610 int saved_errno;
2611
2612 temp = mks_tempfile(git_path("sharedindex_XXXXXX"));
2613 if (!temp) {
2614 hashclr(si->base_sha1);
2615 ret = do_write_locked_index(istate, lock, flags);
ef5b3a6c
NTND
2616 goto out;
2617 }
2618 ret = write_shared_index(istate, &temp);
59f9d2dd
NTND
2619
2620 saved_errno = errno;
2621 if (is_tempfile_active(temp))
2622 delete_tempfile(&temp);
2623 errno = saved_errno;
2624
c18b80a0 2625 if (ret)
df60cf57 2626 goto out;
c18b80a0
NTND
2627 }
2628
0d59ffb4
CC
2629 ret = write_split_index(istate, lock, flags);
2630
2631 /* Freshen the shared index only if the split-index was written */
a125a223
TG
2632 if (!ret && !new_shared_index) {
2633 const char *shared_index = git_path("sharedindex.%s",
2634 sha1_to_hex(si->base_sha1));
2635 freshen_shared_index(shared_index, 1);
2636 }
0d59ffb4 2637
df60cf57
2638out:
2639 if (flags & COMMIT_LOCK)
2640 rollback_lock_file(lock);
0d59ffb4 2641 return ret;
03b86647
NTND
2642}
2643
e46bbcf6
MV
2644/*
2645 * Read the index file that is potentially unmerged into given
63e8dc5b 2646 * index_state, dropping any unmerged entries. Returns true if
e46bbcf6
MV
2647 * the index is unmerged. Callers who want to refuse to work
2648 * from an unmerged state can call this and check its return value,
2649 * instead of calling read_cache().
2650 */
2651int read_index_unmerged(struct index_state *istate)
2652{
2653 int i;
d1a43f2a 2654 int unmerged = 0;
e46bbcf6
MV
2655
2656 read_index(istate);
e46bbcf6
MV
2657 for (i = 0; i < istate->cache_nr; i++) {
2658 struct cache_entry *ce = istate->cache[i];
d1a43f2a
JH
2659 struct cache_entry *new_ce;
2660 int size, len;
2661
2662 if (!ce_stage(ce))
e46bbcf6 2663 continue;
d1a43f2a 2664 unmerged = 1;
68c4f6a5 2665 len = ce_namelen(ce);
d1a43f2a
JH
2666 size = cache_entry_size(len);
2667 new_ce = xcalloc(1, size);
d1a43f2a 2668 memcpy(new_ce->name, ce->name, len);
b60e188c
TG
2669 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2670 new_ce->ce_namelen = len;
d1a43f2a
JH
2671 new_ce->ce_mode = ce->ce_mode;
2672 if (add_index_entry(istate, new_ce, 0))
2673 return error("%s: cannot drop to stage #0",
5699d17e 2674 new_ce->name);
e46bbcf6 2675 }
d1a43f2a 2676 return unmerged;
e46bbcf6 2677}
041aee31 2678
98fa4738
JK
2679/*
2680 * Returns 1 if the path is an "other" path with respect to
2681 * the index; that is, the path is not mentioned in the index at all,
2682 * either as a file, a directory with some files in the index,
2683 * or as an unmerged entry.
2684 *
2685 * We helpfully remove a trailing "/" from directories so that
2686 * the output of read_directory can be used as-is.
2687 */
2688int index_name_is_other(const struct index_state *istate, const char *name,
2689 int namelen)
2690{
2691 int pos;
2692 if (namelen && name[namelen - 1] == '/')
2693 namelen--;
2694 pos = index_name_pos(istate, name, namelen);
2695 if (0 <= pos)
2696 return 0; /* exact match */
2697 pos = -pos - 1;
2698 if (pos < istate->cache_nr) {
2699 struct cache_entry *ce = istate->cache[pos];
2700 if (ce_namelen(ce) == namelen &&
2701 !memcmp(ce->name, name, namelen))
2702 return 0; /* Yup, this one exists unmerged */
2703 }
2704 return 1;
2705}
29fb37b2 2706
87542508
BW
2707void *read_blob_data_from_index(const struct index_state *istate,
2708 const char *path, unsigned long *size)
29fb37b2
LF
2709{
2710 int pos, len;
2711 unsigned long sz;
2712 enum object_type type;
2713 void *data;
2714
2715 len = strlen(path);
2716 pos = index_name_pos(istate, path, len);
2717 if (pos < 0) {
2718 /*
2719 * We might be in the middle of a merge, in which
2720 * case we would read stage #2 (ours).
2721 */
2722 int i;
2723 for (i = -pos - 1;
2724 (pos < 0 && i < istate->cache_nr &&
2725 !strcmp(istate->cache[i]->name, path));
2726 i++)
2727 if (ce_stage(istate->cache[i]) == 2)
2728 pos = i;
2729 }
2730 if (pos < 0)
2731 return NULL;
99d1a986 2732 data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
29fb37b2
LF
2733 if (!data || type != OBJ_BLOB) {
2734 free(data);
2735 return NULL;
2736 }
ff366825
LF
2737 if (size)
2738 *size = sz;
29fb37b2
LF
2739 return data;
2740}
38612532
MH
2741
2742void stat_validity_clear(struct stat_validity *sv)
2743{
6a83d902 2744 FREE_AND_NULL(sv->sd);
38612532
MH
2745}
2746
2747int stat_validity_check(struct stat_validity *sv, const char *path)
2748{
2749 struct stat st;
2750
2751 if (stat(path, &st) < 0)
2752 return sv->sd == NULL;
2753 if (!sv->sd)
2754 return 0;
2755 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2756}
2757
2758void stat_validity_update(struct stat_validity *sv, int fd)
2759{
2760 struct stat st;
2761
2762 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2763 stat_validity_clear(sv);
2764 else {
2765 if (!sv->sd)
2766 sv->sd = xcalloc(1, sizeof(struct stat_data));
2767 fill_stat_data(sv->sd, &st);
2768 }
2769}
edf3b905
DT
2770
2771void move_index_extensions(struct index_state *dst, struct index_state *src)
2772{
2773 dst->untracked = src->untracked;
2774 src->untracked = NULL;
2775}