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