8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
15 static const char * const builtin_fetch_usage
[] = {
16 "git fetch [options] [<repository> <refspec>...]",
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
;
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"),
53 static void unlock_pack(void)
56 transport_unlock_pack(transport
);
59 static void unlock_pack_on_signal(int signo
)
66 static void add_merge_config(struct ref
**head
,
67 const struct ref
*remote_refs
,
68 struct branch
*branch
,
73 for (i
= 0; i
< branch
->merge_nr
; i
++) {
74 struct ref
*rm
, **old_tail
= *tail
;
75 struct refspec refspec
;
77 for (rm
= *head
; rm
; rm
= rm
->next
) {
78 if (branch_merge_matches(branch
, i
, rm
->name
)) {
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
96 refspec
.src
= branch
->merge
[i
]->src
;
100 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
101 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
106 static void find_non_local_tags(struct transport
*transport
,
110 static struct ref
*get_ref_map(struct transport
*transport
,
111 struct refspec
*refs
, int ref_count
, int tags
,
116 struct ref
*ref_map
= NULL
;
117 struct ref
**tail
= &ref_map
;
119 const struct ref
*remote_refs
= transport_get_remote_refs(transport
);
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])
127 /* Merge everything on the command line, but not --tags */
128 for (rm
= ref_map
; rm
; rm
= rm
->next
)
130 if (tags
== TAGS_SET
)
131 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
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])
143 if (!i
&& !has_merge
&& ref_map
&&
144 !remote
->fetch
[0].pattern
)
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.
153 !strcmp(branch
->remote_name
, remote
->name
))
154 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
156 ref_map
= get_remote_ref(remote_refs
, "HEAD");
158 die("Couldn't find remote ref HEAD");
160 tail
= &ref_map
->next
;
163 if (tags
== TAGS_DEFAULT
&& *autotags
)
164 find_non_local_tags(transport
, &ref_map
, &tail
);
165 ref_remove_duplicates(ref_map
);
170 #define STORE_REF_ERROR_OTHER 1
171 #define STORE_REF_ERROR_DF_CONFLICT 2
173 static int s_update_ref(const char *action
,
178 char *rla
= getenv("GIT_REFLOG_ACTION");
179 static struct ref_lock
*lock
;
182 rla
= default_rla
.buf
;
183 snprintf(msg
, sizeof(msg
), "%s: %s", rla
, action
);
184 lock
= lock_any_ref_for_update(ref
->name
,
185 check_old
? ref
->old_sha1
: NULL
, 0);
187 return errno
== ENOTDIR
? STORE_REF_ERROR_DF_CONFLICT
:
188 STORE_REF_ERROR_OTHER
;
189 if (write_ref_sha1(lock
, ref
->new_sha1
, msg
) < 0)
190 return errno
== ENOTDIR
? STORE_REF_ERROR_DF_CONFLICT
:
191 STORE_REF_ERROR_OTHER
;
195 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
196 #define REFCOL_WIDTH 10
198 static int update_local_ref(struct ref
*ref
,
202 struct commit
*current
= NULL
, *updated
;
203 enum object_type type
;
204 struct branch
*current_branch
= branch_get(NULL
);
205 const char *pretty_ref
= prettify_refname(ref
->name
);
208 type
= sha1_object_info(ref
->new_sha1
, NULL
);
210 die("object %s not found", sha1_to_hex(ref
->new_sha1
));
212 if (!hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
214 sprintf(display
, "= %-*s %-*s -> %s", SUMMARY_WIDTH
,
215 "[up to date]", REFCOL_WIDTH
, remote
,
220 if (current_branch
&&
221 !strcmp(ref
->name
, current_branch
->name
) &&
222 !(update_head_ok
|| is_bare_repository()) &&
223 !is_null_sha1(ref
->old_sha1
)) {
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...
228 sprintf(display
, "! %-*s %-*s -> %s (can't fetch in current branch)",
229 SUMMARY_WIDTH
, "[rejected]", REFCOL_WIDTH
, remote
,
234 if (!is_null_sha1(ref
->old_sha1
) &&
235 !prefixcmp(ref
->name
, "refs/tags/")) {
237 r
= s_update_ref("updating tag", ref
, 0);
238 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : '-',
239 SUMMARY_WIDTH
, "[tag update]", REFCOL_WIDTH
, remote
,
240 pretty_ref
, r
? " (unable to update local ref)" : "");
244 current
= lookup_commit_reference_gently(ref
->old_sha1
, 1);
245 updated
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
246 if (!current
|| !updated
) {
250 if (!strncmp(ref
->name
, "refs/tags/", 10)) {
255 msg
= "storing head";
256 what
= "[new branch]";
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)" : "");
266 if (in_merge_bases(current
, &updated
, 1)) {
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
));
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)" : "");
277 } else if (force
|| ref
->force
) {
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
));
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
,
287 r
? "unable to update local ref" : "forced update");
290 sprintf(display
, "! %-*s %-*s -> %s (non fast forward)",
291 SUMMARY_WIDTH
, "[rejected]", REFCOL_WIDTH
, remote
,
297 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
301 struct commit
*commit
;
302 int url_len
, i
, note_len
, shown_url
= 0, rc
= 0;
304 const char *what
, *kind
;
306 char *url
, *filename
= git_path("FETCH_HEAD");
308 fp
= fopen(filename
, "a");
310 return error("cannot open %s: %s\n", filename
, strerror(errno
));
312 url
= transport_anonymize_url(raw_url
);
313 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
314 struct ref
*ref
= NULL
;
317 ref
= xcalloc(1, sizeof(*ref
) + strlen(rm
->peer_ref
->name
) + 1);
318 strcpy(ref
->name
, rm
->peer_ref
->name
);
319 hashcpy(ref
->old_sha1
, rm
->peer_ref
->old_sha1
);
320 hashcpy(ref
->new_sha1
, rm
->old_sha1
);
321 ref
->force
= rm
->peer_ref
->force
;
324 commit
= lookup_commit_reference_gently(rm
->old_sha1
, 1);
328 if (!strcmp(rm
->name
, "HEAD")) {
332 else if (!prefixcmp(rm
->name
, "refs/heads/")) {
334 what
= rm
->name
+ 11;
336 else if (!prefixcmp(rm
->name
, "refs/tags/")) {
338 what
= rm
->name
+ 10;
340 else if (!prefixcmp(rm
->name
, "refs/remotes/")) {
341 kind
= "remote branch";
342 what
= rm
->name
+ 13;
349 url_len
= strlen(url
);
350 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
353 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
359 note_len
+= sprintf(note
+ note_len
, "%s ",
361 note_len
+= sprintf(note
+ note_len
, "'%s' of ", what
);
363 note
[note_len
] = '\0';
364 fprintf(fp
, "%s\t%s\t%s",
365 sha1_to_hex(commit
? commit
->object
.sha1
:
367 rm
->merge
? "" : "not-for-merge",
369 for (i
= 0; i
< url_len
; ++i
)
377 rc
|= update_local_ref(ref
, what
, note
);
379 sprintf(note
, "* %-*s %-*s -> FETCH_HEAD",
380 SUMMARY_WIDTH
, *kind
? kind
: "branch",
381 REFCOL_WIDTH
, *what
? what
: "HEAD");
383 if (verbosity
>= 0 && !shown_url
) {
384 fprintf(stderr
, "From %.*s\n",
389 fprintf(stderr
, " %s\n", note
);
394 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
395 error("some local refs could not be updated; try running\n"
396 " 'git remote prune %s' to remove any old, conflicting "
397 "branches", remote_name
);
402 * We would want to bypass the object transfer altogether if
403 * everything we are going to fetch already exists and is connected
406 * The refs we are going to fetch are in ref_map. If running
408 * $ git rev-list --objects --stdin --not --all
410 * (feeding all the refs in ref_map on its standard input)
411 * does not error out, that means everything reachable from the
412 * refs we are going to fetch exists and is connected to some of
415 static int quickfetch(struct ref
*ref_map
)
417 struct child_process revlist
;
420 const char *argv
[] = {"rev-list",
421 "--quiet", "--objects", "--stdin", "--not", "--all", NULL
};
424 * If we are deepening a shallow clone we already have these
425 * objects reachable. Running rev-list here will return with
426 * a good (0) exit status and we'll bypass the fetch that we
427 * really need to perform. Claiming failure now will ensure
428 * we perform the network exchange to deepen our history.
436 memset(&revlist
, 0, sizeof(revlist
));
439 revlist
.no_stdout
= 1;
440 revlist
.no_stderr
= 1;
443 err
= start_command(&revlist
);
445 error("could not run rev-list");
450 * If rev-list --stdin encounters an unknown commit, it terminates,
451 * which will cause SIGPIPE in the write loop below.
453 sigchain_push(SIGPIPE
, SIG_IGN
);
455 for (ref
= ref_map
; ref
; ref
= ref
->next
) {
456 if (write_in_full(revlist
.in
, sha1_to_hex(ref
->old_sha1
), 40) < 0 ||
457 write_str_in_full(revlist
.in
, "\n") < 0) {
458 if (errno
!= EPIPE
&& errno
!= EINVAL
)
459 error("failed write to rev-list: %s", strerror(errno
));
465 if (close(revlist
.in
)) {
466 error("failed to close rev-list's stdin: %s", strerror(errno
));
470 sigchain_pop(SIGPIPE
);
472 return finish_command(&revlist
) || err
;
475 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
477 int ret
= quickfetch(ref_map
);
479 ret
= transport_fetch_refs(transport
, ref_map
);
481 ret
|= store_updated_refs(transport
->url
,
482 transport
->remote
->name
,
484 transport_unlock_pack(transport
);
488 static int add_existing(const char *refname
, const unsigned char *sha1
,
489 int flag
, void *cbdata
)
491 struct string_list
*list
= (struct string_list
*)cbdata
;
492 string_list_insert(refname
, list
);
496 static int will_fetch(struct ref
**head
, const unsigned char *sha1
)
498 struct ref
*rm
= *head
;
500 if (!hashcmp(rm
->old_sha1
, sha1
))
512 static int add_to_tail(struct string_list_item
*item
, void *cb_data
)
514 struct tag_data
*data
= (struct tag_data
*)cb_data
;
515 struct ref
*rm
= NULL
;
517 /* We have already decided to ignore this item */
521 rm
= alloc_ref(item
->string
);
522 rm
->peer_ref
= alloc_ref(item
->string
);
523 hashcpy(rm
->old_sha1
, item
->util
);
526 *data
->tail
= &rm
->next
;
531 static void find_non_local_tags(struct transport
*transport
,
535 struct string_list existing_refs
= { NULL
, 0, 0, 0 };
536 struct string_list remote_refs
= { NULL
, 0, 0, 0 };
537 struct tag_data data
= {head
, tail
};
538 const struct ref
*ref
;
539 struct string_list_item
*item
= NULL
;
541 for_each_ref(add_existing
, &existing_refs
);
542 for (ref
= transport_get_remote_refs(transport
); ref
; ref
= ref
->next
) {
543 if (prefixcmp(ref
->name
, "refs/tags"))
547 * The peeled ref always follows the matching base
548 * ref, so if we see a peeled ref that we don't want
549 * to fetch then we can mark the ref entry in the list
550 * as one to ignore by setting util to NULL.
552 if (!strcmp(ref
->name
+ strlen(ref
->name
) - 3, "^{}")) {
553 if (item
&& !has_sha1_file(ref
->old_sha1
) &&
554 !will_fetch(head
, ref
->old_sha1
) &&
555 !has_sha1_file(item
->util
) &&
556 !will_fetch(head
, item
->util
))
563 * If item is non-NULL here, then we previously saw a
564 * ref not followed by a peeled reference, so we need
565 * to check if it is a lightweight tag that we want to
568 if (item
&& !has_sha1_file(item
->util
) &&
569 !will_fetch(head
, item
->util
))
574 /* skip duplicates and refs that we already have */
575 if (string_list_has_string(&remote_refs
, ref
->name
) ||
576 string_list_has_string(&existing_refs
, ref
->name
))
579 item
= string_list_insert(ref
->name
, &remote_refs
);
580 item
->util
= (void *)ref
->old_sha1
;
582 string_list_clear(&existing_refs
, 0);
585 * We may have a final lightweight tag that needs to be
586 * checked to see if it needs fetching.
588 if (item
&& !has_sha1_file(item
->util
) &&
589 !will_fetch(head
, item
->util
))
593 * For all the tags in the remote_refs string list, call
594 * add_to_tail to add them to the list of refs to be fetched
596 for_each_string_list(add_to_tail
, &remote_refs
, &data
);
598 string_list_clear(&remote_refs
, 0);
601 static void check_not_current_branch(struct ref
*ref_map
)
603 struct branch
*current_branch
= branch_get(NULL
);
605 if (is_bare_repository() || !current_branch
)
608 for (; ref_map
; ref_map
= ref_map
->next
)
609 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
610 ref_map
->peer_ref
->name
))
611 die("Refusing to fetch into current branch %s "
612 "of non-bare repository", current_branch
->refname
);
615 static int do_fetch(struct transport
*transport
,
616 struct refspec
*refs
, int ref_count
)
620 int autotags
= (transport
->remote
->fetch_tags
== 1);
621 if (transport
->remote
->fetch_tags
== 2 && tags
!= TAGS_UNSET
)
623 if (transport
->remote
->fetch_tags
== -1)
626 if (!transport
->get_refs_list
|| !transport
->fetch
)
627 die("Don't know how to fetch from %s", transport
->url
);
629 /* if not appending, truncate FETCH_HEAD */
631 char *filename
= git_path("FETCH_HEAD");
632 FILE *fp
= fopen(filename
, "w");
634 return error("cannot open %s: %s\n", filename
, strerror(errno
));
638 ref_map
= get_ref_map(transport
, refs
, ref_count
, tags
, &autotags
);
640 check_not_current_branch(ref_map
);
642 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
644 read_ref(rm
->peer_ref
->name
, rm
->peer_ref
->old_sha1
);
647 if (tags
== TAGS_DEFAULT
&& autotags
)
648 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
649 if (fetch_refs(transport
, ref_map
)) {
655 /* if neither --no-tags nor --tags was specified, do automated tag
657 if (tags
== TAGS_DEFAULT
&& autotags
) {
658 struct ref
**tail
= &ref_map
;
660 find_non_local_tags(transport
, &ref_map
, &tail
);
662 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
663 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
664 fetch_refs(transport
, ref_map
);
672 static void set_option(const char *name
, const char *value
)
674 int r
= transport_set_option(transport
, name
, value
);
676 die("Option \"%s\" value \"%s\" is not valid for %s",
677 name
, value
, transport
->url
);
679 warning("Option \"%s\" is ignored for %s\n",
680 name
, transport
->url
);
683 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
685 struct remote
*remote
;
687 static const char **refs
= NULL
;
691 /* Record the command line for the reflog */
692 strbuf_addstr(&default_rla
, "fetch");
693 for (i
= 1; i
< argc
; i
++)
694 strbuf_addf(&default_rla
, " %s", argv
[i
]);
696 argc
= parse_options(argc
, argv
, prefix
,
697 builtin_fetch_options
, builtin_fetch_usage
, 0);
700 remote
= remote_get(NULL
);
702 remote
= remote_get(argv
[0]);
705 die("Where do you want to fetch from today?");
707 transport
= transport_get(remote
, remote
->url
[0]);
709 transport
->verbose
= 1;
711 transport
->verbose
= -1;
713 set_option(TRANS_OPT_UPLOADPACK
, upload_pack
);
715 set_option(TRANS_OPT_KEEP
, "yes");
717 set_option(TRANS_OPT_DEPTH
, depth
);
721 refs
= xcalloc(argc
+ 1, sizeof(const char *));
722 for (i
= 1; i
< argc
; i
++) {
723 if (!strcmp(argv
[i
], "tag")) {
727 die("You need to specify a tag name.");
728 ref
= xmalloc(strlen(argv
[i
]) * 2 + 22);
729 strcpy(ref
, "refs/tags/");
730 strcat(ref
, argv
[i
]);
731 strcat(ref
, ":refs/tags/");
732 strcat(ref
, argv
[i
]);
741 sigchain_push_common(unlock_pack_on_signal
);
743 exit_code
= do_fetch(transport
,
744 parse_fetch_refspec(ref_nr
, refs
), ref_nr
);
745 transport_disconnect(transport
);