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