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