]>
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" |
b888d61c | 13 | |
83201998 | 14 | static const char * const builtin_fetch_usage[] = { |
1b1dd23f | 15 | "git fetch [options] [<repository> <refspec>...]", |
83201998 KH |
16 | NULL |
17 | }; | |
b888d61c | 18 | |
83201998 KH |
19 | enum { |
20 | TAGS_UNSET = 0, | |
21 | TAGS_DEFAULT = 1, | |
22 | TAGS_SET = 2 | |
23 | }; | |
24 | ||
25 | static int append, force, keep, update_head_ok, verbose, quiet; | |
26 | static int tags = TAGS_DEFAULT; | |
4191c356 | 27 | static const char *depth; |
83201998 | 28 | static const char *upload_pack; |
2d324efa | 29 | static struct strbuf default_rla = STRBUF_INIT; |
e4022ed2 SP |
30 | static struct transport *transport; |
31 | ||
83201998 KH |
32 | static struct option builtin_fetch_options[] = { |
33 | OPT__QUIET(&quiet), | |
34 | OPT__VERBOSE(&verbose), | |
35 | OPT_BOOLEAN('a', "append", &append, | |
36 | "append to .git/FETCH_HEAD instead of overwriting"), | |
37 | OPT_STRING(0, "upload-pack", &upload_pack, "PATH", | |
38 | "path to upload pack on remote end"), | |
39 | OPT_BOOLEAN('f', "force", &force, | |
40 | "force overwrite of local branch"), | |
41 | OPT_SET_INT('t', "tags", &tags, | |
42 | "fetch all tags and associated objects", TAGS_SET), | |
e7951290 JS |
43 | OPT_SET_INT('n', NULL, &tags, |
44 | "do not fetch all tags (--no-tags)", TAGS_UNSET), | |
83201998 KH |
45 | OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"), |
46 | OPT_BOOLEAN('u', "update-head-ok", &update_head_ok, | |
47 | "allow updating of HEAD ref"), | |
48 | OPT_STRING(0, "depth", &depth, "DEPTH", | |
49 | "deepen history of shallow clone"), | |
50 | OPT_END() | |
51 | }; | |
52 | ||
e4022ed2 SP |
53 | static void unlock_pack(void) |
54 | { | |
55 | if (transport) | |
56 | transport_unlock_pack(transport); | |
57 | } | |
58 | ||
59 | static void unlock_pack_on_signal(int signo) | |
60 | { | |
61 | unlock_pack(); | |
62 | signal(SIGINT, SIG_DFL); | |
63 | raise(signo); | |
64 | } | |
b888d61c | 65 | |
85682c19 | 66 | static void add_merge_config(struct ref **head, |
4577370e | 67 | const struct ref *remote_refs, |
85682c19 SP |
68 | struct branch *branch, |
69 | struct ref ***tail) | |
b888d61c | 70 | { |
85682c19 | 71 | int i; |
b888d61c | 72 | |
85682c19 SP |
73 | for (i = 0; i < branch->merge_nr; i++) { |
74 | struct ref *rm, **old_tail = *tail; | |
75 | struct refspec refspec; | |
76 | ||
77 | for (rm = *head; rm; rm = rm->next) { | |
78 | if (branch_merge_matches(branch, i, rm->name)) { | |
b888d61c | 79 | rm->merge = 1; |
85682c19 SP |
80 | break; |
81 | } | |
b888d61c | 82 | } |
85682c19 SP |
83 | if (rm) |
84 | continue; | |
85 | ||
9ad7c5ae JH |
86 | /* |
87 | * Not fetched to a tracking branch? We need to fetch | |
85682c19 | 88 | * it anyway to allow this branch's "branch.$name.merge" |
05207a28 | 89 | * to be honored by 'git pull', but we do not have to |
9ad7c5ae JH |
90 | * fail if branch.$name.merge is misconfigured to point |
91 | * at a nonexisting branch. If we were indeed called by | |
05207a28 | 92 | * 'git pull', it will notice the misconfiguration because |
9ad7c5ae JH |
93 | * there is no entry in the resulting FETCH_HEAD marked |
94 | * for merging. | |
85682c19 SP |
95 | */ |
96 | refspec.src = branch->merge[i]->src; | |
97 | refspec.dst = NULL; | |
98 | refspec.pattern = 0; | |
99 | refspec.force = 0; | |
9ad7c5ae | 100 | get_fetch_map(remote_refs, &refspec, tail, 1); |
85682c19 SP |
101 | for (rm = *old_tail; rm; rm = rm->next) |
102 | rm->merge = 1; | |
b888d61c DB |
103 | } |
104 | } | |
105 | ||
767f176a SP |
106 | static void find_non_local_tags(struct transport *transport, |
107 | struct ref **head, | |
108 | struct ref ***tail); | |
109 | ||
b888d61c DB |
110 | static struct ref *get_ref_map(struct transport *transport, |
111 | struct refspec *refs, int ref_count, int tags, | |
112 | int *autotags) | |
113 | { | |
114 | int i; | |
115 | struct ref *rm; | |
116 | struct ref *ref_map = NULL; | |
117 | struct ref **tail = &ref_map; | |
118 | ||
4577370e | 119 | const struct ref *remote_refs = transport_get_remote_refs(transport); |
b888d61c | 120 | |
83201998 | 121 | if (ref_count || tags == TAGS_SET) { |
b888d61c | 122 | for (i = 0; i < ref_count; i++) { |
9ad7c5ae | 123 | get_fetch_map(remote_refs, &refs[i], &tail, 0); |
b888d61c DB |
124 | if (refs[i].dst && refs[i].dst[0]) |
125 | *autotags = 1; | |
126 | } | |
127 | /* Merge everything on the command line, but not --tags */ | |
128 | for (rm = ref_map; rm; rm = rm->next) | |
129 | rm->merge = 1; | |
e0aaa29f DB |
130 | if (tags == TAGS_SET) |
131 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); | |
b888d61c DB |
132 | } else { |
133 | /* Use the defaults */ | |
134 | struct remote *remote = transport->remote; | |
85682c19 SP |
135 | struct branch *branch = branch_get(NULL); |
136 | int has_merge = branch_has_merge_config(branch); | |
137 | if (remote && (remote->fetch_refspec_nr || has_merge)) { | |
b888d61c | 138 | for (i = 0; i < remote->fetch_refspec_nr; i++) { |
9ad7c5ae | 139 | get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0); |
b888d61c DB |
140 | if (remote->fetch[i].dst && |
141 | remote->fetch[i].dst[0]) | |
142 | *autotags = 1; | |
85682c19 | 143 | if (!i && !has_merge && ref_map && |
cfb8f898 | 144 | !remote->fetch[0].pattern) |
85682c19 | 145 | ref_map->merge = 1; |
b888d61c | 146 | } |
da0204df JS |
147 | /* |
148 | * if the remote we're fetching from is the same | |
149 | * as given in branch.<name>.remote, we add the | |
150 | * ref given in branch.<name>.merge, too. | |
151 | */ | |
9ad7c5ae JH |
152 | if (has_merge && |
153 | !strcmp(branch->remote_name, remote->name)) | |
85682c19 | 154 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
b888d61c DB |
155 | } else { |
156 | ref_map = get_remote_ref(remote_refs, "HEAD"); | |
9ad7c5ae JH |
157 | if (!ref_map) |
158 | die("Couldn't find remote ref HEAD"); | |
b888d61c | 159 | ref_map->merge = 1; |
5aaf7f2a | 160 | tail = &ref_map->next; |
b888d61c DB |
161 | } |
162 | } | |
767f176a SP |
163 | if (tags == TAGS_DEFAULT && *autotags) |
164 | find_non_local_tags(transport, &ref_map, &tail); | |
2467a4fa | 165 | ref_remove_duplicates(ref_map); |
b888d61c DB |
166 | |
167 | return ref_map; | |
168 | } | |
169 | ||
b888d61c DB |
170 | static int s_update_ref(const char *action, |
171 | struct ref *ref, | |
172 | int check_old) | |
173 | { | |
174 | char msg[1024]; | |
175 | char *rla = getenv("GIT_REFLOG_ACTION"); | |
176 | static struct ref_lock *lock; | |
177 | ||
178 | if (!rla) | |
2d324efa | 179 | rla = default_rla.buf; |
b888d61c DB |
180 | snprintf(msg, sizeof(msg), "%s: %s", rla, action); |
181 | lock = lock_any_ref_for_update(ref->name, | |
182 | check_old ? ref->old_sha1 : NULL, 0); | |
183 | if (!lock) | |
f3cb169b | 184 | return 2; |
b888d61c | 185 | if (write_ref_sha1(lock, ref->new_sha1, msg) < 0) |
f3cb169b | 186 | return 2; |
b888d61c DB |
187 | return 0; |
188 | } | |
189 | ||
165f3902 | 190 | #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) |
9ef4272b | 191 | #define REFCOL_WIDTH 10 |
165f3902 | 192 | |
b888d61c | 193 | static int update_local_ref(struct ref *ref, |
165f3902 NP |
194 | const char *remote, |
195 | int verbose, | |
196 | char *display) | |
b888d61c | 197 | { |
b888d61c DB |
198 | struct commit *current = NULL, *updated; |
199 | enum object_type type; | |
200 | struct branch *current_branch = branch_get(NULL); | |
165f3902 NP |
201 | const char *pretty_ref = ref->name + ( |
202 | !prefixcmp(ref->name, "refs/heads/") ? 11 : | |
203 | !prefixcmp(ref->name, "refs/tags/") ? 10 : | |
204 | !prefixcmp(ref->name, "refs/remotes/") ? 13 : | |
205 | 0); | |
b888d61c | 206 | |
165f3902 | 207 | *display = 0; |
b888d61c DB |
208 | type = sha1_object_info(ref->new_sha1, NULL); |
209 | if (type < 0) | |
210 | die("object %s not found", sha1_to_hex(ref->new_sha1)); | |
211 | ||
b888d61c | 212 | if (!hashcmp(ref->old_sha1, ref->new_sha1)) { |
165f3902 | 213 | if (verbose) |
9ef4272b PH |
214 | sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH, |
215 | "[up to date]", REFCOL_WIDTH, remote, | |
216 | pretty_ref); | |
b888d61c DB |
217 | return 0; |
218 | } | |
219 | ||
b3abdd9d SP |
220 | if (current_branch && |
221 | !strcmp(ref->name, current_branch->name) && | |
b888d61c DB |
222 | !(update_head_ok || is_bare_repository()) && |
223 | !is_null_sha1(ref->old_sha1)) { | |
224 | /* | |
225 | * If this is the head, and it's not okay to update | |
226 | * the head, and the old value of the head isn't empty... | |
227 | */ | |
9ef4272b PH |
228 | sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)", |
229 | SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, | |
230 | pretty_ref); | |
b888d61c DB |
231 | return 1; |
232 | } | |
233 | ||
234 | if (!is_null_sha1(ref->old_sha1) && | |
235 | !prefixcmp(ref->name, "refs/tags/")) { | |
6315472e JK |
236 | int r; |
237 | r = s_update_ref("updating tag", ref, 0); | |
238 | sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-', | |
9ef4272b | 239 | SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote, |
6315472e JK |
240 | pretty_ref, r ? " (unable to update local ref)" : ""); |
241 | return r; | |
b888d61c DB |
242 | } |
243 | ||
cfa5b2b7 SP |
244 | current = lookup_commit_reference_gently(ref->old_sha1, 1); |
245 | updated = lookup_commit_reference_gently(ref->new_sha1, 1); | |
b888d61c | 246 | if (!current || !updated) { |
165f3902 NP |
247 | const char *msg; |
248 | const char *what; | |
6315472e | 249 | int r; |
165f3902 | 250 | if (!strncmp(ref->name, "refs/tags/", 10)) { |
b888d61c | 251 | msg = "storing tag"; |
165f3902 NP |
252 | what = "[new tag]"; |
253 | } | |
254 | else { | |
b888d61c | 255 | msg = "storing head"; |
165f3902 NP |
256 | what = "[new branch]"; |
257 | } | |
258 | ||
6315472e JK |
259 | r = s_update_ref(msg, ref, 0); |
260 | sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*', | |
261 | SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref, | |
262 | r ? " (unable to update local ref)" : ""); | |
263 | return r; | |
b888d61c DB |
264 | } |
265 | ||
b888d61c | 266 | if (in_merge_bases(current, &updated, 1)) { |
165f3902 | 267 | char quickref[83]; |
6315472e | 268 | int r; |
165f3902 NP |
269 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
270 | strcat(quickref, ".."); | |
271 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); | |
6315472e JK |
272 | r = s_update_ref("fast forward", ref, 1); |
273 | sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ', | |
274 | SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, | |
275 | pretty_ref, r ? " (unable to update local ref)" : ""); | |
276 | return r; | |
165f3902 NP |
277 | } else if (force || ref->force) { |
278 | char quickref[84]; | |
6315472e | 279 | int r; |
165f3902 NP |
280 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
281 | strcat(quickref, "..."); | |
282 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); | |
6315472e JK |
283 | r = s_update_ref("forced-update", ref, 1); |
284 | sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+', | |
285 | SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, | |
286 | pretty_ref, | |
287 | r ? "unable to update local ref" : "forced update"); | |
288 | return r; | |
165f3902 | 289 | } else { |
9ef4272b PH |
290 | sprintf(display, "! %-*s %-*s -> %s (non fast forward)", |
291 | SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, | |
292 | pretty_ref); | |
b888d61c DB |
293 | return 1; |
294 | } | |
b888d61c DB |
295 | } |
296 | ||
f3cb169b JK |
297 | static int store_updated_refs(const char *url, const char *remote_name, |
298 | struct ref *ref_map) | |
b888d61c DB |
299 | { |
300 | FILE *fp; | |
301 | struct commit *commit; | |
efb98b44 | 302 | int url_len, i, note_len, shown_url = 0, rc = 0; |
b888d61c DB |
303 | char note[1024]; |
304 | const char *what, *kind; | |
305 | struct ref *rm; | |
d6617c7c | 306 | char *filename = git_path("FETCH_HEAD"); |
b888d61c | 307 | |
d6617c7c AGR |
308 | fp = fopen(filename, "a"); |
309 | if (!fp) | |
310 | return error("cannot open %s: %s\n", filename, strerror(errno)); | |
b888d61c DB |
311 | for (rm = ref_map; rm; rm = rm->next) { |
312 | struct ref *ref = NULL; | |
313 | ||
314 | if (rm->peer_ref) { | |
315 | ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); | |
316 | strcpy(ref->name, rm->peer_ref->name); | |
317 | hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); | |
318 | hashcpy(ref->new_sha1, rm->old_sha1); | |
1aad91f5 | 319 | ref->force = rm->peer_ref->force; |
b888d61c DB |
320 | } |
321 | ||
cfa5b2b7 | 322 | commit = lookup_commit_reference_gently(rm->old_sha1, 1); |
b888d61c DB |
323 | if (!commit) |
324 | rm->merge = 0; | |
325 | ||
326 | if (!strcmp(rm->name, "HEAD")) { | |
327 | kind = ""; | |
328 | what = ""; | |
329 | } | |
330 | else if (!prefixcmp(rm->name, "refs/heads/")) { | |
331 | kind = "branch"; | |
332 | what = rm->name + 11; | |
333 | } | |
334 | else if (!prefixcmp(rm->name, "refs/tags/")) { | |
335 | kind = "tag"; | |
336 | what = rm->name + 10; | |
337 | } | |
338 | else if (!prefixcmp(rm->name, "refs/remotes/")) { | |
339 | kind = "remote branch"; | |
340 | what = rm->name + 13; | |
341 | } | |
342 | else { | |
343 | kind = ""; | |
344 | what = rm->name; | |
345 | } | |
346 | ||
347 | url_len = strlen(url); | |
348 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
349 | ; | |
350 | url_len = i + 1; | |
351 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
352 | url_len = i - 3; | |
353 | ||
354 | note_len = 0; | |
355 | if (*what) { | |
356 | if (*kind) | |
357 | note_len += sprintf(note + note_len, "%s ", | |
358 | kind); | |
359 | note_len += sprintf(note + note_len, "'%s' of ", what); | |
360 | } | |
361 | note_len += sprintf(note + note_len, "%.*s", url_len, url); | |
362 | fprintf(fp, "%s\t%s\t%s\n", | |
363 | sha1_to_hex(commit ? commit->object.sha1 : | |
364 | rm->old_sha1), | |
365 | rm->merge ? "" : "not-for-merge", | |
366 | note); | |
367 | ||
f59774ad | 368 | if (ref) |
efb98b44 | 369 | rc |= update_local_ref(ref, what, verbose, note); |
e5c49826 | 370 | else |
f59774ad JK |
371 | sprintf(note, "* %-*s %-*s -> FETCH_HEAD", |
372 | SUMMARY_WIDTH, *kind ? kind : "branch", | |
373 | REFCOL_WIDTH, *what ? what : "HEAD"); | |
f59774ad JK |
374 | if (*note) { |
375 | if (!shown_url) { | |
376 | fprintf(stderr, "From %.*s\n", | |
377 | url_len, url); | |
378 | shown_url = 1; | |
165f3902 | 379 | } |
f59774ad | 380 | fprintf(stderr, " %s\n", note); |
165f3902 | 381 | } |
b888d61c DB |
382 | } |
383 | fclose(fp); | |
f3cb169b JK |
384 | if (rc & 2) |
385 | error("some local refs could not be updated; try running\n" | |
386 | " 'git remote prune %s' to remove any old, conflicting " | |
387 | "branches", remote_name); | |
efb98b44 | 388 | return rc; |
b888d61c DB |
389 | } |
390 | ||
4191c356 SP |
391 | /* |
392 | * We would want to bypass the object transfer altogether if | |
393 | * everything we are going to fetch already exists and connected | |
394 | * locally. | |
395 | * | |
396 | * The refs we are going to fetch are in to_fetch (nr_heads in | |
397 | * total). If running | |
398 | * | |
05207a28 | 399 | * $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all |
4191c356 SP |
400 | * |
401 | * does not error out, that means everything reachable from the | |
402 | * refs we are going to fetch exists and is connected to some of | |
403 | * our existing refs. | |
404 | */ | |
405 | static int quickfetch(struct ref *ref_map) | |
406 | { | |
407 | struct child_process revlist; | |
408 | struct ref *ref; | |
409 | char **argv; | |
410 | int i, err; | |
411 | ||
412 | /* | |
413 | * If we are deepening a shallow clone we already have these | |
414 | * objects reachable. Running rev-list here will return with | |
415 | * a good (0) exit status and we'll bypass the fetch that we | |
416 | * really need to perform. Claiming failure now will ensure | |
417 | * we perform the network exchange to deepen our history. | |
418 | */ | |
419 | if (depth) | |
420 | return -1; | |
421 | ||
422 | for (i = 0, ref = ref_map; ref; ref = ref->next) | |
423 | i++; | |
424 | if (!i) | |
425 | return 0; | |
426 | ||
427 | argv = xmalloc(sizeof(*argv) * (i + 6)); | |
428 | i = 0; | |
429 | argv[i++] = xstrdup("rev-list"); | |
430 | argv[i++] = xstrdup("--quiet"); | |
431 | argv[i++] = xstrdup("--objects"); | |
432 | for (ref = ref_map; ref; ref = ref->next) | |
433 | argv[i++] = xstrdup(sha1_to_hex(ref->old_sha1)); | |
434 | argv[i++] = xstrdup("--not"); | |
435 | argv[i++] = xstrdup("--all"); | |
436 | argv[i++] = NULL; | |
437 | ||
438 | memset(&revlist, 0, sizeof(revlist)); | |
439 | revlist.argv = (const char**)argv; | |
440 | revlist.git_cmd = 1; | |
441 | revlist.no_stdin = 1; | |
442 | revlist.no_stdout = 1; | |
443 | revlist.no_stderr = 1; | |
444 | err = run_command(&revlist); | |
445 | ||
446 | for (i = 0; argv[i]; i++) | |
447 | free(argv[i]); | |
448 | free(argv); | |
449 | return err; | |
450 | } | |
451 | ||
b888d61c DB |
452 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
453 | { | |
4191c356 SP |
454 | int ret = quickfetch(ref_map); |
455 | if (ret) | |
456 | ret = transport_fetch_refs(transport, ref_map); | |
b888d61c | 457 | if (!ret) |
f3cb169b JK |
458 | ret |= store_updated_refs(transport->url, |
459 | transport->remote->name, | |
460 | ref_map); | |
1788c39c | 461 | transport_unlock_pack(transport); |
b888d61c DB |
462 | return ret; |
463 | } | |
464 | ||
465 | static int add_existing(const char *refname, const unsigned char *sha1, | |
466 | int flag, void *cbdata) | |
467 | { | |
c455c87c JS |
468 | struct string_list *list = (struct string_list *)cbdata; |
469 | string_list_insert(refname, list); | |
b888d61c DB |
470 | return 0; |
471 | } | |
472 | ||
cf7f929a SP |
473 | static int will_fetch(struct ref **head, const unsigned char *sha1) |
474 | { | |
475 | struct ref *rm = *head; | |
476 | while (rm) { | |
477 | if (!hashcmp(rm->old_sha1, sha1)) | |
478 | return 1; | |
479 | rm = rm->next; | |
480 | } | |
481 | return 0; | |
482 | } | |
483 | ||
c50b2b47 SP |
484 | static void find_non_local_tags(struct transport *transport, |
485 | struct ref **head, | |
486 | struct ref ***tail) | |
b888d61c | 487 | { |
c455c87c JS |
488 | struct string_list existing_refs = { NULL, 0, 0, 0 }; |
489 | struct string_list new_refs = { NULL, 0, 0, 1 }; | |
b888d61c DB |
490 | char *ref_name; |
491 | int ref_name_len; | |
4577370e DB |
492 | const unsigned char *ref_sha1; |
493 | const struct ref *tag_ref; | |
b888d61c | 494 | struct ref *rm = NULL; |
4577370e | 495 | const struct ref *ref; |
b888d61c DB |
496 | |
497 | for_each_ref(add_existing, &existing_refs); | |
498 | for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { | |
499 | if (prefixcmp(ref->name, "refs/tags")) | |
500 | continue; | |
501 | ||
502 | ref_name = xstrdup(ref->name); | |
503 | ref_name_len = strlen(ref_name); | |
504 | ref_sha1 = ref->old_sha1; | |
505 | ||
506 | if (!strcmp(ref_name + ref_name_len - 3, "^{}")) { | |
507 | ref_name[ref_name_len - 3] = 0; | |
508 | tag_ref = transport_get_remote_refs(transport); | |
509 | while (tag_ref) { | |
510 | if (!strcmp(tag_ref->name, ref_name)) { | |
511 | ref_sha1 = tag_ref->old_sha1; | |
512 | break; | |
513 | } | |
514 | tag_ref = tag_ref->next; | |
515 | } | |
516 | } | |
517 | ||
c455c87c JS |
518 | if (!string_list_has_string(&existing_refs, ref_name) && |
519 | !string_list_has_string(&new_refs, ref_name) && | |
cf7f929a SP |
520 | (has_sha1_file(ref->old_sha1) || |
521 | will_fetch(head, ref->old_sha1))) { | |
c455c87c | 522 | string_list_insert(ref_name, &new_refs); |
b888d61c | 523 | |
737922aa KK |
524 | rm = alloc_ref_from_str(ref_name); |
525 | rm->peer_ref = alloc_ref_from_str(ref_name); | |
b888d61c DB |
526 | hashcpy(rm->old_sha1, ref_sha1); |
527 | ||
c50b2b47 SP |
528 | **tail = rm; |
529 | *tail = &rm->next; | |
b888d61c DB |
530 | } |
531 | free(ref_name); | |
532 | } | |
c455c87c JS |
533 | string_list_clear(&existing_refs, 0); |
534 | string_list_clear(&new_refs, 0); | |
b888d61c DB |
535 | } |
536 | ||
537 | static int do_fetch(struct transport *transport, | |
538 | struct refspec *refs, int ref_count) | |
539 | { | |
7f98428d | 540 | struct ref *ref_map; |
b888d61c DB |
541 | struct ref *rm; |
542 | int autotags = (transport->remote->fetch_tags == 1); | |
83201998 KH |
543 | if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET) |
544 | tags = TAGS_SET; | |
b888d61c | 545 | if (transport->remote->fetch_tags == -1) |
83201998 | 546 | tags = TAGS_UNSET; |
b888d61c | 547 | |
824d5776 | 548 | if (!transport->get_refs_list || !transport->fetch) |
b888d61c DB |
549 | die("Don't know how to fetch from %s", transport->url); |
550 | ||
551 | /* if not appending, truncate FETCH_HEAD */ | |
d6617c7c AGR |
552 | if (!append) { |
553 | char *filename = git_path("FETCH_HEAD"); | |
554 | FILE *fp = fopen(filename, "w"); | |
555 | if (!fp) | |
556 | return error("cannot open %s: %s\n", filename, strerror(errno)); | |
557 | fclose(fp); | |
558 | } | |
b888d61c DB |
559 | |
560 | ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); | |
561 | ||
562 | for (rm = ref_map; rm; rm = rm->next) { | |
563 | if (rm->peer_ref) | |
564 | read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1); | |
b888d61c DB |
565 | } |
566 | ||
41fa7d2e SP |
567 | if (tags == TAGS_DEFAULT && autotags) |
568 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); | |
b888d61c DB |
569 | if (fetch_refs(transport, ref_map)) { |
570 | free_refs(ref_map); | |
571 | return 1; | |
572 | } | |
7f98428d | 573 | free_refs(ref_map); |
b888d61c DB |
574 | |
575 | /* if neither --no-tags nor --tags was specified, do automated tag | |
576 | * following ... */ | |
83201998 | 577 | if (tags == TAGS_DEFAULT && autotags) { |
c50b2b47 SP |
578 | struct ref **tail = &ref_map; |
579 | ref_map = NULL; | |
580 | find_non_local_tags(transport, &ref_map, &tail); | |
b888d61c | 581 | if (ref_map) { |
41fa7d2e | 582 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
b888d61c DB |
583 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); |
584 | fetch_refs(transport, ref_map); | |
585 | } | |
586 | free_refs(ref_map); | |
587 | } | |
588 | ||
b888d61c DB |
589 | return 0; |
590 | } | |
591 | ||
ab865e6e SP |
592 | static void set_option(const char *name, const char *value) |
593 | { | |
594 | int r = transport_set_option(transport, name, value); | |
595 | if (r < 0) | |
596 | die("Option \"%s\" value \"%s\" is not valid for %s\n", | |
597 | name, value, transport->url); | |
598 | if (r > 0) | |
599 | warning("Option \"%s\" is ignored for %s\n", | |
600 | name, transport->url); | |
601 | } | |
602 | ||
b888d61c DB |
603 | int cmd_fetch(int argc, const char **argv, const char *prefix) |
604 | { | |
605 | struct remote *remote; | |
2d324efa | 606 | int i; |
b888d61c DB |
607 | static const char **refs = NULL; |
608 | int ref_nr = 0; | |
7b7f39ea | 609 | int exit_code; |
b888d61c | 610 | |
2d324efa KH |
611 | /* Record the command line for the reflog */ |
612 | strbuf_addstr(&default_rla, "fetch"); | |
613 | for (i = 1; i < argc; i++) | |
614 | strbuf_addf(&default_rla, " %s", argv[i]); | |
615 | ||
83201998 KH |
616 | argc = parse_options(argc, argv, |
617 | builtin_fetch_options, builtin_fetch_usage, 0); | |
b888d61c | 618 | |
83201998 | 619 | if (argc == 0) |
b888d61c DB |
620 | remote = remote_get(NULL); |
621 | else | |
83201998 | 622 | remote = remote_get(argv[0]); |
b888d61c | 623 | |
28b91f8a | 624 | transport = transport_get(remote, remote->url[0]); |
b888d61c DB |
625 | if (verbose >= 2) |
626 | transport->verbose = 1; | |
627 | if (quiet) | |
2b5a06ed | 628 | transport->verbose = -1; |
b888d61c | 629 | if (upload_pack) |
ab865e6e | 630 | set_option(TRANS_OPT_UPLOADPACK, upload_pack); |
b888d61c | 631 | if (keep) |
ab865e6e SP |
632 | set_option(TRANS_OPT_KEEP, "yes"); |
633 | if (depth) | |
634 | set_option(TRANS_OPT_DEPTH, depth); | |
b888d61c DB |
635 | |
636 | if (!transport->url) | |
637 | die("Where do you want to fetch from today?"); | |
638 | ||
83201998 | 639 | if (argc > 1) { |
b888d61c | 640 | int j = 0; |
83201998 KH |
641 | refs = xcalloc(argc + 1, sizeof(const char *)); |
642 | for (i = 1; i < argc; i++) { | |
b888d61c DB |
643 | if (!strcmp(argv[i], "tag")) { |
644 | char *ref; | |
645 | i++; | |
f53423b0 KB |
646 | if (i >= argc) |
647 | die("You need to specify a tag name."); | |
b888d61c DB |
648 | ref = xmalloc(strlen(argv[i]) * 2 + 22); |
649 | strcpy(ref, "refs/tags/"); | |
650 | strcat(ref, argv[i]); | |
651 | strcat(ref, ":refs/tags/"); | |
652 | strcat(ref, argv[i]); | |
653 | refs[j++] = ref; | |
654 | } else | |
655 | refs[j++] = argv[i]; | |
b888d61c DB |
656 | } |
657 | refs[j] = NULL; | |
658 | ref_nr = j; | |
b888d61c DB |
659 | } |
660 | ||
e4022ed2 SP |
661 | signal(SIGINT, unlock_pack_on_signal); |
662 | atexit(unlock_pack); | |
7b7f39ea | 663 | exit_code = do_fetch(transport, |
46220ca1 | 664 | parse_fetch_refspec(ref_nr, refs), ref_nr); |
7b7f39ea AR |
665 | transport_disconnect(transport); |
666 | transport = NULL; | |
667 | return exit_code; | |
b888d61c | 668 | } |