]> git.ipfire.org Git - thirdparty/git.git/blame - read-cache.c
verify_path: disallow symlinks in .gitmodules
[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
10ecfa76 735 if (!verify_path(path, mode)) {
7e7abea9 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 */
10ecfa76 799static int verify_dotfile(const char *rest, unsigned mode)
8dcf39c4
LT
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 812 /*
641084b6
JK
813 * ".git" followed by NUL or slash is bad. Note that we match
814 * case-insensitively here, even if ignore_case is not set.
815 * This outlaws ".GIT" everywhere out of an abundance of caution,
816 * since there's really no good reason to allow it.
10ecfa76
JK
817 *
818 * Once we've seen ".git", we can also find ".gitmodules", etc (also
819 * case-insensitively).
8dcf39c4
LT
820 */
821 case 'g':
cc2fc7c2
JK
822 case 'G':
823 if (rest[1] != 'i' && rest[1] != 'I')
8dcf39c4 824 break;
cc2fc7c2 825 if (rest[2] != 't' && rest[2] != 'T')
8dcf39c4 826 break;
e19e5e66
JK
827 if (rest[3] == '\0' || is_dir_sep(rest[3]))
828 return 0;
10ecfa76
JK
829 if (S_ISLNK(mode)) {
830 rest += 3;
831 if (skip_iprefix(rest, "modules", &rest) &&
832 (*rest == '\0' || is_dir_sep(*rest)))
833 return 0;
834 }
e19e5e66 835 break;
8dcf39c4 836 case '.':
e0f530ff 837 if (rest[1] == '\0' || is_dir_sep(rest[1]))
8dcf39c4
LT
838 return 0;
839 }
840 return 1;
841}
842
10ecfa76 843int verify_path(const char *path, unsigned mode)
8dcf39c4
LT
844{
845 char c;
846
56948cb6
EFL
847 if (has_dos_drive_prefix(path))
848 return 0;
849
8dcf39c4
LT
850 goto inside;
851 for (;;) {
852 if (!c)
853 return 1;
56948cb6 854 if (is_dir_sep(c)) {
8dcf39c4 855inside:
10ecfa76
JK
856 if (protect_hfs) {
857 if (is_hfs_dotgit(path))
858 return 0;
859 if (S_ISLNK(mode)) {
860 if (is_hfs_dotgitmodules(path))
861 return 0;
862 }
863 }
864 if (protect_ntfs) {
865 if (is_ntfs_dotgit(path))
866 return 0;
867 if (S_ISLNK(mode)) {
868 if (is_ntfs_dotgitmodules(path))
869 return 0;
870 }
871 }
872
8dcf39c4 873 c = *path++;
10ecfa76 874 if ((c == '.' && !verify_dotfile(path, mode)) ||
3bdf09c7
JH
875 is_dir_sep(c) || c == '\0')
876 return 0;
8dcf39c4
LT
877 }
878 c = *path++;
879 }
880}
881
12676608
LT
882/*
883 * Do we have another file that has the beginning components being a
884 * proper superset of the name we're trying to add?
0f1e4f04 885 */
4aab5b46
JH
886static int has_file_name(struct index_state *istate,
887 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 888{
12676608
LT
889 int retval = 0;
890 int len = ce_namelen(ce);
b155725d 891 int stage = ce_stage(ce);
12676608 892 const char *name = ce->name;
0f1e4f04 893
4aab5b46
JH
894 while (pos < istate->cache_nr) {
895 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 896
12676608 897 if (len >= ce_namelen(p))
0f1e4f04 898 break;
12676608
LT
899 if (memcmp(name, p->name, len))
900 break;
b155725d
JH
901 if (ce_stage(p) != stage)
902 continue;
12676608
LT
903 if (p->name[len] != '/')
904 continue;
7a51ed66 905 if (p->ce_flags & CE_REMOVE)
21cd8d00 906 continue;
12676608
LT
907 retval = -1;
908 if (!ok_to_replace)
909 break;
4aab5b46 910 remove_index_entry_at(istate, --pos);
0f1e4f04 911 }
12676608
LT
912 return retval;
913}
0f1e4f04 914
a6db3fbb
JH
915
916/*
917 * Like strcmp(), but also return the offset of the first change.
918 * If strings are equal, return the length.
919 */
920int strcmp_offset(const char *s1, const char *s2, size_t *first_change)
921{
922 size_t k;
923
924 if (!first_change)
925 return strcmp(s1, s2);
926
927 for (k = 0; s1[k] == s2[k]; k++)
928 if (s1[k] == '\0')
929 break;
930
931 *first_change = k;
932 return (unsigned char)s1[k] - (unsigned char)s2[k];
933}
934
12676608
LT
935/*
936 * Do we have another file with a pathname that is a proper
937 * subset of the name we're trying to add?
06b6d81b
JH
938 *
939 * That is, is there another file in the index with a path
940 * that matches a sub-directory in the given entry?
12676608 941 */
4aab5b46
JH
942static int has_dir_name(struct index_state *istate,
943 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
944{
945 int retval = 0;
b155725d 946 int stage = ce_stage(ce);
12676608
LT
947 const char *name = ce->name;
948 const char *slash = name + ce_namelen(ce);
06b6d81b
JH
949 size_t len_eq_last;
950 int cmp_last = 0;
951
952 /*
953 * We are frequently called during an iteration on a sorted
954 * list of pathnames and while building a new index. Therefore,
955 * there is a high probability that this entry will eventually
956 * be appended to the index, rather than inserted in the middle.
957 * If we can confirm that, we can avoid binary searches on the
958 * components of the pathname.
959 *
960 * Compare the entry's full path with the last path in the index.
961 */
962 if (istate->cache_nr > 0) {
963 cmp_last = strcmp_offset(name,
964 istate->cache[istate->cache_nr - 1]->name,
965 &len_eq_last);
966 if (cmp_last > 0) {
967 if (len_eq_last == 0) {
968 /*
969 * The entry sorts AFTER the last one in the
970 * index and their paths have no common prefix,
971 * so there cannot be a F/D conflict.
972 */
973 return retval;
974 } else {
975 /*
976 * The entry sorts AFTER the last one in the
977 * index, but has a common prefix. Fall through
978 * to the loop below to disect the entry's path
979 * and see where the difference is.
980 */
981 }
982 } else if (cmp_last == 0) {
983 /*
984 * The entry exactly matches the last one in the
985 * index, but because of multiple stage and CE_REMOVE
986 * items, we fall through and let the regular search
987 * code handle it.
988 */
989 }
990 }
0f1e4f04 991
12676608 992 for (;;) {
b986df5c 993 size_t len;
0f1e4f04 994
12676608
LT
995 for (;;) {
996 if (*--slash == '/')
997 break;
998 if (slash <= ce->name)
999 return retval;
1000 }
1001 len = slash - name;
0f1e4f04 1002
b986df5c
JH
1003 if (cmp_last > 0) {
1004 /*
1005 * (len + 1) is a directory boundary (including
1006 * the trailing slash). And since the loop is
1007 * decrementing "slash", the first iteration is
1008 * the longest directory prefix; subsequent
1009 * iterations consider parent directories.
1010 */
1011
1012 if (len + 1 <= len_eq_last) {
1013 /*
1014 * The directory prefix (including the trailing
1015 * slash) also appears as a prefix in the last
1016 * entry, so the remainder cannot collide (because
1017 * strcmp said the whole path was greater).
1018 *
1019 * EQ: last: xxx/A
1020 * this: xxx/B
1021 *
1022 * LT: last: xxx/file_A
1023 * this: xxx/file_B
1024 */
1025 return retval;
1026 }
1027
1028 if (len > len_eq_last) {
1029 /*
1030 * This part of the directory prefix (excluding
1031 * the trailing slash) is longer than the known
1032 * equal portions, so this sub-directory cannot
1033 * collide with a file.
1034 *
1035 * GT: last: xxxA
1036 * this: xxxB/file
1037 */
1038 return retval;
1039 }
1040
1041 if (istate->cache_nr > 0 &&
1042 ce_namelen(istate->cache[istate->cache_nr - 1]) > len) {
1043 /*
1044 * The directory prefix lines up with part of
1045 * a longer file or directory name, but sorts
1046 * after it, so this sub-directory cannot
1047 * collide with a file.
1048 *
1049 * last: xxx/yy-file (because '-' sorts before '/')
1050 * this: xxx/yy/abc
1051 */
1052 return retval;
1053 }
1054
1055 /*
1056 * This is a possible collision. Fall through and
1057 * let the regular search code handle it.
1058 *
1059 * last: xxx
1060 * this: xxx/file
1061 */
1062 }
1063
b60e188c 1064 pos = index_name_stage_pos(istate, name, len, stage);
12676608 1065 if (pos >= 0) {
21cd8d00
JH
1066 /*
1067 * Found one, but not so fast. This could
1068 * be a marker that says "I was here, but
1069 * I am being removed". Such an entry is
1070 * not a part of the resulting tree, and
1071 * it is Ok to have a directory at the same
1072 * path.
1073 */
077c48df 1074 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
1075 retval = -1;
1076 if (!ok_to_replace)
1077 break;
4aab5b46 1078 remove_index_entry_at(istate, pos);
21cd8d00
JH
1079 continue;
1080 }
12676608 1081 }
21cd8d00
JH
1082 else
1083 pos = -pos-1;
12676608
LT
1084
1085 /*
1086 * Trivial optimization: if we find an entry that
1087 * already matches the sub-directory, then we know
b155725d 1088 * we're ok, and we can exit.
12676608 1089 */
4aab5b46
JH
1090 while (pos < istate->cache_nr) {
1091 struct cache_entry *p = istate->cache[pos];
b155725d
JH
1092 if ((ce_namelen(p) <= len) ||
1093 (p->name[len] != '/') ||
1094 memcmp(p->name, name, len))
1095 break; /* not our subdirectory */
077c48df
JH
1096 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
1097 /*
1098 * p is at the same stage as our entry, and
b155725d
JH
1099 * is a subdirectory of what we are looking
1100 * at, so we cannot have conflicts at our
1101 * level or anything shorter.
1102 */
1103 return retval;
1104 pos++;
192268c1 1105 }
0f1e4f04 1106 }
12676608
LT
1107 return retval;
1108}
1109
1110/* We may be in a situation where we already have path/file and path
1111 * is being added, or we already have path and path/file is being
1112 * added. Either one would result in a nonsense tree that has path
1113 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 1114 *
12676608
LT
1115 * If ok-to-replace is specified, we remove the conflicting entries
1116 * from the cache so the caller should recompute the insert position.
1117 * When this happens, we return non-zero.
1118 */
4aab5b46
JH
1119static int check_file_directory_conflict(struct index_state *istate,
1120 const struct cache_entry *ce,
1121 int pos, int ok_to_replace)
12676608 1122{
21cd8d00
JH
1123 int retval;
1124
1125 /*
1126 * When ce is an "I am going away" entry, we allow it to be added
1127 */
7a51ed66 1128 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
1129 return 0;
1130
12676608
LT
1131 /*
1132 * We check if the path is a sub-path of a subsequent pathname
1133 * first, since removing those will not change the position
21cd8d00 1134 * in the array.
12676608 1135 */
4aab5b46 1136 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 1137
12676608
LT
1138 /*
1139 * Then check if the path might have a clashing sub-directory
1140 * before it.
1141 */
4aab5b46 1142 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
1143}
1144
af3785dc 1145static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
1146{
1147 int pos;
192268c1
JH
1148 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1149 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 1150 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 1151 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 1152
ce7c614b
NTND
1153 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1154 cache_tree_invalidate_path(istate, ce->name);
e5494631
JH
1155
1156 /*
1157 * If this entry's path sorts after the last entry in the index,
1158 * we can avoid searching for it.
1159 */
1160 if (istate->cache_nr > 0 &&
1161 strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
1162 pos = -istate->cache_nr - 1;
1163 else
1164 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
197ee8c9 1165
3e09cdfd 1166 /* existing match? Just replace it. */
76e7f4ec 1167 if (pos >= 0) {
39425819
JH
1168 if (!new_only)
1169 replace_index_entry(istate, pos, ce);
197ee8c9
LT
1170 return 0;
1171 }
76e7f4ec 1172 pos = -pos-1;
197ee8c9 1173
ffcc9ba7
NTND
1174 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1175 untracked_cache_add_to_index(istate, ce->name);
e931371a 1176
7b937ca3
LT
1177 /*
1178 * Inserting a merged entry ("stage 0") into the index
1179 * will always replace all non-merged entries..
1180 */
4aab5b46
JH
1181 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1182 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 1183 ok_to_add = 1;
4aab5b46 1184 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
1185 break;
1186 }
1187 }
1188
121481ab
LT
1189 if (!ok_to_add)
1190 return -1;
10ecfa76 1191 if (!verify_path(ce->name, ce->ce_mode))
7e7abea9 1192 return error("Invalid path '%s'", ce->name);
121481ab 1193
3e09cdfd 1194 if (!skip_df_check &&
4aab5b46 1195 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 1196 if (!ok_to_replace)
4aab5b46
JH
1197 return error("'%s' appears as both a file and as a directory",
1198 ce->name);
b60e188c 1199 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
192268c1
JH
1200 pos = -pos-1;
1201 }
af3785dc
JH
1202 return pos + 1;
1203}
1204
1205int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1206{
1207 int pos;
1208
1209 if (option & ADD_CACHE_JUST_APPEND)
1210 pos = istate->cache_nr;
1211 else {
1212 int ret;
1213 ret = add_index_entry_with_check(istate, ce, option);
1214 if (ret <= 0)
1215 return ret;
1216 pos = ret - 1;
1217 }
0f1e4f04 1218
197ee8c9 1219 /* Make sure the array is big enough .. */
999f5660 1220 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
197ee8c9
LT
1221
1222 /* Add it in.. */
4aab5b46 1223 istate->cache_nr++;
af3785dc 1224 if (istate->cache_nr > pos + 1)
4aab5b46
JH
1225 memmove(istate->cache + pos + 1,
1226 istate->cache + pos,
1227 (istate->cache_nr - pos - 1) * sizeof(ce));
cf558704 1228 set_index_entry(istate, pos, ce);
e636a7b4 1229 istate->cache_changed |= CE_ENTRY_ADDED;
197ee8c9
LT
1230 return 0;
1231}
1232
405e5b2f
LT
1233/*
1234 * "refresh" does not calculate a new sha1 file or bring the
1235 * cache up-to-date for mode/content changes. But what it
1236 * _does_ do is to "re-match" the stat information of a file
1237 * with the cache, so that you can refresh the cache for a
1238 * file that hasn't been changed but where the stat entry is
1239 * out of date.
1240 *
1241 * For example, you'd want to do this after doing a "git-read-tree",
1242 * to link up the stat cache details with the proper files.
1243 */
4aab5b46 1244static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da 1245 struct cache_entry *ce,
d05e6970
JK
1246 unsigned int options, int *err,
1247 int *changed_ret)
405e5b2f
LT
1248{
1249 struct stat st;
1250 struct cache_entry *updated;
1251 int changed, size;
25762726 1252 int refresh = options & CE_MATCH_REFRESH;
4bd5b7da 1253 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 1254 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
2e2e7ec1 1255 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
405e5b2f 1256
25762726 1257 if (!refresh || ce_uptodate(ce))
eadb5831
JH
1258 return ce;
1259
aa9349d4 1260 /*
56cac48c
NTND
1261 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1262 * that the change to the work tree does not matter and told
1263 * us not to worry.
aa9349d4 1264 */
56cac48c
NTND
1265 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1266 ce_mark_uptodate(ce);
1267 return ce;
1268 }
aa9349d4
MSO
1269 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1270 ce_mark_uptodate(ce);
1271 return ce;
1272 }
1273
ccad42d4
RS
1274 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1275 if (ignore_missing)
1276 return ce;
1277 if (err)
1278 *err = ENOENT;
1279 return NULL;
1280 }
1281
8fd2cb40 1282 if (lstat(ce->name, &st) < 0) {
2e2e7ec1
BK
1283 if (ignore_missing && errno == ENOENT)
1284 return ce;
ec0cc704
JH
1285 if (err)
1286 *err = errno;
8fd2cb40
JS
1287 return NULL;
1288 }
405e5b2f 1289
4bd5b7da 1290 changed = ie_match_stat(istate, ce, &st, options);
d05e6970
JK
1291 if (changed_ret)
1292 *changed_ret = changed;
405e5b2f 1293 if (!changed) {
4bd5b7da
JH
1294 /*
1295 * The path is unchanged. If we were told to ignore
1296 * valid bit, then we did the actual stat check and
1297 * found that the entry is unmodified. If the entry
1298 * is not marked VALID, this is the place to mark it
1299 * valid again, under "assume unchanged" mode.
1300 */
1301 if (ignore_valid && assume_unchanged &&
7a51ed66 1302 !(ce->ce_flags & CE_VALID))
405e5b2f 1303 ; /* mark this one VALID again */
eadb5831
JH
1304 else {
1305 /*
1306 * We do not mark the index itself "modified"
1307 * because CE_UPTODATE flag is in-core only;
1308 * we are not going to write this change out.
1309 */
125fd984
JH
1310 if (!S_ISGITLINK(ce->ce_mode))
1311 ce_mark_uptodate(ce);
8fd2cb40 1312 return ce;
eadb5831 1313 }
405e5b2f
LT
1314 }
1315
4bd5b7da 1316 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1317 if (err)
1318 *err = EINVAL;
8fd2cb40
JS
1319 return NULL;
1320 }
405e5b2f
LT
1321
1322 size = ce_size(ce);
1323 updated = xmalloc(size);
1324 memcpy(updated, ce, size);
1325 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
1326 /*
1327 * If ignore_valid is not set, we should leave CE_VALID bit
1328 * alone. Otherwise, paths marked with --no-assume-unchanged
1329 * (i.e. things to be edited) will reacquire CE_VALID bit
1330 * automatically, which is not really what we want.
405e5b2f 1331 */
4bd5b7da 1332 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1333 !(ce->ce_flags & CE_VALID))
1334 updated->ce_flags &= ~CE_VALID;
405e5b2f 1335
e636a7b4 1336 /* istate->cache_changed is updated in the caller */
405e5b2f
LT
1337 return updated;
1338}
1339
3deffc52 1340static void show_file(const char * fmt, const char * name, int in_porcelain,
046613c5 1341 int * first, const char *header_msg)
3deffc52
MM
1342{
1343 if (in_porcelain && *first && header_msg) {
1344 printf("%s\n", header_msg);
cd2b8ae9 1345 *first = 0;
3deffc52
MM
1346 }
1347 printf(fmt, name);
1348}
1349
9b2d6149
NTND
1350int refresh_index(struct index_state *istate, unsigned int flags,
1351 const struct pathspec *pathspec,
046613c5 1352 char *seen, const char *header_msg)
405e5b2f
LT
1353{
1354 int i;
1355 int has_errors = 0;
1356 int really = (flags & REFRESH_REALLY) != 0;
1357 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1358 int quiet = (flags & REFRESH_QUIET) != 0;
1359 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1360 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
3deffc52
MM
1361 int first = 1;
1362 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
25762726
BK
1363 unsigned int options = (CE_MATCH_REFRESH |
1364 (really ? CE_MATCH_IGNORE_VALID : 0) |
2e2e7ec1 1365 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
4bd4e730 1366 const char *modified_fmt;
73b7eae6
JK
1367 const char *deleted_fmt;
1368 const char *typechange_fmt;
1369 const char *added_fmt;
4bd4e730 1370 const char *unmerged_fmt;
405e5b2f 1371
4bd4e730 1372 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
73b7eae6
JK
1373 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1374 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1375 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
4bd4e730 1376 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
4aab5b46 1377 for (i = 0; i < istate->cache_nr; i++) {
405e5b2f 1378 struct cache_entry *ce, *new;
ec0cc704 1379 int cache_errno = 0;
73b7eae6 1380 int changed = 0;
3d1f148c 1381 int filtered = 0;
ec0cc704 1382
4aab5b46 1383 ce = istate->cache[i];
5fdeacb0
JS
1384 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1385 continue;
1386
429bb40a 1387 if (pathspec && !ce_path_match(ce, pathspec, seen))
3d1f148c
JH
1388 filtered = 1;
1389
405e5b2f 1390 if (ce_stage(ce)) {
4aab5b46
JH
1391 while ((i < istate->cache_nr) &&
1392 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1393 i++;
1394 i--;
1395 if (allow_unmerged)
1396 continue;
3d1f148c
JH
1397 if (!filtered)
1398 show_file(unmerged_fmt, ce->name, in_porcelain,
1399 &first, header_msg);
405e5b2f
LT
1400 has_errors = 1;
1401 continue;
1402 }
1403
3d1f148c 1404 if (filtered)
d616813d
AJ
1405 continue;
1406
73b7eae6 1407 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
8fd2cb40 1408 if (new == ce)
405e5b2f 1409 continue;
8fd2cb40 1410 if (!new) {
73b7eae6
JK
1411 const char *fmt;
1412
8fd2cb40 1413 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1414 /* If we are doing --really-refresh that
1415 * means the index is not valid anymore.
1416 */
7a51ed66 1417 ce->ce_flags &= ~CE_VALID;
078a58e8 1418 ce->ce_flags |= CE_UPDATE_IN_BASE;
e636a7b4 1419 istate->cache_changed |= CE_ENTRY_CHANGED;
405e5b2f
LT
1420 }
1421 if (quiet)
1422 continue;
73b7eae6
JK
1423
1424 if (cache_errno == ENOENT)
1425 fmt = deleted_fmt;
895ff3b2 1426 else if (ce_intent_to_add(ce))
73b7eae6
JK
1427 fmt = added_fmt; /* must be before other checks */
1428 else if (changed & TYPE_CHANGED)
1429 fmt = typechange_fmt;
1430 else
1431 fmt = modified_fmt;
1432 show_file(fmt,
1433 ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1434 has_errors = 1;
1435 continue;
1436 }
cf558704
LT
1437
1438 replace_index_entry(istate, i, new);
405e5b2f
LT
1439 }
1440 return has_errors;
1441}
1442
1335d76e 1443struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
25762726 1444 unsigned int options)
ec0cc704 1445{
25762726 1446 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
ec0cc704
JH
1447}
1448
db3b313c
JH
1449
1450/*****************************************************************
1451 * Index File I/O
1452 *****************************************************************/
1453
9d227781
JH
1454#define INDEX_FORMAT_DEFAULT 3
1455
136347d7
TG
1456static unsigned int get_index_format_default(void)
1457{
1458 char *envversion = getenv("GIT_INDEX_VERSION");
3c09d684 1459 char *endp;
b27a5720 1460 int value;
3c09d684
TG
1461 unsigned int version = INDEX_FORMAT_DEFAULT;
1462
136347d7 1463 if (!envversion) {
b27a5720
TA
1464 if (!git_config_get_int("index.version", &value))
1465 version = value;
3c09d684
TG
1466 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1467 warning(_("index.version set, but the value is invalid.\n"
136347d7 1468 "Using version %i"), INDEX_FORMAT_DEFAULT);
3c09d684 1469 return INDEX_FORMAT_DEFAULT;
136347d7
TG
1470 }
1471 return version;
1472 }
3c09d684
TG
1473
1474 version = strtoul(envversion, &endp, 10);
1475 if (*endp ||
1476 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1477 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1478 "Using version %i"), INDEX_FORMAT_DEFAULT);
1479 version = INDEX_FORMAT_DEFAULT;
1480 }
1481 return version;
136347d7
TG
1482}
1483
db3b313c
JH
1484/*
1485 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1486 * Again - this is just a (very strong in practice) heuristic that
1487 * the inode hasn't changed.
1488 *
1489 * We save the fields in big-endian order to allow using the
1490 * index file over NFS transparently.
1491 */
1492struct ondisk_cache_entry {
1493 struct cache_time ctime;
1494 struct cache_time mtime;
7800c1eb
TG
1495 uint32_t dev;
1496 uint32_t ino;
1497 uint32_t mode;
1498 uint32_t uid;
1499 uint32_t gid;
1500 uint32_t size;
db3b313c 1501 unsigned char sha1[20];
7800c1eb 1502 uint16_t flags;
db3b313c
JH
1503 char name[FLEX_ARRAY]; /* more */
1504};
1505
1506/*
1507 * This struct is used when CE_EXTENDED bit is 1
1508 * The struct must match ondisk_cache_entry exactly from
1509 * ctime till flags
1510 */
1511struct ondisk_cache_entry_extended {
1512 struct cache_time ctime;
1513 struct cache_time mtime;
7800c1eb
TG
1514 uint32_t dev;
1515 uint32_t ino;
1516 uint32_t mode;
1517 uint32_t uid;
1518 uint32_t gid;
1519 uint32_t size;
db3b313c 1520 unsigned char sha1[20];
7800c1eb
TG
1521 uint16_t flags;
1522 uint16_t flags2;
db3b313c
JH
1523 char name[FLEX_ARRAY]; /* more */
1524};
1525
6c9cd161 1526/* These are only used for v3 or lower */
db3b313c
JH
1527#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1528#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1529#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1530#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1531 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1532 ondisk_cache_entry_size(ce_namelen(ce)))
1533
a33fc72f
JH
1534/* Allow fsck to force verification of the index checksum. */
1535int verify_index_checksum;
1536
bad68ec9 1537static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163 1538{
9126f009 1539 git_SHA_CTX c;
bad68ec9 1540 unsigned char sha1[20];
0136bac9 1541 int hdr_version;
e83c5163 1542
ccc4feb5 1543 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 1544 return error("bad signature");
0136bac9 1545 hdr_version = ntohl(hdr->hdr_version);
b82a7b5b 1546 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
0136bac9 1547 return error("bad index version %d", hdr_version);
a33fc72f
JH
1548
1549 if (!verify_index_checksum)
1550 return 0;
1551
9126f009
NP
1552 git_SHA1_Init(&c);
1553 git_SHA1_Update(&c, hdr, size - 20);
1554 git_SHA1_Final(sha1, &c);
a89fccd2 1555 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
ca9be054 1556 return error("bad index file sha1 signature");
e83c5163
LT
1557 return 0;
1558}
1559
4aab5b46
JH
1560static int read_index_extension(struct index_state *istate,
1561 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
1562{
1563 switch (CACHE_EXT(ext)) {
1564 case CACHE_EXT_TREE:
4aab5b46 1565 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9 1566 break;
cfc5789a
JH
1567 case CACHE_EXT_RESOLVE_UNDO:
1568 istate->resolve_undo = resolve_undo_read(data, sz);
1569 break;
5fc2fc8f
NTND
1570 case CACHE_EXT_LINK:
1571 if (read_link_extension(istate, data, sz))
1572 return -1;
1573 break;
f9e6c649
NTND
1574 case CACHE_EXT_UNTRACKED:
1575 istate->untracked = read_untracked_extension(data, sz);
1576 break;
bad68ec9
JH
1577 default:
1578 if (*ext < 'A' || 'Z' < *ext)
1579 return error("index uses %.4s extension, which we do not understand",
1580 ext);
1581 fprintf(stderr, "ignoring %.4s extension\n", ext);
1582 break;
1583 }
1584 return 0;
1585}
1586
b3e83cc7 1587int hold_locked_index(struct lock_file *lk, int lock_flags)
216aab1e 1588{
b3e83cc7 1589 return hold_lock_file_for_update(lk, get_index_file(), lock_flags);
216aab1e
MH
1590}
1591
4aab5b46 1592int read_index(struct index_state *istate)
8fd2cb40 1593{
4aab5b46 1594 return read_index_from(istate, get_index_file());
8fd2cb40
JS
1595}
1596
3fc22b53
JH
1597static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1598 unsigned int flags,
1599 const char *name,
1600 size_t len)
1601{
1602 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1603
c3d8da57
JK
1604 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1605 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1606 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1607 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1608 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1609 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1610 ce->ce_mode = get_be32(&ondisk->mode);
1611 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1612 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1613 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
b60e188c
TG
1614 ce->ce_flags = flags & ~CE_NAMEMASK;
1615 ce->ce_namelen = len;
5fc2fc8f 1616 ce->index = 0;
99d1a986 1617 hashcpy(ce->oid.hash, ondisk->sha1);
3fc22b53
JH
1618 memcpy(ce->name, name, len);
1619 ce->name[len] = '\0';
1620 return ce;
1621}
1622
6c9cd161
JH
1623/*
1624 * Adjacent cache entries tend to share the leading paths, so it makes
1625 * sense to only store the differences in later entries. In the v4
1626 * on-disk format of the index, each on-disk cache entry stores the
1627 * number of bytes to be stripped from the end of the previous name,
1628 * and the bytes to append to the result, to come up with its name.
1629 */
1630static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1631{
1632 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1633 size_t len = decode_varint(&cp);
1634
1635 if (name->len < len)
1636 die("malformed name field in the index");
1637 strbuf_remove(name, name->len - len, len);
1638 for (ep = cp; *ep; ep++)
1639 ; /* find the end */
1640 strbuf_add(name, cp, ep - cp);
1641 return (const char *)ep + 1 - cp_;
1642}
1643
936f53d0 1644static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
6c9cd161
JH
1645 unsigned long *ent_size,
1646 struct strbuf *previous_name)
7a51ed66 1647{
debed2a6 1648 struct cache_entry *ce;
7fec10b7 1649 size_t len;
06aaaa0b 1650 const char *name;
debed2a6 1651 unsigned int flags;
7fec10b7 1652
7a51ed66 1653 /* On-disk flags are just 16 bits */
c3d8da57 1654 flags = get_be16(&ondisk->flags);
debed2a6 1655 len = flags & CE_NAMEMASK;
7fec10b7 1656
debed2a6 1657 if (flags & CE_EXTENDED) {
06aaaa0b
NTND
1658 struct ondisk_cache_entry_extended *ondisk2;
1659 int extended_flags;
1660 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
c3d8da57 1661 extended_flags = get_be16(&ondisk2->flags2) << 16;
06aaaa0b
NTND
1662 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1663 if (extended_flags & ~CE_EXTENDED_FLAGS)
1664 die("Unknown index entry format %08x", extended_flags);
debed2a6 1665 flags |= extended_flags;
06aaaa0b
NTND
1666 name = ondisk2->name;
1667 }
1668 else
1669 name = ondisk->name;
1670
6c9cd161
JH
1671 if (!previous_name) {
1672 /* v3 and earlier */
1673 if (len == CE_NAMEMASK)
1674 len = strlen(name);
1675 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1676
1677 *ent_size = ondisk_ce_size(ce);
1678 } else {
1679 unsigned long consumed;
1680 consumed = expand_name_field(previous_name, name);
1681 ce = cache_entry_from_ondisk(ondisk, flags,
1682 previous_name->buf,
1683 previous_name->len);
1684
1685 *ent_size = (name - ((char *)ondisk)) + consumed;
1686 }
debed2a6 1687 return ce;
cf558704
LT
1688}
1689
03f15a79 1690static void check_ce_order(struct index_state *istate)
15999d0b 1691{
03f15a79
TG
1692 unsigned int i;
1693
1694 for (i = 1; i < istate->cache_nr; i++) {
1695 struct cache_entry *ce = istate->cache[i - 1];
1696 struct cache_entry *next_ce = istate->cache[i];
1697 int name_compare = strcmp(ce->name, next_ce->name);
1698
1699 if (0 < name_compare)
1700 die("unordered stage entries in index");
1701 if (!name_compare) {
1702 if (!ce_stage(ce))
1703 die("multiple stage entries for merged file '%s'",
1704 ce->name);
1705 if (ce_stage(ce) > ce_stage(next_ce))
1706 die("unordered stage entries for '%s'",
1707 ce->name);
1708 }
15999d0b
JSP
1709 }
1710}
1711
435ec090
CC
1712static void tweak_untracked_cache(struct index_state *istate)
1713{
1714 switch (git_config_get_untracked_cache()) {
1715 case -1: /* keep: do nothing */
1716 break;
1717 case 0: /* false */
1718 remove_untracked_cache(istate);
1719 break;
1720 case 1: /* true */
1721 add_untracked_cache(istate);
1722 break;
1723 default: /* unknown value: do nothing */
1724 break;
1725 }
1726}
1727
43925312
CC
1728static void tweak_split_index(struct index_state *istate)
1729{
1730 switch (git_config_get_split_index()) {
1731 case -1: /* unset: do nothing */
1732 break;
1733 case 0: /* false */
1734 remove_split_index(istate);
1735 break;
1736 case 1: /* true */
1737 add_split_index(istate);
1738 break;
1739 default: /* unknown value: do nothing */
1740 break;
1741 }
1742}
1743
435ec090
CC
1744static void post_read_index_from(struct index_state *istate)
1745{
1746 check_ce_order(istate);
1747 tweak_untracked_cache(istate);
43925312 1748 tweak_split_index(istate);
435ec090
CC
1749}
1750
8fd2cb40 1751/* remember to discard_cache() before reading a different cache! */
3e52f70b 1752int do_read_index(struct index_state *istate, const char *path, int must_exist)
e83c5163
LT
1753{
1754 int fd, i;
1755 struct stat st;
debed2a6 1756 unsigned long src_offset;
e83c5163 1757 struct cache_header *hdr;
7a51ed66
LT
1758 void *mmap;
1759 size_t mmap_size;
6c9cd161 1760 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
e83c5163 1761
913e0e99 1762 if (istate->initialized)
4aab5b46 1763 return istate->cache_nr;
5d1a5c02 1764
fba2f38a
KB
1765 istate->timestamp.sec = 0;
1766 istate->timestamp.nsec = 0;
8fd2cb40 1767 fd = open(path, O_RDONLY);
5d1a5c02 1768 if (fd < 0) {
5fc2fc8f 1769 if (!must_exist && errno == ENOENT)
5d1a5c02 1770 return 0;
5fc2fc8f 1771 die_errno("%s: index file open failed", path);
5d1a5c02 1772 }
e83c5163 1773
3511a377 1774 if (fstat(fd, &st))
d824cbba 1775 die_errno("cannot stat the open index");
3511a377 1776
7a51ed66
LT
1777 mmap_size = xsize_t(st.st_size);
1778 if (mmap_size < sizeof(struct cache_header) + 20)
3511a377
LFC
1779 die("index file smaller than expected");
1780
a1293ef7 1781 mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
7a51ed66 1782 if (mmap == MAP_FAILED)
0721c314 1783 die_errno("unable to map index file");
57d84f8d 1784 close(fd);
e83c5163 1785
7a51ed66
LT
1786 hdr = mmap;
1787 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1788 goto unmap;
1789
e93021b2 1790 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
9d227781 1791 istate->version = ntohl(hdr->hdr_version);
4aab5b46
JH
1792 istate->cache_nr = ntohl(hdr->hdr_entries);
1793 istate->cache_alloc = alloc_nr(istate->cache_nr);
c4aa3167 1794 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
913e0e99 1795 istate->initialized = 1;
7a51ed66 1796
9d227781 1797 if (istate->version == 4)
6c9cd161
JH
1798 previous_name = &previous_name_buf;
1799 else
1800 previous_name = NULL;
1801
7a51ed66 1802 src_offset = sizeof(*hdr);
4aab5b46 1803 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1804 struct ondisk_cache_entry *disk_ce;
4aab5b46 1805 struct cache_entry *ce;
936f53d0 1806 unsigned long consumed;
4aab5b46 1807
7a51ed66 1808 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
6c9cd161 1809 ce = create_from_disk(disk_ce, &consumed, previous_name);
cf558704 1810 set_index_entry(istate, i, ce);
7a51ed66 1811
936f53d0 1812 src_offset += consumed;
e83c5163 1813 }
6c9cd161 1814 strbuf_release(&previous_name_buf);
fba2f38a 1815 istate->timestamp.sec = st.st_mtime;
c06ff490 1816 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 1817
7a51ed66 1818 while (src_offset <= mmap_size - 20 - 8) {
bad68ec9
JH
1819 /* After an array of active_nr index entries,
1820 * there can be arbitrary number of extended
1821 * sections, each of which is prefixed with
1822 * extension name (4-byte) and section length
1823 * in 4-byte network byte order.
1824 */
07cc8eca 1825 uint32_t extsize;
7a51ed66 1826 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1827 extsize = ntohl(extsize);
4aab5b46 1828 if (read_index_extension(istate,
7a51ed66
LT
1829 (const char *) mmap + src_offset,
1830 (char *) mmap + src_offset + 8,
1d7f171c 1831 extsize) < 0)
bad68ec9 1832 goto unmap;
7a51ed66
LT
1833 src_offset += 8;
1834 src_offset += extsize;
bad68ec9 1835 }
7a51ed66 1836 munmap(mmap, mmap_size);
4aab5b46 1837 return istate->cache_nr;
e83c5163
LT
1838
1839unmap:
7a51ed66 1840 munmap(mmap, mmap_size);
5d1a5c02 1841 die("index file corrupt");
e83c5163
LT
1842}
1843
0d59ffb4
CC
1844/*
1845 * Signal that the shared index is used by updating its mtime.
1846 *
1847 * This way, shared index can be removed if they have not been used
1848 * for some time.
1849 */
1850static void freshen_shared_index(char *base_sha1_hex, int warn)
1851{
ccef2bb5 1852 char *shared_index = git_pathdup("sharedindex.%s", base_sha1_hex);
0d59ffb4
CC
1853 if (!check_and_freshen_file(shared_index, 1) && warn)
1854 warning("could not freshen shared index '%s'", shared_index);
ccef2bb5 1855 free(shared_index);
0d59ffb4
CC
1856}
1857
5fc2fc8f
NTND
1858int read_index_from(struct index_state *istate, const char *path)
1859{
1860 struct split_index *split_index;
1861 int ret;
de6ae5f9
CC
1862 char *base_sha1_hex;
1863 const char *base_path;
5fc2fc8f
NTND
1864
1865 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1866 if (istate->initialized)
1867 return istate->cache_nr;
1868
1869 ret = do_read_index(istate, path, 0);
435ec090 1870
5fc2fc8f 1871 split_index = istate->split_index;
03f15a79 1872 if (!split_index || is_null_sha1(split_index->base_sha1)) {
435ec090 1873 post_read_index_from(istate);
5fc2fc8f 1874 return ret;
03f15a79 1875 }
5fc2fc8f
NTND
1876
1877 if (split_index->base)
1878 discard_index(split_index->base);
1879 else
1880 split_index->base = xcalloc(1, sizeof(*split_index->base));
de6ae5f9
CC
1881
1882 base_sha1_hex = sha1_to_hex(split_index->base_sha1);
1883 base_path = git_path("sharedindex.%s", base_sha1_hex);
1884 ret = do_read_index(split_index->base, base_path, 1);
5fc2fc8f
NTND
1885 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1886 die("broken index, expect %s in %s, got %s",
de6ae5f9 1887 base_sha1_hex, base_path,
5fc2fc8f 1888 sha1_to_hex(split_index->base->sha1));
de6ae5f9 1889
c3a00825 1890 freshen_shared_index(base_sha1_hex, 0);
5fc2fc8f 1891 merge_base_index(istate);
435ec090 1892 post_read_index_from(istate);
5fc2fc8f
NTND
1893 return ret;
1894}
1895
fa7b3c2f
JH
1896int is_index_unborn(struct index_state *istate)
1897{
debed2a6 1898 return (!istate->cache_nr && !istate->timestamp.sec);
fa7b3c2f
JH
1899}
1900
4aab5b46 1901int discard_index(struct index_state *istate)
6d297f81 1902{
debed2a6
RS
1903 int i;
1904
5fc2fc8f
NTND
1905 for (i = 0; i < istate->cache_nr; i++) {
1906 if (istate->cache[i]->index &&
1907 istate->split_index &&
1908 istate->split_index->base &&
1909 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1910 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1911 continue;
debed2a6 1912 free(istate->cache[i]);
5fc2fc8f 1913 }
cfc5789a 1914 resolve_undo_clear_index(istate);
4aab5b46
JH
1915 istate->cache_nr = 0;
1916 istate->cache_changed = 0;
fba2f38a
KB
1917 istate->timestamp.sec = 0;
1918 istate->timestamp.nsec = 0;
2092678c 1919 free_name_hash(istate);
4aab5b46 1920 cache_tree_free(&(istate->cache_tree));
913e0e99 1921 istate->initialized = 0;
a0fc4db0
RS
1922 free(istate->cache);
1923 istate->cache = NULL;
1924 istate->cache_alloc = 0;
5fc2fc8f 1925 discard_split_index(istate);
f9e6c649
NTND
1926 free_untracked_cache(istate->untracked);
1927 istate->untracked = NULL;
7a51ed66 1928 return 0;
6d297f81
JS
1929}
1930
d1f128b0 1931int unmerged_index(const struct index_state *istate)
94a5728c
DB
1932{
1933 int i;
1934 for (i = 0; i < istate->cache_nr; i++) {
1935 if (ce_stage(istate->cache[i]))
1936 return 1;
1937 }
1938 return 0;
1939}
1940
4990aadc 1941#define WRITE_BUFFER_SIZE 8192
bf0f910d 1942static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
1943static unsigned long write_buffer_len;
1944
9126f009 1945static int ce_write_flush(git_SHA_CTX *context, int fd)
6015c28b
JH
1946{
1947 unsigned int buffered = write_buffer_len;
1948 if (buffered) {
9126f009 1949 git_SHA1_Update(context, write_buffer, buffered);
93822c22 1950 if (write_in_full(fd, write_buffer, buffered) != buffered)
6015c28b
JH
1951 return -1;
1952 write_buffer_len = 0;
1953 }
1954 return 0;
1955}
1956
9126f009 1957static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
4990aadc
LT
1958{
1959 while (len) {
1960 unsigned int buffered = write_buffer_len;
1961 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1962 if (partial > len)
1963 partial = len;
1964 memcpy(write_buffer + buffered, data, partial);
1965 buffered += partial;
1966 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
1967 write_buffer_len = buffered;
1968 if (ce_write_flush(context, fd))
4990aadc
LT
1969 return -1;
1970 buffered = 0;
1971 }
1972 write_buffer_len = buffered;
1973 len -= partial;
1d7f171c 1974 data = (char *) data + partial;
a6080a0a
JH
1975 }
1976 return 0;
4990aadc
LT
1977}
1978
9126f009 1979static int write_index_ext_header(git_SHA_CTX *context, int fd,
ac58c7b1 1980 unsigned int ext, unsigned int sz)
bad68ec9
JH
1981{
1982 ext = htonl(ext);
1983 sz = htonl(sz);
968a1d65
DR
1984 return ((ce_write(context, fd, &ext, 4) < 0) ||
1985 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
1986}
1987
e93021b2 1988static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
4990aadc
LT
1989{
1990 unsigned int left = write_buffer_len;
ca9be054 1991
4990aadc
LT
1992 if (left) {
1993 write_buffer_len = 0;
9126f009 1994 git_SHA1_Update(context, write_buffer, left);
4990aadc 1995 }
ca9be054 1996
2c865d9a
QH
1997 /* Flush first if not enough space for SHA1 signature */
1998 if (left + 20 > WRITE_BUFFER_SIZE) {
93822c22 1999 if (write_in_full(fd, write_buffer, left) != left)
2c865d9a
QH
2000 return -1;
2001 left = 0;
2002 }
2003
ca9be054 2004 /* Append the SHA1 signature at the end */
9126f009 2005 git_SHA1_Final(write_buffer + left, context);
e93021b2 2006 hashcpy(sha1, write_buffer + left);
ca9be054 2007 left += 20;
93822c22 2008 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
4990aadc
LT
2009}
2010
407c8eb0
JH
2011static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
2012{
2013 /*
2014 * The only thing we care about in this function is to smudge the
2015 * falsely clean entry due to touch-update-touch race, so we leave
2016 * everything else as they are. We are called for entries whose
c21d39d7 2017 * ce_stat_data.sd_mtime match the index file mtime.
c70115b4
JH
2018 *
2019 * Note that this actually does not do much for gitlinks, for
2020 * which ce_match_stat_basic() always goes to the actual
2021 * contents. The caller checks with is_racy_timestamp() which
2022 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
2023 */
2024 struct stat st;
2025
2026 if (lstat(ce->name, &st) < 0)
2027 return;
2028 if (ce_match_stat_basic(ce, &st))
2029 return;
2030 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
2031 /* This is "racily clean"; smudge it. Note that this
2032 * is a tricky code. At first glance, it may appear
2033 * that it can break with this sequence:
2034 *
2035 * $ echo xyzzy >frotz
2036 * $ git-update-index --add frotz
2037 * $ : >frotz
2038 * $ sleep 3
2039 * $ echo filfre >nitfol
2040 * $ git-update-index --add nitfol
2041 *
b7e58b17 2042 * but it does not. When the second update-index runs,
4b3511b0
JH
2043 * it notices that the entry "frotz" has the same timestamp
2044 * as index, and if we were to smudge it by resetting its
2045 * size to zero here, then the object name recorded
2046 * in index is the 6-byte file but the cached stat information
2047 * becomes zero --- which would then match what we would
a6080a0a 2048 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
2049 *
2050 * However, the second update-index, before calling
2051 * this function, notices that the cached size is 6
2052 * bytes and what is on the filesystem is an empty
2053 * file, and never calls us, so the cached size information
2054 * for "frotz" stays 6 which does not match the filesystem.
2055 */
c21d39d7 2056 ce->ce_stat_data.sd_size = 0;
407c8eb0
JH
2057 }
2058}
2059
f136f7bf
JH
2060/* Copy miscellaneous fields but not the name */
2061static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
2062 struct cache_entry *ce)
7a51ed66 2063{
b60e188c
TG
2064 short flags;
2065
c21d39d7
MH
2066 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
2067 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
2068 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
2069 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
2070 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
2071 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
7a51ed66 2072 ondisk->mode = htonl(ce->ce_mode);
c21d39d7
MH
2073 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
2074 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
2075 ondisk->size = htonl(ce->ce_stat_data.sd_size);
99d1a986 2076 hashcpy(ondisk->sha1, ce->oid.hash);
b60e188c 2077
ce51bf09 2078 flags = ce->ce_flags & ~CE_NAMEMASK;
b60e188c
TG
2079 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
2080 ondisk->flags = htons(flags);
06aaaa0b
NTND
2081 if (ce->ce_flags & CE_EXTENDED) {
2082 struct ondisk_cache_entry_extended *ondisk2;
2083 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
2084 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
f136f7bf 2085 return ondisk2->name;
06aaaa0b 2086 }
f136f7bf
JH
2087 else {
2088 return ondisk->name;
2089 }
2090}
2091
9d227781
JH
2092static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
2093 struct strbuf *previous_name)
f136f7bf 2094{
9d227781
JH
2095 int size;
2096 struct ondisk_cache_entry *ondisk;
b3c96fb1 2097 int saved_namelen = saved_namelen; /* compiler workaround */
f136f7bf
JH
2098 char *name;
2099 int result;
2100
b3c96fb1
NTND
2101 if (ce->ce_flags & CE_STRIP_NAME) {
2102 saved_namelen = ce_namelen(ce);
2103 ce->ce_namelen = 0;
2104 }
2105
9d227781
JH
2106 if (!previous_name) {
2107 size = ondisk_ce_size(ce);
2108 ondisk = xcalloc(1, size);
2109 name = copy_cache_entry_to_ondisk(ondisk, ce);
2110 memcpy(name, ce->name, ce_namelen(ce));
2111 } else {
2112 int common, to_remove, prefix_size;
2113 unsigned char to_remove_vi[16];
2114 for (common = 0;
2115 (ce->name[common] &&
2116 common < previous_name->len &&
2117 ce->name[common] == previous_name->buf[common]);
2118 common++)
2119 ; /* still matching */
2120 to_remove = previous_name->len - common;
2121 prefix_size = encode_varint(to_remove, to_remove_vi);
2122
2123 if (ce->ce_flags & CE_EXTENDED)
2124 size = offsetof(struct ondisk_cache_entry_extended, name);
2125 else
2126 size = offsetof(struct ondisk_cache_entry, name);
2127 size += prefix_size + (ce_namelen(ce) - common + 1);
2128
2129 ondisk = xcalloc(1, size);
2130 name = copy_cache_entry_to_ondisk(ondisk, ce);
2131 memcpy(name, to_remove_vi, prefix_size);
2132 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
2133
2134 strbuf_splice(previous_name, common, to_remove,
2135 ce->name + common, ce_namelen(ce) - common);
06aaaa0b 2136 }
b3c96fb1
NTND
2137 if (ce->ce_flags & CE_STRIP_NAME) {
2138 ce->ce_namelen = saved_namelen;
2139 ce->ce_flags &= ~CE_STRIP_NAME;
2140 }
7a51ed66 2141
59efba64
JN
2142 result = ce_write(c, fd, ondisk, size);
2143 free(ondisk);
2144 return result;
7a51ed66
LT
2145}
2146
426ddeea
YM
2147/*
2148 * This function verifies if index_state has the correct sha1 of the
2149 * index file. Don't die if we have any other failure, just return 0.
2150 */
2151static int verify_index_from(const struct index_state *istate, const char *path)
2152{
2153 int fd;
2154 ssize_t n;
2155 struct stat st;
2156 unsigned char sha1[20];
2157
2158 if (!istate->initialized)
2159 return 0;
2160
2161 fd = open(path, O_RDONLY);
2162 if (fd < 0)
2163 return 0;
2164
2165 if (fstat(fd, &st))
2166 goto out;
2167
2168 if (st.st_size < sizeof(struct cache_header) + 20)
2169 goto out;
2170
2171 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
2172 if (n != 20)
2173 goto out;
2174
2175 if (hashcmp(istate->sha1, sha1))
2176 goto out;
2177
2178 close(fd);
2179 return 1;
2180
2181out:
2182 close(fd);
2183 return 0;
2184}
2185
2186static int verify_index(const struct index_state *istate)
2187{
2188 return verify_index_from(istate, get_index_file());
2189}
2190
483fbe2b
JH
2191static int has_racy_timestamp(struct index_state *istate)
2192{
2193 int entries = istate->cache_nr;
2194 int i;
2195
2196 for (i = 0; i < entries; i++) {
2197 struct cache_entry *ce = istate->cache[i];
2198 if (is_racy_timestamp(istate, ce))
2199 return 1;
2200 }
2201 return 0;
2202}
2203
ccdc4ec3 2204/*
98e023de 2205 * Opportunistically update the index but do not complain if we can't
ccdc4ec3
JH
2206 */
2207void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
2208{
483fbe2b 2209 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
788cef81 2210 verify_index(istate) &&
03b86647 2211 write_locked_index(istate, lockfile, COMMIT_LOCK))
ccdc4ec3
JH
2212 rollback_lock_file(lockfile);
2213}
2214
9f41c7a6 2215static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
c18b80a0 2216 int strip_extensions)
197ee8c9 2217{
9f41c7a6 2218 int newfd = tempfile->fd;
9126f009 2219 git_SHA_CTX c;
197ee8c9 2220 struct cache_header hdr;
9d227781 2221 int i, err, removed, extended, hdr_version;
4aab5b46
JH
2222 struct cache_entry **cache = istate->cache;
2223 int entries = istate->cache_nr;
e1afca4f 2224 struct stat st;
9d227781 2225 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
025a0709 2226
06aaaa0b 2227 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 2228 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 2229 removed++;
197ee8c9 2230
06aaaa0b
NTND
2231 /* reduce extended entries if possible */
2232 cache[i]->ce_flags &= ~CE_EXTENDED;
2233 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2234 extended++;
2235 cache[i]->ce_flags |= CE_EXTENDED;
2236 }
2237 }
2238
d6e3c181 2239 if (!istate->version) {
136347d7 2240 istate->version = get_index_format_default();
d6e3c181
NTND
2241 if (getenv("GIT_TEST_SPLIT_INDEX"))
2242 init_split_index(istate);
2243 }
9d227781
JH
2244
2245 /* demote version 3 to version 2 when the latter suffices */
2246 if (istate->version == 3 || istate->version == 2)
2247 istate->version = extended ? 3 : 2;
2248
2249 hdr_version = istate->version;
2250
ccc4feb5 2251 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
9d227781 2252 hdr.hdr_version = htonl(hdr_version);
025a0709 2253 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 2254
9126f009 2255 git_SHA1_Init(&c);
ca9be054 2256 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
2257 return -1;
2258
9d227781 2259 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
197ee8c9
LT
2260 for (i = 0; i < entries; i++) {
2261 struct cache_entry *ce = cache[i];
7a51ed66 2262 if (ce->ce_flags & CE_REMOVE)
aa16021e 2263 continue;
e06c43c7 2264 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
407c8eb0 2265 ce_smudge_racily_clean_entry(ce);
99d1a986 2266 if (is_null_oid(&ce->oid)) {
83bd7437
JK
2267 static const char msg[] = "cache entry has null sha1: %s";
2268 static int allow = -1;
2269
2270 if (allow < 0)
2271 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2272 if (allow)
2273 warning(msg, ce->name);
2274 else
2275 return error(msg, ce->name);
2276 }
9d227781 2277 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
197ee8c9
LT
2278 return -1;
2279 }
9d227781 2280 strbuf_release(&previous_name_buf);
1af1c2b6 2281
bad68ec9 2282 /* Write extension data here */
c18b80a0 2283 if (!strip_extensions && istate->split_index) {
5fc2fc8f
NTND
2284 struct strbuf sb = STRBUF_INIT;
2285
2286 err = write_link_extension(&sb, istate) < 0 ||
2287 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
2288 sb.len) < 0 ||
2289 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2290 strbuf_release(&sb);
2291 if (err)
2292 return -1;
2293 }
c18b80a0 2294 if (!strip_extensions && istate->cache_tree) {
f285a2d7 2295 struct strbuf sb = STRBUF_INIT;
1dffb8fa 2296
1dffb8fa
PH
2297 cache_tree_write(&sb, istate->cache_tree);
2298 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2299 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2300 strbuf_release(&sb);
2301 if (err)
bad68ec9 2302 return -1;
bad68ec9 2303 }
c18b80a0 2304 if (!strip_extensions && istate->resolve_undo) {
cfc5789a
JH
2305 struct strbuf sb = STRBUF_INIT;
2306
2307 resolve_undo_write(&sb, istate->resolve_undo);
2308 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2309 sb.len) < 0
2310 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2311 strbuf_release(&sb);
2312 if (err)
2313 return -1;
2314 }
83c094ad
NTND
2315 if (!strip_extensions && istate->untracked) {
2316 struct strbuf sb = STRBUF_INIT;
2317
2318 write_untracked_extension(&sb, istate->untracked);
2319 err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
2320 sb.len) < 0 ||
2321 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2322 strbuf_release(&sb);
2323 if (err)
2324 return -1;
2325 }
e1afca4f 2326
9f41c7a6
JH
2327 if (ce_flush(&c, newfd, istate->sha1))
2328 return -1;
2329 if (close_tempfile(tempfile))
2330 return error(_("could not close '%s'"), tempfile->filename.buf);
2331 if (stat(tempfile->filename.buf, &st))
e1afca4f 2332 return -1;
5bcf109c
KB
2333 istate->timestamp.sec = (unsigned int)st.st_mtime;
2334 istate->timestamp.nsec = ST_MTIME_NSEC(st);
e1afca4f 2335 return 0;
197ee8c9 2336}
e46bbcf6 2337
626f35c8
NTND
2338void set_alternate_index_output(const char *name)
2339{
2340 alternate_index_output = name;
2341}
2342
2343static int commit_locked_index(struct lock_file *lk)
2344{
751baced
MH
2345 if (alternate_index_output)
2346 return commit_lock_file_to(lk, alternate_index_output);
2347 else
626f35c8 2348 return commit_lock_file(lk);
626f35c8
NTND
2349}
2350
03b86647
NTND
2351static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2352 unsigned flags)
2353{
9f41c7a6 2354 int ret = do_write_index(istate, &lock->tempfile, 0);
03b86647
NTND
2355 if (ret)
2356 return ret;
2357 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2358 (COMMIT_LOCK | CLOSE_LOCK));
2359 if (flags & COMMIT_LOCK)
2360 return commit_locked_index(lock);
2361 else if (flags & CLOSE_LOCK)
2362 return close_lock_file(lock);
2363 else
2364 return ret;
2365}
2366
5fc2fc8f
NTND
2367static int write_split_index(struct index_state *istate,
2368 struct lock_file *lock,
2369 unsigned flags)
2370{
2371 int ret;
2372 prepare_to_write_split_index(istate);
2373 ret = do_write_locked_index(istate, lock, flags);
2374 finish_writing_split_index(istate);
2375 return ret;
2376}
2377
b9683722
CC
2378static const char *shared_index_expire = "2.weeks.ago";
2379
2380static unsigned long get_shared_index_expire_date(void)
2381{
2382 static unsigned long shared_index_expire_date;
2383 static int shared_index_expire_date_prepared;
2384
2385 if (!shared_index_expire_date_prepared) {
2386 git_config_get_expiry("splitindex.sharedindexexpire",
2387 &shared_index_expire);
2388 shared_index_expire_date = approxidate(shared_index_expire);
2389 shared_index_expire_date_prepared = 1;
2390 }
2391
2392 return shared_index_expire_date;
2393}
2394
2395static int should_delete_shared_index(const char *shared_index_path)
2396{
2397 struct stat st;
2398 unsigned long expiration;
2399
2400 /* Check timestamp */
2401 expiration = get_shared_index_expire_date();
2402 if (!expiration)
2403 return 0;
2404 if (stat(shared_index_path, &st))
78bde923 2405 return error_errno(_("could not stat '%s'"), shared_index_path);
b9683722
CC
2406 if (st.st_mtime > expiration)
2407 return 0;
2408
2409 return 1;
2410}
2411
2412static int clean_shared_index_files(const char *current_hex)
2413{
2414 struct dirent *de;
2415 DIR *dir = opendir(get_git_dir());
2416
2417 if (!dir)
2418 return error_errno(_("unable to open git dir: %s"), get_git_dir());
2419
2420 while ((de = readdir(dir)) != NULL) {
2421 const char *sha1_hex;
2422 const char *shared_index_path;
2423 if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
2424 continue;
2425 if (!strcmp(sha1_hex, current_hex))
2426 continue;
2427 shared_index_path = git_path("%s", de->d_name);
2428 if (should_delete_shared_index(shared_index_path) > 0 &&
2429 unlink(shared_index_path))
2430 warning_errno(_("unable to unlink: %s"), shared_index_path);
2431 }
2432 closedir(dir);
2433
2434 return 0;
2435}
2436
f6ecc62d 2437static struct tempfile temporary_sharedindex;
c18b80a0 2438
a0a96756
NTND
2439static int write_shared_index(struct index_state *istate,
2440 struct lock_file *lock, unsigned flags)
c18b80a0
NTND
2441{
2442 struct split_index *si = istate->split_index;
c18b80a0
NTND
2443 int fd, ret;
2444
f6ecc62d 2445 fd = mks_tempfile(&temporary_sharedindex, git_path("sharedindex_XXXXXX"));
a0a96756 2446 if (fd < 0) {
a0a96756
NTND
2447 hashclr(si->base_sha1);
2448 return do_write_locked_index(istate, lock, flags);
2449 }
c18b80a0 2450 move_cache_to_base_index(istate);
9f41c7a6 2451 ret = do_write_index(si->base, &temporary_sharedindex, 1);
c18b80a0 2452 if (ret) {
f6ecc62d 2453 delete_tempfile(&temporary_sharedindex);
c18b80a0
NTND
2454 return ret;
2455 }
df801f3f
CC
2456 ret = adjust_shared_perm(get_tempfile_path(&temporary_sharedindex));
2457 if (ret) {
2458 int save_errno = errno;
2459 error("cannot fix permission bits on %s", get_tempfile_path(&temporary_sharedindex));
2460 delete_tempfile(&temporary_sharedindex);
2461 errno = save_errno;
2462 return ret;
2463 }
f6ecc62d
MH
2464 ret = rename_tempfile(&temporary_sharedindex,
2465 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
b9683722 2466 if (!ret) {
c18b80a0 2467 hashcpy(si->base_sha1, si->base->sha1);
b9683722
CC
2468 clean_shared_index_files(sha1_to_hex(si->base->sha1));
2469 }
2470
c18b80a0
NTND
2471 return ret;
2472}
2473
e6a1dd77
CC
2474static const int default_max_percent_split_change = 20;
2475
2476static int too_many_not_shared_entries(struct index_state *istate)
2477{
2478 int i, not_shared = 0;
2479 int max_split = git_config_get_max_percent_split_change();
2480
2481 switch (max_split) {
2482 case -1:
2483 /* not or badly configured: use the default value */
2484 max_split = default_max_percent_split_change;
2485 break;
2486 case 0:
2487 return 1; /* 0% means always write a new shared index */
2488 case 100:
2489 return 0; /* 100% means never write a new shared index */
2490 default:
2491 break; /* just use the configured value */
2492 }
2493
2494 /* Count not shared entries */
2495 for (i = 0; i < istate->cache_nr; i++) {
2496 struct cache_entry *ce = istate->cache[i];
2497 if (!ce->index)
2498 not_shared++;
2499 }
2500
2501 return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100;
2502}
2503
03b86647
NTND
2504int write_locked_index(struct index_state *istate, struct lock_file *lock,
2505 unsigned flags)
2506{
0d59ffb4 2507 int new_shared_index, ret;
5fc2fc8f
NTND
2508 struct split_index *si = istate->split_index;
2509
5165dd59
NTND
2510 if (!si || alternate_index_output ||
2511 (istate->cache_changed & ~EXTMASK)) {
5fc2fc8f
NTND
2512 if (si)
2513 hashclr(si->base_sha1);
2514 return do_write_locked_index(istate, lock, flags);
2515 }
2516
d6e3c181
NTND
2517 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2518 int v = si->base_sha1[0];
2519 if ((v & 15) < 6)
2520 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2521 }
e6a1dd77
CC
2522 if (too_many_not_shared_entries(istate))
2523 istate->cache_changed |= SPLIT_INDEX_ORDERED;
0d59ffb4
CC
2524
2525 new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
2526
2527 if (new_shared_index) {
2528 ret = write_shared_index(istate, lock, flags);
c18b80a0
NTND
2529 if (ret)
2530 return ret;
2531 }
2532
0d59ffb4
CC
2533 ret = write_split_index(istate, lock, flags);
2534
2535 /* Freshen the shared index only if the split-index was written */
2536 if (!ret && !new_shared_index)
2537 freshen_shared_index(sha1_to_hex(si->base_sha1), 1);
2538
2539 return ret;
03b86647
NTND
2540}
2541
e46bbcf6
MV
2542/*
2543 * Read the index file that is potentially unmerged into given
63e8dc5b 2544 * index_state, dropping any unmerged entries. Returns true if
e46bbcf6
MV
2545 * the index is unmerged. Callers who want to refuse to work
2546 * from an unmerged state can call this and check its return value,
2547 * instead of calling read_cache().
2548 */
2549int read_index_unmerged(struct index_state *istate)
2550{
2551 int i;
d1a43f2a 2552 int unmerged = 0;
e46bbcf6
MV
2553
2554 read_index(istate);
e46bbcf6
MV
2555 for (i = 0; i < istate->cache_nr; i++) {
2556 struct cache_entry *ce = istate->cache[i];
d1a43f2a
JH
2557 struct cache_entry *new_ce;
2558 int size, len;
2559
2560 if (!ce_stage(ce))
e46bbcf6 2561 continue;
d1a43f2a 2562 unmerged = 1;
68c4f6a5 2563 len = ce_namelen(ce);
d1a43f2a
JH
2564 size = cache_entry_size(len);
2565 new_ce = xcalloc(1, size);
d1a43f2a 2566 memcpy(new_ce->name, ce->name, len);
b60e188c
TG
2567 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2568 new_ce->ce_namelen = len;
d1a43f2a
JH
2569 new_ce->ce_mode = ce->ce_mode;
2570 if (add_index_entry(istate, new_ce, 0))
2571 return error("%s: cannot drop to stage #0",
5699d17e 2572 new_ce->name);
e46bbcf6 2573 }
d1a43f2a 2574 return unmerged;
e46bbcf6 2575}
041aee31 2576
98fa4738
JK
2577/*
2578 * Returns 1 if the path is an "other" path with respect to
2579 * the index; that is, the path is not mentioned in the index at all,
2580 * either as a file, a directory with some files in the index,
2581 * or as an unmerged entry.
2582 *
2583 * We helpfully remove a trailing "/" from directories so that
2584 * the output of read_directory can be used as-is.
2585 */
2586int index_name_is_other(const struct index_state *istate, const char *name,
2587 int namelen)
2588{
2589 int pos;
2590 if (namelen && name[namelen - 1] == '/')
2591 namelen--;
2592 pos = index_name_pos(istate, name, namelen);
2593 if (0 <= pos)
2594 return 0; /* exact match */
2595 pos = -pos - 1;
2596 if (pos < istate->cache_nr) {
2597 struct cache_entry *ce = istate->cache[pos];
2598 if (ce_namelen(ce) == namelen &&
2599 !memcmp(ce->name, name, namelen))
2600 return 0; /* Yup, this one exists unmerged */
2601 }
2602 return 1;
2603}
29fb37b2 2604
87542508
BW
2605void *read_blob_data_from_index(const struct index_state *istate,
2606 const char *path, unsigned long *size)
29fb37b2
LF
2607{
2608 int pos, len;
2609 unsigned long sz;
2610 enum object_type type;
2611 void *data;
2612
2613 len = strlen(path);
2614 pos = index_name_pos(istate, path, len);
2615 if (pos < 0) {
2616 /*
2617 * We might be in the middle of a merge, in which
2618 * case we would read stage #2 (ours).
2619 */
2620 int i;
2621 for (i = -pos - 1;
2622 (pos < 0 && i < istate->cache_nr &&
2623 !strcmp(istate->cache[i]->name, path));
2624 i++)
2625 if (ce_stage(istate->cache[i]) == 2)
2626 pos = i;
2627 }
2628 if (pos < 0)
2629 return NULL;
99d1a986 2630 data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
29fb37b2
LF
2631 if (!data || type != OBJ_BLOB) {
2632 free(data);
2633 return NULL;
2634 }
ff366825
LF
2635 if (size)
2636 *size = sz;
29fb37b2
LF
2637 return data;
2638}
38612532
MH
2639
2640void stat_validity_clear(struct stat_validity *sv)
2641{
2642 free(sv->sd);
2643 sv->sd = NULL;
2644}
2645
2646int stat_validity_check(struct stat_validity *sv, const char *path)
2647{
2648 struct stat st;
2649
2650 if (stat(path, &st) < 0)
2651 return sv->sd == NULL;
2652 if (!sv->sd)
2653 return 0;
2654 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2655}
2656
2657void stat_validity_update(struct stat_validity *sv, int fd)
2658{
2659 struct stat st;
2660
2661 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2662 stat_validity_clear(sv);
2663 else {
2664 if (!sv->sd)
2665 sv->sd = xcalloc(1, sizeof(struct stat_data));
2666 fill_stat_data(sv->sd, &st);
2667 }
2668}