8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
14 #include "transport.h"
15 #include "submodule.h"
16 #include "connected.h"
18 static const char * const builtin_fetch_usage
[] = {
19 "git fetch [<options>] [<repository> [<refspec>...]]",
20 "git fetch [<options>] <group>",
21 "git fetch --multiple [<options>] [(<repository> | <group>)...]",
22 "git fetch --all [<options>]",
32 static int all
, append
, dry_run
, force
, keep
, multiple
, prune
, update_head_ok
, verbosity
;
33 static int progress
, recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
34 static int tags
= TAGS_DEFAULT
;
35 static const char *depth
;
36 static const char *upload_pack
;
37 static struct strbuf default_rla
= STRBUF_INIT
;
38 static struct transport
*transport
;
39 static const char *submodule_prefix
= "";
40 static const char *recurse_submodules_default
;
42 static int option_parse_recurse_submodules(const struct option
*opt
,
43 const char *arg
, int unset
)
46 recurse_submodules
= RECURSE_SUBMODULES_OFF
;
49 recurse_submodules
= parse_fetch_recurse_submodules_arg(opt
->long_name
, arg
);
51 recurse_submodules
= RECURSE_SUBMODULES_ON
;
56 static struct option builtin_fetch_options
[] = {
57 OPT__VERBOSITY(&verbosity
),
58 OPT_BOOLEAN(0, "all", &all
,
59 "fetch from all remotes"),
60 OPT_BOOLEAN('a', "append", &append
,
61 "append to .git/FETCH_HEAD instead of overwriting"),
62 OPT_STRING(0, "upload-pack", &upload_pack
, "path",
63 "path to upload pack on remote end"),
64 OPT__FORCE(&force
, "force overwrite of local branch"),
65 OPT_BOOLEAN('m', "multiple", &multiple
,
66 "fetch from multiple remotes"),
67 OPT_SET_INT('t', "tags", &tags
,
68 "fetch all tags and associated objects", TAGS_SET
),
69 OPT_SET_INT('n', NULL
, &tags
,
70 "do not fetch all tags (--no-tags)", TAGS_UNSET
),
71 OPT_BOOLEAN('p', "prune", &prune
,
72 "prune remote-tracking branches no longer on remote"),
73 { OPTION_CALLBACK
, 0, "recurse-submodules", NULL
, "on-demand",
74 "control recursive fetching of submodules",
75 PARSE_OPT_OPTARG
, option_parse_recurse_submodules
},
76 OPT_BOOLEAN(0, "dry-run", &dry_run
,
78 OPT_BOOLEAN('k', "keep", &keep
, "keep downloaded pack"),
79 OPT_BOOLEAN('u', "update-head-ok", &update_head_ok
,
80 "allow updating of HEAD ref"),
81 OPT_BOOLEAN(0, "progress", &progress
, "force progress reporting"),
82 OPT_STRING(0, "depth", &depth
, "depth",
83 "deepen history of shallow clone"),
84 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, "dir",
85 "prepend this to submodule path output", PARSE_OPT_HIDDEN
},
86 { OPTION_STRING
, 0, "recurse-submodules-default",
87 &recurse_submodules_default
, NULL
,
88 "default mode for recursion", PARSE_OPT_HIDDEN
},
92 static void unlock_pack(void)
95 transport_unlock_pack(transport
);
98 static void unlock_pack_on_signal(int signo
)
105 static void add_merge_config(struct ref
**head
,
106 const struct ref
*remote_refs
,
107 struct branch
*branch
,
112 for (i
= 0; i
< branch
->merge_nr
; i
++) {
113 struct ref
*rm
, **old_tail
= *tail
;
114 struct refspec refspec
;
116 for (rm
= *head
; rm
; rm
= rm
->next
) {
117 if (branch_merge_matches(branch
, i
, rm
->name
)) {
126 * Not fetched to a remote-tracking branch? We need to fetch
127 * it anyway to allow this branch's "branch.$name.merge"
128 * to be honored by 'git pull', but we do not have to
129 * fail if branch.$name.merge is misconfigured to point
130 * at a nonexisting branch. If we were indeed called by
131 * 'git pull', it will notice the misconfiguration because
132 * there is no entry in the resulting FETCH_HEAD marked
135 memset(&refspec
, 0, sizeof(refspec
));
136 refspec
.src
= branch
->merge
[i
]->src
;
137 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
138 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
143 static void find_non_local_tags(struct transport
*transport
,
147 static struct ref
*get_ref_map(struct transport
*transport
,
148 struct refspec
*refs
, int ref_count
, int tags
,
153 struct ref
*ref_map
= NULL
;
154 struct ref
**tail
= &ref_map
;
156 const struct ref
*remote_refs
= transport_get_remote_refs(transport
);
158 if (ref_count
|| tags
== TAGS_SET
) {
159 for (i
= 0; i
< ref_count
; i
++) {
160 get_fetch_map(remote_refs
, &refs
[i
], &tail
, 0);
161 if (refs
[i
].dst
&& refs
[i
].dst
[0])
164 /* Merge everything on the command line, but not --tags */
165 for (rm
= ref_map
; rm
; rm
= rm
->next
)
167 if (tags
== TAGS_SET
)
168 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
170 /* Use the defaults */
171 struct remote
*remote
= transport
->remote
;
172 struct branch
*branch
= branch_get(NULL
);
173 int has_merge
= branch_has_merge_config(branch
);
175 (remote
->fetch_refspec_nr
||
176 /* Note: has_merge implies non-NULL branch->remote_name */
177 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
178 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++) {
179 get_fetch_map(remote_refs
, &remote
->fetch
[i
], &tail
, 0);
180 if (remote
->fetch
[i
].dst
&&
181 remote
->fetch
[i
].dst
[0])
183 if (!i
&& !has_merge
&& ref_map
&&
184 !remote
->fetch
[0].pattern
)
188 * if the remote we're fetching from is the same
189 * as given in branch.<name>.remote, we add the
190 * ref given in branch.<name>.merge, too.
192 * Note: has_merge implies non-NULL branch->remote_name
195 !strcmp(branch
->remote_name
, remote
->name
))
196 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
198 ref_map
= get_remote_ref(remote_refs
, "HEAD");
200 die(_("Couldn't find remote ref HEAD"));
202 tail
= &ref_map
->next
;
205 if (tags
== TAGS_DEFAULT
&& *autotags
)
206 find_non_local_tags(transport
, &ref_map
, &tail
);
207 ref_remove_duplicates(ref_map
);
212 #define STORE_REF_ERROR_OTHER 1
213 #define STORE_REF_ERROR_DF_CONFLICT 2
215 static int s_update_ref(const char *action
,
220 char *rla
= getenv("GIT_REFLOG_ACTION");
221 static struct ref_lock
*lock
;
226 rla
= default_rla
.buf
;
227 snprintf(msg
, sizeof(msg
), "%s: %s", rla
, action
);
228 lock
= lock_any_ref_for_update(ref
->name
,
229 check_old
? ref
->old_sha1
: NULL
, 0);
231 return errno
== ENOTDIR
? STORE_REF_ERROR_DF_CONFLICT
:
232 STORE_REF_ERROR_OTHER
;
233 if (write_ref_sha1(lock
, ref
->new_sha1
, msg
) < 0)
234 return errno
== ENOTDIR
? STORE_REF_ERROR_DF_CONFLICT
:
235 STORE_REF_ERROR_OTHER
;
239 #define REFCOL_WIDTH 10
241 static int update_local_ref(struct ref
*ref
,
245 struct commit
*current
= NULL
, *updated
;
246 enum object_type type
;
247 struct branch
*current_branch
= branch_get(NULL
);
248 const char *pretty_ref
= prettify_refname(ref
->name
);
251 type
= sha1_object_info(ref
->new_sha1
, NULL
);
253 die(_("object %s not found"), sha1_to_hex(ref
->new_sha1
));
255 if (!hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
257 sprintf(display
, "= %-*s %-*s -> %s", TRANSPORT_SUMMARY_WIDTH
,
258 _("[up to date]"), REFCOL_WIDTH
, remote
,
263 if (current_branch
&&
264 !strcmp(ref
->name
, current_branch
->name
) &&
265 !(update_head_ok
|| is_bare_repository()) &&
266 !is_null_sha1(ref
->old_sha1
)) {
268 * If this is the head, and it's not okay to update
269 * the head, and the old value of the head isn't empty...
271 sprintf(display
, _("! %-*s %-*s -> %s (can't fetch in current branch)"),
272 TRANSPORT_SUMMARY_WIDTH
, _("[rejected]"), REFCOL_WIDTH
, remote
,
277 if (!is_null_sha1(ref
->old_sha1
) &&
278 !prefixcmp(ref
->name
, "refs/tags/")) {
280 r
= s_update_ref("updating tag", ref
, 0);
281 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : '-',
282 TRANSPORT_SUMMARY_WIDTH
, _("[tag update]"), REFCOL_WIDTH
, remote
,
283 pretty_ref
, r
? _(" (unable to update local ref)") : "");
287 current
= lookup_commit_reference_gently(ref
->old_sha1
, 1);
288 updated
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
289 if (!current
|| !updated
) {
293 if (!strncmp(ref
->name
, "refs/tags/", 10)) {
295 what
= _("[new tag]");
298 msg
= "storing head";
299 what
= _("[new branch]");
300 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
301 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
302 check_for_new_submodule_commits(ref
->new_sha1
);
305 r
= s_update_ref(msg
, ref
, 0);
306 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : '*',
307 TRANSPORT_SUMMARY_WIDTH
, what
, REFCOL_WIDTH
, remote
, pretty_ref
,
308 r
? _(" (unable to update local ref)") : "");
312 if (in_merge_bases(current
, &updated
, 1)) {
315 strcpy(quickref
, find_unique_abbrev(current
->object
.sha1
, DEFAULT_ABBREV
));
316 strcat(quickref
, "..");
317 strcat(quickref
, find_unique_abbrev(ref
->new_sha1
, DEFAULT_ABBREV
));
318 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
319 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
320 check_for_new_submodule_commits(ref
->new_sha1
);
321 r
= s_update_ref("fast-forward", ref
, 1);
322 sprintf(display
, "%c %-*s %-*s -> %s%s", r
? '!' : ' ',
323 TRANSPORT_SUMMARY_WIDTH
, quickref
, REFCOL_WIDTH
, remote
,
324 pretty_ref
, r
? _(" (unable to update local ref)") : "");
326 } else if (force
|| ref
->force
) {
329 strcpy(quickref
, find_unique_abbrev(current
->object
.sha1
, DEFAULT_ABBREV
));
330 strcat(quickref
, "...");
331 strcat(quickref
, find_unique_abbrev(ref
->new_sha1
, DEFAULT_ABBREV
));
332 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
333 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
334 check_for_new_submodule_commits(ref
->new_sha1
);
335 r
= s_update_ref("forced-update", ref
, 1);
336 sprintf(display
, "%c %-*s %-*s -> %s (%s)", r
? '!' : '+',
337 TRANSPORT_SUMMARY_WIDTH
, quickref
, REFCOL_WIDTH
, remote
,
339 r
? _("unable to update local ref") : _("forced update"));
342 sprintf(display
, "! %-*s %-*s -> %s %s",
343 TRANSPORT_SUMMARY_WIDTH
, _("[rejected]"), REFCOL_WIDTH
, remote
,
344 pretty_ref
, _("(non-fast-forward)"));
349 static int iterate_ref_map(void *cb_data
, unsigned char sha1
[20])
351 struct ref
**rm
= cb_data
;
352 struct ref
*ref
= *rm
;
355 return -1; /* end of the list */
357 hashcpy(sha1
, ref
->old_sha1
);
361 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
365 struct commit
*commit
;
366 int url_len
, i
, note_len
, shown_url
= 0, rc
= 0;
368 const char *what
, *kind
;
370 char *url
, *filename
= dry_run
? "/dev/null" : git_path("FETCH_HEAD");
372 fp
= fopen(filename
, "a");
374 return error(_("cannot open %s: %s\n"), filename
, strerror(errno
));
377 url
= transport_anonymize_url(raw_url
);
379 url
= xstrdup("foreign");
382 if (check_everything_connected(iterate_ref_map
, 0, &rm
)) {
383 rc
= error(_("%s did not send all necessary objects\n"), url
);
387 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
388 struct ref
*ref
= NULL
;
391 ref
= xcalloc(1, sizeof(*ref
) + strlen(rm
->peer_ref
->name
) + 1);
392 strcpy(ref
->name
, rm
->peer_ref
->name
);
393 hashcpy(ref
->old_sha1
, rm
->peer_ref
->old_sha1
);
394 hashcpy(ref
->new_sha1
, rm
->old_sha1
);
395 ref
->force
= rm
->peer_ref
->force
;
398 commit
= lookup_commit_reference_gently(rm
->old_sha1
, 1);
402 if (!strcmp(rm
->name
, "HEAD")) {
406 else if (!prefixcmp(rm
->name
, "refs/heads/")) {
408 what
= rm
->name
+ 11;
410 else if (!prefixcmp(rm
->name
, "refs/tags/")) {
412 what
= rm
->name
+ 10;
414 else if (!prefixcmp(rm
->name
, "refs/remotes/")) {
415 kind
= "remote-tracking branch";
416 what
= rm
->name
+ 13;
423 url_len
= strlen(url
);
424 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
427 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
433 note_len
+= sprintf(note
+ note_len
, "%s ",
435 note_len
+= sprintf(note
+ note_len
, "'%s' of ", what
);
437 note
[note_len
] = '\0';
438 fprintf(fp
, "%s\t%s\t%s",
439 sha1_to_hex(commit
? commit
->object
.sha1
:
441 rm
->merge
? "" : "not-for-merge",
443 for (i
= 0; i
< url_len
; ++i
)
451 rc
|= update_local_ref(ref
, what
, note
);
454 sprintf(note
, "* %-*s %-*s -> FETCH_HEAD",
455 TRANSPORT_SUMMARY_WIDTH
, *kind
? kind
: "branch",
456 REFCOL_WIDTH
, *what
? what
: "HEAD");
458 if (verbosity
>= 0 && !shown_url
) {
459 fprintf(stderr
, _("From %.*s\n"),
464 fprintf(stderr
, " %s\n", note
);
468 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
469 error(_("some local refs could not be updated; try running\n"
470 " 'git remote prune %s' to remove any old, conflicting "
471 "branches"), remote_name
);
480 * We would want to bypass the object transfer altogether if
481 * everything we are going to fetch already exists and is connected
484 static int quickfetch(struct ref
*ref_map
)
486 struct ref
*rm
= ref_map
;
489 * If we are deepening a shallow clone we already have these
490 * objects reachable. Running rev-list here will return with
491 * a good (0) exit status and we'll bypass the fetch that we
492 * really need to perform. Claiming failure now will ensure
493 * we perform the network exchange to deepen our history.
497 return check_everything_connected(iterate_ref_map
, 1, &rm
);
500 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
502 int ret
= quickfetch(ref_map
);
504 ret
= transport_fetch_refs(transport
, ref_map
);
506 ret
|= store_updated_refs(transport
->url
,
507 transport
->remote
->name
,
509 transport_unlock_pack(transport
);
513 static int prune_refs(struct refspec
*refs
, int ref_count
, struct ref
*ref_map
)
516 struct ref
*ref
, *stale_refs
= get_stale_heads(refs
, ref_count
, ref_map
);
517 const char *dangling_msg
= dry_run
518 ? _(" (%s will become dangling)\n")
519 : _(" (%s has become dangling)\n");
521 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
523 result
|= delete_ref(ref
->name
, NULL
, 0);
524 if (verbosity
>= 0) {
525 fprintf(stderr
, " x %-*s %-*s -> %s\n",
526 TRANSPORT_SUMMARY_WIDTH
, _("[deleted]"),
527 REFCOL_WIDTH
, _("(none)"), prettify_refname(ref
->name
));
528 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
531 free_refs(stale_refs
);
535 static int add_existing(const char *refname
, const unsigned char *sha1
,
536 int flag
, void *cbdata
)
538 struct string_list
*list
= (struct string_list
*)cbdata
;
539 struct string_list_item
*item
= string_list_insert(list
, refname
);
540 item
->util
= (void *)sha1
;
544 static int will_fetch(struct ref
**head
, const unsigned char *sha1
)
546 struct ref
*rm
= *head
;
548 if (!hashcmp(rm
->old_sha1
, sha1
))
555 static void find_non_local_tags(struct transport
*transport
,
559 struct string_list existing_refs
= STRING_LIST_INIT_NODUP
;
560 struct string_list remote_refs
= STRING_LIST_INIT_NODUP
;
561 const struct ref
*ref
;
562 struct string_list_item
*item
= NULL
;
564 for_each_ref(add_existing
, &existing_refs
);
565 for (ref
= transport_get_remote_refs(transport
); ref
; ref
= ref
->next
) {
566 if (prefixcmp(ref
->name
, "refs/tags"))
570 * The peeled ref always follows the matching base
571 * ref, so if we see a peeled ref that we don't want
572 * to fetch then we can mark the ref entry in the list
573 * as one to ignore by setting util to NULL.
575 if (!suffixcmp(ref
->name
, "^{}")) {
576 if (item
&& !has_sha1_file(ref
->old_sha1
) &&
577 !will_fetch(head
, ref
->old_sha1
) &&
578 !has_sha1_file(item
->util
) &&
579 !will_fetch(head
, item
->util
))
586 * If item is non-NULL here, then we previously saw a
587 * ref not followed by a peeled reference, so we need
588 * to check if it is a lightweight tag that we want to
591 if (item
&& !has_sha1_file(item
->util
) &&
592 !will_fetch(head
, item
->util
))
597 /* skip duplicates and refs that we already have */
598 if (string_list_has_string(&remote_refs
, ref
->name
) ||
599 string_list_has_string(&existing_refs
, ref
->name
))
602 item
= string_list_insert(&remote_refs
, ref
->name
);
603 item
->util
= (void *)ref
->old_sha1
;
605 string_list_clear(&existing_refs
, 0);
608 * We may have a final lightweight tag that needs to be
609 * checked to see if it needs fetching.
611 if (item
&& !has_sha1_file(item
->util
) &&
612 !will_fetch(head
, item
->util
))
616 * For all the tags in the remote_refs string list,
617 * add them to the list of refs to be fetched
619 for_each_string_list_item(item
, &remote_refs
) {
620 /* Unless we have already decided to ignore this item... */
623 struct ref
*rm
= alloc_ref(item
->string
);
624 rm
->peer_ref
= alloc_ref(item
->string
);
625 hashcpy(rm
->old_sha1
, item
->util
);
631 string_list_clear(&remote_refs
, 0);
634 static void check_not_current_branch(struct ref
*ref_map
)
636 struct branch
*current_branch
= branch_get(NULL
);
638 if (is_bare_repository() || !current_branch
)
641 for (; ref_map
; ref_map
= ref_map
->next
)
642 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
643 ref_map
->peer_ref
->name
))
644 die(_("Refusing to fetch into current branch %s "
645 "of non-bare repository"), current_branch
->refname
);
648 static int truncate_fetch_head(void)
650 char *filename
= git_path("FETCH_HEAD");
651 FILE *fp
= fopen(filename
, "w");
654 return error(_("cannot open %s: %s\n"), filename
, strerror(errno
));
659 static int do_fetch(struct transport
*transport
,
660 struct refspec
*refs
, int ref_count
)
662 struct string_list existing_refs
= STRING_LIST_INIT_NODUP
;
663 struct string_list_item
*peer_item
= NULL
;
666 int autotags
= (transport
->remote
->fetch_tags
== 1);
668 for_each_ref(add_existing
, &existing_refs
);
670 if (tags
== TAGS_DEFAULT
) {
671 if (transport
->remote
->fetch_tags
== 2)
673 if (transport
->remote
->fetch_tags
== -1)
677 if (!transport
->get_refs_list
|| !transport
->fetch
)
678 die(_("Don't know how to fetch from %s"), transport
->url
);
680 /* if not appending, truncate FETCH_HEAD */
681 if (!append
&& !dry_run
) {
682 int errcode
= truncate_fetch_head();
687 ref_map
= get_ref_map(transport
, refs
, ref_count
, tags
, &autotags
);
689 check_not_current_branch(ref_map
);
691 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
693 peer_item
= string_list_lookup(&existing_refs
,
696 hashcpy(rm
->peer_ref
->old_sha1
,
701 if (tags
== TAGS_DEFAULT
&& autotags
)
702 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
703 if (fetch_refs(transport
, ref_map
)) {
708 /* If --tags was specified, pretend the user gave us the canonical tags refspec */
709 if (tags
== TAGS_SET
) {
710 const char *tags_str
= "refs/tags/*:refs/tags/*";
711 struct refspec
*tags_refspec
, *refspec
;
713 /* Copy the refspec and add the tags to it */
714 refspec
= xcalloc(ref_count
+ 1, sizeof(struct refspec
));
715 tags_refspec
= parse_fetch_refspec(1, &tags_str
);
716 memcpy(refspec
, refs
, ref_count
* sizeof(struct refspec
));
717 memcpy(&refspec
[ref_count
], tags_refspec
, sizeof(struct refspec
));
720 prune_refs(refspec
, ref_count
, ref_map
);
723 /* The rest of the strings belong to fetch_one */
724 free_refspec(1, tags_refspec
);
726 } else if (ref_count
) {
727 prune_refs(refs
, ref_count
, ref_map
);
729 prune_refs(transport
->remote
->fetch
, transport
->remote
->fetch_refspec_nr
, ref_map
);
734 /* if neither --no-tags nor --tags was specified, do automated tag
736 if (tags
== TAGS_DEFAULT
&& autotags
) {
737 struct ref
**tail
= &ref_map
;
739 find_non_local_tags(transport
, &ref_map
, &tail
);
741 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
742 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
743 fetch_refs(transport
, ref_map
);
751 static void set_option(const char *name
, const char *value
)
753 int r
= transport_set_option(transport
, name
, value
);
755 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
756 name
, value
, transport
->url
);
758 warning(_("Option \"%s\" is ignored for %s\n"),
759 name
, transport
->url
);
762 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
764 struct string_list
*list
= priv
;
765 if (!remote
->skip_default_update
)
766 string_list_append(list
, remote
->name
);
770 struct remote_group_data
{
772 struct string_list
*list
;
775 static int get_remote_group(const char *key
, const char *value
, void *priv
)
777 struct remote_group_data
*g
= priv
;
779 if (!prefixcmp(key
, "remotes.") &&
780 !strcmp(key
+ 8, g
->name
)) {
781 /* split list by white space */
782 int space
= strcspn(value
, " \t\n");
785 string_list_append(g
->list
,
786 xstrndup(value
, space
));
788 value
+= space
+ (value
[space
] != '\0');
789 space
= strcspn(value
, " \t\n");
796 static int add_remote_or_group(const char *name
, struct string_list
*list
)
798 int prev_nr
= list
->nr
;
799 struct remote_group_data g
;
800 g
.name
= name
; g
.list
= list
;
802 git_config(get_remote_group
, &g
);
803 if (list
->nr
== prev_nr
) {
804 struct remote
*remote
;
805 if (!remote_is_configured(name
))
807 remote
= remote_get(name
);
808 string_list_append(list
, remote
->name
);
813 static void add_options_to_argv(int *argc
, const char **argv
)
816 argv
[(*argc
)++] = "--dry-run";
818 argv
[(*argc
)++] = "--prune";
820 argv
[(*argc
)++] = "--update-head-ok";
822 argv
[(*argc
)++] = "--force";
824 argv
[(*argc
)++] = "--keep";
825 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
826 argv
[(*argc
)++] = "--recurse-submodules";
827 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
828 argv
[(*argc
)++] = "--recurse-submodules=on-demand";
830 argv
[(*argc
)++] = "-v";
832 argv
[(*argc
)++] = "-v";
833 else if (verbosity
< 0)
834 argv
[(*argc
)++] = "-q";
838 static int fetch_multiple(struct string_list
*list
)
841 const char *argv
[12] = { "fetch", "--append" };
844 add_options_to_argv(&argc
, argv
);
846 if (!append
&& !dry_run
) {
847 int errcode
= truncate_fetch_head();
852 for (i
= 0; i
< list
->nr
; i
++) {
853 const char *name
= list
->items
[i
].string
;
855 argv
[argc
+ 1] = NULL
;
857 printf(_("Fetching %s\n"), name
);
858 if (run_command_v_opt(argv
, RUN_GIT_CMD
)) {
859 error(_("Could not fetch %s"), name
);
867 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
)
870 static const char **refs
= NULL
;
871 struct refspec
*refspec
;
876 die(_("No remote repository specified. Please, specify either a URL or a\n"
877 "remote name from which new revisions should be fetched."));
879 transport
= transport_get(remote
, NULL
);
880 transport_set_verbosity(transport
, verbosity
, progress
);
882 set_option(TRANS_OPT_UPLOADPACK
, upload_pack
);
884 set_option(TRANS_OPT_KEEP
, "yes");
886 set_option(TRANS_OPT_DEPTH
, depth
);
890 refs
= xcalloc(argc
+ 1, sizeof(const char *));
891 for (i
= 0; i
< argc
; i
++) {
892 if (!strcmp(argv
[i
], "tag")) {
896 die(_("You need to specify a tag name."));
897 ref
= xmalloc(strlen(argv
[i
]) * 2 + 22);
898 strcpy(ref
, "refs/tags/");
899 strcat(ref
, argv
[i
]);
900 strcat(ref
, ":refs/tags/");
901 strcat(ref
, argv
[i
]);
910 sigchain_push_common(unlock_pack_on_signal
);
912 refspec
= parse_fetch_refspec(ref_nr
, refs
);
913 exit_code
= do_fetch(transport
, refspec
, ref_nr
);
914 free_refspec(ref_nr
, refspec
);
915 transport_disconnect(transport
);
920 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
923 struct string_list list
= STRING_LIST_INIT_NODUP
;
924 struct remote
*remote
;
927 packet_trace_identity("fetch");
929 /* Record the command line for the reflog */
930 strbuf_addstr(&default_rla
, "fetch");
931 for (i
= 1; i
< argc
; i
++)
932 strbuf_addf(&default_rla
, " %s", argv
[i
]);
934 argc
= parse_options(argc
, argv
, prefix
,
935 builtin_fetch_options
, builtin_fetch_usage
, 0);
937 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
938 if (recurse_submodules_default
) {
939 int arg
= parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default
);
940 set_config_fetch_recurse_submodules(arg
);
943 git_config(submodule_config
, NULL
);
948 die(_("fetch --all does not take a repository argument"));
950 die(_("fetch --all does not make sense with refspecs"));
951 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
952 result
= fetch_multiple(&list
);
953 } else if (argc
== 0) {
954 /* No arguments -- use default remote */
955 remote
= remote_get(NULL
);
956 result
= fetch_one(remote
, argc
, argv
);
957 } else if (multiple
) {
958 /* All arguments are assumed to be remotes or groups */
959 for (i
= 0; i
< argc
; i
++)
960 if (!add_remote_or_group(argv
[i
], &list
))
961 die(_("No such remote or remote group: %s"), argv
[i
]);
962 result
= fetch_multiple(&list
);
964 /* Single remote or group */
965 (void) add_remote_or_group(argv
[0], &list
);
967 /* More than one remote */
969 die(_("Fetching a group and specifying refspecs does not make sense"));
970 result
= fetch_multiple(&list
);
972 /* Zero or one remotes */
973 remote
= remote_get(argv
[0]);
974 result
= fetch_one(remote
, argc
-1, argv
+1);
978 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
979 const char *options
[10];
981 add_options_to_argv(&num_options
, options
);
982 result
= fetch_populated_submodules(num_options
, options
,
988 /* All names were strdup()ed or strndup()ed */
989 list
.strdup_strings
= 1;
990 string_list_clear(&list
, 0);