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