8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
14 static const char * const builtin_fetch_usage
[] = {
15 "git fetch [options] [<repository> <refspec>...]",
25 static int append
, force
, keep
, update_head_ok
, verbosity
;
26 static int tags
= TAGS_DEFAULT
;
27 static const char *depth
;
28 static const char *upload_pack
;
29 static struct strbuf default_rla
= STRBUF_INIT
;
30 static struct transport
*transport
;
32 static struct option builtin_fetch_options
[] = {
33 OPT__VERBOSITY(&verbosity
),
34 OPT_BOOLEAN('a', "append", &append
,
35 "append to .git/FETCH_HEAD instead of overwriting"),
36 OPT_STRING(0, "upload-pack", &upload_pack
, "PATH",
37 "path to upload pack on remote end"),
38 OPT_BOOLEAN('f', "force", &force
,
39 "force overwrite of local branch"),
40 OPT_SET_INT('t', "tags", &tags
,
41 "fetch all tags and associated objects", TAGS_SET
),
42 OPT_SET_INT('n', NULL
, &tags
,
43 "do not fetch all tags (--no-tags)", TAGS_UNSET
),
44 OPT_BOOLEAN('k', "keep", &keep
, "keep downloaded pack"),
45 OPT_BOOLEAN('u', "update-head-ok", &update_head_ok
,
46 "allow updating of HEAD ref"),
47 OPT_STRING(0, "depth", &depth
, "DEPTH",
48 "deepen history of shallow clone"),
52 static void unlock_pack(void)
55 transport_unlock_pack(transport
);
58 static void unlock_pack_on_signal(int signo
)
61 signal(SIGINT
, SIG_DFL
);
65 static void add_merge_config(struct ref
**head
,
66 const struct ref
*remote_refs
,
67 struct branch
*branch
,
72 for (i
= 0; i
< branch
->merge_nr
; i
++) {
73 struct ref
*rm
, **old_tail
= *tail
;
74 struct refspec refspec
;
76 for (rm
= *head
; rm
; rm
= rm
->next
) {
77 if (branch_merge_matches(branch
, i
, rm
->name
)) {
86 * Not fetched to a tracking branch? We need to fetch
87 * it anyway to allow this branch's "branch.$name.merge"
88 * to be honored by 'git pull', but we do not have to
89 * fail if branch.$name.merge is misconfigured to point
90 * at a nonexisting branch. If we were indeed called by
91 * 'git pull', it will notice the misconfiguration because
92 * there is no entry in the resulting FETCH_HEAD marked
95 refspec
.src
= branch
->merge
[i
]->src
;
99 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
100 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
105 static void find_non_local_tags(struct transport
*transport
,
109 static struct ref
*get_ref_map(struct transport
*transport
,
110 struct refspec
*refs
, int ref_count
, int tags
,
115 struct ref
*ref_map
= NULL
;
116 struct ref
**tail
= &ref_map
;
118 const struct ref
*remote_refs
= transport_get_remote_refs(transport
);
120 if (ref_count
|| tags
== TAGS_SET
) {
121 for (i
= 0; i
< ref_count
; i
++) {
122 get_fetch_map(remote_refs
, &refs
[i
], &tail
, 0);
123 if (refs
[i
].dst
&& refs
[i
].dst
[0])
126 /* Merge everything on the command line, but not --tags */
127 for (rm
= ref_map
; rm
; rm
= rm
->next
)
129 if (tags
== TAGS_SET
)
130 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
132 /* Use the defaults */
133 struct remote
*remote
= transport
->remote
;
134 struct branch
*branch
= branch_get(NULL
);
135 int has_merge
= branch_has_merge_config(branch
);
136 if (remote
&& (remote
->fetch_refspec_nr
|| has_merge
)) {
137 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++) {
138 get_fetch_map(remote_refs
, &remote
->fetch
[i
], &tail
, 0);
139 if (remote
->fetch
[i
].dst
&&
140 remote
->fetch
[i
].dst
[0])
142 if (!i
&& !has_merge
&& ref_map
&&
143 !remote
->fetch
[0].pattern
)
147 * if the remote we're fetching from is the same
148 * as given in branch.<name>.remote, we add the
149 * ref given in branch.<name>.merge, too.
152 !strcmp(branch
->remote_name
, remote
->name
))
153 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
155 ref_map
= get_remote_ref(remote_refs
, "HEAD");
157 die("Couldn't find remote ref HEAD");
159 tail
= &ref_map
->next
;
162 if (tags
== TAGS_DEFAULT
&& *autotags
)
163 find_non_local_tags(transport
, &ref_map
, &tail
);
164 ref_remove_duplicates(ref_map
);
169 static int s_update_ref(const char *action
,
174 char *rla
= getenv("GIT_REFLOG_ACTION");
175 static struct ref_lock
*lock
;
178 rla
= default_rla
.buf
;
179 snprintf(msg
, sizeof(msg
), "%s: %s", rla
, action
);
180 lock
= lock_any_ref_for_update(ref
->name
,
181 check_old
? ref
->old_sha1
: NULL
, 0);
184 if (write_ref_sha1(lock
, ref
->new_sha1
, msg
) < 0)
189 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
190 #define REFCOL_WIDTH 10
192 static int update_local_ref(struct ref
*ref
,
196 struct commit
*current
= NULL
, *updated
;
197 enum object_type type
;
198 struct branch
*current_branch
= branch_get(NULL
);
199 const char *pretty_ref
= ref
->name
+ (
200 !prefixcmp(ref
->name
, "refs/heads/") ? 11 :
201 !prefixcmp(ref
->name
, "refs/tags/") ? 10 :
202 !prefixcmp(ref
->name
, "refs/remotes/") ? 13 :
206 type
= sha1_object_info(ref
->new_sha1
, NULL
);
208 die("object %s not found", sha1_to_hex(ref
->new_sha1
));
210 if (!hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
212 sprintf(display
, "= %-*s %-*s -> %s", SUMMARY_WIDTH
,
213 "[up to date]", REFCOL_WIDTH
, remote
,
218 if (current_branch
&&
219 !strcmp(ref
->name
, current_branch
->name
) &&
220 !(update_head_ok
|| is_bare_repository()) &&
221 !is_null_sha1(ref
->old_sha1
)) {
223 * If this is the head, and it's not okay to update
224 * the head, and the old value of the head isn't empty...
226 sprintf(display
, "! %-*s %-*s -> %s (can't fetch in current branch)",
227 SUMMARY_WIDTH
, "[rejected]", REFCOL_WIDTH
, remote
,
232 if (!is_null_sha1(ref
->old_sha1
) &&
233 !prefixcmp(ref
->name
, "refs/tags/")) {
235 r
= s_update_ref("updating tag", ref
, 0);
236 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : '-',
237 SUMMARY_WIDTH
, "[tag update]", REFCOL_WIDTH
, remote
,
238 pretty_ref
, r
? " (unable to update local ref)" : "");
242 current
= lookup_commit_reference_gently(ref
->old_sha1
, 1);
243 updated
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
244 if (!current
|| !updated
) {
248 if (!strncmp(ref
->name
, "refs/tags/", 10)) {
253 msg
= "storing head";
254 what
= "[new branch]";
257 r
= s_update_ref(msg
, ref
, 0);
258 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : '*',
259 SUMMARY_WIDTH
, what
, REFCOL_WIDTH
, remote
, pretty_ref
,
260 r
? " (unable to update local ref)" : "");
264 if (in_merge_bases(current
, &updated
, 1)) {
267 strcpy(quickref
, find_unique_abbrev(current
->object
.sha1
, DEFAULT_ABBREV
));
268 strcat(quickref
, "..");
269 strcat(quickref
, find_unique_abbrev(ref
->new_sha1
, DEFAULT_ABBREV
));
270 r
= s_update_ref("fast forward", ref
, 1);
271 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : ' ',
272 SUMMARY_WIDTH
, quickref
, REFCOL_WIDTH
, remote
,
273 pretty_ref
, r
? " (unable to update local ref)" : "");
275 } else if (force
|| ref
->force
) {
278 strcpy(quickref
, find_unique_abbrev(current
->object
.sha1
, DEFAULT_ABBREV
));
279 strcat(quickref
, "...");
280 strcat(quickref
, find_unique_abbrev(ref
->new_sha1
, DEFAULT_ABBREV
));
281 r
= s_update_ref("forced-update", ref
, 1);
282 sprintf(display
, "%c %-*s %-*s -> %s (%s)", r
? '!' : '+',
283 SUMMARY_WIDTH
, quickref
, REFCOL_WIDTH
, remote
,
285 r
? "unable to update local ref" : "forced update");
288 sprintf(display
, "! %-*s %-*s -> %s (non fast forward)",
289 SUMMARY_WIDTH
, "[rejected]", REFCOL_WIDTH
, remote
,
295 static int store_updated_refs(const char *url
, const char *remote_name
,
299 struct commit
*commit
;
300 int url_len
, i
, note_len
, shown_url
= 0, rc
= 0;
302 const char *what
, *kind
;
304 char *filename
= git_path("FETCH_HEAD");
306 fp
= fopen(filename
, "a");
308 return error("cannot open %s: %s\n", filename
, strerror(errno
));
309 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
310 struct ref
*ref
= NULL
;
313 ref
= xcalloc(1, sizeof(*ref
) + strlen(rm
->peer_ref
->name
) + 1);
314 strcpy(ref
->name
, rm
->peer_ref
->name
);
315 hashcpy(ref
->old_sha1
, rm
->peer_ref
->old_sha1
);
316 hashcpy(ref
->new_sha1
, rm
->old_sha1
);
317 ref
->force
= rm
->peer_ref
->force
;
320 commit
= lookup_commit_reference_gently(rm
->old_sha1
, 1);
324 if (!strcmp(rm
->name
, "HEAD")) {
328 else if (!prefixcmp(rm
->name
, "refs/heads/")) {
330 what
= rm
->name
+ 11;
332 else if (!prefixcmp(rm
->name
, "refs/tags/")) {
334 what
= rm
->name
+ 10;
336 else if (!prefixcmp(rm
->name
, "refs/remotes/")) {
337 kind
= "remote branch";
338 what
= rm
->name
+ 13;
345 url_len
= strlen(url
);
346 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
349 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
355 note_len
+= sprintf(note
+ note_len
, "%s ",
357 note_len
+= sprintf(note
+ note_len
, "'%s' of ", what
);
359 note_len
+= sprintf(note
+ note_len
, "%.*s", url_len
, url
);
360 fprintf(fp
, "%s\t%s\t%s\n",
361 sha1_to_hex(commit
? commit
->object
.sha1
:
363 rm
->merge
? "" : "not-for-merge",
367 rc
|= update_local_ref(ref
, what
, note
);
369 sprintf(note
, "* %-*s %-*s -> FETCH_HEAD",
370 SUMMARY_WIDTH
, *kind
? kind
: "branch",
371 REFCOL_WIDTH
, *what
? what
: "HEAD");
373 if (verbosity
>= 0 && !shown_url
) {
374 fprintf(stderr
, "From %.*s\n",
379 fprintf(stderr
, " %s\n", note
);
384 error("some local refs could not be updated; try running\n"
385 " 'git remote prune %s' to remove any old, conflicting "
386 "branches", remote_name
);
391 * We would want to bypass the object transfer altogether if
392 * everything we are going to fetch already exists and connected
395 * The refs we are going to fetch are in to_fetch (nr_heads in
398 * $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all
400 * does not error out, that means everything reachable from the
401 * refs we are going to fetch exists and is connected to some of
404 static int quickfetch(struct ref
*ref_map
)
406 struct child_process revlist
;
412 * If we are deepening a shallow clone we already have these
413 * objects reachable. Running rev-list here will return with
414 * a good (0) exit status and we'll bypass the fetch that we
415 * really need to perform. Claiming failure now will ensure
416 * we perform the network exchange to deepen our history.
421 for (i
= 0, ref
= ref_map
; ref
; ref
= ref
->next
)
426 argv
= xmalloc(sizeof(*argv
) * (i
+ 6));
428 argv
[i
++] = xstrdup("rev-list");
429 argv
[i
++] = xstrdup("--quiet");
430 argv
[i
++] = xstrdup("--objects");
431 for (ref
= ref_map
; ref
; ref
= ref
->next
)
432 argv
[i
++] = xstrdup(sha1_to_hex(ref
->old_sha1
));
433 argv
[i
++] = xstrdup("--not");
434 argv
[i
++] = xstrdup("--all");
437 memset(&revlist
, 0, sizeof(revlist
));
438 revlist
.argv
= (const char**)argv
;
440 revlist
.no_stdin
= 1;
441 revlist
.no_stdout
= 1;
442 revlist
.no_stderr
= 1;
443 err
= run_command(&revlist
);
445 for (i
= 0; argv
[i
]; i
++)
451 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
453 int ret
= quickfetch(ref_map
);
455 ret
= transport_fetch_refs(transport
, ref_map
);
457 ret
|= store_updated_refs(transport
->url
,
458 transport
->remote
->name
,
460 transport_unlock_pack(transport
);
464 static int add_existing(const char *refname
, const unsigned char *sha1
,
465 int flag
, void *cbdata
)
467 struct string_list
*list
= (struct string_list
*)cbdata
;
468 string_list_insert(refname
, list
);
472 static int will_fetch(struct ref
**head
, const unsigned char *sha1
)
474 struct ref
*rm
= *head
;
476 if (!hashcmp(rm
->old_sha1
, sha1
))
483 static void find_non_local_tags(struct transport
*transport
,
487 struct string_list existing_refs
= { NULL
, 0, 0, 0 };
488 struct string_list new_refs
= { NULL
, 0, 0, 1 };
491 const unsigned char *ref_sha1
;
492 const struct ref
*tag_ref
;
493 struct ref
*rm
= NULL
;
494 const struct ref
*ref
;
496 for_each_ref(add_existing
, &existing_refs
);
497 for (ref
= transport_get_remote_refs(transport
); ref
; ref
= ref
->next
) {
498 if (prefixcmp(ref
->name
, "refs/tags"))
501 ref_name
= xstrdup(ref
->name
);
502 ref_name_len
= strlen(ref_name
);
503 ref_sha1
= ref
->old_sha1
;
505 if (!strcmp(ref_name
+ ref_name_len
- 3, "^{}")) {
506 ref_name
[ref_name_len
- 3] = 0;
507 tag_ref
= transport_get_remote_refs(transport
);
509 if (!strcmp(tag_ref
->name
, ref_name
)) {
510 ref_sha1
= tag_ref
->old_sha1
;
513 tag_ref
= tag_ref
->next
;
517 if (!string_list_has_string(&existing_refs
, ref_name
) &&
518 !string_list_has_string(&new_refs
, ref_name
) &&
519 (has_sha1_file(ref
->old_sha1
) ||
520 will_fetch(head
, ref
->old_sha1
))) {
521 string_list_insert(ref_name
, &new_refs
);
523 rm
= alloc_ref(ref_name
);
524 rm
->peer_ref
= alloc_ref(ref_name
);
525 hashcpy(rm
->old_sha1
, ref_sha1
);
532 string_list_clear(&existing_refs
, 0);
533 string_list_clear(&new_refs
, 0);
536 static void check_not_current_branch(struct ref
*ref_map
)
538 struct branch
*current_branch
= branch_get(NULL
);
540 if (is_bare_repository() || !current_branch
)
543 for (; ref_map
; ref_map
= ref_map
->next
)
544 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
545 ref_map
->peer_ref
->name
))
546 die("Refusing to fetch into current branch");
549 static int do_fetch(struct transport
*transport
,
550 struct refspec
*refs
, int ref_count
)
554 int autotags
= (transport
->remote
->fetch_tags
== 1);
555 if (transport
->remote
->fetch_tags
== 2 && tags
!= TAGS_UNSET
)
557 if (transport
->remote
->fetch_tags
== -1)
560 if (!transport
->get_refs_list
|| !transport
->fetch
)
561 die("Don't know how to fetch from %s", transport
->url
);
563 /* if not appending, truncate FETCH_HEAD */
565 char *filename
= git_path("FETCH_HEAD");
566 FILE *fp
= fopen(filename
, "w");
568 return error("cannot open %s: %s\n", filename
, strerror(errno
));
572 ref_map
= get_ref_map(transport
, refs
, ref_count
, tags
, &autotags
);
574 check_not_current_branch(ref_map
);
576 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
578 read_ref(rm
->peer_ref
->name
, rm
->peer_ref
->old_sha1
);
581 if (tags
== TAGS_DEFAULT
&& autotags
)
582 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
583 if (fetch_refs(transport
, ref_map
)) {
589 /* if neither --no-tags nor --tags was specified, do automated tag
591 if (tags
== TAGS_DEFAULT
&& autotags
) {
592 struct ref
**tail
= &ref_map
;
594 find_non_local_tags(transport
, &ref_map
, &tail
);
596 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
597 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
598 fetch_refs(transport
, ref_map
);
606 static void set_option(const char *name
, const char *value
)
608 int r
= transport_set_option(transport
, name
, value
);
610 die("Option \"%s\" value \"%s\" is not valid for %s\n",
611 name
, value
, transport
->url
);
613 warning("Option \"%s\" is ignored for %s\n",
614 name
, transport
->url
);
617 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
619 struct remote
*remote
;
621 static const char **refs
= NULL
;
625 /* Record the command line for the reflog */
626 strbuf_addstr(&default_rla
, "fetch");
627 for (i
= 1; i
< argc
; i
++)
628 strbuf_addf(&default_rla
, " %s", argv
[i
]);
630 argc
= parse_options(argc
, argv
,
631 builtin_fetch_options
, builtin_fetch_usage
, 0);
634 remote
= remote_get(NULL
);
636 remote
= remote_get(argv
[0]);
638 transport
= transport_get(remote
, remote
->url
[0]);
640 transport
->verbose
= 1;
642 transport
->verbose
= -1;
644 set_option(TRANS_OPT_UPLOADPACK
, upload_pack
);
646 set_option(TRANS_OPT_KEEP
, "yes");
648 set_option(TRANS_OPT_DEPTH
, depth
);
651 die("Where do you want to fetch from today?");
655 refs
= xcalloc(argc
+ 1, sizeof(const char *));
656 for (i
= 1; i
< argc
; i
++) {
657 if (!strcmp(argv
[i
], "tag")) {
661 die("You need to specify a tag name.");
662 ref
= xmalloc(strlen(argv
[i
]) * 2 + 22);
663 strcpy(ref
, "refs/tags/");
664 strcat(ref
, argv
[i
]);
665 strcat(ref
, ":refs/tags/");
666 strcat(ref
, argv
[i
]);
675 signal(SIGINT
, unlock_pack_on_signal
);
677 exit_code
= do_fetch(transport
,
678 parse_fetch_refspec(ref_nr
, refs
), ref_nr
);
679 transport_disconnect(transport
);