6 #include "repository.h"
9 #include "object-store.h"
13 #include "string-list.h"
15 #include "transport.h"
16 #include "run-command.h"
17 #include "parse-options.h"
19 #include "submodule-config.h"
20 #include "submodule.h"
21 #include "connected.h"
22 #include "argv-array.h"
25 #include "list-objects-filter-options.h"
26 #include "commit-reach.h"
28 #include "promisor-remote.h"
29 #include "commit-graph.h"
31 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
33 static const char * const builtin_fetch_usage
[] = {
34 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
35 N_("git fetch [<options>] <group>"),
36 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
37 N_("git fetch --all [<options>]"),
47 static int fetch_prune_config
= -1; /* unspecified */
48 static int fetch_show_forced_updates
= 1;
49 static uint64_t forced_updates_ms
= 0;
50 static int prune
= -1; /* unspecified */
51 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
53 static int fetch_prune_tags_config
= -1; /* unspecified */
54 static int prune_tags
= -1; /* unspecified */
55 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
57 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
;
58 static int verbosity
, deepen_relative
, set_upstream
;
59 static int progress
= -1;
60 static int enable_auto_gc
= 1;
61 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
, deepen
;
62 static int max_jobs
= -1, submodule_fetch_jobs_config
= -1;
63 static int fetch_parallel_config
= 1;
64 static enum transport_family family
;
65 static const char *depth
;
66 static const char *deepen_since
;
67 static const char *upload_pack
;
68 static struct string_list deepen_not
= STRING_LIST_INIT_NODUP
;
69 static struct strbuf default_rla
= STRBUF_INIT
;
70 static struct transport
*gtransport
;
71 static struct transport
*gsecondary
;
72 static const char *submodule_prefix
= "";
73 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
74 static int recurse_submodules_default
= RECURSE_SUBMODULES_ON_DEMAND
;
75 static int shown_url
= 0;
76 static struct refspec refmap
= REFSPEC_INIT_FETCH
;
77 static struct list_objects_filter_options filter_options
;
78 static struct string_list server_options
= STRING_LIST_INIT_DUP
;
79 static struct string_list negotiation_tip
= STRING_LIST_INIT_NODUP
;
81 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
83 if (!strcmp(k
, "fetch.prune")) {
84 fetch_prune_config
= git_config_bool(k
, v
);
88 if (!strcmp(k
, "fetch.prunetags")) {
89 fetch_prune_tags_config
= git_config_bool(k
, v
);
93 if (!strcmp(k
, "fetch.showforcedupdates")) {
94 fetch_show_forced_updates
= git_config_bool(k
, v
);
98 if (!strcmp(k
, "submodule.recurse")) {
99 int r
= git_config_bool(k
, v
) ?
100 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
101 recurse_submodules
= r
;
104 if (!strcmp(k
, "submodule.fetchjobs")) {
105 submodule_fetch_jobs_config
= parse_submodule_fetchjobs(k
, v
);
107 } else if (!strcmp(k
, "fetch.recursesubmodules")) {
108 recurse_submodules
= parse_fetch_recurse_submodules_arg(k
, v
);
112 if (!strcmp(k
, "fetch.parallel")) {
113 fetch_parallel_config
= git_config_int(k
, v
);
114 if (fetch_parallel_config
< 0)
115 die(_("fetch.parallel cannot be negative"));
119 return git_default_config(k
, v
, cb
);
122 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
124 BUG_ON_OPT_NEG(unset
);
127 * "git fetch --refmap='' origin foo"
128 * can be used to tell the command not to store anywhere
130 refspec_append(&refmap
, arg
);
135 static struct option builtin_fetch_options
[] = {
136 OPT__VERBOSITY(&verbosity
),
137 OPT_BOOL(0, "all", &all
,
138 N_("fetch from all remotes")),
139 OPT_BOOL(0, "set-upstream", &set_upstream
,
140 N_("set upstream for git pull/fetch")),
141 OPT_BOOL('a', "append", &append
,
142 N_("append to .git/FETCH_HEAD instead of overwriting")),
143 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
144 N_("path to upload pack on remote end")),
145 OPT__FORCE(&force
, N_("force overwrite of local reference"), 0),
146 OPT_BOOL('m', "multiple", &multiple
,
147 N_("fetch from multiple remotes")),
148 OPT_SET_INT('t', "tags", &tags
,
149 N_("fetch all tags and associated objects"), TAGS_SET
),
150 OPT_SET_INT('n', NULL
, &tags
,
151 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
152 OPT_INTEGER('j', "jobs", &max_jobs
,
153 N_("number of submodules fetched in parallel")),
154 OPT_BOOL('p', "prune", &prune
,
155 N_("prune remote-tracking branches no longer on remote")),
156 OPT_BOOL('P', "prune-tags", &prune_tags
,
157 N_("prune local tags no longer on remote and clobber changed tags")),
158 { OPTION_CALLBACK
, 0, "recurse-submodules", &recurse_submodules
, N_("on-demand"),
159 N_("control recursive fetching of submodules"),
160 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
},
161 OPT_BOOL(0, "dry-run", &dry_run
,
163 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
164 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
165 N_("allow updating of HEAD ref")),
166 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
167 OPT_STRING(0, "depth", &depth
, N_("depth"),
168 N_("deepen history of shallow clone")),
169 OPT_STRING(0, "shallow-since", &deepen_since
, N_("time"),
170 N_("deepen history of shallow repository based on time")),
171 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not
, N_("revision"),
172 N_("deepen history of shallow clone, excluding rev")),
173 OPT_INTEGER(0, "deepen", &deepen_relative
,
174 N_("deepen history of shallow clone")),
175 OPT_SET_INT_F(0, "unshallow", &unshallow
,
176 N_("convert to a complete repository"),
178 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
179 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
180 { OPTION_CALLBACK
, 0, "recurse-submodules-default",
181 &recurse_submodules_default
, N_("on-demand"),
182 N_("default for recursive fetching of submodules "
183 "(lower priority than config files)"),
184 PARSE_OPT_HIDDEN
, option_fetch_parse_recurse_submodules
},
185 OPT_BOOL(0, "update-shallow", &update_shallow
,
186 N_("accept refs that update .git/shallow")),
187 { OPTION_CALLBACK
, 0, "refmap", NULL
, N_("refmap"),
188 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
},
189 OPT_STRING_LIST('o', "server-option", &server_options
, N_("server-specific"), N_("option to transmit")),
190 OPT_SET_INT('4', "ipv4", &family
, N_("use IPv4 addresses only"),
191 TRANSPORT_FAMILY_IPV4
),
192 OPT_SET_INT('6', "ipv6", &family
, N_("use IPv6 addresses only"),
193 TRANSPORT_FAMILY_IPV6
),
194 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip
, N_("revision"),
195 N_("report that we have only objects reachable from this object")),
196 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options
),
197 OPT_BOOL(0, "auto-gc", &enable_auto_gc
,
198 N_("run 'gc --auto' after fetching")),
199 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates
,
200 N_("check for forced-updates on all updated branches")),
204 static void unlock_pack(void)
207 transport_unlock_pack(gtransport
);
209 transport_unlock_pack(gsecondary
);
212 static void unlock_pack_on_signal(int signo
)
219 static void add_merge_config(struct ref
**head
,
220 const struct ref
*remote_refs
,
221 struct branch
*branch
,
226 for (i
= 0; i
< branch
->merge_nr
; i
++) {
227 struct ref
*rm
, **old_tail
= *tail
;
228 struct refspec_item refspec
;
230 for (rm
= *head
; rm
; rm
= rm
->next
) {
231 if (branch_merge_matches(branch
, i
, rm
->name
)) {
232 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
240 * Not fetched to a remote-tracking branch? We need to fetch
241 * it anyway to allow this branch's "branch.$name.merge"
242 * to be honored by 'git pull', but we do not have to
243 * fail if branch.$name.merge is misconfigured to point
244 * at a nonexisting branch. If we were indeed called by
245 * 'git pull', it will notice the misconfiguration because
246 * there is no entry in the resulting FETCH_HEAD marked
249 memset(&refspec
, 0, sizeof(refspec
));
250 refspec
.src
= branch
->merge
[i
]->src
;
251 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
252 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
253 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
257 static void create_fetch_oidset(struct ref
**head
, struct oidset
*out
)
259 struct ref
*rm
= *head
;
261 oidset_insert(out
, &rm
->old_oid
);
266 struct refname_hash_entry
{
267 struct hashmap_entry ent
; /* must be the first member */
268 struct object_id oid
;
270 char refname
[FLEX_ARRAY
];
273 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data
,
278 const struct refname_hash_entry
*e1
= e1_
;
279 const struct refname_hash_entry
*e2
= e2_
;
281 return strcmp(e1
->refname
, keydata
? keydata
: e2
->refname
);
284 static struct refname_hash_entry
*refname_hash_add(struct hashmap
*map
,
286 const struct object_id
*oid
)
288 struct refname_hash_entry
*ent
;
289 size_t len
= strlen(refname
);
291 FLEX_ALLOC_MEM(ent
, refname
, refname
, len
);
292 hashmap_entry_init(ent
, strhash(refname
));
293 oidcpy(&ent
->oid
, oid
);
294 hashmap_add(map
, ent
);
298 static int add_one_refname(const char *refname
,
299 const struct object_id
*oid
,
300 int flag
, void *cbdata
)
302 struct hashmap
*refname_map
= cbdata
;
304 (void) refname_hash_add(refname_map
, refname
, oid
);
308 static void refname_hash_init(struct hashmap
*map
)
310 hashmap_init(map
, refname_hash_entry_cmp
, NULL
, 0);
313 static int refname_hash_exists(struct hashmap
*map
, const char *refname
)
315 return !!hashmap_get_from_hash(map
, strhash(refname
), refname
);
318 static void clear_item(struct refname_hash_entry
*item
)
323 static void find_non_local_tags(const struct ref
*refs
,
327 struct hashmap existing_refs
;
328 struct hashmap remote_refs
;
329 struct oidset fetch_oids
= OIDSET_INIT
;
330 struct string_list remote_refs_list
= STRING_LIST_INIT_NODUP
;
331 struct string_list_item
*remote_ref_item
;
332 const struct ref
*ref
;
333 struct refname_hash_entry
*item
= NULL
;
335 refname_hash_init(&existing_refs
);
336 refname_hash_init(&remote_refs
);
337 create_fetch_oidset(head
, &fetch_oids
);
339 for_each_ref(add_one_refname
, &existing_refs
);
340 for (ref
= refs
; ref
; ref
= ref
->next
) {
341 if (!starts_with(ref
->name
, "refs/tags/"))
345 * The peeled ref always follows the matching base
346 * ref, so if we see a peeled ref that we don't want
347 * to fetch then we can mark the ref entry in the list
348 * as one to ignore by setting util to NULL.
350 if (ends_with(ref
->name
, "^{}")) {
352 !has_object_file_with_flags(&ref
->old_oid
,
353 OBJECT_INFO_QUICK
) &&
354 !oidset_contains(&fetch_oids
, &ref
->old_oid
) &&
355 !has_object_file_with_flags(&item
->oid
, OBJECT_INFO_QUICK
) &&
356 !oidset_contains(&fetch_oids
, &item
->oid
))
363 * If item is non-NULL here, then we previously saw a
364 * ref not followed by a peeled reference, so we need
365 * to check if it is a lightweight tag that we want to
369 !has_object_file_with_flags(&item
->oid
, OBJECT_INFO_QUICK
) &&
370 !oidset_contains(&fetch_oids
, &item
->oid
))
375 /* skip duplicates and refs that we already have */
376 if (refname_hash_exists(&remote_refs
, ref
->name
) ||
377 refname_hash_exists(&existing_refs
, ref
->name
))
380 item
= refname_hash_add(&remote_refs
, ref
->name
, &ref
->old_oid
);
381 string_list_insert(&remote_refs_list
, ref
->name
);
383 hashmap_free(&existing_refs
, 1);
386 * We may have a final lightweight tag that needs to be
387 * checked to see if it needs fetching.
390 !has_object_file_with_flags(&item
->oid
, OBJECT_INFO_QUICK
) &&
391 !oidset_contains(&fetch_oids
, &item
->oid
))
395 * For all the tags in the remote_refs_list,
396 * add them to the list of refs to be fetched
398 for_each_string_list_item(remote_ref_item
, &remote_refs_list
) {
399 const char *refname
= remote_ref_item
->string
;
402 item
= hashmap_get_from_hash(&remote_refs
, strhash(refname
), refname
);
404 BUG("unseen remote ref?");
406 /* Unless we have already decided to ignore this item... */
410 rm
= alloc_ref(item
->refname
);
411 rm
->peer_ref
= alloc_ref(item
->refname
);
412 oidcpy(&rm
->old_oid
, &item
->oid
);
416 hashmap_free(&remote_refs
, 1);
417 string_list_clear(&remote_refs_list
, 0);
418 oidset_clear(&fetch_oids
);
421 static struct ref
*get_ref_map(struct remote
*remote
,
422 const struct ref
*remote_refs
,
424 int tags
, int *autotags
)
428 struct ref
*ref_map
= NULL
;
429 struct ref
**tail
= &ref_map
;
431 /* opportunistically-updated references: */
432 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
434 struct hashmap existing_refs
;
437 struct refspec
*fetch_refspec
;
439 for (i
= 0; i
< rs
->nr
; i
++) {
440 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
441 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
444 /* Merge everything on the command line (but not --tags) */
445 for (rm
= ref_map
; rm
; rm
= rm
->next
)
446 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
449 * For any refs that we happen to be fetching via
450 * command-line arguments, the destination ref might
451 * have been missing or have been different than the
452 * remote-tracking ref that would be derived from the
453 * configured refspec. In these cases, we want to
454 * take the opportunity to update their configured
455 * remote-tracking reference. However, we do not want
456 * to mention these entries in FETCH_HEAD at all, as
457 * they would simply be duplicates of existing
458 * entries, so we set them FETCH_HEAD_IGNORE below.
460 * We compute these entries now, based only on the
461 * refspecs specified on the command line. But we add
462 * them to the list following the refspecs resulting
463 * from the tags option so that one of the latter,
464 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
465 * by ref_remove_duplicates() in favor of one of these
466 * opportunistic entries with FETCH_HEAD_IGNORE.
469 fetch_refspec
= &refmap
;
471 fetch_refspec
= &remote
->fetch
;
473 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
474 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
475 } else if (refmap
.nr
) {
476 die("--refmap option is only meaningful with command-line refspec(s).");
478 /* Use the defaults */
479 struct branch
*branch
= branch_get(NULL
);
480 int has_merge
= branch_has_merge_config(branch
);
483 /* Note: has_merge implies non-NULL branch->remote_name */
484 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
485 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
486 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
487 if (remote
->fetch
.items
[i
].dst
&&
488 remote
->fetch
.items
[i
].dst
[0])
490 if (!i
&& !has_merge
&& ref_map
&&
491 !remote
->fetch
.items
[0].pattern
)
492 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
495 * if the remote we're fetching from is the same
496 * as given in branch.<name>.remote, we add the
497 * ref given in branch.<name>.merge, too.
499 * Note: has_merge implies non-NULL branch->remote_name
502 !strcmp(branch
->remote_name
, remote
->name
))
503 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
505 ref_map
= get_remote_ref(remote_refs
, "HEAD");
507 die(_("Couldn't find remote ref HEAD"));
508 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
509 tail
= &ref_map
->next
;
513 if (tags
== TAGS_SET
)
514 /* also fetch all tags */
515 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
516 else if (tags
== TAGS_DEFAULT
&& *autotags
)
517 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
519 /* Now append any refs to be updated opportunistically: */
521 for (rm
= orefs
; rm
; rm
= rm
->next
) {
522 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
526 ref_map
= ref_remove_duplicates(ref_map
);
528 refname_hash_init(&existing_refs
);
529 for_each_ref(add_one_refname
, &existing_refs
);
531 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
533 const char *refname
= rm
->peer_ref
->name
;
534 struct refname_hash_entry
*peer_item
;
536 peer_item
= hashmap_get_from_hash(&existing_refs
,
540 struct object_id
*old_oid
= &peer_item
->oid
;
541 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
545 hashmap_free(&existing_refs
, 1);
550 #define STORE_REF_ERROR_OTHER 1
551 #define STORE_REF_ERROR_DF_CONFLICT 2
553 static int s_update_ref(const char *action
,
558 char *rla
= getenv("GIT_REFLOG_ACTION");
559 struct ref_transaction
*transaction
;
560 struct strbuf err
= STRBUF_INIT
;
561 int ret
, df_conflict
= 0;
566 rla
= default_rla
.buf
;
567 msg
= xstrfmt("%s: %s", rla
, action
);
569 transaction
= ref_transaction_begin(&err
);
571 ref_transaction_update(transaction
, ref
->name
,
573 check_old
? &ref
->old_oid
: NULL
,
577 ret
= ref_transaction_commit(transaction
, &err
);
579 df_conflict
= (ret
== TRANSACTION_NAME_CONFLICT
);
583 ref_transaction_free(transaction
);
584 strbuf_release(&err
);
588 ref_transaction_free(transaction
);
589 error("%s", err
.buf
);
590 strbuf_release(&err
);
592 return df_conflict
? STORE_REF_ERROR_DF_CONFLICT
593 : STORE_REF_ERROR_OTHER
;
596 static int refcol_width
= 10;
597 static int compact_format
;
599 static void adjust_refcol_width(const struct ref
*ref
)
601 int max
, rlen
, llen
, len
;
603 /* uptodate lines are only shown on high verbosity level */
604 if (!verbosity
&& oideq(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
607 max
= term_columns();
608 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
610 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
613 * rough estimation to see if the output line is too long and
614 * should not be counted (we can't do precise calculation
615 * anyway because we don't know if the error explanation part
616 * will be printed in update_local_ref)
618 if (compact_format
) {
622 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
627 * Not precise calculation for compact mode because '*' can
628 * appear on the left hand side of '->' and shrink the column
631 if (refcol_width
< rlen
)
635 static void prepare_format_display(struct ref
*ref_map
)
638 const char *format
= "full";
640 git_config_get_string_const("fetch.output", &format
);
641 if (!strcasecmp(format
, "full"))
643 else if (!strcasecmp(format
, "compact"))
646 die(_("configuration fetch.output contains invalid value %s"),
649 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
650 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
652 !strcmp(rm
->name
, "HEAD"))
655 adjust_refcol_width(rm
);
659 static void print_remote_to_local(struct strbuf
*display
,
660 const char *remote
, const char *local
)
662 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
665 static int find_and_replace(struct strbuf
*haystack
,
667 const char *placeholder
)
669 const char *p
= NULL
;
672 nlen
= strlen(needle
);
673 if (ends_with(haystack
->buf
, needle
))
674 p
= haystack
->buf
+ haystack
->len
- nlen
;
676 p
= strstr(haystack
->buf
, needle
);
680 if (p
> haystack
->buf
&& p
[-1] != '/')
684 if (plen
> nlen
&& p
[nlen
] != '/')
687 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
688 placeholder
, strlen(placeholder
));
692 static void print_compact(struct strbuf
*display
,
693 const char *remote
, const char *local
)
695 struct strbuf r
= STRBUF_INIT
;
696 struct strbuf l
= STRBUF_INIT
;
698 if (!strcmp(remote
, local
)) {
699 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
703 strbuf_addstr(&r
, remote
);
704 strbuf_addstr(&l
, local
);
706 if (!find_and_replace(&r
, local
, "*"))
707 find_and_replace(&l
, remote
, "*");
708 print_remote_to_local(display
, r
.buf
, l
.buf
);
714 static void format_display(struct strbuf
*display
, char code
,
715 const char *summary
, const char *error
,
716 const char *remote
, const char *local
,
719 int width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
721 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
723 print_remote_to_local(display
, remote
, local
);
725 print_compact(display
, remote
, local
);
727 strbuf_addf(display
, " (%s)", error
);
730 static int update_local_ref(struct ref
*ref
,
732 const struct ref
*remote_ref
,
733 struct strbuf
*display
,
736 struct commit
*current
= NULL
, *updated
;
737 enum object_type type
;
738 struct branch
*current_branch
= branch_get(NULL
);
739 const char *pretty_ref
= prettify_refname(ref
->name
);
740 int fast_forward
= 0;
742 type
= oid_object_info(the_repository
, &ref
->new_oid
, NULL
);
744 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
746 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
748 format_display(display
, '=', _("[up to date]"), NULL
,
749 remote
, pretty_ref
, summary_width
);
753 if (current_branch
&&
754 !strcmp(ref
->name
, current_branch
->name
) &&
755 !(update_head_ok
|| is_bare_repository()) &&
756 !is_null_oid(&ref
->old_oid
)) {
758 * If this is the head, and it's not okay to update
759 * the head, and the old value of the head isn't empty...
761 format_display(display
, '!', _("[rejected]"),
762 _("can't fetch in current branch"),
763 remote
, pretty_ref
, summary_width
);
767 if (!is_null_oid(&ref
->old_oid
) &&
768 starts_with(ref
->name
, "refs/tags/")) {
769 if (force
|| ref
->force
) {
771 r
= s_update_ref("updating tag", ref
, 0);
772 format_display(display
, r
? '!' : 't', _("[tag update]"),
773 r
? _("unable to update local ref") : NULL
,
774 remote
, pretty_ref
, summary_width
);
777 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
778 remote
, pretty_ref
, summary_width
);
783 current
= lookup_commit_reference_gently(the_repository
,
785 updated
= lookup_commit_reference_gently(the_repository
,
787 if (!current
|| !updated
) {
792 * Nicely describe the new ref we're fetching.
793 * Base this on the remote's ref name, as it's
794 * more likely to follow a standard layout.
796 const char *name
= remote_ref
? remote_ref
->name
: "";
797 if (starts_with(name
, "refs/tags/")) {
799 what
= _("[new tag]");
800 } else if (starts_with(name
, "refs/heads/")) {
801 msg
= "storing head";
802 what
= _("[new branch]");
805 what
= _("[new ref]");
808 r
= s_update_ref(msg
, ref
, 0);
809 format_display(display
, r
? '!' : '*', what
,
810 r
? _("unable to update local ref") : NULL
,
811 remote
, pretty_ref
, summary_width
);
815 if (fetch_show_forced_updates
) {
816 uint64_t t_before
= getnanotime();
817 fast_forward
= in_merge_bases(current
, updated
);
818 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
824 struct strbuf quickref
= STRBUF_INIT
;
827 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
828 strbuf_addstr(&quickref
, "..");
829 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
830 r
= s_update_ref("fast-forward", ref
, 1);
831 format_display(display
, r
? '!' : ' ', quickref
.buf
,
832 r
? _("unable to update local ref") : NULL
,
833 remote
, pretty_ref
, summary_width
);
834 strbuf_release(&quickref
);
836 } else if (force
|| ref
->force
) {
837 struct strbuf quickref
= STRBUF_INIT
;
839 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
840 strbuf_addstr(&quickref
, "...");
841 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
842 r
= s_update_ref("forced-update", ref
, 1);
843 format_display(display
, r
? '!' : '+', quickref
.buf
,
844 r
? _("unable to update local ref") : _("forced update"),
845 remote
, pretty_ref
, summary_width
);
846 strbuf_release(&quickref
);
849 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
850 remote
, pretty_ref
, summary_width
);
855 static int iterate_ref_map(void *cb_data
, struct object_id
*oid
)
857 struct ref
**rm
= cb_data
;
858 struct ref
*ref
= *rm
;
860 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
863 return -1; /* end of the list */
865 oidcpy(oid
, &ref
->old_oid
);
869 static const char warn_show_forced_updates
[] =
870 N_("Fetch normally indicates which branches had a forced update,\n"
871 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
872 "flag or run 'git config fetch.showForcedUpdates true'.");
873 static const char warn_time_show_forced_updates
[] =
874 N_("It took %.2f seconds to check forced updates. You can use\n"
875 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
876 " to avoid this check.\n");
878 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
879 int connectivity_checked
, struct ref
*ref_map
)
882 struct commit
*commit
;
883 int url_len
, i
, rc
= 0;
884 struct strbuf note
= STRBUF_INIT
;
885 const char *what
, *kind
;
888 const char *filename
= dry_run
? "/dev/null" : git_path_fetch_head(the_repository
);
890 int summary_width
= transport_summary_width(ref_map
);
892 fp
= fopen(filename
, "a");
894 return error_errno(_("cannot open %s"), filename
);
897 url
= transport_anonymize_url(raw_url
);
899 url
= xstrdup("foreign");
901 if (!connectivity_checked
) {
903 if (check_connected(iterate_ref_map
, &rm
, NULL
)) {
904 rc
= error(_("%s did not send all necessary objects\n"), url
);
909 prepare_format_display(ref_map
);
912 * We do a pass for each fetch_head_status type in their enum order, so
913 * merged entries are written before not-for-merge. That lets readers
914 * use FETCH_HEAD as a refname to refer to the ref to be merged.
916 for (want_status
= FETCH_HEAD_MERGE
;
917 want_status
<= FETCH_HEAD_IGNORE
;
919 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
920 struct ref
*ref
= NULL
;
921 const char *merge_status_marker
= "";
923 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
924 if (want_status
== FETCH_HEAD_MERGE
)
925 warning(_("reject %s because shallow roots are not allowed to be updated"),
926 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
930 commit
= lookup_commit_reference_gently(the_repository
,
934 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
936 if (rm
->fetch_head_status
!= want_status
)
940 ref
= alloc_ref(rm
->peer_ref
->name
);
941 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
942 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
943 ref
->force
= rm
->peer_ref
->force
;
946 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)
947 check_for_new_submodule_commits(&rm
->old_oid
);
949 if (!strcmp(rm
->name
, "HEAD")) {
953 else if (starts_with(rm
->name
, "refs/heads/")) {
955 what
= rm
->name
+ 11;
957 else if (starts_with(rm
->name
, "refs/tags/")) {
959 what
= rm
->name
+ 10;
961 else if (starts_with(rm
->name
, "refs/remotes/")) {
962 kind
= "remote-tracking branch";
963 what
= rm
->name
+ 13;
970 url_len
= strlen(url
);
971 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
974 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
980 strbuf_addf(¬e
, "%s ", kind
);
981 strbuf_addf(¬e
, "'%s' of ", what
);
983 switch (rm
->fetch_head_status
) {
984 case FETCH_HEAD_NOT_FOR_MERGE
:
985 merge_status_marker
= "not-for-merge";
987 case FETCH_HEAD_MERGE
:
988 fprintf(fp
, "%s\t%s\t%s",
989 oid_to_hex(&rm
->old_oid
),
992 for (i
= 0; i
< url_len
; ++i
)
1000 /* do not write anything to FETCH_HEAD */
1004 strbuf_reset(¬e
);
1006 rc
|= update_local_ref(ref
, what
, rm
, ¬e
,
1010 format_display(¬e
, '*',
1011 *kind
? kind
: "branch", NULL
,
1012 *what
? what
: "HEAD",
1013 "FETCH_HEAD", summary_width
);
1015 if (verbosity
>= 0 && !shown_url
) {
1016 fprintf(stderr
, _("From %.*s\n"),
1021 fprintf(stderr
, " %s\n", note
.buf
);
1026 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1027 error(_("some local refs could not be updated; try running\n"
1028 " 'git remote prune %s' to remove any old, conflicting "
1029 "branches"), remote_name
);
1031 if (advice_fetch_show_forced_updates
) {
1032 if (!fetch_show_forced_updates
) {
1033 warning(_(warn_show_forced_updates
));
1034 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1035 warning(_(warn_time_show_forced_updates
),
1036 forced_updates_ms
/ 1000.0);
1041 strbuf_release(¬e
);
1048 * We would want to bypass the object transfer altogether if
1049 * everything we are going to fetch already exists and is connected
1052 static int check_exist_and_connected(struct ref
*ref_map
)
1054 struct ref
*rm
= ref_map
;
1055 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1059 * If we are deepening a shallow clone we already have these
1060 * objects reachable. Running rev-list here will return with
1061 * a good (0) exit status and we'll bypass the fetch that we
1062 * really need to perform. Claiming failure now will ensure
1063 * we perform the network exchange to deepen our history.
1069 * check_connected() allows objects to merely be promised, but
1070 * we need all direct targets to exist.
1072 for (r
= rm
; r
; r
= r
->next
) {
1073 if (!has_object_file(&r
->old_oid
))
1078 return check_connected(iterate_ref_map
, &rm
, &opt
);
1081 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
1083 int ret
= check_exist_and_connected(ref_map
);
1085 ret
= transport_fetch_refs(transport
, ref_map
);
1088 * Keep the new pack's ".keep" file around to allow the caller
1089 * time to update refs to reference the new objects.
1092 transport_unlock_pack(transport
);
1096 /* Update local refs based on the ref values fetched from a remote */
1097 static int consume_refs(struct transport
*transport
, struct ref
*ref_map
)
1099 int connectivity_checked
= transport
->smart_options
1100 ? transport
->smart_options
->connectivity_checked
: 0;
1101 int ret
= store_updated_refs(transport
->url
,
1102 transport
->remote
->name
,
1103 connectivity_checked
,
1105 transport_unlock_pack(transport
);
1109 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
1110 const char *raw_url
)
1112 int url_len
, i
, result
= 0;
1113 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1115 int summary_width
= transport_summary_width(stale_refs
);
1116 const char *dangling_msg
= dry_run
1117 ? _(" (%s will become dangling)")
1118 : _(" (%s has become dangling)");
1121 url
= transport_anonymize_url(raw_url
);
1123 url
= xstrdup("foreign");
1125 url_len
= strlen(url
);
1126 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1130 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1134 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1136 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1137 string_list_append(&refnames
, ref
->name
);
1139 result
= delete_refs("fetch: prune", &refnames
, 0);
1140 string_list_clear(&refnames
, 0);
1143 if (verbosity
>= 0) {
1144 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1145 struct strbuf sb
= STRBUF_INIT
;
1147 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1150 format_display(&sb
, '-', _("[deleted]"), NULL
,
1151 _("(none)"), prettify_refname(ref
->name
),
1153 fprintf(stderr
, " %s\n",sb
.buf
);
1154 strbuf_release(&sb
);
1155 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1160 free_refs(stale_refs
);
1164 static void check_not_current_branch(struct ref
*ref_map
)
1166 struct branch
*current_branch
= branch_get(NULL
);
1168 if (is_bare_repository() || !current_branch
)
1171 for (; ref_map
; ref_map
= ref_map
->next
)
1172 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1173 ref_map
->peer_ref
->name
))
1174 die(_("Refusing to fetch into current branch %s "
1175 "of non-bare repository"), current_branch
->refname
);
1178 static int truncate_fetch_head(void)
1180 const char *filename
= git_path_fetch_head(the_repository
);
1181 FILE *fp
= fopen_for_writing(filename
);
1184 return error_errno(_("cannot open %s"), filename
);
1189 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1191 int r
= transport_set_option(transport
, name
, value
);
1193 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1194 name
, value
, transport
->url
);
1196 warning(_("Option \"%s\" is ignored for %s\n"),
1197 name
, transport
->url
);
1201 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1204 struct oid_array
*oids
= cb_data
;
1206 oid_array_append(oids
, oid
);
1210 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1212 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1215 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1216 const char *s
= negotiation_tip
.items
[i
].string
;
1218 if (!has_glob_specials(s
)) {
1219 struct object_id oid
;
1220 if (get_oid(s
, &oid
))
1221 die("%s is not a valid object", s
);
1222 oid_array_append(oids
, &oid
);
1226 for_each_glob_ref(add_oid
, s
, oids
);
1227 if (old_nr
== oids
->nr
)
1228 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1231 smart_options
->negotiation_tips
= oids
;
1234 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1236 struct transport
*transport
;
1238 transport
= transport_get(remote
, NULL
);
1239 transport_set_verbosity(transport
, verbosity
, progress
);
1240 transport
->family
= family
;
1242 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1244 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1246 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1247 if (deepen
&& deepen_since
)
1248 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1249 if (deepen
&& deepen_not
.nr
)
1250 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1251 (const char *)&deepen_not
);
1252 if (deepen_relative
)
1253 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1255 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1256 if (filter_options
.choice
) {
1258 expand_list_objects_filter_spec(&filter_options
);
1259 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1260 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1262 if (negotiation_tip
.nr
) {
1263 if (transport
->smart_options
)
1264 add_negotiation_tips(transport
->smart_options
);
1266 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1271 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1276 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1277 * when remote helper is used (setting it to an empty string
1278 * is not unsetting). We could extend the remote helper
1279 * protocol for that, but for now, just force a new connection
1280 * without deepen-since. Similar story for deepen-not.
1282 cannot_reuse
= transport
->cannot_reuse
||
1283 deepen_since
|| deepen_not
.nr
;
1285 gsecondary
= prepare_transport(transport
->remote
, 0);
1286 transport
= gsecondary
;
1289 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1290 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1291 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1292 if (!fetch_refs(transport
, ref_map
))
1293 consume_refs(transport
, ref_map
);
1296 transport_disconnect(gsecondary
);
1301 static int do_fetch(struct transport
*transport
,
1304 struct ref
*ref_map
;
1305 int autotags
= (transport
->remote
->fetch_tags
== 1);
1307 const struct ref
*remote_refs
;
1308 struct argv_array ref_prefixes
= ARGV_ARRAY_INIT
;
1309 int must_list_refs
= 1;
1311 if (tags
== TAGS_DEFAULT
) {
1312 if (transport
->remote
->fetch_tags
== 2)
1314 if (transport
->remote
->fetch_tags
== -1)
1318 /* if not appending, truncate FETCH_HEAD */
1319 if (!append
&& !dry_run
) {
1320 retcode
= truncate_fetch_head();
1328 refspec_ref_prefixes(rs
, &ref_prefixes
);
1331 * We can avoid listing refs if all of them are exact
1335 for (i
= 0; i
< rs
->nr
; i
++) {
1336 if (!rs
->items
[i
].exact_sha1
) {
1341 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1342 refspec_ref_prefixes(&transport
->remote
->fetch
, &ref_prefixes
);
1344 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1346 if (ref_prefixes
.argc
)
1347 argv_array_push(&ref_prefixes
, "refs/tags/");
1351 remote_refs
= transport_get_remote_refs(transport
, &ref_prefixes
);
1355 argv_array_clear(&ref_prefixes
);
1357 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1359 if (!update_head_ok
)
1360 check_not_current_branch(ref_map
);
1362 if (tags
== TAGS_DEFAULT
&& autotags
)
1363 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1366 * We only prune based on refspecs specified
1367 * explicitly (via command line or configuration); we
1368 * don't care whether --tags was specified.
1371 prune_refs(rs
, ref_map
, transport
->url
);
1373 prune_refs(&transport
->remote
->fetch
,
1378 if (fetch_refs(transport
, ref_map
) || consume_refs(transport
, ref_map
)) {
1385 struct branch
*branch
= branch_get("HEAD");
1387 struct ref
*source_ref
= NULL
;
1390 * We're setting the upstream configuration for the
1391 * current branch. The relevent upstream is the
1392 * fetched branch that is meant to be merged with the
1393 * current one, i.e. the one fetched to FETCH_HEAD.
1395 * When there are several such branches, consider the
1396 * request ambiguous and err on the safe side by doing
1397 * nothing and just emit a warning.
1399 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1400 if (!rm
->peer_ref
) {
1402 warning(_("multiple branch detected, incompatible with --set-upstream"));
1410 if (!strcmp(source_ref
->name
, "HEAD") ||
1411 starts_with(source_ref
->name
, "refs/heads/"))
1412 install_branch_config(0,
1414 transport
->remote
->name
,
1416 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1417 warning(_("not setting upstream for a remote remote-tracking branch"));
1418 else if (starts_with(source_ref
->name
, "refs/tags/"))
1419 warning(_("not setting upstream for a remote tag"));
1421 warning(_("unknown branch type"));
1423 warning(_("no source branch found.\n"
1424 "you need to specify exactly one branch with the --set-upstream option."));
1430 /* if neither --no-tags nor --tags was specified, do automated tag
1432 if (tags
== TAGS_DEFAULT
&& autotags
) {
1433 struct ref
**tail
= &ref_map
;
1435 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
1437 backfill_tags(transport
, ref_map
);
1445 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1447 struct string_list
*list
= priv
;
1448 if (!remote
->skip_default_update
)
1449 string_list_append(list
, remote
->name
);
1453 struct remote_group_data
{
1455 struct string_list
*list
;
1458 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1460 struct remote_group_data
*g
= priv
;
1462 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1463 /* split list by white space */
1465 size_t wordlen
= strcspn(value
, " \t\n");
1468 string_list_append_nodup(g
->list
,
1469 xstrndup(value
, wordlen
));
1470 value
+= wordlen
+ (value
[wordlen
] != '\0');
1477 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1479 int prev_nr
= list
->nr
;
1480 struct remote_group_data g
;
1481 g
.name
= name
; g
.list
= list
;
1483 git_config(get_remote_group
, &g
);
1484 if (list
->nr
== prev_nr
) {
1485 struct remote
*remote
= remote_get(name
);
1486 if (!remote_is_configured(remote
, 0))
1488 string_list_append(list
, remote
->name
);
1493 static void add_options_to_argv(struct argv_array
*argv
)
1496 argv_array_push(argv
, "--dry-run");
1498 argv_array_push(argv
, prune
? "--prune" : "--no-prune");
1499 if (prune_tags
!= -1)
1500 argv_array_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1502 argv_array_push(argv
, "--update-head-ok");
1504 argv_array_push(argv
, "--force");
1506 argv_array_push(argv
, "--keep");
1507 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1508 argv_array_push(argv
, "--recurse-submodules");
1509 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1510 argv_array_push(argv
, "--recurse-submodules=on-demand");
1511 if (tags
== TAGS_SET
)
1512 argv_array_push(argv
, "--tags");
1513 else if (tags
== TAGS_UNSET
)
1514 argv_array_push(argv
, "--no-tags");
1516 argv_array_push(argv
, "-v");
1518 argv_array_push(argv
, "-v");
1519 else if (verbosity
< 0)
1520 argv_array_push(argv
, "-q");
1524 /* Fetch multiple remotes in parallel */
1526 struct parallel_fetch_state
{
1528 struct string_list
*remotes
;
1532 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1533 void *cb
, void **task_cb
)
1535 struct parallel_fetch_state
*state
= cb
;
1538 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1541 remote
= state
->remotes
->items
[state
->next
++].string
;
1544 argv_array_pushv(&cp
->args
, state
->argv
);
1545 argv_array_push(&cp
->args
, remote
);
1549 printf(_("Fetching %s\n"), remote
);
1554 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1556 struct parallel_fetch_state
*state
= cb
;
1557 const char *remote
= task_cb
;
1559 state
->result
= error(_("Could not fetch %s"), remote
);
1564 static int fetch_finished(int result
, struct strbuf
*out
,
1565 void *cb
, void *task_cb
)
1567 struct parallel_fetch_state
*state
= cb
;
1568 const char *remote
= task_cb
;
1571 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1579 static int fetch_multiple(struct string_list
*list
, int max_children
)
1582 struct argv_array argv
= ARGV_ARRAY_INIT
;
1584 if (!append
&& !dry_run
) {
1585 int errcode
= truncate_fetch_head();
1590 argv_array_pushl(&argv
, "fetch", "--append", "--no-auto-gc", NULL
);
1591 add_options_to_argv(&argv
);
1593 if (max_children
!= 1 && list
->nr
!= 1) {
1594 struct parallel_fetch_state state
= { argv
.argv
, list
, 0, 0 };
1596 argv_array_push(&argv
, "--end-of-options");
1597 result
= run_processes_parallel_tr2(max_children
,
1599 &fetch_failed_to_start
,
1602 "fetch", "parallel/fetch");
1605 result
= state
.result
;
1607 for (i
= 0; i
< list
->nr
; i
++) {
1608 const char *name
= list
->items
[i
].string
;
1609 argv_array_push(&argv
, name
);
1611 printf(_("Fetching %s\n"), name
);
1612 if (run_command_v_opt(argv
.argv
, RUN_GIT_CMD
)) {
1613 error(_("Could not fetch %s"), name
);
1616 argv_array_pop(&argv
);
1619 argv_array_clear(&argv
);
1624 * Fetching from the promisor remote should use the given filter-spec
1625 * or inherit the default filter-spec from the config.
1627 static inline void fetch_one_setup_partial(struct remote
*remote
)
1630 * Explicit --no-filter argument overrides everything, regardless
1631 * of any prior partial clones and fetches.
1633 if (filter_options
.no_filter
)
1637 * If no prior partial clone/fetch and the current fetch DID NOT
1638 * request a partial-fetch, do a normal fetch.
1640 if (!has_promisor_remote() && !filter_options
.choice
)
1644 * If this is a partial-fetch request, we enable partial on
1645 * this repo if not already enabled and remember the given
1646 * filter-spec as the default for subsequent fetches to this
1649 if (filter_options
.choice
) {
1650 partial_clone_register(remote
->name
, &filter_options
);
1655 * Do a partial-fetch from the promisor remote using either the
1656 * explicitly given filter-spec or inherit the filter-spec from
1659 if (!filter_options
.choice
)
1660 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
1664 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
, int prune_tags_ok
)
1666 struct refspec rs
= REFSPEC_INIT_FETCH
;
1669 int maybe_prune_tags
;
1670 int remote_via_config
= remote_is_configured(remote
, 0);
1673 die(_("No remote repository specified. Please, specify either a URL or a\n"
1674 "remote name from which new revisions should be fetched."));
1676 gtransport
= prepare_transport(remote
, 1);
1679 /* no command line request */
1680 if (0 <= remote
->prune
)
1681 prune
= remote
->prune
;
1682 else if (0 <= fetch_prune_config
)
1683 prune
= fetch_prune_config
;
1685 prune
= PRUNE_BY_DEFAULT
;
1688 if (prune_tags
< 0) {
1689 /* no command line request */
1690 if (0 <= remote
->prune_tags
)
1691 prune_tags
= remote
->prune_tags
;
1692 else if (0 <= fetch_prune_tags_config
)
1693 prune_tags
= fetch_prune_tags_config
;
1695 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1698 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1699 if (maybe_prune_tags
&& remote_via_config
)
1700 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1702 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1703 refspec_append(&rs
, TAG_REFSPEC
);
1705 for (i
= 0; i
< argc
; i
++) {
1706 if (!strcmp(argv
[i
], "tag")) {
1710 die(_("You need to specify a tag name."));
1712 tag
= xstrfmt("refs/tags/%s:refs/tags/%s",
1714 refspec_append(&rs
, tag
);
1717 refspec_append(&rs
, argv
[i
]);
1721 if (server_options
.nr
)
1722 gtransport
->server_options
= &server_options
;
1724 sigchain_push_common(unlock_pack_on_signal
);
1725 atexit(unlock_pack
);
1726 sigchain_push(SIGPIPE
, SIG_IGN
);
1727 exit_code
= do_fetch(gtransport
, &rs
);
1728 sigchain_pop(SIGPIPE
);
1730 transport_disconnect(gtransport
);
1735 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1738 struct string_list list
= STRING_LIST_INIT_DUP
;
1739 struct remote
*remote
= NULL
;
1741 int prune_tags_ok
= 1;
1742 struct argv_array argv_gc_auto
= ARGV_ARRAY_INIT
;
1744 packet_trace_identity("fetch");
1746 fetch_if_missing
= 0;
1748 /* Record the command line for the reflog */
1749 strbuf_addstr(&default_rla
, "fetch");
1750 for (i
= 1; i
< argc
; i
++)
1751 strbuf_addf(&default_rla
, " %s", argv
[i
]);
1753 fetch_config_from_gitmodules(&submodule_fetch_jobs_config
,
1754 &recurse_submodules
);
1755 git_config(git_fetch_config
, NULL
);
1757 argc
= parse_options(argc
, argv
, prefix
,
1758 builtin_fetch_options
, builtin_fetch_usage
, 0);
1760 if (deepen_relative
) {
1761 if (deepen_relative
< 0)
1762 die(_("Negative depth in --deepen is not supported"));
1764 die(_("--deepen and --depth are mutually exclusive"));
1765 depth
= xstrfmt("%d", deepen_relative
);
1769 die(_("--depth and --unshallow cannot be used together"));
1770 else if (!is_repository_shallow(the_repository
))
1771 die(_("--unshallow on a complete repository does not make sense"));
1773 depth
= xstrfmt("%d", INFINITE_DEPTH
);
1776 /* no need to be strict, transport_set_option() will validate it again */
1777 if (depth
&& atoi(depth
) < 1)
1778 die(_("depth %s is not a positive number"), depth
);
1779 if (depth
|| deepen_since
|| deepen_not
.nr
)
1782 if (filter_options
.choice
&& !has_promisor_remote())
1783 die("--filter can only be used when extensions.partialClone is set");
1787 die(_("fetch --all does not take a repository argument"));
1789 die(_("fetch --all does not make sense with refspecs"));
1790 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
1791 } else if (argc
== 0) {
1792 /* No arguments -- use default remote */
1793 remote
= remote_get(NULL
);
1794 } else if (multiple
) {
1795 /* All arguments are assumed to be remotes or groups */
1796 for (i
= 0; i
< argc
; i
++)
1797 if (!add_remote_or_group(argv
[i
], &list
))
1798 die(_("No such remote or remote group: %s"), argv
[i
]);
1800 /* Single remote or group */
1801 (void) add_remote_or_group(argv
[0], &list
);
1803 /* More than one remote */
1805 die(_("Fetching a group and specifying refspecs does not make sense"));
1807 /* Zero or one remotes */
1808 remote
= remote_get(argv
[0]);
1809 prune_tags_ok
= (argc
== 1);
1816 if (filter_options
.choice
|| has_promisor_remote())
1817 fetch_one_setup_partial(remote
);
1818 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
);
1820 int max_children
= max_jobs
;
1822 if (filter_options
.choice
)
1823 die(_("--filter can only be used with the remote "
1824 "configured in extensions.partialclone"));
1826 if (max_children
< 0)
1827 max_children
= fetch_parallel_config
;
1829 /* TODO should this also die if we have a previous partial-clone? */
1830 result
= fetch_multiple(&list
, max_children
);
1833 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
1834 struct argv_array options
= ARGV_ARRAY_INIT
;
1835 int max_children
= max_jobs
;
1837 if (max_children
< 0)
1838 max_children
= submodule_fetch_jobs_config
;
1839 if (max_children
< 0)
1840 max_children
= fetch_parallel_config
;
1842 add_options_to_argv(&options
);
1843 result
= fetch_populated_submodules(the_repository
,
1847 recurse_submodules_default
,
1850 argv_array_clear(&options
);
1853 string_list_clear(&list
, 0);
1855 prepare_repo_settings(the_repository
);
1856 if (the_repository
->settings
.fetch_write_commit_graph
) {
1857 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
1858 struct split_commit_graph_opts split_opts
;
1859 memset(&split_opts
, 0, sizeof(struct split_commit_graph_opts
));
1862 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
1864 write_commit_graph_reachable(get_object_directory(),
1869 close_object_store(the_repository
->objects
);
1871 if (enable_auto_gc
) {
1872 argv_array_pushl(&argv_gc_auto
, "gc", "--auto", NULL
);
1874 argv_array_push(&argv_gc_auto
, "--quiet");
1875 run_command_v_opt(argv_gc_auto
.argv
, RUN_GIT_CMD
);
1876 argv_array_clear(&argv_gc_auto
);