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