]>
Commit | Line | Data |
---|---|---|
bc5c5ec0 | 1 | #include "git-compat-util.h" |
8e440259 | 2 | #include "blob.h" |
a034e910 | 3 | #include "object-store-ll.h" |
8ca12c0d | 4 | #include "dir.h" |
32a8f510 | 5 | #include "environment.h" |
f394e093 | 6 | #include "gettext.h" |
41771fa4 | 7 | #include "hex.h" |
f5653856 | 8 | #include "name-hash.h" |
baf889c2 | 9 | #include "sparse-index.h" |
dd8e9121 | 10 | #include "streaming.h" |
6d14eac3 | 11 | #include "submodule.h" |
cb2a5135 | 12 | #include "symlinks.h" |
52f1d62e | 13 | #include "progress.h" |
883e248b | 14 | #include "fsmonitor.h" |
d052cc03 | 15 | #include "entry.h" |
04155bda | 16 | #include "parallel-checkout.h" |
12dccc16 | 17 | |
81a9aa60 KB |
18 | static void create_directories(const char *path, int path_len, |
19 | const struct checkout *state) | |
12dccc16 | 20 | { |
3733e694 | 21 | char *buf = xmallocz(path_len); |
81a9aa60 KB |
22 | int len = 0; |
23 | ||
24 | while (len < path_len) { | |
25 | do { | |
26 | buf[len] = path[len]; | |
27 | len++; | |
28 | } while (len < path_len && path[len] != '/'); | |
29 | if (len >= path_len) | |
30 | break; | |
12dccc16 | 31 | buf[len] = 0; |
fa2e71c9 | 32 | |
bad4a54f KB |
33 | /* |
34 | * For 'checkout-index --prefix=<dir>', <dir> is | |
35 | * allowed to be a symlink to an existing directory, | |
36 | * and we set 'state->base_dir_len' below, such that | |
37 | * we test the path components of the prefix with the | |
38 | * stat() function instead of the lstat() function. | |
39 | */ | |
57199892 | 40 | if (has_dirs_only_path(buf, len, state->base_dir_len)) |
fa2e71c9 JH |
41 | continue; /* ok, it is already a directory. */ |
42 | ||
43 | /* | |
bad4a54f KB |
44 | * If this mkdir() would fail, it could be that there |
45 | * is already a symlink or something else exists | |
46 | * there, therefore we then try to unlink it and try | |
47 | * one more time to create the directory. | |
fa2e71c9 | 48 | */ |
f312de01 | 49 | if (mkdir(buf, 0777)) { |
fa2e71c9 | 50 | if (errno == EEXIST && state->force && |
691f1a28 | 51 | !unlink_or_warn(buf) && !mkdir(buf, 0777)) |
fa2e71c9 | 52 | continue; |
0721c314 | 53 | die_errno("cannot create directory at '%s'", buf); |
12dccc16 LT |
54 | } |
55 | } | |
56 | free(buf); | |
57 | } | |
58 | ||
2f29e0c6 | 59 | static void remove_subtree(struct strbuf *path) |
12dccc16 | 60 | { |
2f29e0c6 | 61 | DIR *dir = opendir(path->buf); |
12dccc16 | 62 | struct dirent *de; |
2f29e0c6 | 63 | int origlen = path->len; |
a6080a0a | 64 | |
12dccc16 | 65 | if (!dir) |
2f29e0c6 | 66 | die_errno("cannot opendir '%s'", path->buf); |
b548f0f1 | 67 | while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) { |
12dccc16 | 68 | struct stat st; |
2f29e0c6 | 69 | |
2f29e0c6 MH |
70 | strbuf_addch(path, '/'); |
71 | strbuf_addstr(path, de->d_name); | |
72 | if (lstat(path->buf, &st)) | |
73 | die_errno("cannot lstat '%s'", path->buf); | |
12dccc16 | 74 | if (S_ISDIR(st.st_mode)) |
2f29e0c6 MH |
75 | remove_subtree(path); |
76 | else if (unlink(path->buf)) | |
77 | die_errno("cannot unlink '%s'", path->buf); | |
78 | strbuf_setlen(path, origlen); | |
12dccc16 LT |
79 | } |
80 | closedir(dir); | |
2f29e0c6 MH |
81 | if (rmdir(path->buf)) |
82 | die_errno("cannot rmdir '%s'", path->buf); | |
12dccc16 LT |
83 | } |
84 | ||
d48a72f3 | 85 | static int create_file(const char *path, unsigned int mode) |
12dccc16 | 86 | { |
12dccc16 | 87 | mode = (mode & 0100) ? 0777 : 0666; |
781411ed | 88 | return open(path, O_WRONLY | O_CREAT | O_EXCL, mode); |
12dccc16 LT |
89 | } |
90 | ||
e9aa762c | 91 | void *read_blob_entry(const struct cache_entry *ce, size_t *size) |
f0807e62 LT |
92 | { |
93 | enum object_type type; | |
e9aa762c | 94 | unsigned long ul; |
bc726bd0 ÆAB |
95 | void *blob_data = repo_read_object_file(the_repository, &ce->oid, |
96 | &type, &ul); | |
f0807e62 | 97 | |
e9aa762c | 98 | *size = ul; |
d8f71807 | 99 | if (blob_data) { |
f0807e62 | 100 | if (type == OBJ_BLOB) |
d8f71807 BW |
101 | return blob_data; |
102 | free(blob_data); | |
f0807e62 LT |
103 | } |
104 | return NULL; | |
105 | } | |
106 | ||
9c5e6c80 | 107 | static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempfile) |
fd5db55d JH |
108 | { |
109 | int symlink = (ce->ce_mode & S_IFMT) != S_IFREG; | |
110 | if (to_tempfile) { | |
330c8e26 JK |
111 | xsnprintf(path, TEMPORARY_FILENAME_LENGTH, "%s", |
112 | symlink ? ".merge_link_XXXXXX" : ".merge_file_XXXXXX"); | |
fd5db55d JH |
113 | return mkstemp(path); |
114 | } else { | |
115 | return create_file(path, !symlink ? ce->ce_mode : 0666); | |
116 | } | |
117 | } | |
118 | ||
49cfd903 | 119 | int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st) |
fd5db55d JH |
120 | { |
121 | /* use fstat() only when path == ce->name */ | |
122 | if (fstat_is_reliable() && | |
123 | state->refresh_cache && !state->base_dir_len) { | |
35e6e212 | 124 | return !fstat(fd, st); |
fd5db55d JH |
125 | } |
126 | return 0; | |
127 | } | |
128 | ||
9c5e6c80 | 129 | static int streaming_write_entry(const struct cache_entry *ce, char *path, |
b6691092 | 130 | struct stream_filter *filter, |
dd8e9121 JH |
131 | const struct checkout *state, int to_tempfile, |
132 | int *fstat_done, struct stat *statbuf) | |
133 | { | |
d9c31e14 | 134 | int result = 0; |
47a02ff2 | 135 | int fd; |
dd8e9121 JH |
136 | |
137 | fd = open_output_fd(path, ce, to_tempfile); | |
d9c31e14 JK |
138 | if (fd < 0) |
139 | return -1; | |
140 | ||
7eda0e4f | 141 | result |= stream_blob_to_fd(fd, &ce->oid, filter, 1); |
49cfd903 | 142 | *fstat_done = fstat_checkout_output(fd, state, statbuf); |
d9c31e14 JK |
143 | result |= close(fd); |
144 | ||
145 | if (result) | |
dd8e9121 JH |
146 | unlink(path); |
147 | return result; | |
148 | } | |
149 | ||
2841e8f8 LS |
150 | void enable_delayed_checkout(struct checkout *state) |
151 | { | |
152 | if (!state->delayed_checkout) { | |
153 | state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout)); | |
154 | state->delayed_checkout->state = CE_CAN_DELAY; | |
bc40dfb1 ÆAB |
155 | string_list_init_nodup(&state->delayed_checkout->filters); |
156 | string_list_init_nodup(&state->delayed_checkout->paths); | |
2841e8f8 LS |
157 | } |
158 | } | |
159 | ||
160 | static int remove_available_paths(struct string_list_item *item, void *cb_data) | |
161 | { | |
162 | struct string_list *available_paths = cb_data; | |
163 | struct string_list_item *available; | |
164 | ||
165 | available = string_list_lookup(available_paths, item->string); | |
166 | if (available) | |
611c7785 | 167 | available->util = item->util; |
2841e8f8 LS |
168 | return !available; |
169 | } | |
170 | ||
611c7785 | 171 | int finish_delayed_checkout(struct checkout *state, int show_progress) |
2841e8f8 LS |
172 | { |
173 | int errs = 0; | |
bf6d819b | 174 | unsigned processed_paths = 0; |
52f1d62e | 175 | off_t filtered_bytes = 0; |
2841e8f8 | 176 | struct string_list_item *filter, *path; |
bf6d819b | 177 | struct progress *progress = NULL; |
2841e8f8 LS |
178 | struct delayed_checkout *dco = state->delayed_checkout; |
179 | ||
180 | if (!state->delayed_checkout) | |
181 | return errs; | |
182 | ||
183 | dco->state = CE_RETRY; | |
bf6d819b SG |
184 | if (show_progress) |
185 | progress = start_delayed_progress(_("Filtering content"), dco->paths.nr); | |
2841e8f8 LS |
186 | while (dco->filters.nr > 0) { |
187 | for_each_string_list_item(filter, &dco->filters) { | |
188 | struct string_list available_paths = STRING_LIST_INIT_NODUP; | |
189 | ||
190 | if (!async_query_available_blobs(filter->string, &available_paths)) { | |
191 | /* Filter reported an error */ | |
192 | errs = 1; | |
193 | filter->string = ""; | |
194 | continue; | |
195 | } | |
196 | if (available_paths.nr <= 0) { | |
197 | /* | |
198 | * Filter responded with no entries. That means | |
199 | * the filter is done and we can remove the | |
200 | * filter from the list (see | |
201 | * "string_list_remove_empty_items" call below). | |
202 | */ | |
203 | filter->string = ""; | |
204 | continue; | |
205 | } | |
206 | ||
207 | /* | |
208 | * In dco->paths we store a list of all delayed paths. | |
209 | * The filter just send us a list of available paths. | |
210 | * Remove them from the list. | |
211 | */ | |
212 | filter_string_list(&dco->paths, 0, | |
213 | &remove_available_paths, &available_paths); | |
214 | ||
215 | for_each_string_list_item(path, &available_paths) { | |
216 | struct cache_entry* ce; | |
217 | ||
218 | if (!path->util) { | |
219 | error("external filter '%s' signaled that '%s' " | |
220 | "is now available although it has not been " | |
221 | "delayed earlier", | |
222 | filter->string, path->string); | |
223 | errs |= 1; | |
224 | ||
225 | /* | |
226 | * Do not ask the filter for available blobs, | |
227 | * again, as the filter is likely buggy. | |
228 | */ | |
229 | filter->string = ""; | |
230 | continue; | |
231 | } | |
232 | ce = index_file_exists(state->istate, path->string, | |
233 | strlen(path->string), 0); | |
52f1d62e | 234 | if (ce) { |
bf6d819b | 235 | display_progress(progress, ++processed_paths); |
611c7785 | 236 | errs |= checkout_entry(ce, state, NULL, path->util); |
52f1d62e LS |
237 | filtered_bytes += ce->ce_stat_data.sd_size; |
238 | display_throughput(progress, filtered_bytes); | |
239 | } else | |
240 | errs = 1; | |
2841e8f8 LS |
241 | } |
242 | } | |
243 | string_list_remove_empty_items(&dco->filters, 0); | |
244 | } | |
52f1d62e | 245 | stop_progress(&progress); |
2841e8f8 LS |
246 | string_list_clear(&dco->filters, 0); |
247 | ||
248 | /* At this point we should not have any delayed paths anymore. */ | |
249 | errs |= dco->paths.nr; | |
250 | for_each_string_list_item(path, &dco->paths) { | |
251 | error("'%s' was not filtered properly", path->string); | |
252 | } | |
253 | string_list_clear(&dco->paths, 0); | |
254 | ||
255 | free(dco); | |
256 | state->delayed_checkout = NULL; | |
257 | ||
258 | return errs; | |
259 | } | |
260 | ||
584a0d13 MT |
261 | void update_ce_after_write(const struct checkout *state, struct cache_entry *ce, |
262 | struct stat *st) | |
263 | { | |
264 | if (state->refresh_cache) { | |
265 | assert(state->istate); | |
266 | fill_stat_cache_info(state->istate, ce, st); | |
267 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
268 | mark_fsmonitor_invalid(state->istate, ce); | |
269 | state->istate->cache_changed |= CE_ENTRY_CHANGED; | |
270 | } | |
271 | } | |
272 | ||
30419e7e MT |
273 | /* Note: ca is used (and required) iff the entry refers to a regular file. */ |
274 | static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca, | |
611c7785 MT |
275 | const struct checkout *state, int to_tempfile, |
276 | int *nr_checkouts) | |
12dccc16 | 277 | { |
4857c761 | 278 | unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT; |
c602d3a9 | 279 | struct delayed_checkout *dco = state->delayed_checkout; |
e4c72923 | 280 | int fd, ret, fstat_done = 0; |
d8f71807 | 281 | char *new_blob; |
4857c761 | 282 | struct strbuf buf = STRBUF_INIT; |
e9aa762c | 283 | size_t size; |
564bde9a JK |
284 | ssize_t wrote; |
285 | size_t newsize = 0; | |
e4c72923 | 286 | struct stat st; |
6d14eac3 | 287 | const struct submodule *sub; |
c397aac0 | 288 | struct checkout_metadata meta; |
611c7785 | 289 | static int scratch_nr_checkouts; |
c397aac0 | 290 | |
291 | clone_checkout_metadata(&meta, &state->meta, &ce->oid); | |
4857c761 | 292 | |
b6691092 | 293 | if (ce_mode_s_ifmt == S_IFREG) { |
30419e7e | 294 | struct stream_filter *filter = get_stream_filter_ca(ca, &ce->oid); |
b6691092 JH |
295 | if (filter && |
296 | !streaming_write_entry(ce, path, filter, | |
297 | state, to_tempfile, | |
298 | &fstat_done, &st)) | |
299 | goto finish; | |
300 | } | |
dd8e9121 | 301 | |
4857c761 | 302 | switch (ce_mode_s_ifmt) { |
4857c761 | 303 | case S_IFLNK: |
d8f71807 BW |
304 | new_blob = read_blob_entry(ce, &size); |
305 | if (!new_blob) | |
d43e9073 | 306 | return error("unable to read sha1 file of %s (%s)", |
9334ea8e | 307 | ce->name, oid_to_hex(&ce->oid)); |
1a9d7e9b | 308 | |
7cbbf9d6 JK |
309 | /* |
310 | * We can't make a real symlink; write out a regular file entry | |
311 | * with the symlink destination as its contents. | |
312 | */ | |
313 | if (!has_symlinks || to_tempfile) | |
314 | goto write_file_entry; | |
315 | ||
d8f71807 BW |
316 | ret = symlink(new_blob, path); |
317 | free(new_blob); | |
7cbbf9d6 JK |
318 | if (ret) |
319 | return error_errno("unable to create symlink %s", path); | |
320 | break; | |
321 | ||
322 | case S_IFREG: | |
c602d3a9 JK |
323 | /* |
324 | * We do not send the blob in case of a retry, so do not | |
325 | * bother reading it at all. | |
326 | */ | |
7cbbf9d6 | 327 | if (dco && dco->state == CE_RETRY) { |
d8f71807 | 328 | new_blob = NULL; |
c602d3a9 JK |
329 | size = 0; |
330 | } else { | |
d8f71807 BW |
331 | new_blob = read_blob_entry(ce, &size); |
332 | if (!new_blob) | |
c602d3a9 | 333 | return error("unable to read sha1 file of %s (%s)", |
9334ea8e | 334 | ce->name, oid_to_hex(&ce->oid)); |
4857c761 KB |
335 | } |
336 | ||
1a9d7e9b JH |
337 | /* |
338 | * Convert from git internal format to working tree format | |
339 | */ | |
7cbbf9d6 | 340 | if (dco && dco->state != CE_NO_DELAY) { |
30419e7e MT |
341 | ret = async_convert_to_working_tree_ca(ca, ce->name, |
342 | new_blob, size, | |
343 | &buf, &meta, dco); | |
611c7785 MT |
344 | if (ret) { |
345 | struct string_list_item *item = | |
346 | string_list_lookup(&dco->paths, ce->name); | |
347 | if (item) { | |
348 | item->util = nr_checkouts ? nr_checkouts | |
349 | : &scratch_nr_checkouts; | |
350 | free(new_blob); | |
351 | goto delayed; | |
352 | } | |
2841e8f8 | 353 | } |
30419e7e MT |
354 | } else { |
355 | ret = convert_to_working_tree_ca(ca, ce->name, new_blob, | |
356 | size, &buf, &meta); | |
357 | } | |
7cbbf9d6 JK |
358 | |
359 | if (ret) { | |
d8f71807 BW |
360 | free(new_blob); |
361 | new_blob = strbuf_detach(&buf, &newsize); | |
7cbbf9d6 | 362 | size = newsize; |
1a9d7e9b | 363 | } |
7cbbf9d6 JK |
364 | /* |
365 | * No "else" here as errors from convert are OK at this | |
366 | * point. If the error would have been fatal (e.g. | |
367 | * filter is required), then we would have died already. | |
368 | */ | |
1a9d7e9b | 369 | |
7cbbf9d6 | 370 | write_file_entry: |
fd5db55d | 371 | fd = open_output_fd(path, ce, to_tempfile); |
12dccc16 | 372 | if (fd < 0) { |
d8f71807 | 373 | free(new_blob); |
e1ebb3c2 | 374 | return error_errno("unable to create file %s", path); |
12dccc16 | 375 | } |
6c510bee | 376 | |
d8f71807 | 377 | wrote = write_in_full(fd, new_blob, size); |
fd5db55d | 378 | if (!to_tempfile) |
49cfd903 | 379 | fstat_done = fstat_checkout_output(fd, state, &st); |
12dccc16 | 380 | close(fd); |
d8f71807 | 381 | free(new_blob); |
564bde9a | 382 | if (wrote < 0) |
d43e9073 | 383 | return error("unable to write file %s", path); |
12dccc16 | 384 | break; |
7cbbf9d6 | 385 | |
302b9282 | 386 | case S_IFGITLINK: |
f0807e62 | 387 | if (to_tempfile) |
9334ea8e | 388 | return error("cannot create temporary submodule %s", ce->name); |
f0807e62 | 389 | if (mkdir(path, 0777) < 0) |
42063f95 | 390 | return error("cannot create submodule directory %s", path); |
6d14eac3 SB |
391 | sub = submodule_from_ce(ce); |
392 | if (sub) | |
4002ec3d | 393 | return submodule_move_head(ce->name, state->super_prefix, |
cd279e2e SB |
394 | NULL, oid_to_hex(&ce->oid), |
395 | state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0); | |
f0807e62 | 396 | break; |
7cbbf9d6 | 397 | |
12dccc16 | 398 | default: |
9334ea8e | 399 | return error("unknown file mode for %s in index", ce->name); |
12dccc16 LT |
400 | } |
401 | ||
dd8e9121 | 402 | finish: |
6ee67f26 | 403 | if (state->refresh_cache) { |
584a0d13 MT |
404 | if (!fstat_done && lstat(ce->name, &st) < 0) |
405 | return error_errno("unable to stat just-written file %s", | |
406 | ce->name); | |
407 | update_ce_after_write(state, ce , &st); | |
12dccc16 | 408 | } |
611c7785 MT |
409 | if (nr_checkouts) |
410 | (*nr_checkouts)++; | |
03b95333 | 411 | delayed: |
12dccc16 LT |
412 | return 0; |
413 | } | |
414 | ||
b6986d8a LT |
415 | /* |
416 | * This is like 'lstat()', except it refuses to follow symlinks | |
da02ca50 | 417 | * in the path, after skipping "skiplen". |
b6986d8a | 418 | */ |
61b97df7 | 419 | static int check_path(const char *path, int len, struct stat *st, int skiplen) |
b6986d8a | 420 | { |
da02ca50 JH |
421 | const char *slash = path + len; |
422 | ||
423 | while (path < slash && *slash != '/') | |
424 | slash--; | |
425 | if (!has_dirs_only_path(path, slash - path, skiplen)) { | |
b6986d8a LT |
426 | errno = ENOENT; |
427 | return -1; | |
428 | } | |
429 | return lstat(path, st); | |
430 | } | |
431 | ||
b878579a NTND |
432 | static void mark_colliding_entries(const struct checkout *state, |
433 | struct cache_entry *ce, struct stat *st) | |
434 | { | |
435 | int i, trust_ino = check_stat; | |
436 | ||
e66ceca9 | 437 | #if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__) |
b878579a NTND |
438 | trust_ino = 0; |
439 | #endif | |
440 | ||
441 | ce->ce_flags |= CE_MATCHED; | |
442 | ||
3450a304 DS |
443 | /* TODO: audit for interaction with sparse-index. */ |
444 | ensure_full_index(state->istate); | |
b878579a NTND |
445 | for (i = 0; i < state->istate->cache_nr; i++) { |
446 | struct cache_entry *dup = state->istate->cache[i]; | |
447 | ||
04155bda MT |
448 | if (dup == ce) { |
449 | /* | |
450 | * Parallel checkout doesn't create the files in index | |
451 | * order. So the other side of the collision may appear | |
452 | * after the given cache_entry in the array. | |
453 | */ | |
454 | if (parallel_checkout_status() == PC_RUNNING) | |
455 | continue; | |
456 | else | |
457 | break; | |
458 | } | |
b878579a NTND |
459 | |
460 | if (dup->ce_flags & (CE_MATCHED | CE_VALID | CE_SKIP_WORKTREE)) | |
461 | continue; | |
462 | ||
e66ceca9 | 463 | if ((trust_ino && !match_stat_data(&dup->ce_stat_data, st)) || |
b878579a NTND |
464 | (!trust_ino && !fspathcmp(ce->name, dup->name))) { |
465 | dup->ce_flags |= CE_MATCHED; | |
466 | break; | |
467 | } | |
468 | } | |
469 | } | |
470 | ||
ae22751f MT |
471 | int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca, |
472 | const struct checkout *state, char *topath, | |
473 | int *nr_checkouts) | |
12dccc16 | 474 | { |
f63272a3 | 475 | static struct strbuf path = STRBUF_INIT; |
de84f99c | 476 | struct stat st; |
ae22751f | 477 | struct conv_attrs ca_buf; |
12dccc16 | 478 | |
536ec183 TG |
479 | if (ce->ce_flags & CE_WT_REMOVE) { |
480 | if (topath) | |
481 | /* | |
482 | * No content and thus no path to create, so we have | |
483 | * no pathname to return. | |
484 | */ | |
485 | BUG("Can't remove entry to a path"); | |
4002ec3d | 486 | unlink_entry(ce, state->super_prefix); |
536ec183 TG |
487 | return 0; |
488 | } | |
489 | ||
30419e7e | 490 | if (topath) { |
ae22751f | 491 | if (S_ISREG(ce->ce_mode) && !ca) { |
30419e7e MT |
492 | convert_attrs(state->istate, &ca_buf, ce->name); |
493 | ca = &ca_buf; | |
494 | } | |
611c7785 | 495 | return write_entry(ce, topath, ca, state, 1, nr_checkouts); |
30419e7e | 496 | } |
de84f99c | 497 | |
f63272a3 MH |
498 | strbuf_reset(&path); |
499 | strbuf_add(&path, state->base_dir, state->base_dir_len); | |
500 | strbuf_add(&path, ce->name, ce_namelen(ce)); | |
12dccc16 | 501 | |
f63272a3 | 502 | if (!check_path(path.buf, path.len, &st, state->base_dir_len)) { |
6d14eac3 | 503 | const struct submodule *sub; |
74cfc0ee NTND |
504 | unsigned changed = ie_match_stat(state->istate, ce, &st, |
505 | CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE); | |
6d14eac3 SB |
506 | /* |
507 | * Needs to be checked before !changed returns early, | |
508 | * as the possibly empty directory was not changed | |
509 | */ | |
510 | sub = submodule_from_ce(ce); | |
511 | if (sub) { | |
512 | int err; | |
513 | if (!is_submodule_populated_gently(ce->name, &err)) { | |
514 | struct stat sb; | |
515 | if (lstat(ce->name, &sb)) | |
516 | die(_("could not stat file '%s'"), ce->name); | |
517 | if (!(st.st_mode & S_IFDIR)) | |
518 | unlink_or_warn(ce->name); | |
519 | ||
4002ec3d | 520 | return submodule_move_head(ce->name, state->super_prefix, |
cd279e2e | 521 | NULL, oid_to_hex(&ce->oid), 0); |
6d14eac3 | 522 | } else |
4002ec3d | 523 | return submodule_move_head(ce->name, state->super_prefix, |
6d14eac3 | 524 | "HEAD", oid_to_hex(&ce->oid), |
cd279e2e | 525 | state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0); |
6d14eac3 SB |
526 | } |
527 | ||
12dccc16 LT |
528 | if (!changed) |
529 | return 0; | |
530 | if (!state->force) { | |
531 | if (!state->quiet) | |
f63272a3 MH |
532 | fprintf(stderr, |
533 | "%s already exists, no checkout\n", | |
534 | path.buf); | |
4b12dae6 | 535 | return -1; |
12dccc16 LT |
536 | } |
537 | ||
b878579a NTND |
538 | if (state->clone) |
539 | mark_colliding_entries(state, ce, &st); | |
540 | ||
12dccc16 LT |
541 | /* |
542 | * We unlink the old file, to get the new one with the | |
543 | * right permissions (including umask, which is nasty | |
544 | * to emulate by hand - much easier to let the system | |
545 | * just do the right thing) | |
546 | */ | |
d48a72f3 | 547 | if (S_ISDIR(st.st_mode)) { |
f0807e62 | 548 | /* If it is a gitlink, leave it alone! */ |
7a51ed66 | 549 | if (S_ISGITLINK(ce->ce_mode)) |
f0807e62 | 550 | return 0; |
2f29e0c6 | 551 | remove_subtree(&path); |
f63272a3 | 552 | } else if (unlink(path.buf)) |
e1ebb3c2 | 553 | return error_errno("unable to unlink old '%s'", path.buf); |
de84f99c | 554 | } else if (state->not_new) |
12dccc16 | 555 | return 0; |
f63272a3 MH |
556 | |
557 | create_directories(path.buf, path.len, state); | |
30419e7e | 558 | |
ae22751f | 559 | if (S_ISREG(ce->ce_mode) && !ca) { |
30419e7e MT |
560 | convert_attrs(state->istate, &ca_buf, ce->name); |
561 | ca = &ca_buf; | |
562 | } | |
563 | ||
611c7785 | 564 | if (!enqueue_checkout(ce, ca, nr_checkouts)) |
04155bda MT |
565 | return 0; |
566 | ||
611c7785 | 567 | return write_entry(ce, path.buf, ca, state, 0, nr_checkouts); |
12dccc16 | 568 | } |
b702dd12 | 569 | |
4002ec3d | 570 | void unlink_entry(const struct cache_entry *ce, const char *super_prefix) |
b702dd12 TG |
571 | { |
572 | const struct submodule *sub = submodule_from_ce(ce); | |
573 | if (sub) { | |
574 | /* state.force is set at the caller. */ | |
4002ec3d | 575 | submodule_move_head(ce->name, super_prefix, "HEAD", NULL, |
b702dd12 TG |
576 | SUBMODULE_MOVE_HEAD_FORCE); |
577 | } | |
fab78a0c | 578 | if (check_leading_path(ce->name, ce_namelen(ce), 1) >= 0) |
b702dd12 TG |
579 | return; |
580 | if (remove_or_warn(ce->ce_mode, ce->name)) | |
581 | return; | |
582 | schedule_dir_for_removal(ce->name, ce_namelen(ce)); | |
583 | } |