]>
Commit | Line | Data |
---|---|---|
b888d61c DB |
1 | /* |
2 | * "git fetch" | |
3 | */ | |
4 | #include "cache.h" | |
5 | #include "refs.h" | |
6 | #include "commit.h" | |
7 | #include "builtin.h" | |
c455c87c | 8 | #include "string-list.h" |
b888d61c DB |
9 | #include "remote.h" |
10 | #include "transport.h" | |
4191c356 | 11 | #include "run-command.h" |
83201998 | 12 | #include "parse-options.h" |
4a16d072 | 13 | #include "sigchain.h" |
027771fc | 14 | #include "submodule-config.h" |
7dce19d3 | 15 | #include "submodule.h" |
f96400cb | 16 | #include "connected.h" |
85556d4e | 17 | #include "argv-array.h" |
b888d61c | 18 | |
83201998 | 19 | static const char * const builtin_fetch_usage[] = { |
719acedb NTND |
20 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
21 | N_("git fetch [<options>] <group>"), | |
22 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), | |
23 | N_("git fetch --all [<options>]"), | |
83201998 KH |
24 | NULL |
25 | }; | |
b888d61c | 26 | |
83201998 KH |
27 | enum { |
28 | TAGS_UNSET = 0, | |
29 | TAGS_DEFAULT = 1, | |
30 | TAGS_SET = 2 | |
31 | }; | |
32 | ||
737c5a9c MS |
33 | static int fetch_prune_config = -1; /* unspecified */ |
34 | static int prune = -1; /* unspecified */ | |
35 | #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */ | |
36 | ||
37 | static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity; | |
01fdc21f | 38 | static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
48d25cae | 39 | static int tags = TAGS_DEFAULT, unshallow, update_shallow; |
a028a193 | 40 | static int max_children = -1; |
c915f11e | 41 | static enum transport_family family; |
4191c356 | 42 | static const char *depth; |
83201998 | 43 | static const char *upload_pack; |
2d324efa | 44 | static struct strbuf default_rla = STRBUF_INIT; |
af234459 | 45 | static struct transport *gtransport; |
b26ed430 | 46 | static struct transport *gsecondary; |
7dce19d3 | 47 | static const char *submodule_prefix = ""; |
88a21979 | 48 | static const char *recurse_submodules_default; |
4b3b33a7 | 49 | static int shown_url = 0; |
c5558f80 JH |
50 | static int refmap_alloc, refmap_nr; |
51 | static const char **refmap_array; | |
e4022ed2 | 52 | |
8f0700dd JL |
53 | static int option_parse_recurse_submodules(const struct option *opt, |
54 | const char *arg, int unset) | |
55 | { | |
56 | if (unset) { | |
57 | recurse_submodules = RECURSE_SUBMODULES_OFF; | |
58 | } else { | |
59 | if (arg) | |
60 | recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg); | |
61 | else | |
62 | recurse_submodules = RECURSE_SUBMODULES_ON; | |
63 | } | |
64 | return 0; | |
65 | } | |
e4022ed2 | 66 | |
737c5a9c MS |
67 | static int git_fetch_config(const char *k, const char *v, void *cb) |
68 | { | |
69 | if (!strcmp(k, "fetch.prune")) { | |
70 | fetch_prune_config = git_config_bool(k, v); | |
71 | return 0; | |
72 | } | |
72549dfd | 73 | return git_default_config(k, v, cb); |
737c5a9c MS |
74 | } |
75 | ||
c5558f80 JH |
76 | static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |
77 | { | |
78 | ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc); | |
79 | ||
80 | /* | |
81 | * "git fetch --refmap='' origin foo" | |
82 | * can be used to tell the command not to store anywhere | |
83 | */ | |
84 | if (*arg) | |
85 | refmap_array[refmap_nr++] = arg; | |
86 | return 0; | |
87 | } | |
88 | ||
83201998 | 89 | static struct option builtin_fetch_options[] = { |
7f87aff2 | 90 | OPT__VERBOSITY(&verbosity), |
d5d09d47 SB |
91 | OPT_BOOL(0, "all", &all, |
92 | N_("fetch from all remotes")), | |
93 | OPT_BOOL('a', "append", &append, | |
94 | N_("append to .git/FETCH_HEAD instead of overwriting")), | |
719acedb NTND |
95 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
96 | N_("path to upload pack on remote end")), | |
97 | OPT__FORCE(&force, N_("force overwrite of local branch")), | |
d5d09d47 SB |
98 | OPT_BOOL('m', "multiple", &multiple, |
99 | N_("fetch from multiple remotes")), | |
83201998 | 100 | OPT_SET_INT('t', "tags", &tags, |
719acedb | 101 | N_("fetch all tags and associated objects"), TAGS_SET), |
e7951290 | 102 | OPT_SET_INT('n', NULL, &tags, |
719acedb | 103 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
62104ba1 SB |
104 | OPT_INTEGER('j', "jobs", &max_children, |
105 | N_("number of submodules fetched in parallel")), | |
d5d09d47 SB |
106 | OPT_BOOL('p', "prune", &prune, |
107 | N_("prune remote-tracking branches no longer on remote")), | |
719acedb NTND |
108 | { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"), |
109 | N_("control recursive fetching of submodules"), | |
8f0700dd | 110 | PARSE_OPT_OPTARG, option_parse_recurse_submodules }, |
d5d09d47 SB |
111 | OPT_BOOL(0, "dry-run", &dry_run, |
112 | N_("dry run")), | |
113 | OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), | |
114 | OPT_BOOL('u', "update-head-ok", &update_head_ok, | |
719acedb NTND |
115 | N_("allow updating of HEAD ref")), |
116 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), | |
117 | OPT_STRING(0, "depth", &depth, N_("depth"), | |
118 | N_("deepen history of shallow clone")), | |
4dcb167f NTND |
119 | { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL, |
120 | N_("convert to a complete repository"), | |
121 | PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 }, | |
719acedb NTND |
122 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
123 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, | |
88a21979 JL |
124 | { OPTION_STRING, 0, "recurse-submodules-default", |
125 | &recurse_submodules_default, NULL, | |
719acedb | 126 | N_("default mode for recursion"), PARSE_OPT_HIDDEN }, |
48d25cae NTND |
127 | OPT_BOOL(0, "update-shallow", &update_shallow, |
128 | N_("accept refs that update .git/shallow")), | |
c5558f80 JH |
129 | { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"), |
130 | N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg }, | |
c915f11e EW |
131 | OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), |
132 | TRANSPORT_FAMILY_IPV4), | |
133 | OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), | |
134 | TRANSPORT_FAMILY_IPV6), | |
83201998 KH |
135 | OPT_END() |
136 | }; | |
137 | ||
e4022ed2 SP |
138 | static void unlock_pack(void) |
139 | { | |
af234459 JH |
140 | if (gtransport) |
141 | transport_unlock_pack(gtransport); | |
b26ed430 JH |
142 | if (gsecondary) |
143 | transport_unlock_pack(gsecondary); | |
e4022ed2 SP |
144 | } |
145 | ||
146 | static void unlock_pack_on_signal(int signo) | |
147 | { | |
148 | unlock_pack(); | |
4a16d072 | 149 | sigchain_pop(signo); |
e4022ed2 SP |
150 | raise(signo); |
151 | } | |
b888d61c | 152 | |
85682c19 | 153 | static void add_merge_config(struct ref **head, |
4577370e | 154 | const struct ref *remote_refs, |
85682c19 SP |
155 | struct branch *branch, |
156 | struct ref ***tail) | |
b888d61c | 157 | { |
85682c19 | 158 | int i; |
b888d61c | 159 | |
85682c19 SP |
160 | for (i = 0; i < branch->merge_nr; i++) { |
161 | struct ref *rm, **old_tail = *tail; | |
162 | struct refspec refspec; | |
163 | ||
164 | for (rm = *head; rm; rm = rm->next) { | |
165 | if (branch_merge_matches(branch, i, rm->name)) { | |
900f2814 | 166 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
85682c19 SP |
167 | break; |
168 | } | |
b888d61c | 169 | } |
85682c19 SP |
170 | if (rm) |
171 | continue; | |
172 | ||
9ad7c5ae | 173 | /* |
8b3f3f84 | 174 | * Not fetched to a remote-tracking branch? We need to fetch |
85682c19 | 175 | * it anyway to allow this branch's "branch.$name.merge" |
05207a28 | 176 | * to be honored by 'git pull', but we do not have to |
9ad7c5ae JH |
177 | * fail if branch.$name.merge is misconfigured to point |
178 | * at a nonexisting branch. If we were indeed called by | |
05207a28 | 179 | * 'git pull', it will notice the misconfiguration because |
9ad7c5ae JH |
180 | * there is no entry in the resulting FETCH_HEAD marked |
181 | * for merging. | |
85682c19 | 182 | */ |
8da61a2a | 183 | memset(&refspec, 0, sizeof(refspec)); |
85682c19 | 184 | refspec.src = branch->merge[i]->src; |
9ad7c5ae | 185 | get_fetch_map(remote_refs, &refspec, tail, 1); |
85682c19 | 186 | for (rm = *old_tail; rm; rm = rm->next) |
900f2814 | 187 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c DB |
188 | } |
189 | } | |
190 | ||
0e0b7de4 | 191 | static int add_existing(const char *refname, const struct object_id *oid, |
a0fbb5a3 MH |
192 | int flag, void *cbdata) |
193 | { | |
194 | struct string_list *list = (struct string_list *)cbdata; | |
195 | struct string_list_item *item = string_list_insert(list, refname); | |
0e0b7de4 MH |
196 | struct object_id *old_oid = xmalloc(sizeof(*old_oid)); |
197 | ||
198 | oidcpy(old_oid, oid); | |
199 | item->util = old_oid; | |
a0fbb5a3 MH |
200 | return 0; |
201 | } | |
202 | ||
203 | static int will_fetch(struct ref **head, const unsigned char *sha1) | |
204 | { | |
205 | struct ref *rm = *head; | |
206 | while (rm) { | |
f4e54d02 | 207 | if (!hashcmp(rm->old_oid.hash, sha1)) |
a0fbb5a3 MH |
208 | return 1; |
209 | rm = rm->next; | |
210 | } | |
211 | return 0; | |
212 | } | |
213 | ||
767f176a SP |
214 | static void find_non_local_tags(struct transport *transport, |
215 | struct ref **head, | |
a0fbb5a3 MH |
216 | struct ref ***tail) |
217 | { | |
218 | struct string_list existing_refs = STRING_LIST_INIT_DUP; | |
219 | struct string_list remote_refs = STRING_LIST_INIT_NODUP; | |
220 | const struct ref *ref; | |
221 | struct string_list_item *item = NULL; | |
222 | ||
0e0b7de4 | 223 | for_each_ref(add_existing, &existing_refs); |
a0fbb5a3 | 224 | for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { |
ad704485 | 225 | if (!starts_with(ref->name, "refs/tags/")) |
a0fbb5a3 MH |
226 | continue; |
227 | ||
228 | /* | |
229 | * The peeled ref always follows the matching base | |
230 | * ref, so if we see a peeled ref that we don't want | |
231 | * to fetch then we can mark the ref entry in the list | |
232 | * as one to ignore by setting util to NULL. | |
233 | */ | |
ad704485 | 234 | if (ends_with(ref->name, "^{}")) { |
f4e54d02 | 235 | if (item && !has_object_file(&ref->old_oid) && |
236 | !will_fetch(head, ref->old_oid.hash) && | |
a0fbb5a3 MH |
237 | !has_sha1_file(item->util) && |
238 | !will_fetch(head, item->util)) | |
239 | item->util = NULL; | |
240 | item = NULL; | |
241 | continue; | |
242 | } | |
243 | ||
244 | /* | |
245 | * If item is non-NULL here, then we previously saw a | |
246 | * ref not followed by a peeled reference, so we need | |
247 | * to check if it is a lightweight tag that we want to | |
248 | * fetch. | |
249 | */ | |
250 | if (item && !has_sha1_file(item->util) && | |
251 | !will_fetch(head, item->util)) | |
252 | item->util = NULL; | |
253 | ||
254 | item = NULL; | |
255 | ||
256 | /* skip duplicates and refs that we already have */ | |
257 | if (string_list_has_string(&remote_refs, ref->name) || | |
258 | string_list_has_string(&existing_refs, ref->name)) | |
259 | continue; | |
260 | ||
261 | item = string_list_insert(&remote_refs, ref->name); | |
f4e54d02 | 262 | item->util = (void *)&ref->old_oid; |
a0fbb5a3 MH |
263 | } |
264 | string_list_clear(&existing_refs, 1); | |
265 | ||
266 | /* | |
267 | * We may have a final lightweight tag that needs to be | |
268 | * checked to see if it needs fetching. | |
269 | */ | |
270 | if (item && !has_sha1_file(item->util) && | |
271 | !will_fetch(head, item->util)) | |
272 | item->util = NULL; | |
273 | ||
274 | /* | |
275 | * For all the tags in the remote_refs string list, | |
276 | * add them to the list of refs to be fetched | |
277 | */ | |
278 | for_each_string_list_item(item, &remote_refs) { | |
279 | /* Unless we have already decided to ignore this item... */ | |
280 | if (item->util) | |
281 | { | |
282 | struct ref *rm = alloc_ref(item->string); | |
283 | rm->peer_ref = alloc_ref(item->string); | |
f4e54d02 | 284 | oidcpy(&rm->old_oid, item->util); |
a0fbb5a3 MH |
285 | **tail = rm; |
286 | *tail = &rm->next; | |
287 | } | |
288 | } | |
289 | ||
290 | string_list_clear(&remote_refs, 0); | |
291 | } | |
767f176a | 292 | |
b888d61c | 293 | static struct ref *get_ref_map(struct transport *transport, |
f137a45e MH |
294 | struct refspec *refspecs, int refspec_count, |
295 | int tags, int *autotags) | |
b888d61c DB |
296 | { |
297 | int i; | |
298 | struct ref *rm; | |
299 | struct ref *ref_map = NULL; | |
300 | struct ref **tail = &ref_map; | |
301 | ||
c5a84e92 MH |
302 | /* opportunistically-updated references: */ |
303 | struct ref *orefs = NULL, **oref_tail = &orefs; | |
b888d61c | 304 | |
c5a84e92 | 305 | const struct ref *remote_refs = transport_get_remote_refs(transport); |
f2690487 | 306 | |
c5a84e92 | 307 | if (refspec_count) { |
c5558f80 JH |
308 | struct refspec *fetch_refspec; |
309 | int fetch_refspec_nr; | |
310 | ||
f137a45e MH |
311 | for (i = 0; i < refspec_count; i++) { |
312 | get_fetch_map(remote_refs, &refspecs[i], &tail, 0); | |
313 | if (refspecs[i].dst && refspecs[i].dst[0]) | |
b888d61c DB |
314 | *autotags = 1; |
315 | } | |
0281c930 | 316 | /* Merge everything on the command line (but not --tags) */ |
b888d61c | 317 | for (rm = ref_map; rm; rm = rm->next) |
900f2814 | 318 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
f2690487 JK |
319 | |
320 | /* | |
0281c930 MH |
321 | * For any refs that we happen to be fetching via |
322 | * command-line arguments, the destination ref might | |
323 | * have been missing or have been different than the | |
324 | * remote-tracking ref that would be derived from the | |
325 | * configured refspec. In these cases, we want to | |
326 | * take the opportunity to update their configured | |
327 | * remote-tracking reference. However, we do not want | |
328 | * to mention these entries in FETCH_HEAD at all, as | |
329 | * they would simply be duplicates of existing | |
330 | * entries, so we set them FETCH_HEAD_IGNORE below. | |
331 | * | |
332 | * We compute these entries now, based only on the | |
333 | * refspecs specified on the command line. But we add | |
334 | * them to the list following the refspecs resulting | |
335 | * from the tags option so that one of the latter, | |
336 | * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed | |
337 | * by ref_remove_duplicates() in favor of one of these | |
338 | * opportunistic entries with FETCH_HEAD_IGNORE. | |
f2690487 | 339 | */ |
c5558f80 JH |
340 | if (refmap_array) { |
341 | fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array); | |
342 | fetch_refspec_nr = refmap_nr; | |
343 | } else { | |
344 | fetch_refspec = transport->remote->fetch; | |
345 | fetch_refspec_nr = transport->remote->fetch_refspec_nr; | |
346 | } | |
347 | ||
348 | for (i = 0; i < fetch_refspec_nr; i++) | |
349 | get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1); | |
0281c930 MH |
350 | |
351 | if (tags == TAGS_SET) | |
352 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); | |
c5558f80 JH |
353 | } else if (refmap_array) { |
354 | die("--refmap option is only meaningful with command-line refspec(s)."); | |
b888d61c DB |
355 | } else { |
356 | /* Use the defaults */ | |
357 | struct remote *remote = transport->remote; | |
85682c19 SP |
358 | struct branch *branch = branch_get(NULL); |
359 | int has_merge = branch_has_merge_config(branch); | |
3ee1757b BC |
360 | if (remote && |
361 | (remote->fetch_refspec_nr || | |
f31dbdc7 | 362 | /* Note: has_merge implies non-NULL branch->remote_name */ |
3ee1757b | 363 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
b888d61c | 364 | for (i = 0; i < remote->fetch_refspec_nr; i++) { |
9ad7c5ae | 365 | get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0); |
b888d61c DB |
366 | if (remote->fetch[i].dst && |
367 | remote->fetch[i].dst[0]) | |
368 | *autotags = 1; | |
85682c19 | 369 | if (!i && !has_merge && ref_map && |
cfb8f898 | 370 | !remote->fetch[0].pattern) |
900f2814 | 371 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c | 372 | } |
da0204df JS |
373 | /* |
374 | * if the remote we're fetching from is the same | |
375 | * as given in branch.<name>.remote, we add the | |
376 | * ref given in branch.<name>.merge, too. | |
f31dbdc7 BC |
377 | * |
378 | * Note: has_merge implies non-NULL branch->remote_name | |
da0204df | 379 | */ |
9ad7c5ae JH |
380 | if (has_merge && |
381 | !strcmp(branch->remote_name, remote->name)) | |
85682c19 | 382 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
b888d61c DB |
383 | } else { |
384 | ref_map = get_remote_ref(remote_refs, "HEAD"); | |
9ad7c5ae | 385 | if (!ref_map) |
bd4a51fc | 386 | die(_("Couldn't find remote ref HEAD")); |
900f2814 | 387 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
5aaf7f2a | 388 | tail = &ref_map->next; |
b888d61c DB |
389 | } |
390 | } | |
0281c930 | 391 | |
c5a84e92 MH |
392 | if (tags == TAGS_SET) |
393 | /* also fetch all tags */ | |
394 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); | |
395 | else if (tags == TAGS_DEFAULT && *autotags) | |
767f176a | 396 | find_non_local_tags(transport, &ref_map, &tail); |
0281c930 | 397 | |
c5a84e92 MH |
398 | /* Now append any refs to be updated opportunistically: */ |
399 | *tail = orefs; | |
400 | for (rm = orefs; rm; rm = rm->next) { | |
401 | rm->fetch_head_status = FETCH_HEAD_IGNORE; | |
402 | tail = &rm->next; | |
403 | } | |
404 | ||
b9afe665 | 405 | return ref_remove_duplicates(ref_map); |
b888d61c DB |
406 | } |
407 | ||
fa250759 JK |
408 | #define STORE_REF_ERROR_OTHER 1 |
409 | #define STORE_REF_ERROR_DF_CONFLICT 2 | |
410 | ||
b888d61c DB |
411 | static int s_update_ref(const char *action, |
412 | struct ref *ref, | |
413 | int check_old) | |
414 | { | |
415 | char msg[1024]; | |
416 | char *rla = getenv("GIT_REFLOG_ACTION"); | |
cd94f765 RS |
417 | struct ref_transaction *transaction; |
418 | struct strbuf err = STRBUF_INIT; | |
419 | int ret, df_conflict = 0; | |
b888d61c | 420 | |
28a15401 JS |
421 | if (dry_run) |
422 | return 0; | |
b888d61c | 423 | if (!rla) |
2d324efa | 424 | rla = default_rla.buf; |
b888d61c | 425 | snprintf(msg, sizeof(msg), "%s: %s", rla, action); |
cd94f765 RS |
426 | |
427 | transaction = ref_transaction_begin(&err); | |
428 | if (!transaction || | |
1d147bdf | 429 | ref_transaction_update(transaction, ref->name, |
f4e54d02 | 430 | ref->new_oid.hash, |
431 | check_old ? ref->old_oid.hash : NULL, | |
1d147bdf | 432 | 0, msg, &err)) |
cd94f765 RS |
433 | goto fail; |
434 | ||
435 | ret = ref_transaction_commit(transaction, &err); | |
436 | if (ret) { | |
437 | df_conflict = (ret == TRANSACTION_NAME_CONFLICT); | |
438 | goto fail; | |
439 | } | |
440 | ||
441 | ref_transaction_free(transaction); | |
442 | strbuf_release(&err); | |
b888d61c | 443 | return 0; |
cd94f765 RS |
444 | fail: |
445 | ref_transaction_free(transaction); | |
446 | error("%s", err.buf); | |
447 | strbuf_release(&err); | |
448 | return df_conflict ? STORE_REF_ERROR_DF_CONFLICT | |
449 | : STORE_REF_ERROR_OTHER; | |
b888d61c DB |
450 | } |
451 | ||
9ef4272b | 452 | #define REFCOL_WIDTH 10 |
165f3902 | 453 | |
d0b39a03 NTND |
454 | static void format_display(struct strbuf *display, char code, |
455 | const char *summary, const char *error, | |
456 | const char *remote, const char *local) | |
457 | { | |
458 | strbuf_addf(display, "%c %-*s ", code, TRANSPORT_SUMMARY(summary)); | |
459 | strbuf_addf(display, "%-*s -> %s", REFCOL_WIDTH, remote, local); | |
460 | if (error) | |
461 | strbuf_addf(display, " (%s)", error); | |
462 | } | |
463 | ||
b888d61c | 464 | static int update_local_ref(struct ref *ref, |
165f3902 | 465 | const char *remote, |
6da618d5 | 466 | const struct ref *remote_ref, |
5914f2d0 | 467 | struct strbuf *display) |
b888d61c | 468 | { |
b888d61c DB |
469 | struct commit *current = NULL, *updated; |
470 | enum object_type type; | |
471 | struct branch *current_branch = branch_get(NULL); | |
4577e483 | 472 | const char *pretty_ref = prettify_refname(ref->name); |
b888d61c | 473 | |
f4e54d02 | 474 | type = sha1_object_info(ref->new_oid.hash, NULL); |
b888d61c | 475 | if (type < 0) |
f4e54d02 | 476 | die(_("object %s not found"), oid_to_hex(&ref->new_oid)); |
b888d61c | 477 | |
f4e54d02 | 478 | if (!oidcmp(&ref->old_oid, &ref->new_oid)) { |
7f87aff2 | 479 | if (verbosity > 0) |
d0b39a03 NTND |
480 | format_display(display, '=', _("[up to date]"), NULL, |
481 | remote, pretty_ref); | |
b888d61c DB |
482 | return 0; |
483 | } | |
484 | ||
b3abdd9d SP |
485 | if (current_branch && |
486 | !strcmp(ref->name, current_branch->name) && | |
b888d61c | 487 | !(update_head_ok || is_bare_repository()) && |
f4e54d02 | 488 | !is_null_oid(&ref->old_oid)) { |
b888d61c DB |
489 | /* |
490 | * If this is the head, and it's not okay to update | |
491 | * the head, and the old value of the head isn't empty... | |
492 | */ | |
d0b39a03 NTND |
493 | format_display(display, '!', _("[rejected]"), |
494 | _("can't fetch in current branch"), | |
495 | remote, pretty_ref); | |
b888d61c DB |
496 | return 1; |
497 | } | |
498 | ||
f4e54d02 | 499 | if (!is_null_oid(&ref->old_oid) && |
59556548 | 500 | starts_with(ref->name, "refs/tags/")) { |
6315472e JK |
501 | int r; |
502 | r = s_update_ref("updating tag", ref, 0); | |
d0b39a03 NTND |
503 | format_display(display, r ? '!' : '-', _("[tag update]"), |
504 | r ? _("unable to update local ref") : NULL, | |
505 | remote, pretty_ref); | |
6315472e | 506 | return r; |
b888d61c DB |
507 | } |
508 | ||
f4e54d02 | 509 | current = lookup_commit_reference_gently(ref->old_oid.hash, 1); |
510 | updated = lookup_commit_reference_gently(ref->new_oid.hash, 1); | |
b888d61c | 511 | if (!current || !updated) { |
165f3902 NP |
512 | const char *msg; |
513 | const char *what; | |
6315472e | 514 | int r; |
0997adaa MB |
515 | /* |
516 | * Nicely describe the new ref we're fetching. | |
517 | * Base this on the remote's ref name, as it's | |
518 | * more likely to follow a standard layout. | |
519 | */ | |
520 | const char *name = remote_ref ? remote_ref->name : ""; | |
59556548 | 521 | if (starts_with(name, "refs/tags/")) { |
b888d61c | 522 | msg = "storing tag"; |
f7b3742a | 523 | what = _("[new tag]"); |
59556548 | 524 | } else if (starts_with(name, "refs/heads/")) { |
b888d61c | 525 | msg = "storing head"; |
f7b3742a | 526 | what = _("[new branch]"); |
0997adaa MB |
527 | } else { |
528 | msg = "storing ref"; | |
529 | what = _("[new ref]"); | |
165f3902 NP |
530 | } |
531 | ||
a6801adc JL |
532 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
533 | (recurse_submodules != RECURSE_SUBMODULES_ON)) | |
f4e54d02 | 534 | check_for_new_submodule_commits(ref->new_oid.hash); |
6315472e | 535 | r = s_update_ref(msg, ref, 0); |
d0b39a03 NTND |
536 | format_display(display, r ? '!' : '*', what, |
537 | r ? _("unable to update local ref") : NULL, | |
538 | remote, pretty_ref); | |
6315472e | 539 | return r; |
b888d61c DB |
540 | } |
541 | ||
a20efee9 | 542 | if (in_merge_bases(current, updated)) { |
bd22d4ff | 543 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 544 | int r; |
ed1c9977 | 545 | strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV); |
bd22d4ff | 546 | strbuf_addstr(&quickref, ".."); |
f4e54d02 | 547 | strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV); |
88a21979 JL |
548 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
549 | (recurse_submodules != RECURSE_SUBMODULES_ON)) | |
f4e54d02 | 550 | check_for_new_submodule_commits(ref->new_oid.hash); |
a75d7b54 | 551 | r = s_update_ref("fast-forward", ref, 1); |
d0b39a03 NTND |
552 | format_display(display, r ? '!' : ' ', quickref.buf, |
553 | r ? _("unable to update local ref") : NULL, | |
554 | remote, pretty_ref); | |
bd22d4ff | 555 | strbuf_release(&quickref); |
6315472e | 556 | return r; |
165f3902 | 557 | } else if (force || ref->force) { |
bd22d4ff | 558 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 559 | int r; |
ed1c9977 | 560 | strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV); |
bd22d4ff | 561 | strbuf_addstr(&quickref, "..."); |
f4e54d02 | 562 | strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV); |
88a21979 JL |
563 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
564 | (recurse_submodules != RECURSE_SUBMODULES_ON)) | |
f4e54d02 | 565 | check_for_new_submodule_commits(ref->new_oid.hash); |
6315472e | 566 | r = s_update_ref("forced-update", ref, 1); |
d0b39a03 NTND |
567 | format_display(display, r ? '!' : '+', quickref.buf, |
568 | r ? _("unable to update local ref") : _("forced update"), | |
569 | remote, pretty_ref); | |
bd22d4ff | 570 | strbuf_release(&quickref); |
6315472e | 571 | return r; |
165f3902 | 572 | } else { |
d0b39a03 NTND |
573 | format_display(display, '!', _("[rejected]"), _("non-fast-forward"), |
574 | remote, pretty_ref); | |
b888d61c DB |
575 | return 1; |
576 | } | |
b888d61c DB |
577 | } |
578 | ||
f0e278b1 | 579 | static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) |
6b67e0dc | 580 | { |
f0e278b1 JH |
581 | struct ref **rm = cb_data; |
582 | struct ref *ref = *rm; | |
6b67e0dc | 583 | |
4820a33b NTND |
584 | while (ref && ref->status == REF_STATUS_REJECT_SHALLOW) |
585 | ref = ref->next; | |
f0e278b1 JH |
586 | if (!ref) |
587 | return -1; /* end of the list */ | |
588 | *rm = ref->next; | |
f4e54d02 | 589 | hashcpy(sha1, ref->old_oid.hash); |
f0e278b1 | 590 | return 0; |
6b67e0dc JH |
591 | } |
592 | ||
47abd85b | 593 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
f3cb169b | 594 | struct ref *ref_map) |
b888d61c DB |
595 | { |
596 | FILE *fp; | |
597 | struct commit *commit; | |
4b3b33a7 | 598 | int url_len, i, rc = 0; |
5914f2d0 | 599 | struct strbuf note = STRBUF_INIT; |
b888d61c DB |
600 | const char *what, *kind; |
601 | struct ref *rm; | |
dcf69262 | 602 | char *url; |
f932729c | 603 | const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(); |
900f2814 | 604 | int want_status; |
b888d61c | 605 | |
d6617c7c AGR |
606 | fp = fopen(filename, "a"); |
607 | if (!fp) | |
6da31d7f | 608 | return error_errno(_("cannot open %s"), filename); |
47abd85b | 609 | |
fb0cc87e DB |
610 | if (raw_url) |
611 | url = transport_anonymize_url(raw_url); | |
612 | else | |
613 | url = xstrdup("foreign"); | |
6b67e0dc | 614 | |
f0e278b1 | 615 | rm = ref_map; |
3f7d11c4 | 616 | if (check_everything_connected(iterate_ref_map, 0, &rm)) { |
9516a598 TRC |
617 | rc = error(_("%s did not send all necessary objects\n"), url); |
618 | goto abort; | |
619 | } | |
6b67e0dc | 620 | |
96890f4c | 621 | /* |
900f2814 JK |
622 | * We do a pass for each fetch_head_status type in their enum order, so |
623 | * merged entries are written before not-for-merge. That lets readers | |
624 | * use FETCH_HEAD as a refname to refer to the ref to be merged. | |
96890f4c | 625 | */ |
900f2814 JK |
626 | for (want_status = FETCH_HEAD_MERGE; |
627 | want_status <= FETCH_HEAD_IGNORE; | |
628 | want_status++) { | |
96890f4c JH |
629 | for (rm = ref_map; rm; rm = rm->next) { |
630 | struct ref *ref = NULL; | |
900f2814 | 631 | const char *merge_status_marker = ""; |
96890f4c | 632 | |
4820a33b NTND |
633 | if (rm->status == REF_STATUS_REJECT_SHALLOW) { |
634 | if (want_status == FETCH_HEAD_MERGE) | |
635 | warning(_("reject %s because shallow roots are not allowed to be updated"), | |
636 | rm->peer_ref ? rm->peer_ref->name : rm->name); | |
637 | continue; | |
638 | } | |
639 | ||
f4e54d02 | 640 | commit = lookup_commit_reference_gently(rm->old_oid.hash, 1); |
96890f4c | 641 | if (!commit) |
900f2814 | 642 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; |
96890f4c | 643 | |
900f2814 | 644 | if (rm->fetch_head_status != want_status) |
96890f4c JH |
645 | continue; |
646 | ||
647 | if (rm->peer_ref) { | |
6f687c21 | 648 | ref = alloc_ref(rm->peer_ref->name); |
f4e54d02 | 649 | oidcpy(&ref->old_oid, &rm->peer_ref->old_oid); |
650 | oidcpy(&ref->new_oid, &rm->old_oid); | |
96890f4c JH |
651 | ref->force = rm->peer_ref->force; |
652 | } | |
b888d61c | 653 | |
b888d61c | 654 | |
96890f4c JH |
655 | if (!strcmp(rm->name, "HEAD")) { |
656 | kind = ""; | |
657 | what = ""; | |
658 | } | |
59556548 | 659 | else if (starts_with(rm->name, "refs/heads/")) { |
96890f4c JH |
660 | kind = "branch"; |
661 | what = rm->name + 11; | |
662 | } | |
59556548 | 663 | else if (starts_with(rm->name, "refs/tags/")) { |
96890f4c JH |
664 | kind = "tag"; |
665 | what = rm->name + 10; | |
666 | } | |
59556548 | 667 | else if (starts_with(rm->name, "refs/remotes/")) { |
96890f4c JH |
668 | kind = "remote-tracking branch"; |
669 | what = rm->name + 13; | |
670 | } | |
671 | else { | |
672 | kind = ""; | |
673 | what = rm->name; | |
674 | } | |
b888d61c | 675 | |
96890f4c JH |
676 | url_len = strlen(url); |
677 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
678 | ; | |
679 | url_len = i + 1; | |
680 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
681 | url_len = i - 3; | |
682 | ||
683 | strbuf_reset(¬e); | |
684 | if (*what) { | |
685 | if (*kind) | |
686 | strbuf_addf(¬e, "%s ", kind); | |
687 | strbuf_addf(¬e, "'%s' of ", what); | |
688 | } | |
900f2814 JK |
689 | switch (rm->fetch_head_status) { |
690 | case FETCH_HEAD_NOT_FOR_MERGE: | |
691 | merge_status_marker = "not-for-merge"; | |
692 | /* fall-through */ | |
693 | case FETCH_HEAD_MERGE: | |
694 | fprintf(fp, "%s\t%s\t%s", | |
f4e54d02 | 695 | oid_to_hex(&rm->old_oid), |
900f2814 JK |
696 | merge_status_marker, |
697 | note.buf); | |
698 | for (i = 0; i < url_len; ++i) | |
699 | if ('\n' == url[i]) | |
700 | fputs("\\n", fp); | |
701 | else | |
702 | fputc(url[i], fp); | |
703 | fputc('\n', fp); | |
704 | break; | |
705 | default: | |
706 | /* do not write anything to FETCH_HEAD */ | |
707 | break; | |
708 | } | |
96890f4c JH |
709 | |
710 | strbuf_reset(¬e); | |
711 | if (ref) { | |
6da618d5 | 712 | rc |= update_local_ref(ref, what, rm, ¬e); |
96890f4c JH |
713 | free(ref); |
714 | } else | |
d0b39a03 NTND |
715 | format_display(¬e, '*', |
716 | *kind ? kind : "branch", NULL, | |
717 | *what ? what : "HEAD", | |
718 | "FETCH_HEAD"); | |
96890f4c JH |
719 | if (note.len) { |
720 | if (verbosity >= 0 && !shown_url) { | |
721 | fprintf(stderr, _("From %.*s\n"), | |
722 | url_len, url); | |
723 | shown_url = 1; | |
724 | } | |
725 | if (verbosity >= 0) | |
726 | fprintf(stderr, " %s\n", note.buf); | |
165f3902 NP |
727 | } |
728 | } | |
b888d61c | 729 | } |
9516a598 | 730 | |
fa250759 | 731 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
bd4a51fc | 732 | error(_("some local refs could not be updated; try running\n" |
f3cb169b | 733 | " 'git remote prune %s' to remove any old, conflicting " |
bd4a51fc | 734 | "branches"), remote_name); |
9516a598 TRC |
735 | |
736 | abort: | |
5914f2d0 | 737 | strbuf_release(¬e); |
9516a598 TRC |
738 | free(url); |
739 | fclose(fp); | |
efb98b44 | 740 | return rc; |
b888d61c DB |
741 | } |
742 | ||
4191c356 SP |
743 | /* |
744 | * We would want to bypass the object transfer altogether if | |
d9eb0205 | 745 | * everything we are going to fetch already exists and is connected |
4191c356 | 746 | * locally. |
4191c356 SP |
747 | */ |
748 | static int quickfetch(struct ref *ref_map) | |
749 | { | |
f0e278b1 JH |
750 | struct ref *rm = ref_map; |
751 | ||
4191c356 SP |
752 | /* |
753 | * If we are deepening a shallow clone we already have these | |
754 | * objects reachable. Running rev-list here will return with | |
755 | * a good (0) exit status and we'll bypass the fetch that we | |
756 | * really need to perform. Claiming failure now will ensure | |
757 | * we perform the network exchange to deepen our history. | |
758 | */ | |
759 | if (depth) | |
760 | return -1; | |
f0e278b1 | 761 | return check_everything_connected(iterate_ref_map, 1, &rm); |
4191c356 SP |
762 | } |
763 | ||
b888d61c DB |
764 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
765 | { | |
4191c356 SP |
766 | int ret = quickfetch(ref_map); |
767 | if (ret) | |
768 | ret = transport_fetch_refs(transport, ref_map); | |
b888d61c | 769 | if (!ret) |
f3cb169b JK |
770 | ret |= store_updated_refs(transport->url, |
771 | transport->remote->name, | |
772 | ref_map); | |
1788c39c | 773 | transport_unlock_pack(transport); |
b888d61c DB |
774 | return ret; |
775 | } | |
776 | ||
4b3b33a7 TM |
777 | static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map, |
778 | const char *raw_url) | |
f360d844 | 779 | { |
4b3b33a7 | 780 | int url_len, i, result = 0; |
ed43de6e | 781 | struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); |
4b3b33a7 | 782 | char *url; |
f360d844 | 783 | const char *dangling_msg = dry_run |
18986d53 NTND |
784 | ? _(" (%s will become dangling)") |
785 | : _(" (%s has become dangling)"); | |
f360d844 | 786 | |
4b3b33a7 TM |
787 | if (raw_url) |
788 | url = transport_anonymize_url(raw_url); | |
789 | else | |
790 | url = xstrdup("foreign"); | |
791 | ||
792 | url_len = strlen(url); | |
793 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
794 | ; | |
795 | ||
796 | url_len = i + 1; | |
797 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
798 | url_len = i - 3; | |
799 | ||
a087b432 MH |
800 | if (!dry_run) { |
801 | struct string_list refnames = STRING_LIST_INIT_NODUP; | |
802 | ||
803 | for (ref = stale_refs; ref; ref = ref->next) | |
804 | string_list_append(&refnames, ref->name); | |
805 | ||
806 | result = delete_refs(&refnames); | |
807 | string_list_clear(&refnames, 0); | |
808 | } | |
809 | ||
810 | if (verbosity >= 0) { | |
811 | for (ref = stale_refs; ref; ref = ref->next) { | |
d0b39a03 | 812 | struct strbuf sb = STRBUF_INIT; |
a087b432 MH |
813 | if (!shown_url) { |
814 | fprintf(stderr, _("From %.*s\n"), url_len, url); | |
815 | shown_url = 1; | |
816 | } | |
d0b39a03 NTND |
817 | format_display(&sb, 'x', _("[deleted]"), NULL, |
818 | _("(none)"), prettify_refname(ref->name)); | |
819 | fprintf(stderr, " %s\n",sb.buf); | |
820 | strbuf_release(&sb); | |
f360d844 JS |
821 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
822 | } | |
823 | } | |
a087b432 | 824 | |
4b3b33a7 | 825 | free(url); |
f360d844 JS |
826 | free_refs(stale_refs); |
827 | return result; | |
828 | } | |
829 | ||
8ee5d731 JS |
830 | static void check_not_current_branch(struct ref *ref_map) |
831 | { | |
832 | struct branch *current_branch = branch_get(NULL); | |
833 | ||
834 | if (is_bare_repository() || !current_branch) | |
835 | return; | |
836 | ||
837 | for (; ref_map; ref_map = ref_map->next) | |
838 | if (ref_map->peer_ref && !strcmp(current_branch->refname, | |
839 | ref_map->peer_ref->name)) | |
bd4a51fc ÆAB |
840 | die(_("Refusing to fetch into current branch %s " |
841 | "of non-bare repository"), current_branch->refname); | |
8ee5d731 JS |
842 | } |
843 | ||
e6cc5104 JH |
844 | static int truncate_fetch_head(void) |
845 | { | |
f932729c | 846 | const char *filename = git_path_fetch_head(); |
ea56518d | 847 | FILE *fp = fopen_for_writing(filename); |
e6cc5104 JH |
848 | |
849 | if (!fp) | |
6da31d7f | 850 | return error_errno(_("cannot open %s"), filename); |
e6cc5104 JH |
851 | fclose(fp); |
852 | return 0; | |
853 | } | |
854 | ||
db5723c6 JH |
855 | static void set_option(struct transport *transport, const char *name, const char *value) |
856 | { | |
857 | int r = transport_set_option(transport, name, value); | |
858 | if (r < 0) | |
859 | die(_("Option \"%s\" value \"%s\" is not valid for %s"), | |
860 | name, value, transport->url); | |
861 | if (r > 0) | |
862 | warning(_("Option \"%s\" is ignored for %s\n"), | |
863 | name, transport->url); | |
864 | } | |
865 | ||
0f73f8bd | 866 | static struct transport *prepare_transport(struct remote *remote) |
db5723c6 JH |
867 | { |
868 | struct transport *transport; | |
869 | transport = transport_get(remote, NULL); | |
870 | transport_set_verbosity(transport, verbosity, progress); | |
c915f11e | 871 | transport->family = family; |
db5723c6 JH |
872 | if (upload_pack) |
873 | set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack); | |
874 | if (keep) | |
875 | set_option(transport, TRANS_OPT_KEEP, "yes"); | |
876 | if (depth) | |
877 | set_option(transport, TRANS_OPT_DEPTH, depth); | |
48d25cae NTND |
878 | if (update_shallow) |
879 | set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); | |
db5723c6 JH |
880 | return transport; |
881 | } | |
882 | ||
069d5032 JH |
883 | static void backfill_tags(struct transport *transport, struct ref *ref_map) |
884 | { | |
b26ed430 JH |
885 | if (transport->cannot_reuse) { |
886 | gsecondary = prepare_transport(transport->remote); | |
887 | transport = gsecondary; | |
888 | } | |
889 | ||
069d5032 JH |
890 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
891 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); | |
892 | fetch_refs(transport, ref_map); | |
b26ed430 JH |
893 | |
894 | if (gsecondary) { | |
895 | transport_disconnect(gsecondary); | |
896 | gsecondary = NULL; | |
897 | } | |
069d5032 JH |
898 | } |
899 | ||
b888d61c DB |
900 | static int do_fetch(struct transport *transport, |
901 | struct refspec *refs, int ref_count) | |
902 | { | |
b87dbcc8 | 903 | struct string_list existing_refs = STRING_LIST_INIT_DUP; |
7f98428d | 904 | struct ref *ref_map; |
b888d61c DB |
905 | struct ref *rm; |
906 | int autotags = (transport->remote->fetch_tags == 1); | |
5b87d8d3 | 907 | int retcode = 0; |
b1a01e1c | 908 | |
0e0b7de4 | 909 | for_each_ref(add_existing, &existing_refs); |
b1a01e1c | 910 | |
ed368546 DJ |
911 | if (tags == TAGS_DEFAULT) { |
912 | if (transport->remote->fetch_tags == 2) | |
913 | tags = TAGS_SET; | |
914 | if (transport->remote->fetch_tags == -1) | |
915 | tags = TAGS_UNSET; | |
916 | } | |
b888d61c | 917 | |
824d5776 | 918 | if (!transport->get_refs_list || !transport->fetch) |
bd4a51fc | 919 | die(_("Don't know how to fetch from %s"), transport->url); |
b888d61c DB |
920 | |
921 | /* if not appending, truncate FETCH_HEAD */ | |
28a15401 | 922 | if (!append && !dry_run) { |
5b87d8d3 MH |
923 | retcode = truncate_fetch_head(); |
924 | if (retcode) | |
925 | goto cleanup; | |
d6617c7c | 926 | } |
b888d61c DB |
927 | |
928 | ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); | |
8ee5d731 JS |
929 | if (!update_head_ok) |
930 | check_not_current_branch(ref_map); | |
b888d61c DB |
931 | |
932 | for (rm = ref_map; rm; rm = rm->next) { | |
b1a01e1c | 933 | if (rm->peer_ref) { |
6f64a16f MH |
934 | struct string_list_item *peer_item = |
935 | string_list_lookup(&existing_refs, | |
936 | rm->peer_ref->name); | |
0e0b7de4 MH |
937 | if (peer_item) { |
938 | struct object_id *old_oid = peer_item->util; | |
f4e54d02 | 939 | oidcpy(&rm->peer_ref->old_oid, old_oid); |
0e0b7de4 | 940 | } |
b1a01e1c | 941 | } |
b888d61c DB |
942 | } |
943 | ||
41fa7d2e SP |
944 | if (tags == TAGS_DEFAULT && autotags) |
945 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); | |
ed43de6e | 946 | if (prune) { |
0838bf47 MH |
947 | /* |
948 | * We only prune based on refspecs specified | |
949 | * explicitly (via command line or configuration); we | |
950 | * don't care whether --tags was specified. | |
951 | */ | |
c5a84e92 | 952 | if (ref_count) { |
4b3b33a7 | 953 | prune_refs(refs, ref_count, ref_map, transport->url); |
e8c1e6c7 | 954 | } else { |
0838bf47 MH |
955 | prune_refs(transport->remote->fetch, |
956 | transport->remote->fetch_refspec_nr, | |
4b3b33a7 TM |
957 | ref_map, |
958 | transport->url); | |
e8c1e6c7 | 959 | } |
ed43de6e | 960 | } |
10a6cc88 TM |
961 | if (fetch_refs(transport, ref_map)) { |
962 | free_refs(ref_map); | |
963 | retcode = 1; | |
964 | goto cleanup; | |
965 | } | |
7f98428d | 966 | free_refs(ref_map); |
b888d61c DB |
967 | |
968 | /* if neither --no-tags nor --tags was specified, do automated tag | |
969 | * following ... */ | |
83201998 | 970 | if (tags == TAGS_DEFAULT && autotags) { |
c50b2b47 SP |
971 | struct ref **tail = &ref_map; |
972 | ref_map = NULL; | |
973 | find_non_local_tags(transport, &ref_map, &tail); | |
069d5032 JH |
974 | if (ref_map) |
975 | backfill_tags(transport, ref_map); | |
b888d61c DB |
976 | free_refs(ref_map); |
977 | } | |
978 | ||
5b87d8d3 | 979 | cleanup: |
f83918ed | 980 | string_list_clear(&existing_refs, 1); |
5b87d8d3 | 981 | return retcode; |
b888d61c DB |
982 | } |
983 | ||
9c4a036b BG |
984 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
985 | { | |
986 | struct string_list *list = priv; | |
7cc91a2f | 987 | if (!remote->skip_default_update) |
1d2f80fa | 988 | string_list_append(list, remote->name); |
9c4a036b BG |
989 | return 0; |
990 | } | |
991 | ||
992 | struct remote_group_data { | |
993 | const char *name; | |
994 | struct string_list *list; | |
995 | }; | |
996 | ||
997 | static int get_remote_group(const char *key, const char *value, void *priv) | |
998 | { | |
999 | struct remote_group_data *g = priv; | |
1000 | ||
bc598c32 | 1001 | if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) { |
9c4a036b | 1002 | /* split list by white space */ |
9c4a036b | 1003 | while (*value) { |
5f65499f MH |
1004 | size_t wordlen = strcspn(value, " \t\n"); |
1005 | ||
e286542d | 1006 | if (wordlen >= 1) |
1d2f80fa | 1007 | string_list_append(g->list, |
e286542d MH |
1008 | xstrndup(value, wordlen)); |
1009 | value += wordlen + (value[wordlen] != '\0'); | |
9c4a036b BG |
1010 | } |
1011 | } | |
1012 | ||
1013 | return 0; | |
1014 | } | |
1015 | ||
1016 | static int add_remote_or_group(const char *name, struct string_list *list) | |
1017 | { | |
1018 | int prev_nr = list->nr; | |
66dbfd55 GV |
1019 | struct remote_group_data g; |
1020 | g.name = name; g.list = list; | |
9c4a036b BG |
1021 | |
1022 | git_config(get_remote_group, &g); | |
1023 | if (list->nr == prev_nr) { | |
674468b3 TG |
1024 | struct remote *remote = remote_get(name); |
1025 | if (!remote_is_configured(remote)) | |
9c4a036b | 1026 | return 0; |
1d2f80fa | 1027 | string_list_append(list, remote->name); |
9c4a036b BG |
1028 | } |
1029 | return 1; | |
1030 | } | |
1031 | ||
85556d4e | 1032 | static void add_options_to_argv(struct argv_array *argv) |
9c4a036b | 1033 | { |
28a15401 | 1034 | if (dry_run) |
85556d4e | 1035 | argv_array_push(argv, "--dry-run"); |
90765fa3 MH |
1036 | if (prune != -1) |
1037 | argv_array_push(argv, prune ? "--prune" : "--no-prune"); | |
bba5322a | 1038 | if (update_head_ok) |
85556d4e | 1039 | argv_array_push(argv, "--update-head-ok"); |
bba5322a | 1040 | if (force) |
85556d4e | 1041 | argv_array_push(argv, "--force"); |
bba5322a | 1042 | if (keep) |
85556d4e | 1043 | argv_array_push(argv, "--keep"); |
be254a0e | 1044 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
85556d4e | 1045 | argv_array_push(argv, "--recurse-submodules"); |
8f0700dd | 1046 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
85556d4e | 1047 | argv_array_push(argv, "--recurse-submodules=on-demand"); |
85566460 DJ |
1048 | if (tags == TAGS_SET) |
1049 | argv_array_push(argv, "--tags"); | |
1050 | else if (tags == TAGS_UNSET) | |
1051 | argv_array_push(argv, "--no-tags"); | |
9c4a036b | 1052 | if (verbosity >= 2) |
85556d4e | 1053 | argv_array_push(argv, "-v"); |
9c4a036b | 1054 | if (verbosity >= 1) |
85556d4e | 1055 | argv_array_push(argv, "-v"); |
9c4a036b | 1056 | else if (verbosity < 0) |
85556d4e | 1057 | argv_array_push(argv, "-q"); |
7dce19d3 JL |
1058 | |
1059 | } | |
1060 | ||
1061 | static int fetch_multiple(struct string_list *list) | |
1062 | { | |
1063 | int i, result = 0; | |
85556d4e | 1064 | struct argv_array argv = ARGV_ARRAY_INIT; |
9c4a036b | 1065 | |
e6cc5104 JH |
1066 | if (!append && !dry_run) { |
1067 | int errcode = truncate_fetch_head(); | |
1068 | if (errcode) | |
1069 | return errcode; | |
1070 | } | |
1071 | ||
85556d4e JK |
1072 | argv_array_pushl(&argv, "fetch", "--append", NULL); |
1073 | add_options_to_argv(&argv); | |
1074 | ||
9c4a036b BG |
1075 | for (i = 0; i < list->nr; i++) { |
1076 | const char *name = list->items[i].string; | |
85556d4e | 1077 | argv_array_push(&argv, name); |
9c4a036b | 1078 | if (verbosity >= 0) |
bd4a51fc | 1079 | printf(_("Fetching %s\n"), name); |
85556d4e | 1080 | if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { |
bd4a51fc | 1081 | error(_("Could not fetch %s"), name); |
9c4a036b BG |
1082 | result = 1; |
1083 | } | |
85556d4e | 1084 | argv_array_pop(&argv); |
9c4a036b BG |
1085 | } |
1086 | ||
85556d4e | 1087 | argv_array_clear(&argv); |
9c4a036b BG |
1088 | return result; |
1089 | } | |
1090 | ||
1091 | static int fetch_one(struct remote *remote, int argc, const char **argv) | |
b888d61c | 1092 | { |
b888d61c | 1093 | static const char **refs = NULL; |
d8ead159 | 1094 | struct refspec *refspec; |
b888d61c | 1095 | int ref_nr = 0; |
7b7f39ea | 1096 | int exit_code; |
b888d61c | 1097 | |
fa685bdf | 1098 | if (!remote) |
bd4a51fc ÆAB |
1099 | die(_("No remote repository specified. Please, specify either a URL or a\n" |
1100 | "remote name from which new revisions should be fetched.")); | |
fa685bdf | 1101 | |
db5723c6 | 1102 | gtransport = prepare_transport(remote); |
737c5a9c MS |
1103 | |
1104 | if (prune < 0) { | |
1105 | /* no command line request */ | |
20419de9 JH |
1106 | if (0 <= gtransport->remote->prune) |
1107 | prune = gtransport->remote->prune; | |
737c5a9c MS |
1108 | else if (0 <= fetch_prune_config) |
1109 | prune = fetch_prune_config; | |
1110 | else | |
1111 | prune = PRUNE_BY_DEFAULT; | |
1112 | } | |
1113 | ||
9c4a036b | 1114 | if (argc > 0) { |
b888d61c | 1115 | int j = 0; |
bf7e645c | 1116 | int i; |
50a6c8ef | 1117 | refs = xcalloc(st_add(argc, 1), sizeof(const char *)); |
9c4a036b | 1118 | for (i = 0; i < argc; i++) { |
b888d61c | 1119 | if (!strcmp(argv[i], "tag")) { |
b888d61c | 1120 | i++; |
f53423b0 | 1121 | if (i >= argc) |
bd4a51fc | 1122 | die(_("You need to specify a tag name.")); |
b2724c87 JK |
1123 | refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s", |
1124 | argv[i], argv[i]); | |
b888d61c DB |
1125 | } else |
1126 | refs[j++] = argv[i]; | |
b888d61c DB |
1127 | } |
1128 | refs[j] = NULL; | |
1129 | ref_nr = j; | |
b888d61c DB |
1130 | } |
1131 | ||
57b235a4 | 1132 | sigchain_push_common(unlock_pack_on_signal); |
e4022ed2 | 1133 | atexit(unlock_pack); |
d8ead159 | 1134 | refspec = parse_fetch_refspec(ref_nr, refs); |
af234459 | 1135 | exit_code = do_fetch(gtransport, refspec, ref_nr); |
5caf1973 | 1136 | free_refspec(ref_nr, refspec); |
af234459 JH |
1137 | transport_disconnect(gtransport); |
1138 | gtransport = NULL; | |
7b7f39ea | 1139 | return exit_code; |
b888d61c | 1140 | } |
9c4a036b BG |
1141 | |
1142 | int cmd_fetch(int argc, const char **argv, const char *prefix) | |
1143 | { | |
1144 | int i; | |
183113a5 | 1145 | struct string_list list = STRING_LIST_INIT_NODUP; |
9c4a036b BG |
1146 | struct remote *remote; |
1147 | int result = 0; | |
1991006c | 1148 | struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; |
9c4a036b | 1149 | |
bbc30f99 JK |
1150 | packet_trace_identity("fetch"); |
1151 | ||
9c4a036b BG |
1152 | /* Record the command line for the reflog */ |
1153 | strbuf_addstr(&default_rla, "fetch"); | |
1154 | for (i = 1; i < argc; i++) | |
1155 | strbuf_addf(&default_rla, " %s", argv[i]); | |
1156 | ||
737c5a9c MS |
1157 | git_config(git_fetch_config, NULL); |
1158 | ||
9c4a036b BG |
1159 | argc = parse_options(argc, argv, prefix, |
1160 | builtin_fetch_options, builtin_fetch_usage, 0); | |
1161 | ||
4dcb167f NTND |
1162 | if (unshallow) { |
1163 | if (depth) | |
1164 | die(_("--depth and --unshallow cannot be used together")); | |
1165 | else if (!is_repository_shallow()) | |
1166 | die(_("--unshallow on a complete repository does not make sense")); | |
2805bb59 JK |
1167 | else |
1168 | depth = xstrfmt("%d", INFINITE_DEPTH); | |
4dcb167f NTND |
1169 | } |
1170 | ||
5594bcad NTND |
1171 | /* no need to be strict, transport_set_option() will validate it again */ |
1172 | if (depth && atoi(depth) < 1) | |
1173 | die(_("depth %s is not a positive number"), depth); | |
1174 | ||
18322bad JL |
1175 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) { |
1176 | if (recurse_submodules_default) { | |
1177 | int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default); | |
1178 | set_config_fetch_recurse_submodules(arg); | |
1179 | } | |
1180 | gitmodules_config(); | |
1181 | git_config(submodule_config, NULL); | |
1182 | } | |
1183 | ||
9c4a036b BG |
1184 | if (all) { |
1185 | if (argc == 1) | |
bd4a51fc | 1186 | die(_("fetch --all does not take a repository argument")); |
9c4a036b | 1187 | else if (argc > 1) |
bd4a51fc | 1188 | die(_("fetch --all does not make sense with refspecs")); |
9c4a036b BG |
1189 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
1190 | result = fetch_multiple(&list); | |
1191 | } else if (argc == 0) { | |
1192 | /* No arguments -- use default remote */ | |
1193 | remote = remote_get(NULL); | |
1194 | result = fetch_one(remote, argc, argv); | |
16679e37 BG |
1195 | } else if (multiple) { |
1196 | /* All arguments are assumed to be remotes or groups */ | |
1197 | for (i = 0; i < argc; i++) | |
1198 | if (!add_remote_or_group(argv[i], &list)) | |
bd4a51fc | 1199 | die(_("No such remote or remote group: %s"), argv[i]); |
16679e37 | 1200 | result = fetch_multiple(&list); |
9c4a036b BG |
1201 | } else { |
1202 | /* Single remote or group */ | |
1203 | (void) add_remote_or_group(argv[0], &list); | |
1204 | if (list.nr > 1) { | |
1205 | /* More than one remote */ | |
1206 | if (argc > 1) | |
bd4a51fc | 1207 | die(_("Fetching a group and specifying refspecs does not make sense")); |
9c4a036b BG |
1208 | result = fetch_multiple(&list); |
1209 | } else { | |
1210 | /* Zero or one remotes */ | |
1211 | remote = remote_get(argv[0]); | |
1212 | result = fetch_one(remote, argc-1, argv+1); | |
1213 | } | |
1214 | } | |
1215 | ||
be254a0e | 1216 | if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { |
85556d4e JK |
1217 | struct argv_array options = ARGV_ARRAY_INIT; |
1218 | ||
1219 | add_options_to_argv(&options); | |
50d89ad6 | 1220 | result = fetch_populated_submodules(&options, |
7dce19d3 | 1221 | submodule_prefix, |
8f0700dd | 1222 | recurse_submodules, |
62104ba1 SB |
1223 | verbosity < 0, |
1224 | max_children); | |
85556d4e | 1225 | argv_array_clear(&options); |
7dce19d3 JL |
1226 | } |
1227 | ||
9c4a036b BG |
1228 | /* All names were strdup()ed or strndup()ed */ |
1229 | list.strdup_strings = 1; | |
1230 | string_list_clear(&list, 0); | |
1231 | ||
0898c962 JS |
1232 | close_all_packs(); |
1233 | ||
1991006c | 1234 | argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL); |
6fceed3b NTND |
1235 | if (verbosity < 0) |
1236 | argv_array_push(&argv_gc_auto, "--quiet"); | |
1991006c NTND |
1237 | run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD); |
1238 | argv_array_clear(&argv_gc_auto); | |
131b8fcb | 1239 | |
9c4a036b BG |
1240 | return result; |
1241 | } |