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