Merge branch 'maint-1.6.1' into maint
[git/git.git] / builtin-fetch.c
1 /*
2 * "git fetch"
3 */
4 #include "cache.h"
5 #include "refs.h"
6 #include "commit.h"
7 #include "builtin.h"
8 #include "string-list.h"
9 #include "remote.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "sigchain.h"
14
15 static const char * const builtin_fetch_usage[] = {
16 "git fetch [options] [<repository> <refspec>...]",
17 NULL
18 };
19
20 enum {
21 TAGS_UNSET = 0,
22 TAGS_DEFAULT = 1,
23 TAGS_SET = 2
24 };
25
26 static int append, force, keep, update_head_ok, verbosity;
27 static int tags = TAGS_DEFAULT;
28 static const char *depth;
29 static const char *upload_pack;
30 static struct strbuf default_rla = STRBUF_INIT;
31 static struct transport *transport;
32
33 static struct option builtin_fetch_options[] = {
34 OPT__VERBOSITY(&verbosity),
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),
43 OPT_SET_INT('n', NULL, &tags,
44 "do not fetch all tags (--no-tags)", TAGS_UNSET),
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
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 sigchain_pop(signo);
63 raise(signo);
64 }
65
66 static void add_merge_config(struct ref **head,
67 const struct ref *remote_refs,
68 struct branch *branch,
69 struct ref ***tail)
70 {
71 int i;
72
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)) {
79 rm->merge = 1;
80 break;
81 }
82 }
83 if (rm)
84 continue;
85
86 /*
87 * Not fetched to a tracking branch? We need to fetch
88 * it anyway to allow this branch's "branch.$name.merge"
89 * to be honored by 'git pull', but we do not have to
90 * fail if branch.$name.merge is misconfigured to point
91 * at a nonexisting branch. If we were indeed called by
92 * 'git pull', it will notice the misconfiguration because
93 * there is no entry in the resulting FETCH_HEAD marked
94 * for merging.
95 */
96 refspec.src = branch->merge[i]->src;
97 refspec.dst = NULL;
98 refspec.pattern = 0;
99 refspec.force = 0;
100 get_fetch_map(remote_refs, &refspec, tail, 1);
101 for (rm = *old_tail; rm; rm = rm->next)
102 rm->merge = 1;
103 }
104 }
105
106 static void find_non_local_tags(struct transport *transport,
107 struct ref **head,
108 struct ref ***tail);
109
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
119 const struct ref *remote_refs = transport_get_remote_refs(transport);
120
121 if (ref_count || tags == TAGS_SET) {
122 for (i = 0; i < ref_count; i++) {
123 get_fetch_map(remote_refs, &refs[i], &tail, 0);
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;
130 if (tags == TAGS_SET)
131 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
132 } else {
133 /* Use the defaults */
134 struct remote *remote = transport->remote;
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)) {
138 for (i = 0; i < remote->fetch_refspec_nr; i++) {
139 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
140 if (remote->fetch[i].dst &&
141 remote->fetch[i].dst[0])
142 *autotags = 1;
143 if (!i && !has_merge && ref_map &&
144 !remote->fetch[0].pattern)
145 ref_map->merge = 1;
146 }
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 */
152 if (has_merge &&
153 !strcmp(branch->remote_name, remote->name))
154 add_merge_config(&ref_map, remote_refs, branch, &tail);
155 } else {
156 ref_map = get_remote_ref(remote_refs, "HEAD");
157 if (!ref_map)
158 die("Couldn't find remote ref HEAD");
159 ref_map->merge = 1;
160 tail = &ref_map->next;
161 }
162 }
163 if (tags == TAGS_DEFAULT && *autotags)
164 find_non_local_tags(transport, &ref_map, &tail);
165 ref_remove_duplicates(ref_map);
166
167 return ref_map;
168 }
169
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)
179 rla = default_rla.buf;
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)
184 return 2;
185 if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
186 return 2;
187 return 0;
188 }
189
190 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
191 #define REFCOL_WIDTH 10
192
193 static int update_local_ref(struct ref *ref,
194 const char *remote,
195 char *display)
196 {
197 struct commit *current = NULL, *updated;
198 enum object_type type;
199 struct branch *current_branch = branch_get(NULL);
200 const char *pretty_ref = ref->name + (
201 !prefixcmp(ref->name, "refs/heads/") ? 11 :
202 !prefixcmp(ref->name, "refs/tags/") ? 10 :
203 !prefixcmp(ref->name, "refs/remotes/") ? 13 :
204 0);
205
206 *display = 0;
207 type = sha1_object_info(ref->new_sha1, NULL);
208 if (type < 0)
209 die("object %s not found", sha1_to_hex(ref->new_sha1));
210
211 if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
212 if (verbosity > 0)
213 sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH,
214 "[up to date]", REFCOL_WIDTH, remote,
215 pretty_ref);
216 return 0;
217 }
218
219 if (current_branch &&
220 !strcmp(ref->name, current_branch->name) &&
221 !(update_head_ok || is_bare_repository()) &&
222 !is_null_sha1(ref->old_sha1)) {
223 /*
224 * If this is the head, and it's not okay to update
225 * the head, and the old value of the head isn't empty...
226 */
227 sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)",
228 SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
229 pretty_ref);
230 return 1;
231 }
232
233 if (!is_null_sha1(ref->old_sha1) &&
234 !prefixcmp(ref->name, "refs/tags/")) {
235 int r;
236 r = s_update_ref("updating tag", ref, 0);
237 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-',
238 SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
239 pretty_ref, r ? " (unable to update local ref)" : "");
240 return r;
241 }
242
243 current = lookup_commit_reference_gently(ref->old_sha1, 1);
244 updated = lookup_commit_reference_gently(ref->new_sha1, 1);
245 if (!current || !updated) {
246 const char *msg;
247 const char *what;
248 int r;
249 if (!strncmp(ref->name, "refs/tags/", 10)) {
250 msg = "storing tag";
251 what = "[new tag]";
252 }
253 else {
254 msg = "storing head";
255 what = "[new branch]";
256 }
257
258 r = s_update_ref(msg, ref, 0);
259 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
260 SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
261 r ? " (unable to update local ref)" : "");
262 return r;
263 }
264
265 if (in_merge_bases(current, &updated, 1)) {
266 char quickref[83];
267 int r;
268 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
269 strcat(quickref, "..");
270 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
271 r = s_update_ref("fast forward", ref, 1);
272 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
273 SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
274 pretty_ref, r ? " (unable to update local ref)" : "");
275 return r;
276 } else if (force || ref->force) {
277 char quickref[84];
278 int r;
279 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
280 strcat(quickref, "...");
281 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
282 r = s_update_ref("forced-update", ref, 1);
283 sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+',
284 SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
285 pretty_ref,
286 r ? "unable to update local ref" : "forced update");
287 return r;
288 } else {
289 sprintf(display, "! %-*s %-*s -> %s (non fast forward)",
290 SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
291 pretty_ref);
292 return 1;
293 }
294 }
295
296 static int store_updated_refs(const char *url, const char *remote_name,
297 struct ref *ref_map)
298 {
299 FILE *fp;
300 struct commit *commit;
301 int url_len, i, note_len, shown_url = 0, rc = 0;
302 char note[1024];
303 const char *what, *kind;
304 struct ref *rm;
305 char *filename = git_path("FETCH_HEAD");
306
307 fp = fopen(filename, "a");
308 if (!fp)
309 return error("cannot open %s: %s\n", filename, strerror(errno));
310 for (rm = ref_map; rm; rm = rm->next) {
311 struct ref *ref = NULL;
312
313 if (rm->peer_ref) {
314 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
315 strcpy(ref->name, rm->peer_ref->name);
316 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
317 hashcpy(ref->new_sha1, rm->old_sha1);
318 ref->force = rm->peer_ref->force;
319 }
320
321 commit = lookup_commit_reference_gently(rm->old_sha1, 1);
322 if (!commit)
323 rm->merge = 0;
324
325 if (!strcmp(rm->name, "HEAD")) {
326 kind = "";
327 what = "";
328 }
329 else if (!prefixcmp(rm->name, "refs/heads/")) {
330 kind = "branch";
331 what = rm->name + 11;
332 }
333 else if (!prefixcmp(rm->name, "refs/tags/")) {
334 kind = "tag";
335 what = rm->name + 10;
336 }
337 else if (!prefixcmp(rm->name, "refs/remotes/")) {
338 kind = "remote branch";
339 what = rm->name + 13;
340 }
341 else {
342 kind = "";
343 what = rm->name;
344 }
345
346 url_len = strlen(url);
347 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
348 ;
349 url_len = i + 1;
350 if (4 < i && !strncmp(".git", url + i - 3, 4))
351 url_len = i - 3;
352
353 note_len = 0;
354 if (*what) {
355 if (*kind)
356 note_len += sprintf(note + note_len, "%s ",
357 kind);
358 note_len += sprintf(note + note_len, "'%s' of ", what);
359 }
360 note_len += sprintf(note + note_len, "%.*s", url_len, url);
361 fprintf(fp, "%s\t%s\t%s\n",
362 sha1_to_hex(commit ? commit->object.sha1 :
363 rm->old_sha1),
364 rm->merge ? "" : "not-for-merge",
365 note);
366
367 if (ref)
368 rc |= update_local_ref(ref, what, note);
369 else
370 sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
371 SUMMARY_WIDTH, *kind ? kind : "branch",
372 REFCOL_WIDTH, *what ? what : "HEAD");
373 if (*note) {
374 if (verbosity >= 0 && !shown_url) {
375 fprintf(stderr, "From %.*s\n",
376 url_len, url);
377 shown_url = 1;
378 }
379 if (verbosity >= 0)
380 fprintf(stderr, " %s\n", note);
381 }
382 }
383 fclose(fp);
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);
388 return rc;
389 }
390
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 *
399 * $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all
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
452 static int fetch_refs(struct transport *transport, struct ref *ref_map)
453 {
454 int ret = quickfetch(ref_map);
455 if (ret)
456 ret = transport_fetch_refs(transport, ref_map);
457 if (!ret)
458 ret |= store_updated_refs(transport->url,
459 transport->remote->name,
460 ref_map);
461 transport_unlock_pack(transport);
462 return ret;
463 }
464
465 static int add_existing(const char *refname, const unsigned char *sha1,
466 int flag, void *cbdata)
467 {
468 struct string_list *list = (struct string_list *)cbdata;
469 string_list_insert(refname, list);
470 return 0;
471 }
472
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
484 static void find_non_local_tags(struct transport *transport,
485 struct ref **head,
486 struct ref ***tail)
487 {
488 struct string_list existing_refs = { NULL, 0, 0, 0 };
489 struct string_list new_refs = { NULL, 0, 0, 1 };
490 char *ref_name;
491 int ref_name_len;
492 const unsigned char *ref_sha1;
493 const struct ref *tag_ref;
494 struct ref *rm = NULL;
495 const struct ref *ref;
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
518 if (!string_list_has_string(&existing_refs, ref_name) &&
519 !string_list_has_string(&new_refs, ref_name) &&
520 (has_sha1_file(ref->old_sha1) ||
521 will_fetch(head, ref->old_sha1))) {
522 string_list_insert(ref_name, &new_refs);
523
524 rm = alloc_ref(ref_name);
525 rm->peer_ref = alloc_ref(ref_name);
526 hashcpy(rm->old_sha1, ref_sha1);
527
528 **tail = rm;
529 *tail = &rm->next;
530 }
531 free(ref_name);
532 }
533 string_list_clear(&existing_refs, 0);
534 string_list_clear(&new_refs, 0);
535 }
536
537 static void check_not_current_branch(struct ref *ref_map)
538 {
539 struct branch *current_branch = branch_get(NULL);
540
541 if (is_bare_repository() || !current_branch)
542 return;
543
544 for (; ref_map; ref_map = ref_map->next)
545 if (ref_map->peer_ref && !strcmp(current_branch->refname,
546 ref_map->peer_ref->name))
547 die("Refusing to fetch into current branch");
548 }
549
550 static int do_fetch(struct transport *transport,
551 struct refspec *refs, int ref_count)
552 {
553 struct ref *ref_map;
554 struct ref *rm;
555 int autotags = (transport->remote->fetch_tags == 1);
556 if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
557 tags = TAGS_SET;
558 if (transport->remote->fetch_tags == -1)
559 tags = TAGS_UNSET;
560
561 if (!transport->get_refs_list || !transport->fetch)
562 die("Don't know how to fetch from %s", transport->url);
563
564 /* if not appending, truncate FETCH_HEAD */
565 if (!append) {
566 char *filename = git_path("FETCH_HEAD");
567 FILE *fp = fopen(filename, "w");
568 if (!fp)
569 return error("cannot open %s: %s\n", filename, strerror(errno));
570 fclose(fp);
571 }
572
573 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
574 if (!update_head_ok)
575 check_not_current_branch(ref_map);
576
577 for (rm = ref_map; rm; rm = rm->next) {
578 if (rm->peer_ref)
579 read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1);
580 }
581
582 if (tags == TAGS_DEFAULT && autotags)
583 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
584 if (fetch_refs(transport, ref_map)) {
585 free_refs(ref_map);
586 return 1;
587 }
588 free_refs(ref_map);
589
590 /* if neither --no-tags nor --tags was specified, do automated tag
591 * following ... */
592 if (tags == TAGS_DEFAULT && autotags) {
593 struct ref **tail = &ref_map;
594 ref_map = NULL;
595 find_non_local_tags(transport, &ref_map, &tail);
596 if (ref_map) {
597 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
598 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
599 fetch_refs(transport, ref_map);
600 }
601 free_refs(ref_map);
602 }
603
604 return 0;
605 }
606
607 static void set_option(const char *name, const char *value)
608 {
609 int r = transport_set_option(transport, name, value);
610 if (r < 0)
611 die("Option \"%s\" value \"%s\" is not valid for %s",
612 name, value, transport->url);
613 if (r > 0)
614 warning("Option \"%s\" is ignored for %s\n",
615 name, transport->url);
616 }
617
618 int cmd_fetch(int argc, const char **argv, const char *prefix)
619 {
620 struct remote *remote;
621 int i;
622 static const char **refs = NULL;
623 int ref_nr = 0;
624 int exit_code;
625
626 /* Record the command line for the reflog */
627 strbuf_addstr(&default_rla, "fetch");
628 for (i = 1; i < argc; i++)
629 strbuf_addf(&default_rla, " %s", argv[i]);
630
631 argc = parse_options(argc, argv,
632 builtin_fetch_options, builtin_fetch_usage, 0);
633
634 if (argc == 0)
635 remote = remote_get(NULL);
636 else
637 remote = remote_get(argv[0]);
638
639 if (!remote)
640 die("Where do you want to fetch from today?");
641
642 transport = transport_get(remote, remote->url[0]);
643 if (verbosity >= 2)
644 transport->verbose = 1;
645 if (verbosity < 0)
646 transport->verbose = -1;
647 if (upload_pack)
648 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
649 if (keep)
650 set_option(TRANS_OPT_KEEP, "yes");
651 if (depth)
652 set_option(TRANS_OPT_DEPTH, depth);
653
654 if (argc > 1) {
655 int j = 0;
656 refs = xcalloc(argc + 1, sizeof(const char *));
657 for (i = 1; i < argc; i++) {
658 if (!strcmp(argv[i], "tag")) {
659 char *ref;
660 i++;
661 if (i >= argc)
662 die("You need to specify a tag name.");
663 ref = xmalloc(strlen(argv[i]) * 2 + 22);
664 strcpy(ref, "refs/tags/");
665 strcat(ref, argv[i]);
666 strcat(ref, ":refs/tags/");
667 strcat(ref, argv[i]);
668 refs[j++] = ref;
669 } else
670 refs[j++] = argv[i];
671 }
672 refs[j] = NULL;
673 ref_nr = j;
674 }
675
676 sigchain_push_common(unlock_pack_on_signal);
677 atexit(unlock_pack);
678 exit_code = do_fetch(transport,
679 parse_fetch_refspec(ref_nr, refs), ref_nr);
680 transport_disconnect(transport);
681 transport = NULL;
682 return exit_code;
683 }