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