read-cache: introduce chmod_index_entry
[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
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 */
895ff3b2 330 if (ce_intent_to_add(ce))
331fcb59
JH
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
4e55ed32 633int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags, int force_mode)
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
4e55ed32
ET
662 if (S_ISREG(st_mode) && force_mode)
663 ce->ce_mode = create_ce_mode(force_mode);
664 else if (trust_executable_bit && has_symlinks)
d177cab0 665 ce->ce_mode = create_ce_mode(st_mode);
185c975f 666 else {
78a8d641
JS
667 /* If there is an existing entry, pick the mode bits and type
668 * from it, otherwise assume unexecutable regular file.
11be42a4 669 */
185c975f 670 struct cache_entry *ent;
20314271 671 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 672
4aab5b46 673 ent = (0 <= pos) ? istate->cache[pos] : NULL;
d177cab0 674 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
11be42a4
JS
675 }
676
dc1ae704
JJ
677 /* When core.ignorecase=true, determine if a directory of the same name but differing
678 * case already exists within the Git repository. If it does, ensure the directory
679 * case of the file being added to the repository matches (is folded into) the existing
680 * entry's directory case.
681 */
682 if (ignore_case) {
41284eb0 683 adjust_dirname_case(istate, ce->name);
dc1ae704
JJ
684 }
685
ebbd7439 686 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
d177cab0 687 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
0781b8a9 688 /* Nothing changed, really */
125fd984
JH
689 if (!S_ISGITLINK(alias->ce_mode))
690 ce_mark_uptodate(alias);
1102952b 691 alias->ce_flags |= CE_ADDED;
2d9426b0
SB
692
693 free(ce);
0781b8a9
JH
694 return 0;
695 }
39425819 696 if (!intent_only) {
2d9426b0
SB
697 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) {
698 free(ce);
39425819 699 return error("unable to index file %s", path);
2d9426b0 700 }
39425819 701 } else
b4b313f9 702 set_object_name_for_intent_to_add_entry(ce);
39425819 703
1102952b 704 if (ignore_case && alias && different_name(ce, alias))
045113a5 705 ce = create_alias_ce(istate, ce, alias);
1102952b 706 ce->ce_flags |= CE_ADDED;
38ed1d89 707
3bf0dd1f 708 /* It was suspected to be racily clean, but it turns out to be Ok */
38ed1d89
JH
709 was_same = (alias &&
710 !ce_stage(alias) &&
711 !hashcmp(alias->sha1, ce->sha1) &&
712 ce->ce_mode == alias->ce_mode);
713
714 if (pretend)
067178ed
JH
715 free(ce);
716 else if (add_index_entry(istate, ce, add_option)) {
717 free(ce);
718 return error("unable to add %s to index", path);
719 }
38ed1d89 720 if (verbose && !was_same)
11be42a4 721 printf("add '%s'\n", path);
11be42a4
JS
722 return 0;
723}
724
4e55ed32
ET
725int add_file_to_index(struct index_state *istate, const char *path,
726 int flags, int force_mode)
d177cab0
LT
727{
728 struct stat st;
729 if (lstat(path, &st))
d824cbba 730 die_errno("unable to stat '%s'", path);
4e55ed32 731 return add_to_index(istate, path, &st, flags, force_mode);
d177cab0
LT
732}
733
6640f881
CR
734struct cache_entry *make_cache_entry(unsigned int mode,
735 const unsigned char *sha1, const char *path, int stage,
25762726 736 unsigned int refresh_options)
6640f881
CR
737{
738 int size, len;
bc1c2caa 739 struct cache_entry *ce, *ret;
6640f881 740
7e7abea9
DP
741 if (!verify_path(path)) {
742 error("Invalid path '%s'", path);
6640f881 743 return NULL;
7e7abea9 744 }
6640f881
CR
745
746 len = strlen(path);
747 size = cache_entry_size(len);
748 ce = xcalloc(1, size);
749
750 hashcpy(ce->sha1, sha1);
751 memcpy(ce->name, path, len);
b60e188c
TG
752 ce->ce_flags = create_ce_flags(stage);
753 ce->ce_namelen = len;
6640f881
CR
754 ce->ce_mode = create_ce_mode(mode);
755
bc1c2caa 756 ret = refresh_cache_entry(ce, refresh_options);
915e44c6 757 if (ret != ce)
bc1c2caa 758 free(ce);
915e44c6 759 return ret;
6640f881
CR
760}
761
d9d70966
TG
762/*
763 * Chmod an index entry with either +x or -x.
764 *
765 * Returns -1 if the chmod for the particular cache entry failed (if it's
766 * not a regular file), -2 if an invalid flip argument is passed in, 0
767 * otherwise.
768 */
769int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
770 char flip)
771{
772 if (!S_ISREG(ce->ce_mode))
773 return -1;
774 switch (flip) {
775 case '+':
776 ce->ce_mode |= 0111;
777 break;
778 case '-':
779 ce->ce_mode &= ~0111;
780 break;
781 default:
782 return -2;
783 }
784 cache_tree_invalidate_path(istate, ce->name);
785 ce->ce_flags |= CE_UPDATE_IN_BASE;
786 istate->cache_changed |= CE_ENTRY_CHANGED;
787
788 return 0;
789}
790
9c5e6c80 791int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
7b937ca3
LT
792{
793 int len = ce_namelen(a);
794 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
795}
796
8dcf39c4
LT
797/*
798 * We fundamentally don't like some paths: we don't want
799 * dot or dot-dot anywhere, and for obvious reasons don't
800 * want to recurse into ".git" either.
801 *
802 * Also, we don't want double slashes or slashes at the
803 * end that can make pathnames ambiguous.
804 */
805static int verify_dotfile(const char *rest)
806{
807 /*
808 * The first character was '.', but that
809 * has already been discarded, we now test
810 * the rest.
811 */
e0f530ff 812
8dcf39c4 813 /* "." is not allowed */
e0f530ff 814 if (*rest == '\0' || is_dir_sep(*rest))
8dcf39c4
LT
815 return 0;
816
e0f530ff 817 switch (*rest) {
8dcf39c4
LT
818 /*
819 * ".git" followed by NUL or slash is bad. This
820 * shares the path end test with the ".." case.
821 */
822 case 'g':
cc2fc7c2
JK
823 case 'G':
824 if (rest[1] != 'i' && rest[1] != 'I')
8dcf39c4 825 break;
cc2fc7c2 826 if (rest[2] != 't' && rest[2] != 'T')
8dcf39c4
LT
827 break;
828 rest += 2;
829 /* fallthrough */
830 case '.':
e0f530ff 831 if (rest[1] == '\0' || is_dir_sep(rest[1]))
8dcf39c4
LT
832 return 0;
833 }
834 return 1;
835}
836
837int verify_path(const char *path)
838{
839 char c;
840
56948cb6
EFL
841 if (has_dos_drive_prefix(path))
842 return 0;
843
8dcf39c4
LT
844 goto inside;
845 for (;;) {
846 if (!c)
847 return 1;
56948cb6 848 if (is_dir_sep(c)) {
8dcf39c4 849inside:
a42643aa
JK
850 if (protect_hfs && is_hfs_dotgit(path))
851 return 0;
2b4c6efc
JS
852 if (protect_ntfs && is_ntfs_dotgit(path))
853 return 0;
8dcf39c4 854 c = *path++;
3bdf09c7
JH
855 if ((c == '.' && !verify_dotfile(path)) ||
856 is_dir_sep(c) || c == '\0')
857 return 0;
8dcf39c4
LT
858 }
859 c = *path++;
860 }
861}
862
12676608
LT
863/*
864 * Do we have another file that has the beginning components being a
865 * proper superset of the name we're trying to add?
0f1e4f04 866 */
4aab5b46
JH
867static int has_file_name(struct index_state *istate,
868 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 869{
12676608
LT
870 int retval = 0;
871 int len = ce_namelen(ce);
b155725d 872 int stage = ce_stage(ce);
12676608 873 const char *name = ce->name;
0f1e4f04 874
4aab5b46
JH
875 while (pos < istate->cache_nr) {
876 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 877
12676608 878 if (len >= ce_namelen(p))
0f1e4f04 879 break;
12676608
LT
880 if (memcmp(name, p->name, len))
881 break;
b155725d
JH
882 if (ce_stage(p) != stage)
883 continue;
12676608
LT
884 if (p->name[len] != '/')
885 continue;
7a51ed66 886 if (p->ce_flags & CE_REMOVE)
21cd8d00 887 continue;
12676608
LT
888 retval = -1;
889 if (!ok_to_replace)
890 break;
4aab5b46 891 remove_index_entry_at(istate, --pos);
0f1e4f04 892 }
12676608
LT
893 return retval;
894}
0f1e4f04 895
12676608
LT
896/*
897 * Do we have another file with a pathname that is a proper
898 * subset of the name we're trying to add?
899 */
4aab5b46
JH
900static int has_dir_name(struct index_state *istate,
901 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
902{
903 int retval = 0;
b155725d 904 int stage = ce_stage(ce);
12676608
LT
905 const char *name = ce->name;
906 const char *slash = name + ce_namelen(ce);
0f1e4f04 907
12676608
LT
908 for (;;) {
909 int len;
0f1e4f04 910
12676608
LT
911 for (;;) {
912 if (*--slash == '/')
913 break;
914 if (slash <= ce->name)
915 return retval;
916 }
917 len = slash - name;
0f1e4f04 918
b60e188c 919 pos = index_name_stage_pos(istate, name, len, stage);
12676608 920 if (pos >= 0) {
21cd8d00
JH
921 /*
922 * Found one, but not so fast. This could
923 * be a marker that says "I was here, but
924 * I am being removed". Such an entry is
925 * not a part of the resulting tree, and
926 * it is Ok to have a directory at the same
927 * path.
928 */
077c48df 929 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
930 retval = -1;
931 if (!ok_to_replace)
932 break;
4aab5b46 933 remove_index_entry_at(istate, pos);
21cd8d00
JH
934 continue;
935 }
12676608 936 }
21cd8d00
JH
937 else
938 pos = -pos-1;
12676608
LT
939
940 /*
941 * Trivial optimization: if we find an entry that
942 * already matches the sub-directory, then we know
b155725d 943 * we're ok, and we can exit.
12676608 944 */
4aab5b46
JH
945 while (pos < istate->cache_nr) {
946 struct cache_entry *p = istate->cache[pos];
b155725d
JH
947 if ((ce_namelen(p) <= len) ||
948 (p->name[len] != '/') ||
949 memcmp(p->name, name, len))
950 break; /* not our subdirectory */
077c48df
JH
951 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
952 /*
953 * p is at the same stage as our entry, and
b155725d
JH
954 * is a subdirectory of what we are looking
955 * at, so we cannot have conflicts at our
956 * level or anything shorter.
957 */
958 return retval;
959 pos++;
192268c1 960 }
0f1e4f04 961 }
12676608
LT
962 return retval;
963}
964
965/* We may be in a situation where we already have path/file and path
966 * is being added, or we already have path and path/file is being
967 * added. Either one would result in a nonsense tree that has path
968 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 969 *
12676608
LT
970 * If ok-to-replace is specified, we remove the conflicting entries
971 * from the cache so the caller should recompute the insert position.
972 * When this happens, we return non-zero.
973 */
4aab5b46
JH
974static int check_file_directory_conflict(struct index_state *istate,
975 const struct cache_entry *ce,
976 int pos, int ok_to_replace)
12676608 977{
21cd8d00
JH
978 int retval;
979
980 /*
981 * When ce is an "I am going away" entry, we allow it to be added
982 */
7a51ed66 983 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
984 return 0;
985
12676608
LT
986 /*
987 * We check if the path is a sub-path of a subsequent pathname
988 * first, since removing those will not change the position
21cd8d00 989 * in the array.
12676608 990 */
4aab5b46 991 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 992
12676608
LT
993 /*
994 * Then check if the path might have a clashing sub-directory
995 * before it.
996 */
4aab5b46 997 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
998}
999
af3785dc 1000static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
1001{
1002 int pos;
192268c1
JH
1003 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
1004 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 1005 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 1006 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 1007
ce7c614b
NTND
1008 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1009 cache_tree_invalidate_path(istate, ce->name);
b60e188c 1010 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
197ee8c9 1011
3e09cdfd 1012 /* existing match? Just replace it. */
76e7f4ec 1013 if (pos >= 0) {
39425819
JH
1014 if (!new_only)
1015 replace_index_entry(istate, pos, ce);
197ee8c9
LT
1016 return 0;
1017 }
76e7f4ec 1018 pos = -pos-1;
197ee8c9 1019
ffcc9ba7
NTND
1020 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
1021 untracked_cache_add_to_index(istate, ce->name);
e931371a 1022
7b937ca3
LT
1023 /*
1024 * Inserting a merged entry ("stage 0") into the index
1025 * will always replace all non-merged entries..
1026 */
4aab5b46
JH
1027 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
1028 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 1029 ok_to_add = 1;
4aab5b46 1030 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
1031 break;
1032 }
1033 }
1034
121481ab
LT
1035 if (!ok_to_add)
1036 return -1;
8dcf39c4 1037 if (!verify_path(ce->name))
7e7abea9 1038 return error("Invalid path '%s'", ce->name);
121481ab 1039
3e09cdfd 1040 if (!skip_df_check &&
4aab5b46 1041 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 1042 if (!ok_to_replace)
4aab5b46
JH
1043 return error("'%s' appears as both a file and as a directory",
1044 ce->name);
b60e188c 1045 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
192268c1
JH
1046 pos = -pos-1;
1047 }
af3785dc
JH
1048 return pos + 1;
1049}
1050
1051int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
1052{
1053 int pos;
1054
1055 if (option & ADD_CACHE_JUST_APPEND)
1056 pos = istate->cache_nr;
1057 else {
1058 int ret;
1059 ret = add_index_entry_with_check(istate, ce, option);
1060 if (ret <= 0)
1061 return ret;
1062 pos = ret - 1;
1063 }
0f1e4f04 1064
197ee8c9 1065 /* Make sure the array is big enough .. */
999f5660 1066 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
197ee8c9
LT
1067
1068 /* Add it in.. */
4aab5b46 1069 istate->cache_nr++;
af3785dc 1070 if (istate->cache_nr > pos + 1)
4aab5b46
JH
1071 memmove(istate->cache + pos + 1,
1072 istate->cache + pos,
1073 (istate->cache_nr - pos - 1) * sizeof(ce));
cf558704 1074 set_index_entry(istate, pos, ce);
e636a7b4 1075 istate->cache_changed |= CE_ENTRY_ADDED;
197ee8c9
LT
1076 return 0;
1077}
1078
405e5b2f
LT
1079/*
1080 * "refresh" does not calculate a new sha1 file or bring the
1081 * cache up-to-date for mode/content changes. But what it
1082 * _does_ do is to "re-match" the stat information of a file
1083 * with the cache, so that you can refresh the cache for a
1084 * file that hasn't been changed but where the stat entry is
1085 * out of date.
1086 *
1087 * For example, you'd want to do this after doing a "git-read-tree",
1088 * to link up the stat cache details with the proper files.
1089 */
4aab5b46 1090static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da 1091 struct cache_entry *ce,
d05e6970
JK
1092 unsigned int options, int *err,
1093 int *changed_ret)
405e5b2f
LT
1094{
1095 struct stat st;
1096 struct cache_entry *updated;
1097 int changed, size;
25762726 1098 int refresh = options & CE_MATCH_REFRESH;
4bd5b7da 1099 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
56cac48c 1100 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
2e2e7ec1 1101 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
405e5b2f 1102
25762726 1103 if (!refresh || ce_uptodate(ce))
eadb5831
JH
1104 return ce;
1105
aa9349d4 1106 /*
56cac48c
NTND
1107 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1108 * that the change to the work tree does not matter and told
1109 * us not to worry.
aa9349d4 1110 */
56cac48c
NTND
1111 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1112 ce_mark_uptodate(ce);
1113 return ce;
1114 }
aa9349d4
MSO
1115 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1116 ce_mark_uptodate(ce);
1117 return ce;
1118 }
1119
ccad42d4
RS
1120 if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
1121 if (ignore_missing)
1122 return ce;
1123 if (err)
1124 *err = ENOENT;
1125 return NULL;
1126 }
1127
8fd2cb40 1128 if (lstat(ce->name, &st) < 0) {
2e2e7ec1
BK
1129 if (ignore_missing && errno == ENOENT)
1130 return ce;
ec0cc704
JH
1131 if (err)
1132 *err = errno;
8fd2cb40
JS
1133 return NULL;
1134 }
405e5b2f 1135
4bd5b7da 1136 changed = ie_match_stat(istate, ce, &st, options);
d05e6970
JK
1137 if (changed_ret)
1138 *changed_ret = changed;
405e5b2f 1139 if (!changed) {
4bd5b7da
JH
1140 /*
1141 * The path is unchanged. If we were told to ignore
1142 * valid bit, then we did the actual stat check and
1143 * found that the entry is unmodified. If the entry
1144 * is not marked VALID, this is the place to mark it
1145 * valid again, under "assume unchanged" mode.
1146 */
1147 if (ignore_valid && assume_unchanged &&
7a51ed66 1148 !(ce->ce_flags & CE_VALID))
405e5b2f 1149 ; /* mark this one VALID again */
eadb5831
JH
1150 else {
1151 /*
1152 * We do not mark the index itself "modified"
1153 * because CE_UPTODATE flag is in-core only;
1154 * we are not going to write this change out.
1155 */
125fd984
JH
1156 if (!S_ISGITLINK(ce->ce_mode))
1157 ce_mark_uptodate(ce);
8fd2cb40 1158 return ce;
eadb5831 1159 }
405e5b2f
LT
1160 }
1161
4bd5b7da 1162 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1163 if (err)
1164 *err = EINVAL;
8fd2cb40
JS
1165 return NULL;
1166 }
405e5b2f
LT
1167
1168 size = ce_size(ce);
1169 updated = xmalloc(size);
1170 memcpy(updated, ce, size);
1171 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
1172 /*
1173 * If ignore_valid is not set, we should leave CE_VALID bit
1174 * alone. Otherwise, paths marked with --no-assume-unchanged
1175 * (i.e. things to be edited) will reacquire CE_VALID bit
1176 * automatically, which is not really what we want.
405e5b2f 1177 */
4bd5b7da 1178 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1179 !(ce->ce_flags & CE_VALID))
1180 updated->ce_flags &= ~CE_VALID;
405e5b2f 1181
e636a7b4 1182 /* istate->cache_changed is updated in the caller */
405e5b2f
LT
1183 return updated;
1184}
1185
3deffc52 1186static void show_file(const char * fmt, const char * name, int in_porcelain,
046613c5 1187 int * first, const char *header_msg)
3deffc52
MM
1188{
1189 if (in_porcelain && *first && header_msg) {
1190 printf("%s\n", header_msg);
cd2b8ae9 1191 *first = 0;
3deffc52
MM
1192 }
1193 printf(fmt, name);
1194}
1195
9b2d6149
NTND
1196int refresh_index(struct index_state *istate, unsigned int flags,
1197 const struct pathspec *pathspec,
046613c5 1198 char *seen, const char *header_msg)
405e5b2f
LT
1199{
1200 int i;
1201 int has_errors = 0;
1202 int really = (flags & REFRESH_REALLY) != 0;
1203 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1204 int quiet = (flags & REFRESH_QUIET) != 0;
1205 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1206 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
3deffc52
MM
1207 int first = 1;
1208 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
25762726
BK
1209 unsigned int options = (CE_MATCH_REFRESH |
1210 (really ? CE_MATCH_IGNORE_VALID : 0) |
2e2e7ec1 1211 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
4bd4e730 1212 const char *modified_fmt;
73b7eae6
JK
1213 const char *deleted_fmt;
1214 const char *typechange_fmt;
1215 const char *added_fmt;
4bd4e730 1216 const char *unmerged_fmt;
405e5b2f 1217
4bd4e730 1218 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
73b7eae6
JK
1219 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1220 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1221 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
4bd4e730 1222 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
4aab5b46 1223 for (i = 0; i < istate->cache_nr; i++) {
405e5b2f 1224 struct cache_entry *ce, *new;
ec0cc704 1225 int cache_errno = 0;
73b7eae6 1226 int changed = 0;
3d1f148c 1227 int filtered = 0;
ec0cc704 1228
4aab5b46 1229 ce = istate->cache[i];
5fdeacb0
JS
1230 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1231 continue;
1232
429bb40a 1233 if (pathspec && !ce_path_match(ce, pathspec, seen))
3d1f148c
JH
1234 filtered = 1;
1235
405e5b2f 1236 if (ce_stage(ce)) {
4aab5b46
JH
1237 while ((i < istate->cache_nr) &&
1238 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1239 i++;
1240 i--;
1241 if (allow_unmerged)
1242 continue;
3d1f148c
JH
1243 if (!filtered)
1244 show_file(unmerged_fmt, ce->name, in_porcelain,
1245 &first, header_msg);
405e5b2f
LT
1246 has_errors = 1;
1247 continue;
1248 }
1249
3d1f148c 1250 if (filtered)
d616813d
AJ
1251 continue;
1252
73b7eae6 1253 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
8fd2cb40 1254 if (new == ce)
405e5b2f 1255 continue;
8fd2cb40 1256 if (!new) {
73b7eae6
JK
1257 const char *fmt;
1258
8fd2cb40 1259 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1260 /* If we are doing --really-refresh that
1261 * means the index is not valid anymore.
1262 */
7a51ed66 1263 ce->ce_flags &= ~CE_VALID;
078a58e8 1264 ce->ce_flags |= CE_UPDATE_IN_BASE;
e636a7b4 1265 istate->cache_changed |= CE_ENTRY_CHANGED;
405e5b2f
LT
1266 }
1267 if (quiet)
1268 continue;
73b7eae6
JK
1269
1270 if (cache_errno == ENOENT)
1271 fmt = deleted_fmt;
895ff3b2 1272 else if (ce_intent_to_add(ce))
73b7eae6
JK
1273 fmt = added_fmt; /* must be before other checks */
1274 else if (changed & TYPE_CHANGED)
1275 fmt = typechange_fmt;
1276 else
1277 fmt = modified_fmt;
1278 show_file(fmt,
1279 ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1280 has_errors = 1;
1281 continue;
1282 }
cf558704
LT
1283
1284 replace_index_entry(istate, i, new);
405e5b2f
LT
1285 }
1286 return has_errors;
1287}
1288
25762726
BK
1289static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1290 unsigned int options)
ec0cc704 1291{
25762726 1292 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
ec0cc704
JH
1293}
1294
db3b313c
JH
1295
1296/*****************************************************************
1297 * Index File I/O
1298 *****************************************************************/
1299
9d227781
JH
1300#define INDEX_FORMAT_DEFAULT 3
1301
136347d7
TG
1302static unsigned int get_index_format_default(void)
1303{
1304 char *envversion = getenv("GIT_INDEX_VERSION");
3c09d684 1305 char *endp;
b27a5720 1306 int value;
3c09d684
TG
1307 unsigned int version = INDEX_FORMAT_DEFAULT;
1308
136347d7 1309 if (!envversion) {
b27a5720
TA
1310 if (!git_config_get_int("index.version", &value))
1311 version = value;
3c09d684
TG
1312 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1313 warning(_("index.version set, but the value is invalid.\n"
136347d7 1314 "Using version %i"), INDEX_FORMAT_DEFAULT);
3c09d684 1315 return INDEX_FORMAT_DEFAULT;
136347d7
TG
1316 }
1317 return version;
1318 }
3c09d684
TG
1319
1320 version = strtoul(envversion, &endp, 10);
1321 if (*endp ||
1322 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1323 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1324 "Using version %i"), INDEX_FORMAT_DEFAULT);
1325 version = INDEX_FORMAT_DEFAULT;
1326 }
1327 return version;
136347d7
TG
1328}
1329
db3b313c
JH
1330/*
1331 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1332 * Again - this is just a (very strong in practice) heuristic that
1333 * the inode hasn't changed.
1334 *
1335 * We save the fields in big-endian order to allow using the
1336 * index file over NFS transparently.
1337 */
1338struct ondisk_cache_entry {
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 1348 uint16_t flags;
db3b313c
JH
1349 char name[FLEX_ARRAY]; /* more */
1350};
1351
1352/*
1353 * This struct is used when CE_EXTENDED bit is 1
1354 * The struct must match ondisk_cache_entry exactly from
1355 * ctime till flags
1356 */
1357struct ondisk_cache_entry_extended {
1358 struct cache_time ctime;
1359 struct cache_time mtime;
7800c1eb
TG
1360 uint32_t dev;
1361 uint32_t ino;
1362 uint32_t mode;
1363 uint32_t uid;
1364 uint32_t gid;
1365 uint32_t size;
db3b313c 1366 unsigned char sha1[20];
7800c1eb
TG
1367 uint16_t flags;
1368 uint16_t flags2;
db3b313c
JH
1369 char name[FLEX_ARRAY]; /* more */
1370};
1371
6c9cd161 1372/* These are only used for v3 or lower */
db3b313c
JH
1373#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1374#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1375#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1376#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1377 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1378 ondisk_cache_entry_size(ce_namelen(ce)))
1379
bad68ec9 1380static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163 1381{
9126f009 1382 git_SHA_CTX c;
bad68ec9 1383 unsigned char sha1[20];
0136bac9 1384 int hdr_version;
e83c5163 1385
ccc4feb5 1386 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 1387 return error("bad signature");
0136bac9 1388 hdr_version = ntohl(hdr->hdr_version);
b82a7b5b 1389 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
0136bac9 1390 return error("bad index version %d", hdr_version);
9126f009
NP
1391 git_SHA1_Init(&c);
1392 git_SHA1_Update(&c, hdr, size - 20);
1393 git_SHA1_Final(sha1, &c);
a89fccd2 1394 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
ca9be054 1395 return error("bad index file sha1 signature");
e83c5163
LT
1396 return 0;
1397}
1398
4aab5b46
JH
1399static int read_index_extension(struct index_state *istate,
1400 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
1401{
1402 switch (CACHE_EXT(ext)) {
1403 case CACHE_EXT_TREE:
4aab5b46 1404 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9 1405 break;
cfc5789a
JH
1406 case CACHE_EXT_RESOLVE_UNDO:
1407 istate->resolve_undo = resolve_undo_read(data, sz);
1408 break;
5fc2fc8f
NTND
1409 case CACHE_EXT_LINK:
1410 if (read_link_extension(istate, data, sz))
1411 return -1;
1412 break;
f9e6c649
NTND
1413 case CACHE_EXT_UNTRACKED:
1414 istate->untracked = read_untracked_extension(data, sz);
1415 break;
bad68ec9
JH
1416 default:
1417 if (*ext < 'A' || 'Z' < *ext)
1418 return error("index uses %.4s extension, which we do not understand",
1419 ext);
1420 fprintf(stderr, "ignoring %.4s extension\n", ext);
1421 break;
1422 }
1423 return 0;
1424}
1425
216aab1e
MH
1426int hold_locked_index(struct lock_file *lk, int die_on_error)
1427{
1428 return hold_lock_file_for_update(lk, get_index_file(),
1429 die_on_error
1430 ? LOCK_DIE_ON_ERROR
1431 : 0);
1432}
1433
4aab5b46 1434int read_index(struct index_state *istate)
8fd2cb40 1435{
4aab5b46 1436 return read_index_from(istate, get_index_file());
8fd2cb40
JS
1437}
1438
3fc22b53
JH
1439static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1440 unsigned int flags,
1441 const char *name,
1442 size_t len)
1443{
1444 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1445
c3d8da57
JK
1446 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1447 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1448 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1449 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1450 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1451 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1452 ce->ce_mode = get_be32(&ondisk->mode);
1453 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1454 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1455 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
b60e188c
TG
1456 ce->ce_flags = flags & ~CE_NAMEMASK;
1457 ce->ce_namelen = len;
5fc2fc8f 1458 ce->index = 0;
3fc22b53
JH
1459 hashcpy(ce->sha1, ondisk->sha1);
1460 memcpy(ce->name, name, len);
1461 ce->name[len] = '\0';
1462 return ce;
1463}
1464
6c9cd161
JH
1465/*
1466 * Adjacent cache entries tend to share the leading paths, so it makes
1467 * sense to only store the differences in later entries. In the v4
1468 * on-disk format of the index, each on-disk cache entry stores the
1469 * number of bytes to be stripped from the end of the previous name,
1470 * and the bytes to append to the result, to come up with its name.
1471 */
1472static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1473{
1474 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1475 size_t len = decode_varint(&cp);
1476
1477 if (name->len < len)
1478 die("malformed name field in the index");
1479 strbuf_remove(name, name->len - len, len);
1480 for (ep = cp; *ep; ep++)
1481 ; /* find the end */
1482 strbuf_add(name, cp, ep - cp);
1483 return (const char *)ep + 1 - cp_;
1484}
1485
936f53d0 1486static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
6c9cd161
JH
1487 unsigned long *ent_size,
1488 struct strbuf *previous_name)
7a51ed66 1489{
debed2a6 1490 struct cache_entry *ce;
7fec10b7 1491 size_t len;
06aaaa0b 1492 const char *name;
debed2a6 1493 unsigned int flags;
7fec10b7 1494
7a51ed66 1495 /* On-disk flags are just 16 bits */
c3d8da57 1496 flags = get_be16(&ondisk->flags);
debed2a6 1497 len = flags & CE_NAMEMASK;
7fec10b7 1498
debed2a6 1499 if (flags & CE_EXTENDED) {
06aaaa0b
NTND
1500 struct ondisk_cache_entry_extended *ondisk2;
1501 int extended_flags;
1502 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
c3d8da57 1503 extended_flags = get_be16(&ondisk2->flags2) << 16;
06aaaa0b
NTND
1504 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1505 if (extended_flags & ~CE_EXTENDED_FLAGS)
1506 die("Unknown index entry format %08x", extended_flags);
debed2a6 1507 flags |= extended_flags;
06aaaa0b
NTND
1508 name = ondisk2->name;
1509 }
1510 else
1511 name = ondisk->name;
1512
6c9cd161
JH
1513 if (!previous_name) {
1514 /* v3 and earlier */
1515 if (len == CE_NAMEMASK)
1516 len = strlen(name);
1517 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1518
1519 *ent_size = ondisk_ce_size(ce);
1520 } else {
1521 unsigned long consumed;
1522 consumed = expand_name_field(previous_name, name);
1523 ce = cache_entry_from_ondisk(ondisk, flags,
1524 previous_name->buf,
1525 previous_name->len);
1526
1527 *ent_size = (name - ((char *)ondisk)) + consumed;
1528 }
debed2a6 1529 return ce;
cf558704
LT
1530}
1531
03f15a79 1532static void check_ce_order(struct index_state *istate)
15999d0b 1533{
03f15a79
TG
1534 unsigned int i;
1535
1536 for (i = 1; i < istate->cache_nr; i++) {
1537 struct cache_entry *ce = istate->cache[i - 1];
1538 struct cache_entry *next_ce = istate->cache[i];
1539 int name_compare = strcmp(ce->name, next_ce->name);
1540
1541 if (0 < name_compare)
1542 die("unordered stage entries in index");
1543 if (!name_compare) {
1544 if (!ce_stage(ce))
1545 die("multiple stage entries for merged file '%s'",
1546 ce->name);
1547 if (ce_stage(ce) > ce_stage(next_ce))
1548 die("unordered stage entries for '%s'",
1549 ce->name);
1550 }
15999d0b
JSP
1551 }
1552}
1553
435ec090
CC
1554static void tweak_untracked_cache(struct index_state *istate)
1555{
1556 switch (git_config_get_untracked_cache()) {
1557 case -1: /* keep: do nothing */
1558 break;
1559 case 0: /* false */
1560 remove_untracked_cache(istate);
1561 break;
1562 case 1: /* true */
1563 add_untracked_cache(istate);
1564 break;
1565 default: /* unknown value: do nothing */
1566 break;
1567 }
1568}
1569
1570static void post_read_index_from(struct index_state *istate)
1571{
1572 check_ce_order(istate);
1573 tweak_untracked_cache(istate);
1574}
1575
8fd2cb40 1576/* remember to discard_cache() before reading a different cache! */
3e52f70b 1577int do_read_index(struct index_state *istate, const char *path, int must_exist)
e83c5163
LT
1578{
1579 int fd, i;
1580 struct stat st;
debed2a6 1581 unsigned long src_offset;
e83c5163 1582 struct cache_header *hdr;
7a51ed66
LT
1583 void *mmap;
1584 size_t mmap_size;
6c9cd161 1585 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
e83c5163 1586
913e0e99 1587 if (istate->initialized)
4aab5b46 1588 return istate->cache_nr;
5d1a5c02 1589
fba2f38a
KB
1590 istate->timestamp.sec = 0;
1591 istate->timestamp.nsec = 0;
8fd2cb40 1592 fd = open(path, O_RDONLY);
5d1a5c02 1593 if (fd < 0) {
5fc2fc8f 1594 if (!must_exist && errno == ENOENT)
5d1a5c02 1595 return 0;
5fc2fc8f 1596 die_errno("%s: index file open failed", path);
5d1a5c02 1597 }
e83c5163 1598
3511a377 1599 if (fstat(fd, &st))
d824cbba 1600 die_errno("cannot stat the open index");
3511a377 1601
7a51ed66
LT
1602 mmap_size = xsize_t(st.st_size);
1603 if (mmap_size < sizeof(struct cache_header) + 20)
3511a377
LFC
1604 die("index file smaller than expected");
1605
a1293ef7 1606 mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
7a51ed66 1607 if (mmap == MAP_FAILED)
0721c314 1608 die_errno("unable to map index file");
57d84f8d 1609 close(fd);
e83c5163 1610
7a51ed66
LT
1611 hdr = mmap;
1612 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1613 goto unmap;
1614
e93021b2 1615 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
9d227781 1616 istate->version = ntohl(hdr->hdr_version);
4aab5b46
JH
1617 istate->cache_nr = ntohl(hdr->hdr_entries);
1618 istate->cache_alloc = alloc_nr(istate->cache_nr);
c4aa3167 1619 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
913e0e99 1620 istate->initialized = 1;
7a51ed66 1621
9d227781 1622 if (istate->version == 4)
6c9cd161
JH
1623 previous_name = &previous_name_buf;
1624 else
1625 previous_name = NULL;
1626
7a51ed66 1627 src_offset = sizeof(*hdr);
4aab5b46 1628 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1629 struct ondisk_cache_entry *disk_ce;
4aab5b46 1630 struct cache_entry *ce;
936f53d0 1631 unsigned long consumed;
4aab5b46 1632
7a51ed66 1633 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
6c9cd161 1634 ce = create_from_disk(disk_ce, &consumed, previous_name);
cf558704 1635 set_index_entry(istate, i, ce);
7a51ed66 1636
936f53d0 1637 src_offset += consumed;
e83c5163 1638 }
6c9cd161 1639 strbuf_release(&previous_name_buf);
fba2f38a 1640 istate->timestamp.sec = st.st_mtime;
c06ff490 1641 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 1642
7a51ed66 1643 while (src_offset <= mmap_size - 20 - 8) {
bad68ec9
JH
1644 /* After an array of active_nr index entries,
1645 * there can be arbitrary number of extended
1646 * sections, each of which is prefixed with
1647 * extension name (4-byte) and section length
1648 * in 4-byte network byte order.
1649 */
07cc8eca 1650 uint32_t extsize;
7a51ed66 1651 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1652 extsize = ntohl(extsize);
4aab5b46 1653 if (read_index_extension(istate,
7a51ed66
LT
1654 (const char *) mmap + src_offset,
1655 (char *) mmap + src_offset + 8,
1d7f171c 1656 extsize) < 0)
bad68ec9 1657 goto unmap;
7a51ed66
LT
1658 src_offset += 8;
1659 src_offset += extsize;
bad68ec9 1660 }
7a51ed66 1661 munmap(mmap, mmap_size);
4aab5b46 1662 return istate->cache_nr;
e83c5163
LT
1663
1664unmap:
7a51ed66 1665 munmap(mmap, mmap_size);
5d1a5c02 1666 die("index file corrupt");
e83c5163
LT
1667}
1668
5fc2fc8f
NTND
1669int read_index_from(struct index_state *istate, const char *path)
1670{
1671 struct split_index *split_index;
1672 int ret;
1673
1674 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1675 if (istate->initialized)
1676 return istate->cache_nr;
1677
1678 ret = do_read_index(istate, path, 0);
435ec090 1679
5fc2fc8f 1680 split_index = istate->split_index;
03f15a79 1681 if (!split_index || is_null_sha1(split_index->base_sha1)) {
435ec090 1682 post_read_index_from(istate);
5fc2fc8f 1683 return ret;
03f15a79 1684 }
5fc2fc8f
NTND
1685
1686 if (split_index->base)
1687 discard_index(split_index->base);
1688 else
1689 split_index->base = xcalloc(1, sizeof(*split_index->base));
1690 ret = do_read_index(split_index->base,
1691 git_path("sharedindex.%s",
1692 sha1_to_hex(split_index->base_sha1)), 1);
1693 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1694 die("broken index, expect %s in %s, got %s",
1695 sha1_to_hex(split_index->base_sha1),
1696 git_path("sharedindex.%s",
6bea53c1 1697 sha1_to_hex(split_index->base_sha1)),
5fc2fc8f
NTND
1698 sha1_to_hex(split_index->base->sha1));
1699 merge_base_index(istate);
435ec090 1700 post_read_index_from(istate);
5fc2fc8f
NTND
1701 return ret;
1702}
1703
fa7b3c2f
JH
1704int is_index_unborn(struct index_state *istate)
1705{
debed2a6 1706 return (!istate->cache_nr && !istate->timestamp.sec);
fa7b3c2f
JH
1707}
1708
4aab5b46 1709int discard_index(struct index_state *istate)
6d297f81 1710{
debed2a6
RS
1711 int i;
1712
5fc2fc8f
NTND
1713 for (i = 0; i < istate->cache_nr; i++) {
1714 if (istate->cache[i]->index &&
1715 istate->split_index &&
1716 istate->split_index->base &&
1717 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1718 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1719 continue;
debed2a6 1720 free(istate->cache[i]);
5fc2fc8f 1721 }
cfc5789a 1722 resolve_undo_clear_index(istate);
4aab5b46
JH
1723 istate->cache_nr = 0;
1724 istate->cache_changed = 0;
fba2f38a
KB
1725 istate->timestamp.sec = 0;
1726 istate->timestamp.nsec = 0;
2092678c 1727 free_name_hash(istate);
4aab5b46 1728 cache_tree_free(&(istate->cache_tree));
913e0e99 1729 istate->initialized = 0;
a0fc4db0
RS
1730 free(istate->cache);
1731 istate->cache = NULL;
1732 istate->cache_alloc = 0;
5fc2fc8f 1733 discard_split_index(istate);
f9e6c649
NTND
1734 free_untracked_cache(istate->untracked);
1735 istate->untracked = NULL;
7a51ed66 1736 return 0;
6d297f81
JS
1737}
1738
d1f128b0 1739int unmerged_index(const struct index_state *istate)
94a5728c
DB
1740{
1741 int i;
1742 for (i = 0; i < istate->cache_nr; i++) {
1743 if (ce_stage(istate->cache[i]))
1744 return 1;
1745 }
1746 return 0;
1747}
1748
4990aadc 1749#define WRITE_BUFFER_SIZE 8192
bf0f910d 1750static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
1751static unsigned long write_buffer_len;
1752
9126f009 1753static int ce_write_flush(git_SHA_CTX *context, int fd)
6015c28b
JH
1754{
1755 unsigned int buffered = write_buffer_len;
1756 if (buffered) {
9126f009 1757 git_SHA1_Update(context, write_buffer, buffered);
93822c22 1758 if (write_in_full(fd, write_buffer, buffered) != buffered)
6015c28b
JH
1759 return -1;
1760 write_buffer_len = 0;
1761 }
1762 return 0;
1763}
1764
9126f009 1765static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
4990aadc
LT
1766{
1767 while (len) {
1768 unsigned int buffered = write_buffer_len;
1769 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1770 if (partial > len)
1771 partial = len;
1772 memcpy(write_buffer + buffered, data, partial);
1773 buffered += partial;
1774 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
1775 write_buffer_len = buffered;
1776 if (ce_write_flush(context, fd))
4990aadc
LT
1777 return -1;
1778 buffered = 0;
1779 }
1780 write_buffer_len = buffered;
1781 len -= partial;
1d7f171c 1782 data = (char *) data + partial;
a6080a0a
JH
1783 }
1784 return 0;
4990aadc
LT
1785}
1786
9126f009 1787static int write_index_ext_header(git_SHA_CTX *context, int fd,
ac58c7b1 1788 unsigned int ext, unsigned int sz)
bad68ec9
JH
1789{
1790 ext = htonl(ext);
1791 sz = htonl(sz);
968a1d65
DR
1792 return ((ce_write(context, fd, &ext, 4) < 0) ||
1793 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
1794}
1795
e93021b2 1796static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
4990aadc
LT
1797{
1798 unsigned int left = write_buffer_len;
ca9be054 1799
4990aadc
LT
1800 if (left) {
1801 write_buffer_len = 0;
9126f009 1802 git_SHA1_Update(context, write_buffer, left);
4990aadc 1803 }
ca9be054 1804
2c865d9a
QH
1805 /* Flush first if not enough space for SHA1 signature */
1806 if (left + 20 > WRITE_BUFFER_SIZE) {
93822c22 1807 if (write_in_full(fd, write_buffer, left) != left)
2c865d9a
QH
1808 return -1;
1809 left = 0;
1810 }
1811
ca9be054 1812 /* Append the SHA1 signature at the end */
9126f009 1813 git_SHA1_Final(write_buffer + left, context);
e93021b2 1814 hashcpy(sha1, write_buffer + left);
ca9be054 1815 left += 20;
93822c22 1816 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
4990aadc
LT
1817}
1818
407c8eb0
JH
1819static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1820{
1821 /*
1822 * The only thing we care about in this function is to smudge the
1823 * falsely clean entry due to touch-update-touch race, so we leave
1824 * everything else as they are. We are called for entries whose
c21d39d7 1825 * ce_stat_data.sd_mtime match the index file mtime.
c70115b4
JH
1826 *
1827 * Note that this actually does not do much for gitlinks, for
1828 * which ce_match_stat_basic() always goes to the actual
1829 * contents. The caller checks with is_racy_timestamp() which
1830 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
1831 */
1832 struct stat st;
1833
1834 if (lstat(ce->name, &st) < 0)
1835 return;
1836 if (ce_match_stat_basic(ce, &st))
1837 return;
1838 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
1839 /* This is "racily clean"; smudge it. Note that this
1840 * is a tricky code. At first glance, it may appear
1841 * that it can break with this sequence:
1842 *
1843 * $ echo xyzzy >frotz
1844 * $ git-update-index --add frotz
1845 * $ : >frotz
1846 * $ sleep 3
1847 * $ echo filfre >nitfol
1848 * $ git-update-index --add nitfol
1849 *
b7e58b17 1850 * but it does not. When the second update-index runs,
4b3511b0
JH
1851 * it notices that the entry "frotz" has the same timestamp
1852 * as index, and if we were to smudge it by resetting its
1853 * size to zero here, then the object name recorded
1854 * in index is the 6-byte file but the cached stat information
1855 * becomes zero --- which would then match what we would
a6080a0a 1856 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
1857 *
1858 * However, the second update-index, before calling
1859 * this function, notices that the cached size is 6
1860 * bytes and what is on the filesystem is an empty
1861 * file, and never calls us, so the cached size information
1862 * for "frotz" stays 6 which does not match the filesystem.
1863 */
c21d39d7 1864 ce->ce_stat_data.sd_size = 0;
407c8eb0
JH
1865 }
1866}
1867
f136f7bf
JH
1868/* Copy miscellaneous fields but not the name */
1869static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1870 struct cache_entry *ce)
7a51ed66 1871{
b60e188c
TG
1872 short flags;
1873
c21d39d7
MH
1874 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1875 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1876 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1877 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1878 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1879 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
7a51ed66 1880 ondisk->mode = htonl(ce->ce_mode);
c21d39d7
MH
1881 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1882 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1883 ondisk->size = htonl(ce->ce_stat_data.sd_size);
7a51ed66 1884 hashcpy(ondisk->sha1, ce->sha1);
b60e188c 1885
ce51bf09 1886 flags = ce->ce_flags & ~CE_NAMEMASK;
b60e188c
TG
1887 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1888 ondisk->flags = htons(flags);
06aaaa0b
NTND
1889 if (ce->ce_flags & CE_EXTENDED) {
1890 struct ondisk_cache_entry_extended *ondisk2;
1891 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1892 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
f136f7bf 1893 return ondisk2->name;
06aaaa0b 1894 }
f136f7bf
JH
1895 else {
1896 return ondisk->name;
1897 }
1898}
1899
9d227781
JH
1900static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1901 struct strbuf *previous_name)
f136f7bf 1902{
9d227781
JH
1903 int size;
1904 struct ondisk_cache_entry *ondisk;
b3c96fb1 1905 int saved_namelen = saved_namelen; /* compiler workaround */
f136f7bf
JH
1906 char *name;
1907 int result;
1908
b3c96fb1
NTND
1909 if (ce->ce_flags & CE_STRIP_NAME) {
1910 saved_namelen = ce_namelen(ce);
1911 ce->ce_namelen = 0;
1912 }
1913
9d227781
JH
1914 if (!previous_name) {
1915 size = ondisk_ce_size(ce);
1916 ondisk = xcalloc(1, size);
1917 name = copy_cache_entry_to_ondisk(ondisk, ce);
1918 memcpy(name, ce->name, ce_namelen(ce));
1919 } else {
1920 int common, to_remove, prefix_size;
1921 unsigned char to_remove_vi[16];
1922 for (common = 0;
1923 (ce->name[common] &&
1924 common < previous_name->len &&
1925 ce->name[common] == previous_name->buf[common]);
1926 common++)
1927 ; /* still matching */
1928 to_remove = previous_name->len - common;
1929 prefix_size = encode_varint(to_remove, to_remove_vi);
1930
1931 if (ce->ce_flags & CE_EXTENDED)
1932 size = offsetof(struct ondisk_cache_entry_extended, name);
1933 else
1934 size = offsetof(struct ondisk_cache_entry, name);
1935 size += prefix_size + (ce_namelen(ce) - common + 1);
1936
1937 ondisk = xcalloc(1, size);
1938 name = copy_cache_entry_to_ondisk(ondisk, ce);
1939 memcpy(name, to_remove_vi, prefix_size);
1940 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1941
1942 strbuf_splice(previous_name, common, to_remove,
1943 ce->name + common, ce_namelen(ce) - common);
06aaaa0b 1944 }
b3c96fb1
NTND
1945 if (ce->ce_flags & CE_STRIP_NAME) {
1946 ce->ce_namelen = saved_namelen;
1947 ce->ce_flags &= ~CE_STRIP_NAME;
1948 }
7a51ed66 1949
59efba64
JN
1950 result = ce_write(c, fd, ondisk, size);
1951 free(ondisk);
1952 return result;
7a51ed66
LT
1953}
1954
426ddeea
YM
1955/*
1956 * This function verifies if index_state has the correct sha1 of the
1957 * index file. Don't die if we have any other failure, just return 0.
1958 */
1959static int verify_index_from(const struct index_state *istate, const char *path)
1960{
1961 int fd;
1962 ssize_t n;
1963 struct stat st;
1964 unsigned char sha1[20];
1965
1966 if (!istate->initialized)
1967 return 0;
1968
1969 fd = open(path, O_RDONLY);
1970 if (fd < 0)
1971 return 0;
1972
1973 if (fstat(fd, &st))
1974 goto out;
1975
1976 if (st.st_size < sizeof(struct cache_header) + 20)
1977 goto out;
1978
1979 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
1980 if (n != 20)
1981 goto out;
1982
1983 if (hashcmp(istate->sha1, sha1))
1984 goto out;
1985
1986 close(fd);
1987 return 1;
1988
1989out:
1990 close(fd);
1991 return 0;
1992}
1993
1994static int verify_index(const struct index_state *istate)
1995{
1996 return verify_index_from(istate, get_index_file());
1997}
1998
483fbe2b
JH
1999static int has_racy_timestamp(struct index_state *istate)
2000{
2001 int entries = istate->cache_nr;
2002 int i;
2003
2004 for (i = 0; i < entries; i++) {
2005 struct cache_entry *ce = istate->cache[i];
2006 if (is_racy_timestamp(istate, ce))
2007 return 1;
2008 }
2009 return 0;
2010}
2011
ccdc4ec3 2012/*
98e023de 2013 * Opportunistically update the index but do not complain if we can't
ccdc4ec3
JH
2014 */
2015void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
2016{
483fbe2b 2017 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
788cef81 2018 verify_index(istate) &&
03b86647 2019 write_locked_index(istate, lockfile, COMMIT_LOCK))
ccdc4ec3
JH
2020 rollback_lock_file(lockfile);
2021}
2022
c18b80a0
NTND
2023static int do_write_index(struct index_state *istate, int newfd,
2024 int strip_extensions)
197ee8c9 2025{
9126f009 2026 git_SHA_CTX c;
197ee8c9 2027 struct cache_header hdr;
9d227781 2028 int i, err, removed, extended, hdr_version;
4aab5b46
JH
2029 struct cache_entry **cache = istate->cache;
2030 int entries = istate->cache_nr;
e1afca4f 2031 struct stat st;
9d227781 2032 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
025a0709 2033
06aaaa0b 2034 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 2035 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 2036 removed++;
197ee8c9 2037
06aaaa0b
NTND
2038 /* reduce extended entries if possible */
2039 cache[i]->ce_flags &= ~CE_EXTENDED;
2040 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
2041 extended++;
2042 cache[i]->ce_flags |= CE_EXTENDED;
2043 }
2044 }
2045
d6e3c181 2046 if (!istate->version) {
136347d7 2047 istate->version = get_index_format_default();
d6e3c181
NTND
2048 if (getenv("GIT_TEST_SPLIT_INDEX"))
2049 init_split_index(istate);
2050 }
9d227781
JH
2051
2052 /* demote version 3 to version 2 when the latter suffices */
2053 if (istate->version == 3 || istate->version == 2)
2054 istate->version = extended ? 3 : 2;
2055
2056 hdr_version = istate->version;
2057
ccc4feb5 2058 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
9d227781 2059 hdr.hdr_version = htonl(hdr_version);
025a0709 2060 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 2061
9126f009 2062 git_SHA1_Init(&c);
ca9be054 2063 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
2064 return -1;
2065
9d227781 2066 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
197ee8c9
LT
2067 for (i = 0; i < entries; i++) {
2068 struct cache_entry *ce = cache[i];
7a51ed66 2069 if (ce->ce_flags & CE_REMOVE)
aa16021e 2070 continue;
e06c43c7 2071 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
407c8eb0 2072 ce_smudge_racily_clean_entry(ce);
83bd7437
JK
2073 if (is_null_sha1(ce->sha1)) {
2074 static const char msg[] = "cache entry has null sha1: %s";
2075 static int allow = -1;
2076
2077 if (allow < 0)
2078 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
2079 if (allow)
2080 warning(msg, ce->name);
2081 else
2082 return error(msg, ce->name);
2083 }
9d227781 2084 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
197ee8c9
LT
2085 return -1;
2086 }
9d227781 2087 strbuf_release(&previous_name_buf);
1af1c2b6 2088
bad68ec9 2089 /* Write extension data here */
c18b80a0 2090 if (!strip_extensions && istate->split_index) {
5fc2fc8f
NTND
2091 struct strbuf sb = STRBUF_INIT;
2092
2093 err = write_link_extension(&sb, istate) < 0 ||
2094 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
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 }
c18b80a0 2101 if (!strip_extensions && istate->cache_tree) {
f285a2d7 2102 struct strbuf sb = STRBUF_INIT;
1dffb8fa 2103
1dffb8fa
PH
2104 cache_tree_write(&sb, istate->cache_tree);
2105 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
2106 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2107 strbuf_release(&sb);
2108 if (err)
bad68ec9 2109 return -1;
bad68ec9 2110 }
c18b80a0 2111 if (!strip_extensions && istate->resolve_undo) {
cfc5789a
JH
2112 struct strbuf sb = STRBUF_INIT;
2113
2114 resolve_undo_write(&sb, istate->resolve_undo);
2115 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2116 sb.len) < 0
2117 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2118 strbuf_release(&sb);
2119 if (err)
2120 return -1;
2121 }
83c094ad
NTND
2122 if (!strip_extensions && istate->untracked) {
2123 struct strbuf sb = STRBUF_INIT;
2124
2125 write_untracked_extension(&sb, istate->untracked);
2126 err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED,
2127 sb.len) < 0 ||
2128 ce_write(&c, newfd, sb.buf, sb.len) < 0;
2129 strbuf_release(&sb);
2130 if (err)
2131 return -1;
2132 }
e1afca4f 2133
e93021b2 2134 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
e1afca4f 2135 return -1;
5bcf109c
KB
2136 istate->timestamp.sec = (unsigned int)st.st_mtime;
2137 istate->timestamp.nsec = ST_MTIME_NSEC(st);
e1afca4f 2138 return 0;
197ee8c9 2139}
e46bbcf6 2140
626f35c8
NTND
2141void set_alternate_index_output(const char *name)
2142{
2143 alternate_index_output = name;
2144}
2145
2146static int commit_locked_index(struct lock_file *lk)
2147{
751baced
MH
2148 if (alternate_index_output)
2149 return commit_lock_file_to(lk, alternate_index_output);
2150 else
626f35c8 2151 return commit_lock_file(lk);
626f35c8
NTND
2152}
2153
03b86647
NTND
2154static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2155 unsigned flags)
2156{
c99a4c2d 2157 int ret = do_write_index(istate, get_lock_file_fd(lock), 0);
03b86647
NTND
2158 if (ret)
2159 return ret;
2160 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2161 (COMMIT_LOCK | CLOSE_LOCK));
2162 if (flags & COMMIT_LOCK)
2163 return commit_locked_index(lock);
2164 else if (flags & CLOSE_LOCK)
2165 return close_lock_file(lock);
2166 else
2167 return ret;
2168}
2169
5fc2fc8f
NTND
2170static int write_split_index(struct index_state *istate,
2171 struct lock_file *lock,
2172 unsigned flags)
2173{
2174 int ret;
2175 prepare_to_write_split_index(istate);
2176 ret = do_write_locked_index(istate, lock, flags);
2177 finish_writing_split_index(istate);
2178 return ret;
2179}
2180
f6ecc62d 2181static struct tempfile temporary_sharedindex;
c18b80a0 2182
a0a96756
NTND
2183static int write_shared_index(struct index_state *istate,
2184 struct lock_file *lock, unsigned flags)
c18b80a0
NTND
2185{
2186 struct split_index *si = istate->split_index;
c18b80a0
NTND
2187 int fd, ret;
2188
f6ecc62d 2189 fd = mks_tempfile(&temporary_sharedindex, git_path("sharedindex_XXXXXX"));
a0a96756 2190 if (fd < 0) {
a0a96756
NTND
2191 hashclr(si->base_sha1);
2192 return do_write_locked_index(istate, lock, flags);
2193 }
c18b80a0
NTND
2194 move_cache_to_base_index(istate);
2195 ret = do_write_index(si->base, fd, 1);
c18b80a0 2196 if (ret) {
f6ecc62d 2197 delete_tempfile(&temporary_sharedindex);
c18b80a0
NTND
2198 return ret;
2199 }
f6ecc62d
MH
2200 ret = rename_tempfile(&temporary_sharedindex,
2201 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
c18b80a0
NTND
2202 if (!ret)
2203 hashcpy(si->base_sha1, si->base->sha1);
2204 return ret;
2205}
2206
03b86647
NTND
2207int write_locked_index(struct index_state *istate, struct lock_file *lock,
2208 unsigned flags)
2209{
5fc2fc8f
NTND
2210 struct split_index *si = istate->split_index;
2211
5165dd59
NTND
2212 if (!si || alternate_index_output ||
2213 (istate->cache_changed & ~EXTMASK)) {
5fc2fc8f
NTND
2214 if (si)
2215 hashclr(si->base_sha1);
2216 return do_write_locked_index(istate, lock, flags);
2217 }
2218
d6e3c181
NTND
2219 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2220 int v = si->base_sha1[0];
2221 if ((v & 15) < 6)
2222 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2223 }
c18b80a0 2224 if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
a0a96756 2225 int ret = write_shared_index(istate, lock, flags);
c18b80a0
NTND
2226 if (ret)
2227 return ret;
2228 }
2229
5fc2fc8f 2230 return write_split_index(istate, lock, flags);
03b86647
NTND
2231}
2232
e46bbcf6
MV
2233/*
2234 * Read the index file that is potentially unmerged into given
63e8dc5b 2235 * index_state, dropping any unmerged entries. Returns true if
e46bbcf6
MV
2236 * the index is unmerged. Callers who want to refuse to work
2237 * from an unmerged state can call this and check its return value,
2238 * instead of calling read_cache().
2239 */
2240int read_index_unmerged(struct index_state *istate)
2241{
2242 int i;
d1a43f2a 2243 int unmerged = 0;
e46bbcf6
MV
2244
2245 read_index(istate);
e46bbcf6
MV
2246 for (i = 0; i < istate->cache_nr; i++) {
2247 struct cache_entry *ce = istate->cache[i];
d1a43f2a
JH
2248 struct cache_entry *new_ce;
2249 int size, len;
2250
2251 if (!ce_stage(ce))
e46bbcf6 2252 continue;
d1a43f2a 2253 unmerged = 1;
68c4f6a5 2254 len = ce_namelen(ce);
d1a43f2a
JH
2255 size = cache_entry_size(len);
2256 new_ce = xcalloc(1, size);
d1a43f2a 2257 memcpy(new_ce->name, ce->name, len);
b60e188c
TG
2258 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2259 new_ce->ce_namelen = len;
d1a43f2a
JH
2260 new_ce->ce_mode = ce->ce_mode;
2261 if (add_index_entry(istate, new_ce, 0))
2262 return error("%s: cannot drop to stage #0",
5699d17e 2263 new_ce->name);
e46bbcf6 2264 }
d1a43f2a 2265 return unmerged;
e46bbcf6 2266}
041aee31 2267
98fa4738
JK
2268/*
2269 * Returns 1 if the path is an "other" path with respect to
2270 * the index; that is, the path is not mentioned in the index at all,
2271 * either as a file, a directory with some files in the index,
2272 * or as an unmerged entry.
2273 *
2274 * We helpfully remove a trailing "/" from directories so that
2275 * the output of read_directory can be used as-is.
2276 */
2277int index_name_is_other(const struct index_state *istate, const char *name,
2278 int namelen)
2279{
2280 int pos;
2281 if (namelen && name[namelen - 1] == '/')
2282 namelen--;
2283 pos = index_name_pos(istate, name, namelen);
2284 if (0 <= pos)
2285 return 0; /* exact match */
2286 pos = -pos - 1;
2287 if (pos < istate->cache_nr) {
2288 struct cache_entry *ce = istate->cache[pos];
2289 if (ce_namelen(ce) == namelen &&
2290 !memcmp(ce->name, name, namelen))
2291 return 0; /* Yup, this one exists unmerged */
2292 }
2293 return 1;
2294}
29fb37b2 2295
ff366825 2296void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
29fb37b2
LF
2297{
2298 int pos, len;
2299 unsigned long sz;
2300 enum object_type type;
2301 void *data;
2302
2303 len = strlen(path);
2304 pos = index_name_pos(istate, path, len);
2305 if (pos < 0) {
2306 /*
2307 * We might be in the middle of a merge, in which
2308 * case we would read stage #2 (ours).
2309 */
2310 int i;
2311 for (i = -pos - 1;
2312 (pos < 0 && i < istate->cache_nr &&
2313 !strcmp(istate->cache[i]->name, path));
2314 i++)
2315 if (ce_stage(istate->cache[i]) == 2)
2316 pos = i;
2317 }
2318 if (pos < 0)
2319 return NULL;
2320 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2321 if (!data || type != OBJ_BLOB) {
2322 free(data);
2323 return NULL;
2324 }
ff366825
LF
2325 if (size)
2326 *size = sz;
29fb37b2
LF
2327 return data;
2328}
38612532
MH
2329
2330void stat_validity_clear(struct stat_validity *sv)
2331{
2332 free(sv->sd);
2333 sv->sd = NULL;
2334}
2335
2336int stat_validity_check(struct stat_validity *sv, const char *path)
2337{
2338 struct stat st;
2339
2340 if (stat(path, &st) < 0)
2341 return sv->sd == NULL;
2342 if (!sv->sd)
2343 return 0;
2344 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2345}
2346
2347void stat_validity_update(struct stat_validity *sv, int fd)
2348{
2349 struct stat st;
2350
2351 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2352 stat_validity_clear(sv);
2353 else {
2354 if (!sv->sd)
2355 sv->sd = xcalloc(1, sizeof(struct stat_data));
2356 fill_stat_data(sv->sd, &st);
2357 }
2358}