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