reset: make the reminder output consistent with "checkout"
[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"
bad68ec9 8#include "cache-tree.h"
f35a6d3b 9#include "refs.h"
d616813d 10#include "dir.h"
041aee31
JH
11#include "tree.h"
12#include "commit.h"
13#include "diff.h"
14#include "diffcore.h"
15#include "revision.h"
39425819 16#include "blob.h"
bad68ec9
JH
17
18/* Index extensions.
19 *
20 * The first letter should be 'A'..'Z' for extensions that are not
21 * necessary for a correct operation (i.e. optimization data).
22 * When new extensions are added that _needs_ to be understood in
23 * order to correctly interpret the index file, pick character that
24 * is outside the range, to cause the reader to abort.
25 */
26
27#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
28#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
e83c5163 29
228e94f9 30struct index_state the_index;
8fd2cb40 31
9cb76b8c
JH
32static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
33{
34 istate->cache[nr] = ce;
96872bc2 35 add_name_hash(istate, ce);
9cb76b8c
JH
36}
37
cf558704
LT
38static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
39{
40 struct cache_entry *old = istate->cache[nr];
41
96872bc2 42 remove_name_hash(old);
a22c6371 43 set_index_entry(istate, nr, ce);
cf558704
LT
44 istate->cache_changed = 1;
45}
46
81dc2307
PB
47void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
48{
49 struct cache_entry *old = istate->cache[nr], *new;
50 int namelen = strlen(new_name);
51
52 new = xmalloc(cache_entry_size(namelen));
53 copy_cache_entry(new, old);
54 new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
55 new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
56 memcpy(new->name, new_name, namelen + 1);
57
58 cache_tree_invalidate_path(istate->cache_tree, old->name);
59 remove_index_entry_at(istate, nr);
60 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
61}
62
415e96c8
JH
63/*
64 * This only updates the "non-critical" parts of the directory
65 * cache, ie the parts that aren't tracked by GIT, and only used
66 * to validate the cache.
67 */
68void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
69{
fba2f38a
KB
70 ce->ce_ctime.sec = (unsigned int)st->st_ctime;
71 ce->ce_mtime.sec = (unsigned int)st->st_mtime;
c06ff490
KB
72 ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
73 ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
7a51ed66
LT
74 ce->ce_dev = st->st_dev;
75 ce->ce_ino = st->st_ino;
76 ce->ce_uid = st->st_uid;
77 ce->ce_gid = st->st_gid;
78 ce->ce_size = st->st_size;
5f73076c
JH
79
80 if (assume_unchanged)
7a51ed66 81 ce->ce_flags |= CE_VALID;
eadb5831
JH
82
83 if (S_ISREG(st->st_mode))
84 ce_mark_uptodate(ce);
415e96c8
JH
85}
86
29e4d363
JH
87static int ce_compare_data(struct cache_entry *ce, struct stat *st)
88{
89 int match = -1;
90 int fd = open(ce->name, O_RDONLY);
91
92 if (fd >= 0) {
93 unsigned char sha1[20];
53bca91a 94 if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
a89fccd2 95 match = hashcmp(sha1, ce->sha1);
7f8508e8 96 /* index_fd() closed the file descriptor already */
29e4d363
JH
97 }
98 return match;
99}
100
dc49cd76 101static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
29e4d363
JH
102{
103 int match = -1;
29e4d363
JH
104 void *buffer;
105 unsigned long size;
21666f1a 106 enum object_type type;
a60272b3 107 struct strbuf sb = STRBUF_INIT;
29e4d363 108
a60272b3 109 if (strbuf_readlink(&sb, ce->name, expected_size))
29e4d363 110 return -1;
a60272b3 111
21666f1a 112 buffer = read_sha1_file(ce->sha1, &type, &size);
a60272b3
LT
113 if (buffer) {
114 if (size == sb.len)
115 match = memcmp(buffer, sb.buf, size);
116 free(buffer);
29e4d363 117 }
a60272b3 118 strbuf_release(&sb);
29e4d363
JH
119 return match;
120}
121
f35a6d3b
LT
122static int ce_compare_gitlink(struct cache_entry *ce)
123{
124 unsigned char sha1[20];
125
126 /*
127 * We don't actually require that the .git directory
302b9282 128 * under GITLINK directory be a valid git directory. It
f35a6d3b
LT
129 * might even be missing (in case nobody populated that
130 * sub-project).
131 *
132 * If so, we consider it always to match.
133 */
134 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
135 return 0;
136 return hashcmp(sha1, ce->sha1);
137}
138
29e4d363
JH
139static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
140{
141 switch (st->st_mode & S_IFMT) {
142 case S_IFREG:
143 if (ce_compare_data(ce, st))
144 return DATA_CHANGED;
145 break;
146 case S_IFLNK:
dc49cd76 147 if (ce_compare_link(ce, xsize_t(st->st_size)))
29e4d363
JH
148 return DATA_CHANGED;
149 break;
a8ee75bc 150 case S_IFDIR:
7a51ed66 151 if (S_ISGITLINK(ce->ce_mode))
c70115b4 152 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
29e4d363
JH
153 default:
154 return TYPE_CHANGED;
155 }
156 return 0;
157}
158
f55527f8 159int is_empty_blob_sha1(const unsigned char *sha1)
f49c2c22
LT
160{
161 static const unsigned char empty_blob_sha1[20] = {
162 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
163 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
164 };
165
166 return !hashcmp(sha1, empty_blob_sha1);
167}
168
407c8eb0 169static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
734aab75
LT
170{
171 unsigned int changed = 0;
172
7a51ed66
LT
173 if (ce->ce_flags & CE_REMOVE)
174 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
175
176 switch (ce->ce_mode & S_IFMT) {
8ae0a8c5
KS
177 case S_IFREG:
178 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
3e09cdfd
JH
179 /* We consider only the owner x bit to be relevant for
180 * "mode changes"
181 */
182 if (trust_executable_bit &&
7a51ed66 183 (0100 & (ce->ce_mode ^ st->st_mode)))
ffbe1add 184 changed |= MODE_CHANGED;
8ae0a8c5
KS
185 break;
186 case S_IFLNK:
78a8d641
JS
187 if (!S_ISLNK(st->st_mode) &&
188 (has_symlinks || !S_ISREG(st->st_mode)))
189 changed |= TYPE_CHANGED;
8ae0a8c5 190 break;
302b9282 191 case S_IFGITLINK:
c70115b4 192 /* We ignore most of the st_xxx fields for gitlinks */
f35a6d3b
LT
193 if (!S_ISDIR(st->st_mode))
194 changed |= TYPE_CHANGED;
195 else if (ce_compare_gitlink(ce))
196 changed |= DATA_CHANGED;
a8ee75bc 197 return changed;
8ae0a8c5 198 default:
7a51ed66 199 die("internal error: ce_mode is %o", ce->ce_mode);
8ae0a8c5 200 }
fba2f38a 201 if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
ccc4feb5 202 changed |= MTIME_CHANGED;
fba2f38a 203 if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
734aab75 204 changed |= CTIME_CHANGED;
ccc4feb5 205
fba2f38a 206#ifdef USE_NSEC
110c46a9 207 if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
fba2f38a 208 changed |= MTIME_CHANGED;
110c46a9 209 if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
fba2f38a
KB
210 changed |= CTIME_CHANGED;
211#endif
212
7a51ed66
LT
213 if (ce->ce_uid != (unsigned int) st->st_uid ||
214 ce->ce_gid != (unsigned int) st->st_gid)
734aab75 215 changed |= OWNER_CHANGED;
7a51ed66 216 if (ce->ce_ino != (unsigned int) st->st_ino)
734aab75 217 changed |= INODE_CHANGED;
2cb45e95
LT
218
219#ifdef USE_STDEV
220 /*
221 * st_dev breaks on network filesystems where different
222 * clients will have different views of what "device"
223 * the filesystem is on
224 */
7a51ed66 225 if (ce->ce_dev != (unsigned int) st->st_dev)
2cb45e95
LT
226 changed |= INODE_CHANGED;
227#endif
228
7a51ed66 229 if (ce->ce_size != (unsigned int) st->st_size)
734aab75 230 changed |= DATA_CHANGED;
b0391890 231
f49c2c22
LT
232 /* Racily smudged entry? */
233 if (!ce->ce_size) {
234 if (!is_empty_blob_sha1(ce->sha1))
235 changed |= DATA_CHANGED;
236 }
237
407c8eb0
JH
238 return changed;
239}
240
d1f128b0 241static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
6d91da6d 242{
050288d5 243 return (!S_ISGITLINK(ce->ce_mode) &&
fba2f38a
KB
244 istate->timestamp.sec &&
245#ifdef USE_NSEC
246 /* nanosecond timestamped files can also be racy! */
247 (istate->timestamp.sec < ce->ce_mtime.sec ||
248 (istate->timestamp.sec == ce->ce_mtime.sec &&
249 istate->timestamp.nsec <= ce->ce_mtime.nsec))
250#else
251 istate->timestamp.sec <= ce->ce_mtime.sec
252#endif
253 );
6d91da6d
JH
254}
255
d1f128b0 256int ie_match_stat(const struct index_state *istate,
4bd5b7da
JH
257 struct cache_entry *ce, struct stat *st,
258 unsigned int options)
407c8eb0 259{
5f73076c 260 unsigned int changed;
4bd5b7da
JH
261 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
262 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
5f73076c
JH
263
264 /*
265 * If it's marked as always valid in the index, it's
266 * valid whatever the checked-out copy says.
267 */
7a51ed66 268 if (!ignore_valid && (ce->ce_flags & CE_VALID))
5f73076c
JH
269 return 0;
270
331fcb59
JH
271 /*
272 * Intent-to-add entries have not been added, so the index entry
273 * by definition never matches what is in the work tree until it
274 * actually gets added.
275 */
276 if (ce->ce_flags & CE_INTENT_TO_ADD)
277 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
278
5f73076c 279 changed = ce_match_stat_basic(ce, st);
407c8eb0 280
29e4d363
JH
281 /*
282 * Within 1 second of this sequence:
283 * echo xyzzy >file && git-update-index --add file
284 * running this command:
285 * echo frotz >file
286 * would give a falsely clean cache entry. The mtime and
287 * length match the cache, and other stat fields do not change.
288 *
289 * We could detect this at update-index time (the cache entry
290 * being registered/updated records the same time as "now")
291 * and delay the return from git-update-index, but that would
292 * effectively mean we can make at most one commit per second,
293 * which is not acceptable. Instead, we check cache entries
294 * whose mtime are the same as the index file timestamp more
5f73076c 295 * carefully than others.
29e4d363 296 */
6d91da6d 297 if (!changed && is_racy_timestamp(istate, ce)) {
42f77406
JH
298 if (assume_racy_is_modified)
299 changed |= DATA_CHANGED;
300 else
301 changed |= ce_modified_check_fs(ce, st);
302 }
b0391890 303
29e4d363 304 return changed;
b0391890
JH
305}
306
d1f128b0 307int ie_modified(const struct index_state *istate,
4bd5b7da 308 struct cache_entry *ce, struct stat *st, unsigned int options)
b0391890 309{
29e4d363 310 int changed, changed_fs;
4bd5b7da
JH
311
312 changed = ie_match_stat(istate, ce, st, options);
b0391890
JH
313 if (!changed)
314 return 0;
b0391890
JH
315 /*
316 * If the mode or type has changed, there's no point in trying
317 * to refresh the entry - it's not going to match
318 */
319 if (changed & (MODE_CHANGED | TYPE_CHANGED))
320 return changed;
321
c70115b4
JH
322 /*
323 * Immediately after read-tree or update-index --cacheinfo,
324 * the length field is zero, as we have never even read the
325 * lstat(2) information once, and we cannot trust DATA_CHANGED
326 * returned by ie_match_stat() which in turn was returned by
327 * ce_match_stat_basic() to signal that the filesize of the
328 * blob changed. We have to actually go to the filesystem to
329 * see if the contents match, and if so, should answer "unchanged".
330 *
331 * The logic does not apply to gitlinks, as ce_match_stat_basic()
332 * already has checked the actual HEAD from the filesystem in the
333 * subproject. If ie_match_stat() already said it is different,
334 * then we know it is.
b0391890 335 */
c70115b4
JH
336 if ((changed & DATA_CHANGED) &&
337 (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
b0391890
JH
338 return changed;
339
29e4d363
JH
340 changed_fs = ce_modified_check_fs(ce, st);
341 if (changed_fs)
342 return changed | changed_fs;
b0391890
JH
343 return 0;
344}
345
958ba6c9
LT
346int base_name_compare(const char *name1, int len1, int mode1,
347 const char *name2, int len2, int mode2)
348{
349 unsigned char c1, c2;
350 int len = len1 < len2 ? len1 : len2;
351 int cmp;
352
353 cmp = memcmp(name1, name2, len);
354 if (cmp)
355 return cmp;
356 c1 = name1[len];
357 c2 = name2[len];
1833a925 358 if (!c1 && S_ISDIR(mode1))
958ba6c9 359 c1 = '/';
1833a925 360 if (!c2 && S_ISDIR(mode2))
958ba6c9
LT
361 c2 = '/';
362 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
363}
364
0ab9e1e8
LT
365/*
366 * df_name_compare() is identical to base_name_compare(), except it
367 * compares conflicting directory/file entries as equal. Note that
368 * while a directory name compares as equal to a regular file, they
369 * then individually compare _differently_ to a filename that has
370 * a dot after the basename (because '\0' < '.' < '/').
371 *
372 * This is used by routines that want to traverse the git namespace
373 * but then handle conflicting entries together when possible.
374 */
375int df_name_compare(const char *name1, int len1, int mode1,
376 const char *name2, int len2, int mode2)
377{
378 int len = len1 < len2 ? len1 : len2, cmp;
379 unsigned char c1, c2;
380
381 cmp = memcmp(name1, name2, len);
382 if (cmp)
383 return cmp;
384 /* Directories and files compare equal (same length, same name) */
385 if (len1 == len2)
386 return 0;
387 c1 = name1[len];
388 if (!c1 && S_ISDIR(mode1))
389 c1 = '/';
390 c2 = name2[len];
391 if (!c2 && S_ISDIR(mode2))
392 c2 = '/';
393 if (c1 == '/' && !c2)
394 return 0;
395 if (c2 == '/' && !c1)
396 return 0;
397 return c1 - c2;
398}
399
95fd5bf8 400int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
eb38c22f 401{
95fd5bf8
LT
402 int len1 = flags1 & CE_NAMEMASK;
403 int len2 = flags2 & CE_NAMEMASK;
eb38c22f
LT
404 int len = len1 < len2 ? len1 : len2;
405 int cmp;
406
407 cmp = memcmp(name1, name2, len);
408 if (cmp)
409 return cmp;
410 if (len1 < len2)
411 return -1;
412 if (len1 > len2)
413 return 1;
5f73076c 414
7b80be15
JH
415 /* Compare stages */
416 flags1 &= CE_STAGEMASK;
417 flags2 &= CE_STAGEMASK;
5f73076c 418
95fd5bf8
LT
419 if (flags1 < flags2)
420 return -1;
421 if (flags1 > flags2)
422 return 1;
eb38c22f
LT
423 return 0;
424}
425
d1f128b0 426int index_name_pos(const struct index_state *istate, const char *name, int namelen)
eb38c22f
LT
427{
428 int first, last;
429
430 first = 0;
4aab5b46 431 last = istate->cache_nr;
eb38c22f
LT
432 while (last > first) {
433 int next = (last + first) >> 1;
4aab5b46 434 struct cache_entry *ce = istate->cache[next];
7a51ed66 435 int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
eb38c22f 436 if (!cmp)
76e7f4ec 437 return next;
eb38c22f
LT
438 if (cmp < 0) {
439 last = next;
440 continue;
441 }
442 first = next+1;
443 }
76e7f4ec 444 return -first-1;
eb38c22f
LT
445}
446
7b937ca3 447/* Remove entry, return true if there are more entries to go.. */
4aab5b46 448int remove_index_entry_at(struct index_state *istate, int pos)
7b937ca3 449{
cf558704
LT
450 struct cache_entry *ce = istate->cache[pos];
451
96872bc2 452 remove_name_hash(ce);
4aab5b46
JH
453 istate->cache_changed = 1;
454 istate->cache_nr--;
455 if (pos >= istate->cache_nr)
7b937ca3 456 return 0;
4aab5b46
JH
457 memmove(istate->cache + pos,
458 istate->cache + pos + 1,
459 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
7b937ca3
LT
460 return 1;
461}
462
36419c8e
KB
463/*
464 * Remove all cache ententries marked for removal, that is where
465 * CE_REMOVE is set in ce_flags. This is much more effective than
466 * calling remove_index_entry_at() for each entry to be removed.
467 */
468void remove_marked_cache_entries(struct index_state *istate)
469{
470 struct cache_entry **ce_array = istate->cache;
471 unsigned int i, j;
472
473 for (i = j = 0; i < istate->cache_nr; i++) {
474 if (ce_array[i]->ce_flags & CE_REMOVE)
475 remove_name_hash(ce_array[i]);
476 else
477 ce_array[j++] = ce_array[i];
478 }
479 istate->cache_changed = 1;
480 istate->cache_nr = j;
481}
482
4aab5b46 483int remove_file_from_index(struct index_state *istate, const char *path)
197ee8c9 484{
4aab5b46 485 int pos = index_name_pos(istate, path, strlen(path));
c4e3cca1
JH
486 if (pos < 0)
487 pos = -pos-1;
09d5dc32 488 cache_tree_invalidate_path(istate->cache_tree, path);
4aab5b46
JH
489 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
490 remove_index_entry_at(istate, pos);
197ee8c9
LT
491 return 0;
492}
493
20314271
JS
494static int compare_name(struct cache_entry *ce, const char *path, int namelen)
495{
496 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
497}
498
499static int index_name_pos_also_unmerged(struct index_state *istate,
500 const char *path, int namelen)
501{
502 int pos = index_name_pos(istate, path, namelen);
503 struct cache_entry *ce;
504
505 if (pos >= 0)
506 return pos;
507
508 /* maybe unmerged? */
509 pos = -1 - pos;
510 if (pos >= istate->cache_nr ||
511 compare_name((ce = istate->cache[pos]), path, namelen))
512 return -1;
513
514 /* order of preference: stage 2, 1, 3 */
515 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
516 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
517 !compare_name(ce, path, namelen))
518 pos++;
519 return pos;
520}
521
1102952b
LT
522static int different_name(struct cache_entry *ce, struct cache_entry *alias)
523{
524 int len = ce_namelen(ce);
525 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
526}
527
528/*
529 * If we add a filename that aliases in the cache, we will use the
530 * name that we already have - but we don't want to update the same
531 * alias twice, because that implies that there were actually two
532 * different files with aliasing names!
533 *
534 * So we use the CE_ADDED flag to verify that the alias was an old
535 * one before we accept it as
536 */
537static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
538{
539 int len;
540 struct cache_entry *new;
541
542 if (alias->ce_flags & CE_ADDED)
543 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
544
545 /* Ok, create the new entry using the name of the existing alias */
546 len = ce_namelen(alias);
547 new = xcalloc(1, cache_entry_size(len));
548 memcpy(new->name, alias->name, len);
549 copy_cache_entry(new, ce);
550 free(ce);
551 return new;
552}
553
39425819
JH
554static void record_intent_to_add(struct cache_entry *ce)
555{
556 unsigned char sha1[20];
557 if (write_sha1_file("", 0, blob_type, sha1))
558 die("cannot create an empty blob in the object database");
559 hashcpy(ce->sha1, sha1);
560}
561
38ed1d89 562int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
11be42a4 563{
38ed1d89 564 int size, namelen, was_same;
d177cab0 565 mode_t st_mode = st->st_mode;
6835550d 566 struct cache_entry *ce, *alias;
fb63d7f8 567 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
38ed1d89
JH
568 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
569 int pretend = flags & ADD_CACHE_PRETEND;
39425819
JH
570 int intent_only = flags & ADD_CACHE_INTENT;
571 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
572 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
11be42a4 573
d177cab0 574 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
960b8ad1 575 return error("%s: can only add regular files, symbolic links or git-directories", path);
11be42a4
JS
576
577 namelen = strlen(path);
d177cab0 578 if (S_ISDIR(st_mode)) {
09595258
LT
579 while (namelen && path[namelen-1] == '/')
580 namelen--;
581 }
11be42a4
JS
582 size = cache_entry_size(namelen);
583 ce = xcalloc(1, size);
584 memcpy(ce->name, path, namelen);
7a51ed66 585 ce->ce_flags = namelen;
39425819
JH
586 if (!intent_only)
587 fill_stat_cache_info(ce, st);
388b2acd
JH
588 else
589 ce->ce_flags |= CE_INTENT_TO_ADD;
11be42a4 590
78a8d641 591 if (trust_executable_bit && has_symlinks)
d177cab0 592 ce->ce_mode = create_ce_mode(st_mode);
185c975f 593 else {
78a8d641
JS
594 /* If there is an existing entry, pick the mode bits and type
595 * from it, otherwise assume unexecutable regular file.
11be42a4 596 */
185c975f 597 struct cache_entry *ent;
20314271 598 int pos = index_name_pos_also_unmerged(istate, path, namelen);
185c975f 599
4aab5b46 600 ent = (0 <= pos) ? istate->cache[pos] : NULL;
d177cab0 601 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
11be42a4
JS
602 }
603
6835550d 604 alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
d177cab0 605 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
0781b8a9
JH
606 /* Nothing changed, really */
607 free(ce);
6835550d 608 ce_mark_uptodate(alias);
1102952b 609 alias->ce_flags |= CE_ADDED;
0781b8a9
JH
610 return 0;
611 }
39425819
JH
612 if (!intent_only) {
613 if (index_path(ce->sha1, path, st, 1))
614 return error("unable to index file %s", path);
615 } else
616 record_intent_to_add(ce);
617
1102952b
LT
618 if (ignore_case && alias && different_name(ce, alias))
619 ce = create_alias_ce(ce, alias);
620 ce->ce_flags |= CE_ADDED;
38ed1d89 621
3bf0dd1f 622 /* It was suspected to be racily clean, but it turns out to be Ok */
38ed1d89
JH
623 was_same = (alias &&
624 !ce_stage(alias) &&
625 !hashcmp(alias->sha1, ce->sha1) &&
626 ce->ce_mode == alias->ce_mode);
627
628 if (pretend)
629 ;
39425819 630 else if (add_index_entry(istate, ce, add_option))
960b8ad1 631 return error("unable to add %s to index",path);
38ed1d89 632 if (verbose && !was_same)
11be42a4 633 printf("add '%s'\n", path);
11be42a4
JS
634 return 0;
635}
636
38ed1d89 637int add_file_to_index(struct index_state *istate, const char *path, int flags)
d177cab0
LT
638{
639 struct stat st;
640 if (lstat(path, &st))
d824cbba 641 die_errno("unable to stat '%s'", path);
38ed1d89 642 return add_to_index(istate, path, &st, flags);
d177cab0
LT
643}
644
6640f881
CR
645struct cache_entry *make_cache_entry(unsigned int mode,
646 const unsigned char *sha1, const char *path, int stage,
647 int refresh)
648{
649 int size, len;
650 struct cache_entry *ce;
651
7e7abea9
DP
652 if (!verify_path(path)) {
653 error("Invalid path '%s'", path);
6640f881 654 return NULL;
7e7abea9 655 }
6640f881
CR
656
657 len = strlen(path);
658 size = cache_entry_size(len);
659 ce = xcalloc(1, size);
660
661 hashcpy(ce->sha1, sha1);
662 memcpy(ce->name, path, len);
663 ce->ce_flags = create_ce_flags(len, stage);
664 ce->ce_mode = create_ce_mode(mode);
665
666 if (refresh)
667 return refresh_cache_entry(ce, 0);
668
669 return ce;
670}
671
dbbce55b 672int ce_same_name(struct cache_entry *a, struct cache_entry *b)
7b937ca3
LT
673{
674 int len = ce_namelen(a);
675 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
676}
677
c0fd1f51
LT
678int ce_path_match(const struct cache_entry *ce, const char **pathspec)
679{
680 const char *match, *name;
681 int len;
682
683 if (!pathspec)
684 return 1;
685
686 len = ce_namelen(ce);
687 name = ce->name;
688 while ((match = *pathspec++) != NULL) {
689 int matchlen = strlen(match);
690 if (matchlen > len)
691 continue;
692 if (memcmp(name, match, matchlen))
693 continue;
694 if (matchlen && name[matchlen-1] == '/')
695 return 1;
696 if (name[matchlen] == '/' || !name[matchlen])
697 return 1;
f332726e
LT
698 if (!matchlen)
699 return 1;
c0fd1f51
LT
700 }
701 return 0;
702}
703
8dcf39c4
LT
704/*
705 * We fundamentally don't like some paths: we don't want
706 * dot or dot-dot anywhere, and for obvious reasons don't
707 * want to recurse into ".git" either.
708 *
709 * Also, we don't want double slashes or slashes at the
710 * end that can make pathnames ambiguous.
711 */
712static int verify_dotfile(const char *rest)
713{
714 /*
715 * The first character was '.', but that
716 * has already been discarded, we now test
717 * the rest.
718 */
719 switch (*rest) {
720 /* "." is not allowed */
721 case '\0': case '/':
722 return 0;
723
724 /*
725 * ".git" followed by NUL or slash is bad. This
726 * shares the path end test with the ".." case.
727 */
728 case 'g':
729 if (rest[1] != 'i')
730 break;
731 if (rest[2] != 't')
732 break;
733 rest += 2;
734 /* fallthrough */
735 case '.':
736 if (rest[1] == '\0' || rest[1] == '/')
737 return 0;
738 }
739 return 1;
740}
741
742int verify_path(const char *path)
743{
744 char c;
745
746 goto inside;
747 for (;;) {
748 if (!c)
749 return 1;
750 if (c == '/') {
751inside:
752 c = *path++;
753 switch (c) {
754 default:
755 continue;
756 case '/': case '\0':
757 break;
758 case '.':
759 if (verify_dotfile(path))
760 continue;
761 }
762 return 0;
763 }
764 c = *path++;
765 }
766}
767
12676608
LT
768/*
769 * Do we have another file that has the beginning components being a
770 * proper superset of the name we're trying to add?
0f1e4f04 771 */
4aab5b46
JH
772static int has_file_name(struct index_state *istate,
773 const struct cache_entry *ce, int pos, int ok_to_replace)
0f1e4f04 774{
12676608
LT
775 int retval = 0;
776 int len = ce_namelen(ce);
b155725d 777 int stage = ce_stage(ce);
12676608 778 const char *name = ce->name;
0f1e4f04 779
4aab5b46
JH
780 while (pos < istate->cache_nr) {
781 struct cache_entry *p = istate->cache[pos++];
0f1e4f04 782
12676608 783 if (len >= ce_namelen(p))
0f1e4f04 784 break;
12676608
LT
785 if (memcmp(name, p->name, len))
786 break;
b155725d
JH
787 if (ce_stage(p) != stage)
788 continue;
12676608
LT
789 if (p->name[len] != '/')
790 continue;
7a51ed66 791 if (p->ce_flags & CE_REMOVE)
21cd8d00 792 continue;
12676608
LT
793 retval = -1;
794 if (!ok_to_replace)
795 break;
4aab5b46 796 remove_index_entry_at(istate, --pos);
0f1e4f04 797 }
12676608
LT
798 return retval;
799}
0f1e4f04 800
12676608
LT
801/*
802 * Do we have another file with a pathname that is a proper
803 * subset of the name we're trying to add?
804 */
4aab5b46
JH
805static int has_dir_name(struct index_state *istate,
806 const struct cache_entry *ce, int pos, int ok_to_replace)
12676608
LT
807{
808 int retval = 0;
b155725d 809 int stage = ce_stage(ce);
12676608
LT
810 const char *name = ce->name;
811 const char *slash = name + ce_namelen(ce);
0f1e4f04 812
12676608
LT
813 for (;;) {
814 int len;
0f1e4f04 815
12676608
LT
816 for (;;) {
817 if (*--slash == '/')
818 break;
819 if (slash <= ce->name)
820 return retval;
821 }
822 len = slash - name;
0f1e4f04 823
7a51ed66 824 pos = index_name_pos(istate, name, create_ce_flags(len, stage));
12676608 825 if (pos >= 0) {
21cd8d00
JH
826 /*
827 * Found one, but not so fast. This could
828 * be a marker that says "I was here, but
829 * I am being removed". Such an entry is
830 * not a part of the resulting tree, and
831 * it is Ok to have a directory at the same
832 * path.
833 */
077c48df 834 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
21cd8d00
JH
835 retval = -1;
836 if (!ok_to_replace)
837 break;
4aab5b46 838 remove_index_entry_at(istate, pos);
21cd8d00
JH
839 continue;
840 }
12676608 841 }
21cd8d00
JH
842 else
843 pos = -pos-1;
12676608
LT
844
845 /*
846 * Trivial optimization: if we find an entry that
847 * already matches the sub-directory, then we know
b155725d 848 * we're ok, and we can exit.
12676608 849 */
4aab5b46
JH
850 while (pos < istate->cache_nr) {
851 struct cache_entry *p = istate->cache[pos];
b155725d
JH
852 if ((ce_namelen(p) <= len) ||
853 (p->name[len] != '/') ||
854 memcmp(p->name, name, len))
855 break; /* not our subdirectory */
077c48df
JH
856 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
857 /*
858 * p is at the same stage as our entry, and
b155725d
JH
859 * is a subdirectory of what we are looking
860 * at, so we cannot have conflicts at our
861 * level or anything shorter.
862 */
863 return retval;
864 pos++;
192268c1 865 }
0f1e4f04 866 }
12676608
LT
867 return retval;
868}
869
870/* We may be in a situation where we already have path/file and path
871 * is being added, or we already have path and path/file is being
872 * added. Either one would result in a nonsense tree that has path
873 * twice when git-write-tree tries to write it out. Prevent it.
a6080a0a 874 *
12676608
LT
875 * If ok-to-replace is specified, we remove the conflicting entries
876 * from the cache so the caller should recompute the insert position.
877 * When this happens, we return non-zero.
878 */
4aab5b46
JH
879static int check_file_directory_conflict(struct index_state *istate,
880 const struct cache_entry *ce,
881 int pos, int ok_to_replace)
12676608 882{
21cd8d00
JH
883 int retval;
884
885 /*
886 * When ce is an "I am going away" entry, we allow it to be added
887 */
7a51ed66 888 if (ce->ce_flags & CE_REMOVE)
21cd8d00
JH
889 return 0;
890
12676608
LT
891 /*
892 * We check if the path is a sub-path of a subsequent pathname
893 * first, since removing those will not change the position
21cd8d00 894 * in the array.
12676608 895 */
4aab5b46 896 retval = has_file_name(istate, ce, pos, ok_to_replace);
21cd8d00 897
12676608
LT
898 /*
899 * Then check if the path might have a clashing sub-directory
900 * before it.
901 */
4aab5b46 902 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
0f1e4f04
JH
903}
904
af3785dc 905static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
197ee8c9
LT
906{
907 int pos;
192268c1
JH
908 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
909 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
b155725d 910 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
39425819 911 int new_only = option & ADD_CACHE_NEW_ONLY;
5f73076c 912
09d5dc32 913 cache_tree_invalidate_path(istate->cache_tree, ce->name);
7a51ed66 914 pos = index_name_pos(istate, ce->name, ce->ce_flags);
197ee8c9 915
3e09cdfd 916 /* existing match? Just replace it. */
76e7f4ec 917 if (pos >= 0) {
39425819
JH
918 if (!new_only)
919 replace_index_entry(istate, pos, ce);
197ee8c9
LT
920 return 0;
921 }
76e7f4ec 922 pos = -pos-1;
197ee8c9 923
7b937ca3
LT
924 /*
925 * Inserting a merged entry ("stage 0") into the index
926 * will always replace all non-merged entries..
927 */
4aab5b46
JH
928 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
929 while (ce_same_name(istate->cache[pos], ce)) {
7b937ca3 930 ok_to_add = 1;
4aab5b46 931 if (!remove_index_entry_at(istate, pos))
7b937ca3
LT
932 break;
933 }
934 }
935
121481ab
LT
936 if (!ok_to_add)
937 return -1;
8dcf39c4 938 if (!verify_path(ce->name))
7e7abea9 939 return error("Invalid path '%s'", ce->name);
121481ab 940
3e09cdfd 941 if (!skip_df_check &&
4aab5b46 942 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
192268c1 943 if (!ok_to_replace)
4aab5b46
JH
944 return error("'%s' appears as both a file and as a directory",
945 ce->name);
7a51ed66 946 pos = index_name_pos(istate, ce->name, ce->ce_flags);
192268c1
JH
947 pos = -pos-1;
948 }
af3785dc
JH
949 return pos + 1;
950}
951
952int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
953{
954 int pos;
955
956 if (option & ADD_CACHE_JUST_APPEND)
957 pos = istate->cache_nr;
958 else {
959 int ret;
960 ret = add_index_entry_with_check(istate, ce, option);
961 if (ret <= 0)
962 return ret;
963 pos = ret - 1;
964 }
0f1e4f04 965
197ee8c9 966 /* Make sure the array is big enough .. */
4aab5b46
JH
967 if (istate->cache_nr == istate->cache_alloc) {
968 istate->cache_alloc = alloc_nr(istate->cache_alloc);
969 istate->cache = xrealloc(istate->cache,
970 istate->cache_alloc * sizeof(struct cache_entry *));
197ee8c9
LT
971 }
972
973 /* Add it in.. */
4aab5b46 974 istate->cache_nr++;
af3785dc 975 if (istate->cache_nr > pos + 1)
4aab5b46
JH
976 memmove(istate->cache + pos + 1,
977 istate->cache + pos,
978 (istate->cache_nr - pos - 1) * sizeof(ce));
cf558704 979 set_index_entry(istate, pos, ce);
4aab5b46 980 istate->cache_changed = 1;
197ee8c9
LT
981 return 0;
982}
983
405e5b2f
LT
984/*
985 * "refresh" does not calculate a new sha1 file or bring the
986 * cache up-to-date for mode/content changes. But what it
987 * _does_ do is to "re-match" the stat information of a file
988 * with the cache, so that you can refresh the cache for a
989 * file that hasn't been changed but where the stat entry is
990 * out of date.
991 *
992 * For example, you'd want to do this after doing a "git-read-tree",
993 * to link up the stat cache details with the proper files.
994 */
4aab5b46 995static struct cache_entry *refresh_cache_ent(struct index_state *istate,
4bd5b7da
JH
996 struct cache_entry *ce,
997 unsigned int options, int *err)
405e5b2f
LT
998{
999 struct stat st;
1000 struct cache_entry *updated;
1001 int changed, size;
4bd5b7da 1002 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
405e5b2f 1003
eadb5831
JH
1004 if (ce_uptodate(ce))
1005 return ce;
1006
aa9349d4
MSO
1007 /*
1008 * CE_VALID means the user promised us that the change to
1009 * the work tree does not matter and told us not to worry.
1010 */
1011 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1012 ce_mark_uptodate(ce);
1013 return ce;
1014 }
1015
8fd2cb40 1016 if (lstat(ce->name, &st) < 0) {
ec0cc704
JH
1017 if (err)
1018 *err = errno;
8fd2cb40
JS
1019 return NULL;
1020 }
405e5b2f 1021
4bd5b7da 1022 changed = ie_match_stat(istate, ce, &st, options);
405e5b2f 1023 if (!changed) {
4bd5b7da
JH
1024 /*
1025 * The path is unchanged. If we were told to ignore
1026 * valid bit, then we did the actual stat check and
1027 * found that the entry is unmodified. If the entry
1028 * is not marked VALID, this is the place to mark it
1029 * valid again, under "assume unchanged" mode.
1030 */
1031 if (ignore_valid && assume_unchanged &&
7a51ed66 1032 !(ce->ce_flags & CE_VALID))
405e5b2f 1033 ; /* mark this one VALID again */
eadb5831
JH
1034 else {
1035 /*
1036 * We do not mark the index itself "modified"
1037 * because CE_UPTODATE flag is in-core only;
1038 * we are not going to write this change out.
1039 */
1040 ce_mark_uptodate(ce);
8fd2cb40 1041 return ce;
eadb5831 1042 }
405e5b2f
LT
1043 }
1044
4bd5b7da 1045 if (ie_modified(istate, ce, &st, options)) {
ec0cc704
JH
1046 if (err)
1047 *err = EINVAL;
8fd2cb40
JS
1048 return NULL;
1049 }
405e5b2f
LT
1050
1051 size = ce_size(ce);
1052 updated = xmalloc(size);
1053 memcpy(updated, ce, size);
1054 fill_stat_cache_info(updated, &st);
4bd5b7da
JH
1055 /*
1056 * If ignore_valid is not set, we should leave CE_VALID bit
1057 * alone. Otherwise, paths marked with --no-assume-unchanged
1058 * (i.e. things to be edited) will reacquire CE_VALID bit
1059 * automatically, which is not really what we want.
405e5b2f 1060 */
4bd5b7da 1061 if (!ignore_valid && assume_unchanged &&
7a51ed66
LT
1062 !(ce->ce_flags & CE_VALID))
1063 updated->ce_flags &= ~CE_VALID;
405e5b2f
LT
1064
1065 return updated;
1066}
1067
3deffc52
MM
1068static void show_file(const char * fmt, const char * name, int in_porcelain,
1069 int * first, char *header_msg)
1070{
1071 if (in_porcelain && *first && header_msg) {
1072 printf("%s\n", header_msg);
1073 *first=0;
1074 }
1075 printf(fmt, name);
1076}
1077
1078int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
1079 char *seen, char *header_msg)
405e5b2f
LT
1080{
1081 int i;
1082 int has_errors = 0;
1083 int really = (flags & REFRESH_REALLY) != 0;
1084 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1085 int quiet = (flags & REFRESH_QUIET) != 0;
1086 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
5fdeacb0 1087 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
3deffc52
MM
1088 int first = 1;
1089 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
4bd5b7da 1090 unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
3deffc52
MM
1091 const char *needs_update_fmt;
1092 const char *needs_merge_fmt;
405e5b2f 1093
3deffc52
MM
1094 needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1095 needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
4aab5b46 1096 for (i = 0; i < istate->cache_nr; i++) {
405e5b2f 1097 struct cache_entry *ce, *new;
ec0cc704
JH
1098 int cache_errno = 0;
1099
4aab5b46 1100 ce = istate->cache[i];
5fdeacb0
JS
1101 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1102 continue;
1103
405e5b2f 1104 if (ce_stage(ce)) {
4aab5b46
JH
1105 while ((i < istate->cache_nr) &&
1106 ! strcmp(istate->cache[i]->name, ce->name))
405e5b2f
LT
1107 i++;
1108 i--;
1109 if (allow_unmerged)
1110 continue;
3deffc52 1111 show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1112 has_errors = 1;
1113 continue;
1114 }
1115
d616813d
AJ
1116 if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
1117 continue;
1118
4bd5b7da 1119 new = refresh_cache_ent(istate, ce, options, &cache_errno);
8fd2cb40 1120 if (new == ce)
405e5b2f 1121 continue;
8fd2cb40
JS
1122 if (!new) {
1123 if (not_new && cache_errno == ENOENT)
405e5b2f 1124 continue;
8fd2cb40 1125 if (really && cache_errno == EINVAL) {
405e5b2f
LT
1126 /* If we are doing --really-refresh that
1127 * means the index is not valid anymore.
1128 */
7a51ed66 1129 ce->ce_flags &= ~CE_VALID;
4aab5b46 1130 istate->cache_changed = 1;
405e5b2f
LT
1131 }
1132 if (quiet)
1133 continue;
3deffc52 1134 show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);
405e5b2f
LT
1135 has_errors = 1;
1136 continue;
1137 }
cf558704
LT
1138
1139 replace_index_entry(istate, i, new);
405e5b2f
LT
1140 }
1141 return has_errors;
1142}
1143
ec0cc704
JH
1144struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
1145{
4aab5b46 1146 return refresh_cache_ent(&the_index, ce, really, NULL);
ec0cc704
JH
1147}
1148
bad68ec9 1149static int verify_hdr(struct cache_header *hdr, unsigned long size)
e83c5163 1150{
9126f009 1151 git_SHA_CTX c;
bad68ec9 1152 unsigned char sha1[20];
e83c5163 1153
ccc4feb5 1154 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
e83c5163 1155 return error("bad signature");
06aaaa0b 1156 if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
ca9be054 1157 return error("bad index version");
9126f009
NP
1158 git_SHA1_Init(&c);
1159 git_SHA1_Update(&c, hdr, size - 20);
1160 git_SHA1_Final(sha1, &c);
a89fccd2 1161 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
ca9be054 1162 return error("bad index file sha1 signature");
e83c5163
LT
1163 return 0;
1164}
1165
4aab5b46
JH
1166static int read_index_extension(struct index_state *istate,
1167 const char *ext, void *data, unsigned long sz)
bad68ec9
JH
1168{
1169 switch (CACHE_EXT(ext)) {
1170 case CACHE_EXT_TREE:
4aab5b46 1171 istate->cache_tree = cache_tree_read(data, sz);
bad68ec9
JH
1172 break;
1173 default:
1174 if (*ext < 'A' || 'Z' < *ext)
1175 return error("index uses %.4s extension, which we do not understand",
1176 ext);
1177 fprintf(stderr, "ignoring %.4s extension\n", ext);
1178 break;
1179 }
1180 return 0;
1181}
1182
4aab5b46 1183int read_index(struct index_state *istate)
8fd2cb40 1184{
4aab5b46 1185 return read_index_from(istate, get_index_file());
8fd2cb40
JS
1186}
1187
7a51ed66
LT
1188static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce)
1189{
7fec10b7 1190 size_t len;
06aaaa0b 1191 const char *name;
7fec10b7 1192
fba2f38a
KB
1193 ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
1194 ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
fba2f38a
KB
1195 ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
1196 ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
7a51ed66
LT
1197 ce->ce_dev = ntohl(ondisk->dev);
1198 ce->ce_ino = ntohl(ondisk->ino);
1199 ce->ce_mode = ntohl(ondisk->mode);
1200 ce->ce_uid = ntohl(ondisk->uid);
1201 ce->ce_gid = ntohl(ondisk->gid);
1202 ce->ce_size = ntohl(ondisk->size);
1203 /* On-disk flags are just 16 bits */
1204 ce->ce_flags = ntohs(ondisk->flags);
16ce2e4c 1205
7a51ed66 1206 hashcpy(ce->sha1, ondisk->sha1);
7fec10b7
JH
1207
1208 len = ce->ce_flags & CE_NAMEMASK;
06aaaa0b
NTND
1209
1210 if (ce->ce_flags & CE_EXTENDED) {
1211 struct ondisk_cache_entry_extended *ondisk2;
1212 int extended_flags;
1213 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1214 extended_flags = ntohs(ondisk2->flags2) << 16;
1215 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1216 if (extended_flags & ~CE_EXTENDED_FLAGS)
1217 die("Unknown index entry format %08x", extended_flags);
1218 ce->ce_flags |= extended_flags;
1219 name = ondisk2->name;
1220 }
1221 else
1222 name = ondisk->name;
1223
7fec10b7 1224 if (len == CE_NAMEMASK)
06aaaa0b 1225 len = strlen(name);
7fec10b7
JH
1226 /*
1227 * NEEDSWORK: If the original index is crafted, this copy could
1228 * go unchecked.
1229 */
06aaaa0b 1230 memcpy(ce->name, name, len + 1);
7a51ed66
LT
1231}
1232
cf558704
LT
1233static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
1234{
1235 long per_entry;
1236
1237 per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry);
1238
1239 /*
1240 * Alignment can cause differences. This should be "alignof", but
1241 * since that's a gcc'ism, just use the size of a pointer.
1242 */
1243 per_entry += sizeof(void *);
1244 return ondisk_size + entries*per_entry;
1245}
1246
8fd2cb40 1247/* remember to discard_cache() before reading a different cache! */
4aab5b46 1248int read_index_from(struct index_state *istate, const char *path)
e83c5163
LT
1249{
1250 int fd, i;
1251 struct stat st;
7a51ed66 1252 unsigned long src_offset, dst_offset;
e83c5163 1253 struct cache_header *hdr;
7a51ed66
LT
1254 void *mmap;
1255 size_t mmap_size;
e83c5163
LT
1256
1257 errno = EBUSY;
913e0e99 1258 if (istate->initialized)
4aab5b46 1259 return istate->cache_nr;
5d1a5c02 1260
e83c5163 1261 errno = ENOENT;
fba2f38a
KB
1262 istate->timestamp.sec = 0;
1263 istate->timestamp.nsec = 0;
8fd2cb40 1264 fd = open(path, O_RDONLY);
5d1a5c02
LT
1265 if (fd < 0) {
1266 if (errno == ENOENT)
1267 return 0;
d824cbba 1268 die_errno("index file open failed");
5d1a5c02 1269 }
e83c5163 1270
3511a377 1271 if (fstat(fd, &st))
d824cbba 1272 die_errno("cannot stat the open index");
3511a377
LFC
1273
1274 errno = EINVAL;
7a51ed66
LT
1275 mmap_size = xsize_t(st.st_size);
1276 if (mmap_size < sizeof(struct cache_header) + 20)
3511a377
LFC
1277 die("index file smaller than expected");
1278
7a51ed66 1279 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
e83c5163 1280 close(fd);
7a51ed66 1281 if (mmap == MAP_FAILED)
0721c314 1282 die_errno("unable to map index file");
e83c5163 1283
7a51ed66
LT
1284 hdr = mmap;
1285 if (verify_hdr(hdr, mmap_size) < 0)
e83c5163
LT
1286 goto unmap;
1287
4aab5b46
JH
1288 istate->cache_nr = ntohl(hdr->hdr_entries);
1289 istate->cache_alloc = alloc_nr(istate->cache_nr);
1290 istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
e83c5163 1291
7a51ed66
LT
1292 /*
1293 * The disk format is actually larger than the in-memory format,
1294 * due to space for nsec etc, so even though the in-memory one
1295 * has room for a few more flags, we can allocate using the same
1296 * index size
1297 */
cf558704 1298 istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr));
913e0e99 1299 istate->initialized = 1;
7a51ed66
LT
1300
1301 src_offset = sizeof(*hdr);
1302 dst_offset = 0;
4aab5b46 1303 for (i = 0; i < istate->cache_nr; i++) {
7a51ed66 1304 struct ondisk_cache_entry *disk_ce;
4aab5b46
JH
1305 struct cache_entry *ce;
1306
7a51ed66
LT
1307 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1308 ce = (struct cache_entry *)((char *)istate->alloc + dst_offset);
1309 convert_from_disk(disk_ce, ce);
cf558704 1310 set_index_entry(istate, i, ce);
7a51ed66
LT
1311
1312 src_offset += ondisk_ce_size(ce);
1313 dst_offset += ce_size(ce);
e83c5163 1314 }
fba2f38a 1315 istate->timestamp.sec = st.st_mtime;
c06ff490 1316 istate->timestamp.nsec = ST_MTIME_NSEC(st);
fba2f38a 1317
7a51ed66 1318 while (src_offset <= mmap_size - 20 - 8) {
bad68ec9
JH
1319 /* After an array of active_nr index entries,
1320 * there can be arbitrary number of extended
1321 * sections, each of which is prefixed with
1322 * extension name (4-byte) and section length
1323 * in 4-byte network byte order.
1324 */
1325 unsigned long extsize;
7a51ed66 1326 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
bad68ec9 1327 extsize = ntohl(extsize);
4aab5b46 1328 if (read_index_extension(istate,
7a51ed66
LT
1329 (const char *) mmap + src_offset,
1330 (char *) mmap + src_offset + 8,
1d7f171c 1331 extsize) < 0)
bad68ec9 1332 goto unmap;
7a51ed66
LT
1333 src_offset += 8;
1334 src_offset += extsize;
bad68ec9 1335 }
7a51ed66 1336 munmap(mmap, mmap_size);
4aab5b46 1337 return istate->cache_nr;
e83c5163
LT
1338
1339unmap:
7a51ed66 1340 munmap(mmap, mmap_size);
e83c5163 1341 errno = EINVAL;
5d1a5c02 1342 die("index file corrupt");
e83c5163
LT
1343}
1344
fa7b3c2f
JH
1345int is_index_unborn(struct index_state *istate)
1346{
fba2f38a 1347 return (!istate->cache_nr && !istate->alloc && !istate->timestamp.sec);
fa7b3c2f
JH
1348}
1349
4aab5b46 1350int discard_index(struct index_state *istate)
6d297f81 1351{
4aab5b46
JH
1352 istate->cache_nr = 0;
1353 istate->cache_changed = 0;
fba2f38a
KB
1354 istate->timestamp.sec = 0;
1355 istate->timestamp.nsec = 0;
64ca23af 1356 istate->name_hash_initialized = 0;
cf558704 1357 free_hash(&istate->name_hash);
4aab5b46 1358 cache_tree_free(&(istate->cache_tree));
7a51ed66
LT
1359 free(istate->alloc);
1360 istate->alloc = NULL;
913e0e99 1361 istate->initialized = 0;
6d297f81
JS
1362
1363 /* no need to throw away allocated active_cache */
7a51ed66 1364 return 0;
6d297f81
JS
1365}
1366
d1f128b0 1367int unmerged_index(const struct index_state *istate)
94a5728c
DB
1368{
1369 int i;
1370 for (i = 0; i < istate->cache_nr; i++) {
1371 if (ce_stage(istate->cache[i]))
1372 return 1;
1373 }
1374 return 0;
1375}
1376
4990aadc 1377#define WRITE_BUFFER_SIZE 8192
bf0f910d 1378static unsigned char write_buffer[WRITE_BUFFER_SIZE];
4990aadc
LT
1379static unsigned long write_buffer_len;
1380
9126f009 1381static int ce_write_flush(git_SHA_CTX *context, int fd)
6015c28b
JH
1382{
1383 unsigned int buffered = write_buffer_len;
1384 if (buffered) {
9126f009 1385 git_SHA1_Update(context, write_buffer, buffered);
93822c22 1386 if (write_in_full(fd, write_buffer, buffered) != buffered)
6015c28b
JH
1387 return -1;
1388 write_buffer_len = 0;
1389 }
1390 return 0;
1391}
1392
9126f009 1393static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
4990aadc
LT
1394{
1395 while (len) {
1396 unsigned int buffered = write_buffer_len;
1397 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1398 if (partial > len)
1399 partial = len;
1400 memcpy(write_buffer + buffered, data, partial);
1401 buffered += partial;
1402 if (buffered == WRITE_BUFFER_SIZE) {
6015c28b
JH
1403 write_buffer_len = buffered;
1404 if (ce_write_flush(context, fd))
4990aadc
LT
1405 return -1;
1406 buffered = 0;
1407 }
1408 write_buffer_len = buffered;
1409 len -= partial;
1d7f171c 1410 data = (char *) data + partial;
a6080a0a
JH
1411 }
1412 return 0;
4990aadc
LT
1413}
1414
9126f009 1415static int write_index_ext_header(git_SHA_CTX *context, int fd,
ac58c7b1 1416 unsigned int ext, unsigned int sz)
bad68ec9
JH
1417{
1418 ext = htonl(ext);
1419 sz = htonl(sz);
968a1d65
DR
1420 return ((ce_write(context, fd, &ext, 4) < 0) ||
1421 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
bad68ec9
JH
1422}
1423
9126f009 1424static int ce_flush(git_SHA_CTX *context, int fd)
4990aadc
LT
1425{
1426 unsigned int left = write_buffer_len;
ca9be054 1427
4990aadc
LT
1428 if (left) {
1429 write_buffer_len = 0;
9126f009 1430 git_SHA1_Update(context, write_buffer, left);
4990aadc 1431 }
ca9be054 1432
2c865d9a
QH
1433 /* Flush first if not enough space for SHA1 signature */
1434 if (left + 20 > WRITE_BUFFER_SIZE) {
93822c22 1435 if (write_in_full(fd, write_buffer, left) != left)
2c865d9a
QH
1436 return -1;
1437 left = 0;
1438 }
1439
ca9be054 1440 /* Append the SHA1 signature at the end */
9126f009 1441 git_SHA1_Final(write_buffer + left, context);
ca9be054 1442 left += 20;
93822c22 1443 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
4990aadc
LT
1444}
1445
407c8eb0
JH
1446static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1447{
1448 /*
1449 * The only thing we care about in this function is to smudge the
1450 * falsely clean entry due to touch-update-touch race, so we leave
1451 * everything else as they are. We are called for entries whose
1452 * ce_mtime match the index file mtime.
c70115b4
JH
1453 *
1454 * Note that this actually does not do much for gitlinks, for
1455 * which ce_match_stat_basic() always goes to the actual
1456 * contents. The caller checks with is_racy_timestamp() which
1457 * always says "no" for gitlinks, so we are not called for them ;-)
407c8eb0
JH
1458 */
1459 struct stat st;
1460
1461 if (lstat(ce->name, &st) < 0)
1462 return;
1463 if (ce_match_stat_basic(ce, &st))
1464 return;
1465 if (ce_modified_check_fs(ce, &st)) {
4b3511b0
JH
1466 /* This is "racily clean"; smudge it. Note that this
1467 * is a tricky code. At first glance, it may appear
1468 * that it can break with this sequence:
1469 *
1470 * $ echo xyzzy >frotz
1471 * $ git-update-index --add frotz
1472 * $ : >frotz
1473 * $ sleep 3
1474 * $ echo filfre >nitfol
1475 * $ git-update-index --add nitfol
1476 *
b7e58b17 1477 * but it does not. When the second update-index runs,
4b3511b0
JH
1478 * it notices that the entry "frotz" has the same timestamp
1479 * as index, and if we were to smudge it by resetting its
1480 * size to zero here, then the object name recorded
1481 * in index is the 6-byte file but the cached stat information
1482 * becomes zero --- which would then match what we would
a6080a0a 1483 * obtain from the filesystem next time we stat("frotz").
4b3511b0
JH
1484 *
1485 * However, the second update-index, before calling
1486 * this function, notices that the cached size is 6
1487 * bytes and what is on the filesystem is an empty
1488 * file, and never calls us, so the cached size information
1489 * for "frotz" stays 6 which does not match the filesystem.
1490 */
7a51ed66 1491 ce->ce_size = 0;
407c8eb0
JH
1492 }
1493}
1494
9126f009 1495static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
7a51ed66
LT
1496{
1497 int size = ondisk_ce_size(ce);
1498 struct ondisk_cache_entry *ondisk = xcalloc(1, size);
06aaaa0b 1499 char *name;
7a51ed66 1500
fba2f38a
KB
1501 ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
1502 ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
fba2f38a
KB
1503 ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
1504 ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
7a51ed66
LT
1505 ondisk->dev = htonl(ce->ce_dev);
1506 ondisk->ino = htonl(ce->ce_ino);
1507 ondisk->mode = htonl(ce->ce_mode);
1508 ondisk->uid = htonl(ce->ce_uid);
1509 ondisk->gid = htonl(ce->ce_gid);
1510 ondisk->size = htonl(ce->ce_size);
1511 hashcpy(ondisk->sha1, ce->sha1);
1512 ondisk->flags = htons(ce->ce_flags);
06aaaa0b
NTND
1513 if (ce->ce_flags & CE_EXTENDED) {
1514 struct ondisk_cache_entry_extended *ondisk2;
1515 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1516 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1517 name = ondisk2->name;
1518 }
1519 else
1520 name = ondisk->name;
1521 memcpy(name, ce->name, ce_namelen(ce));
7a51ed66
LT
1522
1523 return ce_write(c, fd, ondisk, size);
1524}
1525
e1afca4f 1526int write_index(struct index_state *istate, int newfd)
197ee8c9 1527{
9126f009 1528 git_SHA_CTX c;
197ee8c9 1529 struct cache_header hdr;
06aaaa0b 1530 int i, err, removed, extended;
4aab5b46
JH
1531 struct cache_entry **cache = istate->cache;
1532 int entries = istate->cache_nr;
e1afca4f 1533 struct stat st;
025a0709 1534
06aaaa0b 1535 for (i = removed = extended = 0; i < entries; i++) {
7a51ed66 1536 if (cache[i]->ce_flags & CE_REMOVE)
025a0709 1537 removed++;
197ee8c9 1538
06aaaa0b
NTND
1539 /* reduce extended entries if possible */
1540 cache[i]->ce_flags &= ~CE_EXTENDED;
1541 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1542 extended++;
1543 cache[i]->ce_flags |= CE_EXTENDED;
1544 }
1545 }
1546
ccc4feb5 1547 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
06aaaa0b
NTND
1548 /* for extended format, increase version so older git won't try to read it */
1549 hdr.hdr_version = htonl(extended ? 3 : 2);
025a0709 1550 hdr.hdr_entries = htonl(entries - removed);
197ee8c9 1551
9126f009 1552 git_SHA1_Init(&c);
ca9be054 1553 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
197ee8c9
LT
1554 return -1;
1555
1556 for (i = 0; i < entries; i++) {
1557 struct cache_entry *ce = cache[i];
7a51ed66 1558 if (ce->ce_flags & CE_REMOVE)
aa16021e 1559 continue;
e06c43c7 1560 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
407c8eb0 1561 ce_smudge_racily_clean_entry(ce);
7a51ed66 1562 if (ce_write_entry(&c, newfd, ce) < 0)
197ee8c9
LT
1563 return -1;
1564 }
1af1c2b6 1565
bad68ec9 1566 /* Write extension data here */
4aab5b46 1567 if (istate->cache_tree) {
f285a2d7 1568 struct strbuf sb = STRBUF_INIT;
1dffb8fa 1569
1dffb8fa
PH
1570 cache_tree_write(&sb, istate->cache_tree);
1571 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1572 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1573 strbuf_release(&sb);
1574 if (err)
bad68ec9 1575 return -1;
bad68ec9 1576 }
e1afca4f
KB
1577
1578 if (ce_flush(&c, newfd) || fstat(newfd, &st))
1579 return -1;
5bcf109c
KB
1580 istate->timestamp.sec = (unsigned int)st.st_mtime;
1581 istate->timestamp.nsec = ST_MTIME_NSEC(st);
e1afca4f 1582 return 0;
197ee8c9 1583}
e46bbcf6
MV
1584
1585/*
1586 * Read the index file that is potentially unmerged into given
63e8dc5b 1587 * index_state, dropping any unmerged entries. Returns true if
e46bbcf6
MV
1588 * the index is unmerged. Callers who want to refuse to work
1589 * from an unmerged state can call this and check its return value,
1590 * instead of calling read_cache().
1591 */
1592int read_index_unmerged(struct index_state *istate)
1593{
1594 int i;
d1a43f2a 1595 int unmerged = 0;
e46bbcf6
MV
1596
1597 read_index(istate);
e46bbcf6
MV
1598 for (i = 0; i < istate->cache_nr; i++) {
1599 struct cache_entry *ce = istate->cache[i];
d1a43f2a
JH
1600 struct cache_entry *new_ce;
1601 int size, len;
1602
1603 if (!ce_stage(ce))
e46bbcf6 1604 continue;
d1a43f2a
JH
1605 unmerged = 1;
1606 len = strlen(ce->name);
1607 size = cache_entry_size(len);
1608 new_ce = xcalloc(1, size);
1609 hashcpy(new_ce->sha1, ce->sha1);
1610 memcpy(new_ce->name, ce->name, len);
1611 new_ce->ce_flags = create_ce_flags(len, 0);
1612 new_ce->ce_mode = ce->ce_mode;
1613 if (add_index_entry(istate, new_ce, 0))
1614 return error("%s: cannot drop to stage #0",
1615 ce->name);
1616 i = index_name_pos(istate, new_ce->name, len);
e46bbcf6 1617 }
d1a43f2a 1618 return unmerged;
e46bbcf6 1619}
041aee31
JH
1620
1621struct update_callback_data
1622{
1623 int flags;
1624 int add_errors;
1625};
1626
1627static void update_callback(struct diff_queue_struct *q,
1628 struct diff_options *opt, void *cbdata)
1629{
1630 int i;
1631 struct update_callback_data *data = cbdata;
1632
1633 for (i = 0; i < q->nr; i++) {
1634 struct diff_filepair *p = q->queue[i];
1635 const char *path = p->one->path;
1636 switch (p->status) {
1637 default:
1638 die("unexpected diff status %c", p->status);
1639 case DIFF_STATUS_UNMERGED:
4cc8d6c6
JH
1640 /*
1641 * ADD_CACHE_IGNORE_REMOVAL is unset if "git
1642 * add -u" is calling us, In such a case, a
1643 * missing work tree file needs to be removed
1644 * if there is an unmerged entry at stage #2,
1645 * but such a diff record is followed by
1646 * another with DIFF_STATUS_DELETED (and if
1647 * there is no stage #2, we won't see DELETED
1648 * nor MODIFIED). We can simply continue
1649 * either way.
1650 */
1651 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
1652 continue;
1653 /*
1654 * Otherwise, it is "git add path" is asking
1655 * to explicitly add it; we fall through. A
1656 * missing work tree file is an error and is
1657 * caught by add_file_to_index() in such a
1658 * case.
1659 */
041aee31
JH
1660 case DIFF_STATUS_MODIFIED:
1661 case DIFF_STATUS_TYPE_CHANGED:
1662 if (add_file_to_index(&the_index, path, data->flags)) {
1663 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
1664 die("updating files failed");
1665 data->add_errors++;
1666 }
1667 break;
1668 case DIFF_STATUS_DELETED:
1669 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
1670 break;
1671 if (!(data->flags & ADD_CACHE_PRETEND))
1672 remove_file_from_index(&the_index, path);
1673 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
1674 printf("remove '%s'\n", path);
1675 break;
1676 }
1677 }
1678}
1679
1680int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
1681{
1682 struct update_callback_data data;
1683 struct rev_info rev;
1684 init_revisions(&rev, prefix);
1685 setup_revisions(0, NULL, &rev, NULL);
1686 rev.prune_data = pathspec;
1687 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
1688 rev.diffopt.format_callback = update_callback;
1689 data.flags = flags;
1690 data.add_errors = 0;
1691 rev.diffopt.format_callback_data = &data;
1692 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
1693 return !!data.add_errors;
1694}
1695
98fa4738
JK
1696/*
1697 * Returns 1 if the path is an "other" path with respect to
1698 * the index; that is, the path is not mentioned in the index at all,
1699 * either as a file, a directory with some files in the index,
1700 * or as an unmerged entry.
1701 *
1702 * We helpfully remove a trailing "/" from directories so that
1703 * the output of read_directory can be used as-is.
1704 */
1705int index_name_is_other(const struct index_state *istate, const char *name,
1706 int namelen)
1707{
1708 int pos;
1709 if (namelen && name[namelen - 1] == '/')
1710 namelen--;
1711 pos = index_name_pos(istate, name, namelen);
1712 if (0 <= pos)
1713 return 0; /* exact match */
1714 pos = -pos - 1;
1715 if (pos < istate->cache_nr) {
1716 struct cache_entry *ce = istate->cache[pos];
1717 if (ce_namelen(ce) == namelen &&
1718 !memcmp(ce->name, name, namelen))
1719 return 0; /* Yup, this one exists unmerged */
1720 }
1721 return 1;
1722}