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"
25 #include "list-objects-filter-options.h"
26 #include "commit-reach.h"
28 #include "promisor-remote.h"
29 #include "commit-graph.h"
32 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
34 static const char * const builtin_fetch_usage
[] = {
35 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
36 N_("git fetch [<options>] <group>"),
37 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
38 N_("git fetch --all [<options>]"),
48 static int fetch_prune_config
= -1; /* unspecified */
49 static int fetch_show_forced_updates
= 1;
50 static uint64_t forced_updates_ms
= 0;
51 static int prune
= -1; /* unspecified */
52 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
54 static int fetch_prune_tags_config
= -1; /* unspecified */
55 static int prune_tags
= -1; /* unspecified */
56 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
58 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
;
59 static int write_fetch_head
= 1;
60 static int verbosity
, deepen_relative
, set_upstream
;
61 static int progress
= -1;
62 static int enable_auto_gc
= 1;
63 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
, deepen
;
64 static int max_jobs
= -1, submodule_fetch_jobs_config
= -1;
65 static int fetch_parallel_config
= 1;
66 static enum transport_family family
;
67 static const char *depth
;
68 static const char *deepen_since
;
69 static const char *upload_pack
;
70 static struct string_list deepen_not
= STRING_LIST_INIT_NODUP
;
71 static struct strbuf default_rla
= STRBUF_INIT
;
72 static struct transport
*gtransport
;
73 static struct transport
*gsecondary
;
74 static const char *submodule_prefix
= "";
75 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
76 static int recurse_submodules_default
= RECURSE_SUBMODULES_ON_DEMAND
;
77 static int shown_url
= 0;
78 static struct refspec refmap
= REFSPEC_INIT_FETCH
;
79 static struct list_objects_filter_options filter_options
;
80 static struct string_list server_options
= STRING_LIST_INIT_DUP
;
81 static struct string_list negotiation_tip
= STRING_LIST_INIT_NODUP
;
82 static int fetch_write_commit_graph
= -1;
83 static int stdin_refspecs
= 0;
85 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
87 if (!strcmp(k
, "fetch.prune")) {
88 fetch_prune_config
= git_config_bool(k
, v
);
92 if (!strcmp(k
, "fetch.prunetags")) {
93 fetch_prune_tags_config
= git_config_bool(k
, v
);
97 if (!strcmp(k
, "fetch.showforcedupdates")) {
98 fetch_show_forced_updates
= git_config_bool(k
, v
);
102 if (!strcmp(k
, "submodule.recurse")) {
103 int r
= git_config_bool(k
, v
) ?
104 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
105 recurse_submodules
= r
;
108 if (!strcmp(k
, "submodule.fetchjobs")) {
109 submodule_fetch_jobs_config
= parse_submodule_fetchjobs(k
, v
);
111 } else if (!strcmp(k
, "fetch.recursesubmodules")) {
112 recurse_submodules
= parse_fetch_recurse_submodules_arg(k
, v
);
116 if (!strcmp(k
, "fetch.parallel")) {
117 fetch_parallel_config
= git_config_int(k
, v
);
118 if (fetch_parallel_config
< 0)
119 die(_("fetch.parallel cannot be negative"));
123 return git_default_config(k
, v
, cb
);
126 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
128 BUG_ON_OPT_NEG(unset
);
131 * "git fetch --refmap='' origin foo"
132 * can be used to tell the command not to store anywhere
134 refspec_append(&refmap
, arg
);
139 static struct option builtin_fetch_options
[] = {
140 OPT__VERBOSITY(&verbosity
),
141 OPT_BOOL(0, "all", &all
,
142 N_("fetch from all remotes")),
143 OPT_BOOL(0, "set-upstream", &set_upstream
,
144 N_("set upstream for git pull/fetch")),
145 OPT_BOOL('a', "append", &append
,
146 N_("append to .git/FETCH_HEAD instead of overwriting")),
147 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
148 N_("path to upload pack on remote end")),
149 OPT__FORCE(&force
, N_("force overwrite of local reference"), 0),
150 OPT_BOOL('m', "multiple", &multiple
,
151 N_("fetch from multiple remotes")),
152 OPT_SET_INT('t', "tags", &tags
,
153 N_("fetch all tags and associated objects"), TAGS_SET
),
154 OPT_SET_INT('n', NULL
, &tags
,
155 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
156 OPT_INTEGER('j', "jobs", &max_jobs
,
157 N_("number of submodules fetched in parallel")),
158 OPT_BOOL('p', "prune", &prune
,
159 N_("prune remote-tracking branches no longer on remote")),
160 OPT_BOOL('P', "prune-tags", &prune_tags
,
161 N_("prune local tags no longer on remote and clobber changed tags")),
162 OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules
, N_("on-demand"),
163 N_("control recursive fetching of submodules"),
164 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
),
165 OPT_BOOL(0, "dry-run", &dry_run
,
167 OPT_BOOL(0, "write-fetch-head", &write_fetch_head
,
168 N_("write fetched references to the FETCH_HEAD file")),
169 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
170 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
171 N_("allow updating of HEAD ref")),
172 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
173 OPT_STRING(0, "depth", &depth
, N_("depth"),
174 N_("deepen history of shallow clone")),
175 OPT_STRING(0, "shallow-since", &deepen_since
, N_("time"),
176 N_("deepen history of shallow repository based on time")),
177 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not
, N_("revision"),
178 N_("deepen history of shallow clone, excluding rev")),
179 OPT_INTEGER(0, "deepen", &deepen_relative
,
180 N_("deepen history of shallow clone")),
181 OPT_SET_INT_F(0, "unshallow", &unshallow
,
182 N_("convert to a complete repository"),
184 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
185 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
186 OPT_CALLBACK_F(0, "recurse-submodules-default",
187 &recurse_submodules_default
, N_("on-demand"),
188 N_("default for recursive fetching of submodules "
189 "(lower priority than config files)"),
190 PARSE_OPT_HIDDEN
, option_fetch_parse_recurse_submodules
),
191 OPT_BOOL(0, "update-shallow", &update_shallow
,
192 N_("accept refs that update .git/shallow")),
193 OPT_CALLBACK_F(0, "refmap", NULL
, N_("refmap"),
194 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
),
195 OPT_STRING_LIST('o', "server-option", &server_options
, N_("server-specific"), N_("option to transmit")),
196 OPT_SET_INT('4', "ipv4", &family
, N_("use IPv4 addresses only"),
197 TRANSPORT_FAMILY_IPV4
),
198 OPT_SET_INT('6', "ipv6", &family
, N_("use IPv6 addresses only"),
199 TRANSPORT_FAMILY_IPV6
),
200 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip
, N_("revision"),
201 N_("report that we have only objects reachable from this object")),
202 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options
),
203 OPT_BOOL(0, "auto-maintenance", &enable_auto_gc
,
204 N_("run 'maintenance --auto' after fetching")),
205 OPT_BOOL(0, "auto-gc", &enable_auto_gc
,
206 N_("run 'maintenance --auto' after fetching")),
207 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates
,
208 N_("check for forced-updates on all updated branches")),
209 OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph
,
210 N_("write the commit-graph after fetching")),
211 OPT_BOOL(0, "stdin", &stdin_refspecs
,
212 N_("accept refspecs from stdin")),
216 static void unlock_pack(void)
219 transport_unlock_pack(gtransport
);
221 transport_unlock_pack(gsecondary
);
224 static void unlock_pack_on_signal(int signo
)
231 static void add_merge_config(struct ref
**head
,
232 const struct ref
*remote_refs
,
233 struct branch
*branch
,
238 for (i
= 0; i
< branch
->merge_nr
; i
++) {
239 struct ref
*rm
, **old_tail
= *tail
;
240 struct refspec_item refspec
;
242 for (rm
= *head
; rm
; rm
= rm
->next
) {
243 if (branch_merge_matches(branch
, i
, rm
->name
)) {
244 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
252 * Not fetched to a remote-tracking branch? We need to fetch
253 * it anyway to allow this branch's "branch.$name.merge"
254 * to be honored by 'git pull', but we do not have to
255 * fail if branch.$name.merge is misconfigured to point
256 * at a nonexisting branch. If we were indeed called by
257 * 'git pull', it will notice the misconfiguration because
258 * there is no entry in the resulting FETCH_HEAD marked
261 memset(&refspec
, 0, sizeof(refspec
));
262 refspec
.src
= branch
->merge
[i
]->src
;
263 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
264 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
265 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
269 static void create_fetch_oidset(struct ref
**head
, struct oidset
*out
)
271 struct ref
*rm
= *head
;
273 oidset_insert(out
, &rm
->old_oid
);
278 struct refname_hash_entry
{
279 struct hashmap_entry ent
;
280 struct object_id oid
;
282 char refname
[FLEX_ARRAY
];
285 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data
,
286 const struct hashmap_entry
*eptr
,
287 const struct hashmap_entry
*entry_or_key
,
290 const struct refname_hash_entry
*e1
, *e2
;
292 e1
= container_of(eptr
, const struct refname_hash_entry
, ent
);
293 e2
= container_of(entry_or_key
, const struct refname_hash_entry
, ent
);
294 return strcmp(e1
->refname
, keydata
? keydata
: e2
->refname
);
297 static struct refname_hash_entry
*refname_hash_add(struct hashmap
*map
,
299 const struct object_id
*oid
)
301 struct refname_hash_entry
*ent
;
302 size_t len
= strlen(refname
);
304 FLEX_ALLOC_MEM(ent
, refname
, refname
, len
);
305 hashmap_entry_init(&ent
->ent
, strhash(refname
));
306 oidcpy(&ent
->oid
, oid
);
307 hashmap_add(map
, &ent
->ent
);
311 static int add_one_refname(const char *refname
,
312 const struct object_id
*oid
,
313 int flag
, void *cbdata
)
315 struct hashmap
*refname_map
= cbdata
;
317 (void) refname_hash_add(refname_map
, refname
, oid
);
321 static void refname_hash_init(struct hashmap
*map
)
323 hashmap_init(map
, refname_hash_entry_cmp
, NULL
, 0);
326 static int refname_hash_exists(struct hashmap
*map
, const char *refname
)
328 return !!hashmap_get_from_hash(map
, strhash(refname
), refname
);
331 static void clear_item(struct refname_hash_entry
*item
)
336 static void find_non_local_tags(const struct ref
*refs
,
340 struct hashmap existing_refs
;
341 struct hashmap remote_refs
;
342 struct oidset fetch_oids
= OIDSET_INIT
;
343 struct string_list remote_refs_list
= STRING_LIST_INIT_NODUP
;
344 struct string_list_item
*remote_ref_item
;
345 const struct ref
*ref
;
346 struct refname_hash_entry
*item
= NULL
;
347 const int quick_flags
= OBJECT_INFO_QUICK
| OBJECT_INFO_SKIP_FETCH_OBJECT
;
349 refname_hash_init(&existing_refs
);
350 refname_hash_init(&remote_refs
);
351 create_fetch_oidset(head
, &fetch_oids
);
353 for_each_ref(add_one_refname
, &existing_refs
);
354 for (ref
= refs
; ref
; ref
= ref
->next
) {
355 if (!starts_with(ref
->name
, "refs/tags/"))
359 * The peeled ref always follows the matching base
360 * ref, so if we see a peeled ref that we don't want
361 * to fetch then we can mark the ref entry in the list
362 * as one to ignore by setting util to NULL.
364 if (ends_with(ref
->name
, "^{}")) {
366 !has_object_file_with_flags(&ref
->old_oid
, quick_flags
) &&
367 !oidset_contains(&fetch_oids
, &ref
->old_oid
) &&
368 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
369 !oidset_contains(&fetch_oids
, &item
->oid
))
376 * If item is non-NULL here, then we previously saw a
377 * ref not followed by a peeled reference, so we need
378 * to check if it is a lightweight tag that we want to
382 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
383 !oidset_contains(&fetch_oids
, &item
->oid
))
388 /* skip duplicates and refs that we already have */
389 if (refname_hash_exists(&remote_refs
, ref
->name
) ||
390 refname_hash_exists(&existing_refs
, ref
->name
))
393 item
= refname_hash_add(&remote_refs
, ref
->name
, &ref
->old_oid
);
394 string_list_insert(&remote_refs_list
, ref
->name
);
396 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
399 * We may have a final lightweight tag that needs to be
400 * checked to see if it needs fetching.
403 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
404 !oidset_contains(&fetch_oids
, &item
->oid
))
408 * For all the tags in the remote_refs_list,
409 * add them to the list of refs to be fetched
411 for_each_string_list_item(remote_ref_item
, &remote_refs_list
) {
412 const char *refname
= remote_ref_item
->string
;
414 unsigned int hash
= strhash(refname
);
416 item
= hashmap_get_entry_from_hash(&remote_refs
, hash
, refname
,
417 struct refname_hash_entry
, ent
);
419 BUG("unseen remote ref?");
421 /* Unless we have already decided to ignore this item... */
425 rm
= alloc_ref(item
->refname
);
426 rm
->peer_ref
= alloc_ref(item
->refname
);
427 oidcpy(&rm
->old_oid
, &item
->oid
);
431 hashmap_clear_and_free(&remote_refs
, struct refname_hash_entry
, ent
);
432 string_list_clear(&remote_refs_list
, 0);
433 oidset_clear(&fetch_oids
);
436 static struct ref
*get_ref_map(struct remote
*remote
,
437 const struct ref
*remote_refs
,
439 int tags
, int *autotags
)
443 struct ref
*ref_map
= NULL
;
444 struct ref
**tail
= &ref_map
;
446 /* opportunistically-updated references: */
447 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
449 struct hashmap existing_refs
;
450 int existing_refs_populated
= 0;
453 struct refspec
*fetch_refspec
;
455 for (i
= 0; i
< rs
->nr
; i
++) {
456 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
457 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
460 /* Merge everything on the command line (but not --tags) */
461 for (rm
= ref_map
; rm
; rm
= rm
->next
)
462 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
465 * For any refs that we happen to be fetching via
466 * command-line arguments, the destination ref might
467 * have been missing or have been different than the
468 * remote-tracking ref that would be derived from the
469 * configured refspec. In these cases, we want to
470 * take the opportunity to update their configured
471 * remote-tracking reference. However, we do not want
472 * to mention these entries in FETCH_HEAD at all, as
473 * they would simply be duplicates of existing
474 * entries, so we set them FETCH_HEAD_IGNORE below.
476 * We compute these entries now, based only on the
477 * refspecs specified on the command line. But we add
478 * them to the list following the refspecs resulting
479 * from the tags option so that one of the latter,
480 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
481 * by ref_remove_duplicates() in favor of one of these
482 * opportunistic entries with FETCH_HEAD_IGNORE.
485 fetch_refspec
= &refmap
;
487 fetch_refspec
= &remote
->fetch
;
489 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
490 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
491 } else if (refmap
.nr
) {
492 die("--refmap option is only meaningful with command-line refspec(s).");
494 /* Use the defaults */
495 struct branch
*branch
= branch_get(NULL
);
496 int has_merge
= branch_has_merge_config(branch
);
499 /* Note: has_merge implies non-NULL branch->remote_name */
500 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
501 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
502 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
503 if (remote
->fetch
.items
[i
].dst
&&
504 remote
->fetch
.items
[i
].dst
[0])
506 if (!i
&& !has_merge
&& ref_map
&&
507 !remote
->fetch
.items
[0].pattern
)
508 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
511 * if the remote we're fetching from is the same
512 * as given in branch.<name>.remote, we add the
513 * ref given in branch.<name>.merge, too.
515 * Note: has_merge implies non-NULL branch->remote_name
518 !strcmp(branch
->remote_name
, remote
->name
))
519 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
521 ref_map
= get_remote_ref(remote_refs
, "HEAD");
523 die(_("Couldn't find remote ref HEAD"));
524 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
525 tail
= &ref_map
->next
;
529 if (tags
== TAGS_SET
)
530 /* also fetch all tags */
531 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
532 else if (tags
== TAGS_DEFAULT
&& *autotags
)
533 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
535 /* Now append any refs to be updated opportunistically: */
537 for (rm
= orefs
; rm
; rm
= rm
->next
) {
538 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
543 * apply negative refspecs first, before we remove duplicates. This is
544 * necessary as negative refspecs might remove an otherwise conflicting
548 ref_map
= apply_negative_refspecs(ref_map
, rs
);
550 ref_map
= apply_negative_refspecs(ref_map
, &remote
->fetch
);
552 ref_map
= ref_remove_duplicates(ref_map
);
554 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
556 const char *refname
= rm
->peer_ref
->name
;
557 struct refname_hash_entry
*peer_item
;
558 unsigned int hash
= strhash(refname
);
560 if (!existing_refs_populated
) {
561 refname_hash_init(&existing_refs
);
562 for_each_ref(add_one_refname
, &existing_refs
);
563 existing_refs_populated
= 1;
566 peer_item
= hashmap_get_entry_from_hash(&existing_refs
,
568 struct refname_hash_entry
, ent
);
570 struct object_id
*old_oid
= &peer_item
->oid
;
571 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
575 if (existing_refs_populated
)
576 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
581 #define STORE_REF_ERROR_OTHER 1
582 #define STORE_REF_ERROR_DF_CONFLICT 2
584 static int s_update_ref(const char *action
,
589 char *rla
= getenv("GIT_REFLOG_ACTION");
590 struct ref_transaction
*transaction
;
591 struct strbuf err
= STRBUF_INIT
;
592 int ret
, df_conflict
= 0;
597 rla
= default_rla
.buf
;
598 msg
= xstrfmt("%s: %s", rla
, action
);
600 transaction
= ref_transaction_begin(&err
);
602 ref_transaction_update(transaction
, ref
->name
,
604 check_old
? &ref
->old_oid
: NULL
,
608 ret
= ref_transaction_commit(transaction
, &err
);
610 df_conflict
= (ret
== TRANSACTION_NAME_CONFLICT
);
614 ref_transaction_free(transaction
);
615 strbuf_release(&err
);
619 ref_transaction_free(transaction
);
620 error("%s", err
.buf
);
621 strbuf_release(&err
);
623 return df_conflict
? STORE_REF_ERROR_DF_CONFLICT
624 : STORE_REF_ERROR_OTHER
;
627 static int refcol_width
= 10;
628 static int compact_format
;
630 static void adjust_refcol_width(const struct ref
*ref
)
632 int max
, rlen
, llen
, len
;
634 /* uptodate lines are only shown on high verbosity level */
635 if (!verbosity
&& oideq(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
638 max
= term_columns();
639 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
641 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
644 * rough estimation to see if the output line is too long and
645 * should not be counted (we can't do precise calculation
646 * anyway because we don't know if the error explanation part
647 * will be printed in update_local_ref)
649 if (compact_format
) {
653 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
658 * Not precise calculation for compact mode because '*' can
659 * appear on the left hand side of '->' and shrink the column
662 if (refcol_width
< rlen
)
666 static void prepare_format_display(struct ref
*ref_map
)
669 const char *format
= "full";
671 git_config_get_string_tmp("fetch.output", &format
);
672 if (!strcasecmp(format
, "full"))
674 else if (!strcasecmp(format
, "compact"))
677 die(_("configuration fetch.output contains invalid value %s"),
680 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
681 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
683 !strcmp(rm
->name
, "HEAD"))
686 adjust_refcol_width(rm
);
690 static void print_remote_to_local(struct strbuf
*display
,
691 const char *remote
, const char *local
)
693 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
696 static int find_and_replace(struct strbuf
*haystack
,
698 const char *placeholder
)
700 const char *p
= NULL
;
703 nlen
= strlen(needle
);
704 if (ends_with(haystack
->buf
, needle
))
705 p
= haystack
->buf
+ haystack
->len
- nlen
;
707 p
= strstr(haystack
->buf
, needle
);
711 if (p
> haystack
->buf
&& p
[-1] != '/')
715 if (plen
> nlen
&& p
[nlen
] != '/')
718 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
719 placeholder
, strlen(placeholder
));
723 static void print_compact(struct strbuf
*display
,
724 const char *remote
, const char *local
)
726 struct strbuf r
= STRBUF_INIT
;
727 struct strbuf l
= STRBUF_INIT
;
729 if (!strcmp(remote
, local
)) {
730 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
734 strbuf_addstr(&r
, remote
);
735 strbuf_addstr(&l
, local
);
737 if (!find_and_replace(&r
, local
, "*"))
738 find_and_replace(&l
, remote
, "*");
739 print_remote_to_local(display
, r
.buf
, l
.buf
);
745 static void format_display(struct strbuf
*display
, char code
,
746 const char *summary
, const char *error
,
747 const char *remote
, const char *local
,
750 int width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
752 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
754 print_remote_to_local(display
, remote
, local
);
756 print_compact(display
, remote
, local
);
758 strbuf_addf(display
, " (%s)", error
);
761 static int update_local_ref(struct ref
*ref
,
763 const struct ref
*remote_ref
,
764 struct strbuf
*display
,
767 struct commit
*current
= NULL
, *updated
;
768 enum object_type type
;
769 struct branch
*current_branch
= branch_get(NULL
);
770 const char *pretty_ref
= prettify_refname(ref
->name
);
771 int fast_forward
= 0;
773 type
= oid_object_info(the_repository
, &ref
->new_oid
, NULL
);
775 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
777 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
779 format_display(display
, '=', _("[up to date]"), NULL
,
780 remote
, pretty_ref
, summary_width
);
784 if (current_branch
&&
785 !strcmp(ref
->name
, current_branch
->name
) &&
786 !(update_head_ok
|| is_bare_repository()) &&
787 !is_null_oid(&ref
->old_oid
)) {
789 * If this is the head, and it's not okay to update
790 * the head, and the old value of the head isn't empty...
792 format_display(display
, '!', _("[rejected]"),
793 _("can't fetch in current branch"),
794 remote
, pretty_ref
, summary_width
);
798 if (!is_null_oid(&ref
->old_oid
) &&
799 starts_with(ref
->name
, "refs/tags/")) {
800 if (force
|| ref
->force
) {
802 r
= s_update_ref("updating tag", ref
, 0);
803 format_display(display
, r
? '!' : 't', _("[tag update]"),
804 r
? _("unable to update local ref") : NULL
,
805 remote
, pretty_ref
, summary_width
);
808 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
809 remote
, pretty_ref
, summary_width
);
814 current
= lookup_commit_reference_gently(the_repository
,
816 updated
= lookup_commit_reference_gently(the_repository
,
818 if (!current
|| !updated
) {
823 * Nicely describe the new ref we're fetching.
824 * Base this on the remote's ref name, as it's
825 * more likely to follow a standard layout.
827 const char *name
= remote_ref
? remote_ref
->name
: "";
828 if (starts_with(name
, "refs/tags/")) {
830 what
= _("[new tag]");
831 } else if (starts_with(name
, "refs/heads/")) {
832 msg
= "storing head";
833 what
= _("[new branch]");
836 what
= _("[new ref]");
839 r
= s_update_ref(msg
, ref
, 0);
840 format_display(display
, r
? '!' : '*', what
,
841 r
? _("unable to update local ref") : NULL
,
842 remote
, pretty_ref
, summary_width
);
846 if (fetch_show_forced_updates
) {
847 uint64_t t_before
= getnanotime();
848 fast_forward
= in_merge_bases(current
, updated
);
849 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
855 struct strbuf quickref
= STRBUF_INIT
;
858 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
859 strbuf_addstr(&quickref
, "..");
860 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
861 r
= s_update_ref("fast-forward", ref
, 1);
862 format_display(display
, r
? '!' : ' ', quickref
.buf
,
863 r
? _("unable to update local ref") : NULL
,
864 remote
, pretty_ref
, summary_width
);
865 strbuf_release(&quickref
);
867 } else if (force
|| ref
->force
) {
868 struct strbuf quickref
= STRBUF_INIT
;
870 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
871 strbuf_addstr(&quickref
, "...");
872 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
873 r
= s_update_ref("forced-update", ref
, 1);
874 format_display(display
, r
? '!' : '+', quickref
.buf
,
875 r
? _("unable to update local ref") : _("forced update"),
876 remote
, pretty_ref
, summary_width
);
877 strbuf_release(&quickref
);
880 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
881 remote
, pretty_ref
, summary_width
);
886 static int iterate_ref_map(void *cb_data
, struct object_id
*oid
)
888 struct ref
**rm
= cb_data
;
889 struct ref
*ref
= *rm
;
891 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
894 return -1; /* end of the list */
896 oidcpy(oid
, &ref
->old_oid
);
900 static const char warn_show_forced_updates
[] =
901 N_("Fetch normally indicates which branches had a forced update,\n"
902 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
903 "flag or run 'git config fetch.showForcedUpdates true'.");
904 static const char warn_time_show_forced_updates
[] =
905 N_("It took %.2f seconds to check forced updates. You can use\n"
906 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
907 " to avoid this check.\n");
909 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
910 int connectivity_checked
, struct ref
*ref_map
)
913 struct commit
*commit
;
914 int url_len
, i
, rc
= 0;
915 struct strbuf note
= STRBUF_INIT
;
916 const char *what
, *kind
;
919 const char *filename
= (!write_fetch_head
921 : git_path_fetch_head(the_repository
));
923 int summary_width
= transport_summary_width(ref_map
);
925 fp
= fopen(filename
, "a");
927 return error_errno(_("cannot open %s"), filename
);
930 url
= transport_anonymize_url(raw_url
);
932 url
= xstrdup("foreign");
934 if (!connectivity_checked
) {
935 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
938 if (check_connected(iterate_ref_map
, &rm
, &opt
)) {
939 rc
= error(_("%s did not send all necessary objects\n"), url
);
944 prepare_format_display(ref_map
);
947 * We do a pass for each fetch_head_status type in their enum order, so
948 * merged entries are written before not-for-merge. That lets readers
949 * use FETCH_HEAD as a refname to refer to the ref to be merged.
951 for (want_status
= FETCH_HEAD_MERGE
;
952 want_status
<= FETCH_HEAD_IGNORE
;
954 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
955 struct ref
*ref
= NULL
;
956 const char *merge_status_marker
= "";
958 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
959 if (want_status
== FETCH_HEAD_MERGE
)
960 warning(_("reject %s because shallow roots are not allowed to be updated"),
961 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
965 commit
= lookup_commit_reference_gently(the_repository
,
969 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
971 if (rm
->fetch_head_status
!= want_status
)
975 ref
= alloc_ref(rm
->peer_ref
->name
);
976 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
977 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
978 ref
->force
= rm
->peer_ref
->force
;
981 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
&&
982 (!rm
->peer_ref
|| !oideq(&ref
->old_oid
, &ref
->new_oid
))) {
983 check_for_new_submodule_commits(&rm
->old_oid
);
986 if (!strcmp(rm
->name
, "HEAD")) {
990 else if (skip_prefix(rm
->name
, "refs/heads/", &what
))
992 else if (skip_prefix(rm
->name
, "refs/tags/", &what
))
994 else if (skip_prefix(rm
->name
, "refs/remotes/", &what
))
995 kind
= "remote-tracking branch";
1001 url_len
= strlen(url
);
1002 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1005 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1008 strbuf_reset(¬e
);
1011 strbuf_addf(¬e
, "%s ", kind
);
1012 strbuf_addf(¬e
, "'%s' of ", what
);
1014 switch (rm
->fetch_head_status
) {
1015 case FETCH_HEAD_NOT_FOR_MERGE
:
1016 merge_status_marker
= "not-for-merge";
1018 case FETCH_HEAD_MERGE
:
1019 fprintf(fp
, "%s\t%s\t%s",
1020 oid_to_hex(&rm
->old_oid
),
1021 merge_status_marker
,
1023 for (i
= 0; i
< url_len
; ++i
)
1031 /* do not write anything to FETCH_HEAD */
1035 strbuf_reset(¬e
);
1037 rc
|= update_local_ref(ref
, what
, rm
, ¬e
,
1040 } else if (write_fetch_head
|| dry_run
) {
1042 * Display fetches written to FETCH_HEAD (or
1043 * would be written to FETCH_HEAD, if --dry-run
1046 format_display(¬e
, '*',
1047 *kind
? kind
: "branch", NULL
,
1048 *what
? what
: "HEAD",
1049 "FETCH_HEAD", summary_width
);
1052 if (verbosity
>= 0 && !shown_url
) {
1053 fprintf(stderr
, _("From %.*s\n"),
1058 fprintf(stderr
, " %s\n", note
.buf
);
1063 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1064 error(_("some local refs could not be updated; try running\n"
1065 " 'git remote prune %s' to remove any old, conflicting "
1066 "branches"), remote_name
);
1068 if (advice_fetch_show_forced_updates
) {
1069 if (!fetch_show_forced_updates
) {
1070 warning(_(warn_show_forced_updates
));
1071 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1072 warning(_(warn_time_show_forced_updates
),
1073 forced_updates_ms
/ 1000.0);
1078 strbuf_release(¬e
);
1085 * We would want to bypass the object transfer altogether if
1086 * everything we are going to fetch already exists and is connected
1089 static int check_exist_and_connected(struct ref
*ref_map
)
1091 struct ref
*rm
= ref_map
;
1092 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1096 * If we are deepening a shallow clone we already have these
1097 * objects reachable. Running rev-list here will return with
1098 * a good (0) exit status and we'll bypass the fetch that we
1099 * really need to perform. Claiming failure now will ensure
1100 * we perform the network exchange to deepen our history.
1106 * check_connected() allows objects to merely be promised, but
1107 * we need all direct targets to exist.
1109 for (r
= rm
; r
; r
= r
->next
) {
1110 if (!has_object_file_with_flags(&r
->old_oid
,
1111 OBJECT_INFO_SKIP_FETCH_OBJECT
))
1116 return check_connected(iterate_ref_map
, &rm
, &opt
);
1119 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
1121 int ret
= check_exist_and_connected(ref_map
);
1123 trace2_region_enter("fetch", "fetch_refs", the_repository
);
1124 ret
= transport_fetch_refs(transport
, ref_map
);
1125 trace2_region_leave("fetch", "fetch_refs", the_repository
);
1129 * Keep the new pack's ".keep" file around to allow the caller
1130 * time to update refs to reference the new objects.
1133 transport_unlock_pack(transport
);
1137 /* Update local refs based on the ref values fetched from a remote */
1138 static int consume_refs(struct transport
*transport
, struct ref
*ref_map
)
1140 int connectivity_checked
= transport
->smart_options
1141 ? transport
->smart_options
->connectivity_checked
: 0;
1143 trace2_region_enter("fetch", "consume_refs", the_repository
);
1144 ret
= store_updated_refs(transport
->url
,
1145 transport
->remote
->name
,
1146 connectivity_checked
,
1148 transport_unlock_pack(transport
);
1149 trace2_region_leave("fetch", "consume_refs", the_repository
);
1153 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
1154 const char *raw_url
)
1156 int url_len
, i
, result
= 0;
1157 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1159 int summary_width
= transport_summary_width(stale_refs
);
1160 const char *dangling_msg
= dry_run
1161 ? _(" (%s will become dangling)")
1162 : _(" (%s has become dangling)");
1165 url
= transport_anonymize_url(raw_url
);
1167 url
= xstrdup("foreign");
1169 url_len
= strlen(url
);
1170 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1174 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1178 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1180 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1181 string_list_append(&refnames
, ref
->name
);
1183 result
= delete_refs("fetch: prune", &refnames
, 0);
1184 string_list_clear(&refnames
, 0);
1187 if (verbosity
>= 0) {
1188 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1189 struct strbuf sb
= STRBUF_INIT
;
1191 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1194 format_display(&sb
, '-', _("[deleted]"), NULL
,
1195 _("(none)"), prettify_refname(ref
->name
),
1197 fprintf(stderr
, " %s\n",sb
.buf
);
1198 strbuf_release(&sb
);
1199 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1204 free_refs(stale_refs
);
1208 static void check_not_current_branch(struct ref
*ref_map
)
1210 struct branch
*current_branch
= branch_get(NULL
);
1212 if (is_bare_repository() || !current_branch
)
1215 for (; ref_map
; ref_map
= ref_map
->next
)
1216 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1217 ref_map
->peer_ref
->name
))
1218 die(_("Refusing to fetch into current branch %s "
1219 "of non-bare repository"), current_branch
->refname
);
1222 static int truncate_fetch_head(void)
1224 const char *filename
= git_path_fetch_head(the_repository
);
1225 FILE *fp
= fopen_for_writing(filename
);
1228 return error_errno(_("cannot open %s"), filename
);
1233 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1235 int r
= transport_set_option(transport
, name
, value
);
1237 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1238 name
, value
, transport
->url
);
1240 warning(_("Option \"%s\" is ignored for %s\n"),
1241 name
, transport
->url
);
1245 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1248 struct oid_array
*oids
= cb_data
;
1250 oid_array_append(oids
, oid
);
1254 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1256 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1259 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1260 const char *s
= negotiation_tip
.items
[i
].string
;
1262 if (!has_glob_specials(s
)) {
1263 struct object_id oid
;
1264 if (get_oid(s
, &oid
))
1265 die("%s is not a valid object", s
);
1266 oid_array_append(oids
, &oid
);
1270 for_each_glob_ref(add_oid
, s
, oids
);
1271 if (old_nr
== oids
->nr
)
1272 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1275 smart_options
->negotiation_tips
= oids
;
1278 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1280 struct transport
*transport
;
1282 transport
= transport_get(remote
, NULL
);
1283 transport_set_verbosity(transport
, verbosity
, progress
);
1284 transport
->family
= family
;
1286 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1288 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1290 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1291 if (deepen
&& deepen_since
)
1292 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1293 if (deepen
&& deepen_not
.nr
)
1294 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1295 (const char *)&deepen_not
);
1296 if (deepen_relative
)
1297 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1299 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1300 if (filter_options
.choice
) {
1302 expand_list_objects_filter_spec(&filter_options
);
1303 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1304 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1306 if (negotiation_tip
.nr
) {
1307 if (transport
->smart_options
)
1308 add_negotiation_tips(transport
->smart_options
);
1310 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1315 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1320 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1321 * when remote helper is used (setting it to an empty string
1322 * is not unsetting). We could extend the remote helper
1323 * protocol for that, but for now, just force a new connection
1324 * without deepen-since. Similar story for deepen-not.
1326 cannot_reuse
= transport
->cannot_reuse
||
1327 deepen_since
|| deepen_not
.nr
;
1329 gsecondary
= prepare_transport(transport
->remote
, 0);
1330 transport
= gsecondary
;
1333 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1334 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1335 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1336 if (!fetch_refs(transport
, ref_map
))
1337 consume_refs(transport
, ref_map
);
1340 transport_disconnect(gsecondary
);
1345 static int do_fetch(struct transport
*transport
,
1348 struct ref
*ref_map
;
1349 int autotags
= (transport
->remote
->fetch_tags
== 1);
1351 const struct ref
*remote_refs
;
1352 struct strvec ref_prefixes
= STRVEC_INIT
;
1353 int must_list_refs
= 1;
1355 if (tags
== TAGS_DEFAULT
) {
1356 if (transport
->remote
->fetch_tags
== 2)
1358 if (transport
->remote
->fetch_tags
== -1)
1362 /* if not appending, truncate FETCH_HEAD */
1363 if (!append
&& write_fetch_head
) {
1364 retcode
= truncate_fetch_head();
1372 refspec_ref_prefixes(rs
, &ref_prefixes
);
1375 * We can avoid listing refs if all of them are exact
1379 for (i
= 0; i
< rs
->nr
; i
++) {
1380 if (!rs
->items
[i
].exact_sha1
) {
1385 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1386 refspec_ref_prefixes(&transport
->remote
->fetch
, &ref_prefixes
);
1388 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1390 if (ref_prefixes
.nr
)
1391 strvec_push(&ref_prefixes
, "refs/tags/");
1394 if (must_list_refs
) {
1395 trace2_region_enter("fetch", "remote_refs", the_repository
);
1396 remote_refs
= transport_get_remote_refs(transport
, &ref_prefixes
);
1397 trace2_region_leave("fetch", "remote_refs", the_repository
);
1401 strvec_clear(&ref_prefixes
);
1403 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1405 if (!update_head_ok
)
1406 check_not_current_branch(ref_map
);
1408 if (tags
== TAGS_DEFAULT
&& autotags
)
1409 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1412 * We only prune based on refspecs specified
1413 * explicitly (via command line or configuration); we
1414 * don't care whether --tags was specified.
1417 prune_refs(rs
, ref_map
, transport
->url
);
1419 prune_refs(&transport
->remote
->fetch
,
1424 if (fetch_refs(transport
, ref_map
) || consume_refs(transport
, ref_map
)) {
1431 struct branch
*branch
= branch_get("HEAD");
1433 struct ref
*source_ref
= NULL
;
1436 * We're setting the upstream configuration for the
1437 * current branch. The relevant upstream is the
1438 * fetched branch that is meant to be merged with the
1439 * current one, i.e. the one fetched to FETCH_HEAD.
1441 * When there are several such branches, consider the
1442 * request ambiguous and err on the safe side by doing
1443 * nothing and just emit a warning.
1445 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1446 if (!rm
->peer_ref
) {
1448 warning(_("multiple branches detected, incompatible with --set-upstream"));
1456 if (!strcmp(source_ref
->name
, "HEAD") ||
1457 starts_with(source_ref
->name
, "refs/heads/"))
1458 install_branch_config(0,
1460 transport
->remote
->name
,
1462 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1463 warning(_("not setting upstream for a remote remote-tracking branch"));
1464 else if (starts_with(source_ref
->name
, "refs/tags/"))
1465 warning(_("not setting upstream for a remote tag"));
1467 warning(_("unknown branch type"));
1469 warning(_("no source branch found.\n"
1470 "you need to specify exactly one branch with the --set-upstream option."));
1476 /* if neither --no-tags nor --tags was specified, do automated tag
1478 if (tags
== TAGS_DEFAULT
&& autotags
) {
1479 struct ref
**tail
= &ref_map
;
1481 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
1483 backfill_tags(transport
, ref_map
);
1491 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1493 struct string_list
*list
= priv
;
1494 if (!remote
->skip_default_update
)
1495 string_list_append(list
, remote
->name
);
1499 struct remote_group_data
{
1501 struct string_list
*list
;
1504 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1506 struct remote_group_data
*g
= priv
;
1508 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1509 /* split list by white space */
1511 size_t wordlen
= strcspn(value
, " \t\n");
1514 string_list_append_nodup(g
->list
,
1515 xstrndup(value
, wordlen
));
1516 value
+= wordlen
+ (value
[wordlen
] != '\0');
1523 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1525 int prev_nr
= list
->nr
;
1526 struct remote_group_data g
;
1527 g
.name
= name
; g
.list
= list
;
1529 git_config(get_remote_group
, &g
);
1530 if (list
->nr
== prev_nr
) {
1531 struct remote
*remote
= remote_get(name
);
1532 if (!remote_is_configured(remote
, 0))
1534 string_list_append(list
, remote
->name
);
1539 static void add_options_to_argv(struct strvec
*argv
)
1542 strvec_push(argv
, "--dry-run");
1544 strvec_push(argv
, prune
? "--prune" : "--no-prune");
1545 if (prune_tags
!= -1)
1546 strvec_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1548 strvec_push(argv
, "--update-head-ok");
1550 strvec_push(argv
, "--force");
1552 strvec_push(argv
, "--keep");
1553 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1554 strvec_push(argv
, "--recurse-submodules");
1555 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1556 strvec_push(argv
, "--recurse-submodules=on-demand");
1557 if (tags
== TAGS_SET
)
1558 strvec_push(argv
, "--tags");
1559 else if (tags
== TAGS_UNSET
)
1560 strvec_push(argv
, "--no-tags");
1562 strvec_push(argv
, "-v");
1564 strvec_push(argv
, "-v");
1565 else if (verbosity
< 0)
1566 strvec_push(argv
, "-q");
1567 if (family
== TRANSPORT_FAMILY_IPV4
)
1568 strvec_push(argv
, "--ipv4");
1569 else if (family
== TRANSPORT_FAMILY_IPV6
)
1570 strvec_push(argv
, "--ipv6");
1573 /* Fetch multiple remotes in parallel */
1575 struct parallel_fetch_state
{
1577 struct string_list
*remotes
;
1581 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1582 void *cb
, void **task_cb
)
1584 struct parallel_fetch_state
*state
= cb
;
1587 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1590 remote
= state
->remotes
->items
[state
->next
++].string
;
1593 strvec_pushv(&cp
->args
, state
->argv
);
1594 strvec_push(&cp
->args
, remote
);
1598 printf(_("Fetching %s\n"), remote
);
1603 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1605 struct parallel_fetch_state
*state
= cb
;
1606 const char *remote
= task_cb
;
1608 state
->result
= error(_("Could not fetch %s"), remote
);
1613 static int fetch_finished(int result
, struct strbuf
*out
,
1614 void *cb
, void *task_cb
)
1616 struct parallel_fetch_state
*state
= cb
;
1617 const char *remote
= task_cb
;
1620 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1628 static int fetch_multiple(struct string_list
*list
, int max_children
)
1631 struct strvec argv
= STRVEC_INIT
;
1633 if (!append
&& write_fetch_head
) {
1634 int errcode
= truncate_fetch_head();
1639 strvec_pushl(&argv
, "fetch", "--append", "--no-auto-gc",
1640 "--no-write-commit-graph", NULL
);
1641 add_options_to_argv(&argv
);
1643 if (max_children
!= 1 && list
->nr
!= 1) {
1644 struct parallel_fetch_state state
= { argv
.v
, list
, 0, 0 };
1646 strvec_push(&argv
, "--end-of-options");
1647 result
= run_processes_parallel_tr2(max_children
,
1649 &fetch_failed_to_start
,
1652 "fetch", "parallel/fetch");
1655 result
= state
.result
;
1657 for (i
= 0; i
< list
->nr
; i
++) {
1658 const char *name
= list
->items
[i
].string
;
1659 strvec_push(&argv
, name
);
1661 printf(_("Fetching %s\n"), name
);
1662 if (run_command_v_opt(argv
.v
, RUN_GIT_CMD
)) {
1663 error(_("Could not fetch %s"), name
);
1669 strvec_clear(&argv
);
1674 * Fetching from the promisor remote should use the given filter-spec
1675 * or inherit the default filter-spec from the config.
1677 static inline void fetch_one_setup_partial(struct remote
*remote
)
1680 * Explicit --no-filter argument overrides everything, regardless
1681 * of any prior partial clones and fetches.
1683 if (filter_options
.no_filter
)
1687 * If no prior partial clone/fetch and the current fetch DID NOT
1688 * request a partial-fetch, do a normal fetch.
1690 if (!has_promisor_remote() && !filter_options
.choice
)
1694 * If this is a partial-fetch request, we enable partial on
1695 * this repo if not already enabled and remember the given
1696 * filter-spec as the default for subsequent fetches to this
1697 * remote if there is currently no default filter-spec.
1699 if (filter_options
.choice
) {
1700 partial_clone_register(remote
->name
, &filter_options
);
1705 * Do a partial-fetch from the promisor remote using either the
1706 * explicitly given filter-spec or inherit the filter-spec from
1709 if (!filter_options
.choice
)
1710 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
1714 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
,
1715 int prune_tags_ok
, int use_stdin_refspecs
)
1717 struct refspec rs
= REFSPEC_INIT_FETCH
;
1720 int maybe_prune_tags
;
1721 int remote_via_config
= remote_is_configured(remote
, 0);
1724 die(_("No remote repository specified. Please, specify either a URL or a\n"
1725 "remote name from which new revisions should be fetched."));
1727 gtransport
= prepare_transport(remote
, 1);
1730 /* no command line request */
1731 if (0 <= remote
->prune
)
1732 prune
= remote
->prune
;
1733 else if (0 <= fetch_prune_config
)
1734 prune
= fetch_prune_config
;
1736 prune
= PRUNE_BY_DEFAULT
;
1739 if (prune_tags
< 0) {
1740 /* no command line request */
1741 if (0 <= remote
->prune_tags
)
1742 prune_tags
= remote
->prune_tags
;
1743 else if (0 <= fetch_prune_tags_config
)
1744 prune_tags
= fetch_prune_tags_config
;
1746 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1749 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1750 if (maybe_prune_tags
&& remote_via_config
)
1751 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1753 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1754 refspec_append(&rs
, TAG_REFSPEC
);
1756 for (i
= 0; i
< argc
; i
++) {
1757 if (!strcmp(argv
[i
], "tag")) {
1760 die(_("You need to specify a tag name."));
1762 refspec_appendf(&rs
, "refs/tags/%s:refs/tags/%s",
1765 refspec_append(&rs
, argv
[i
]);
1769 if (use_stdin_refspecs
) {
1770 struct strbuf line
= STRBUF_INIT
;
1771 while (strbuf_getline_lf(&line
, stdin
) != EOF
)
1772 refspec_append(&rs
, line
.buf
);
1773 strbuf_release(&line
);
1776 if (server_options
.nr
)
1777 gtransport
->server_options
= &server_options
;
1779 sigchain_push_common(unlock_pack_on_signal
);
1780 atexit(unlock_pack
);
1781 sigchain_push(SIGPIPE
, SIG_IGN
);
1782 exit_code
= do_fetch(gtransport
, &rs
);
1783 sigchain_pop(SIGPIPE
);
1785 transport_disconnect(gtransport
);
1790 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1793 struct string_list list
= STRING_LIST_INIT_DUP
;
1794 struct remote
*remote
= NULL
;
1796 int prune_tags_ok
= 1;
1798 packet_trace_identity("fetch");
1800 /* Record the command line for the reflog */
1801 strbuf_addstr(&default_rla
, "fetch");
1802 for (i
= 1; i
< argc
; i
++) {
1803 /* This handles non-URLs gracefully */
1804 char *anon
= transport_anonymize_url(argv
[i
]);
1806 strbuf_addf(&default_rla
, " %s", anon
);
1810 git_config(git_fetch_config
, NULL
);
1812 argc
= parse_options(argc
, argv
, prefix
,
1813 builtin_fetch_options
, builtin_fetch_usage
, 0);
1814 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
1815 int *sfjc
= submodule_fetch_jobs_config
== -1
1816 ? &submodule_fetch_jobs_config
: NULL
;
1817 int *rs
= recurse_submodules
== RECURSE_SUBMODULES_DEFAULT
1818 ? &recurse_submodules
: NULL
;
1820 fetch_config_from_gitmodules(sfjc
, rs
);
1823 if (deepen_relative
) {
1824 if (deepen_relative
< 0)
1825 die(_("Negative depth in --deepen is not supported"));
1827 die(_("--deepen and --depth are mutually exclusive"));
1828 depth
= xstrfmt("%d", deepen_relative
);
1832 die(_("--depth and --unshallow cannot be used together"));
1833 else if (!is_repository_shallow(the_repository
))
1834 die(_("--unshallow on a complete repository does not make sense"));
1836 depth
= xstrfmt("%d", INFINITE_DEPTH
);
1839 /* no need to be strict, transport_set_option() will validate it again */
1840 if (depth
&& atoi(depth
) < 1)
1841 die(_("depth %s is not a positive number"), depth
);
1842 if (depth
|| deepen_since
|| deepen_not
.nr
)
1845 /* FETCH_HEAD never gets updated in --dry-run mode */
1847 write_fetch_head
= 0;
1851 die(_("fetch --all does not take a repository argument"));
1853 die(_("fetch --all does not make sense with refspecs"));
1854 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
1855 } else if (argc
== 0) {
1856 /* No arguments -- use default remote */
1857 remote
= remote_get(NULL
);
1858 } else if (multiple
) {
1859 /* All arguments are assumed to be remotes or groups */
1860 for (i
= 0; i
< argc
; i
++)
1861 if (!add_remote_or_group(argv
[i
], &list
))
1862 die(_("No such remote or remote group: %s"), argv
[i
]);
1864 /* Single remote or group */
1865 (void) add_remote_or_group(argv
[0], &list
);
1867 /* More than one remote */
1869 die(_("Fetching a group and specifying refspecs does not make sense"));
1871 /* Zero or one remotes */
1872 remote
= remote_get(argv
[0]);
1873 prune_tags_ok
= (argc
== 1);
1880 if (filter_options
.choice
|| has_promisor_remote())
1881 fetch_one_setup_partial(remote
);
1882 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
, stdin_refspecs
);
1884 int max_children
= max_jobs
;
1886 if (filter_options
.choice
)
1887 die(_("--filter can only be used with the remote "
1888 "configured in extensions.partialclone"));
1891 die(_("--stdin can only be used when fetching "
1892 "from one remote"));
1894 if (max_children
< 0)
1895 max_children
= fetch_parallel_config
;
1897 /* TODO should this also die if we have a previous partial-clone? */
1898 result
= fetch_multiple(&list
, max_children
);
1901 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
1902 struct strvec options
= STRVEC_INIT
;
1903 int max_children
= max_jobs
;
1905 if (max_children
< 0)
1906 max_children
= submodule_fetch_jobs_config
;
1907 if (max_children
< 0)
1908 max_children
= fetch_parallel_config
;
1910 add_options_to_argv(&options
);
1911 result
= fetch_populated_submodules(the_repository
,
1915 recurse_submodules_default
,
1918 strvec_clear(&options
);
1921 string_list_clear(&list
, 0);
1923 prepare_repo_settings(the_repository
);
1924 if (fetch_write_commit_graph
> 0 ||
1925 (fetch_write_commit_graph
< 0 &&
1926 the_repository
->settings
.fetch_write_commit_graph
)) {
1927 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
1930 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
1932 write_commit_graph_reachable(the_repository
->objects
->odb
,
1937 close_object_store(the_repository
->objects
);
1940 run_auto_maintenance(verbosity
< 0);