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