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