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