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