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-gc", &enable_auto_gc
,
204 N_("run 'gc --auto' after fetching")),
205 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates
,
206 N_("check for forced-updates on all updated branches")),
207 OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph
,
208 N_("write the commit-graph after fetching")),
209 OPT_BOOL(0, "stdin", &stdin_refspecs
,
210 N_("accept refspecs from stdin")),
214 static void unlock_pack(void)
217 transport_unlock_pack(gtransport
);
219 transport_unlock_pack(gsecondary
);
222 static void unlock_pack_on_signal(int signo
)
229 static void add_merge_config(struct ref
**head
,
230 const struct ref
*remote_refs
,
231 struct branch
*branch
,
236 for (i
= 0; i
< branch
->merge_nr
; i
++) {
237 struct ref
*rm
, **old_tail
= *tail
;
238 struct refspec_item refspec
;
240 for (rm
= *head
; rm
; rm
= rm
->next
) {
241 if (branch_merge_matches(branch
, i
, rm
->name
)) {
242 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
250 * Not fetched to a remote-tracking branch? We need to fetch
251 * it anyway to allow this branch's "branch.$name.merge"
252 * to be honored by 'git pull', but we do not have to
253 * fail if branch.$name.merge is misconfigured to point
254 * at a nonexisting branch. If we were indeed called by
255 * 'git pull', it will notice the misconfiguration because
256 * there is no entry in the resulting FETCH_HEAD marked
259 memset(&refspec
, 0, sizeof(refspec
));
260 refspec
.src
= branch
->merge
[i
]->src
;
261 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
262 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
263 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
267 static void create_fetch_oidset(struct ref
**head
, struct oidset
*out
)
269 struct ref
*rm
= *head
;
271 oidset_insert(out
, &rm
->old_oid
);
276 struct refname_hash_entry
{
277 struct hashmap_entry ent
;
278 struct object_id oid
;
280 char refname
[FLEX_ARRAY
];
283 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data
,
284 const struct hashmap_entry
*eptr
,
285 const struct hashmap_entry
*entry_or_key
,
288 const struct refname_hash_entry
*e1
, *e2
;
290 e1
= container_of(eptr
, const struct refname_hash_entry
, ent
);
291 e2
= container_of(entry_or_key
, const struct refname_hash_entry
, ent
);
292 return strcmp(e1
->refname
, keydata
? keydata
: e2
->refname
);
295 static struct refname_hash_entry
*refname_hash_add(struct hashmap
*map
,
297 const struct object_id
*oid
)
299 struct refname_hash_entry
*ent
;
300 size_t len
= strlen(refname
);
302 FLEX_ALLOC_MEM(ent
, refname
, refname
, len
);
303 hashmap_entry_init(&ent
->ent
, strhash(refname
));
304 oidcpy(&ent
->oid
, oid
);
305 hashmap_add(map
, &ent
->ent
);
309 static int add_one_refname(const char *refname
,
310 const struct object_id
*oid
,
311 int flag
, void *cbdata
)
313 struct hashmap
*refname_map
= cbdata
;
315 (void) refname_hash_add(refname_map
, refname
, oid
);
319 static void refname_hash_init(struct hashmap
*map
)
321 hashmap_init(map
, refname_hash_entry_cmp
, NULL
, 0);
324 static int refname_hash_exists(struct hashmap
*map
, const char *refname
)
326 return !!hashmap_get_from_hash(map
, strhash(refname
), refname
);
329 static void clear_item(struct refname_hash_entry
*item
)
334 static void find_non_local_tags(const struct ref
*refs
,
338 struct hashmap existing_refs
;
339 struct hashmap remote_refs
;
340 struct oidset fetch_oids
= OIDSET_INIT
;
341 struct string_list remote_refs_list
= STRING_LIST_INIT_NODUP
;
342 struct string_list_item
*remote_ref_item
;
343 const struct ref
*ref
;
344 struct refname_hash_entry
*item
= NULL
;
345 const int quick_flags
= OBJECT_INFO_QUICK
| OBJECT_INFO_SKIP_FETCH_OBJECT
;
347 refname_hash_init(&existing_refs
);
348 refname_hash_init(&remote_refs
);
349 create_fetch_oidset(head
, &fetch_oids
);
351 for_each_ref(add_one_refname
, &existing_refs
);
352 for (ref
= refs
; ref
; ref
= ref
->next
) {
353 if (!starts_with(ref
->name
, "refs/tags/"))
357 * The peeled ref always follows the matching base
358 * ref, so if we see a peeled ref that we don't want
359 * to fetch then we can mark the ref entry in the list
360 * as one to ignore by setting util to NULL.
362 if (ends_with(ref
->name
, "^{}")) {
364 !has_object_file_with_flags(&ref
->old_oid
, quick_flags
) &&
365 !oidset_contains(&fetch_oids
, &ref
->old_oid
) &&
366 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
367 !oidset_contains(&fetch_oids
, &item
->oid
))
374 * If item is non-NULL here, then we previously saw a
375 * ref not followed by a peeled reference, so we need
376 * to check if it is a lightweight tag that we want to
380 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
381 !oidset_contains(&fetch_oids
, &item
->oid
))
386 /* skip duplicates and refs that we already have */
387 if (refname_hash_exists(&remote_refs
, ref
->name
) ||
388 refname_hash_exists(&existing_refs
, ref
->name
))
391 item
= refname_hash_add(&remote_refs
, ref
->name
, &ref
->old_oid
);
392 string_list_insert(&remote_refs_list
, ref
->name
);
394 hashmap_free_entries(&existing_refs
, struct refname_hash_entry
, ent
);
397 * We may have a final lightweight tag that needs to be
398 * checked to see if it needs fetching.
401 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
402 !oidset_contains(&fetch_oids
, &item
->oid
))
406 * For all the tags in the remote_refs_list,
407 * add them to the list of refs to be fetched
409 for_each_string_list_item(remote_ref_item
, &remote_refs_list
) {
410 const char *refname
= remote_ref_item
->string
;
412 unsigned int hash
= strhash(refname
);
414 item
= hashmap_get_entry_from_hash(&remote_refs
, hash
, refname
,
415 struct refname_hash_entry
, ent
);
417 BUG("unseen remote ref?");
419 /* Unless we have already decided to ignore this item... */
423 rm
= alloc_ref(item
->refname
);
424 rm
->peer_ref
= alloc_ref(item
->refname
);
425 oidcpy(&rm
->old_oid
, &item
->oid
);
429 hashmap_free_entries(&remote_refs
, struct refname_hash_entry
, ent
);
430 string_list_clear(&remote_refs_list
, 0);
431 oidset_clear(&fetch_oids
);
434 static struct ref
*get_ref_map(struct remote
*remote
,
435 const struct ref
*remote_refs
,
437 int tags
, int *autotags
)
441 struct ref
*ref_map
= NULL
;
442 struct ref
**tail
= &ref_map
;
444 /* opportunistically-updated references: */
445 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
447 struct hashmap existing_refs
;
448 int existing_refs_populated
= 0;
451 struct refspec
*fetch_refspec
;
453 for (i
= 0; i
< rs
->nr
; i
++) {
454 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
455 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
458 /* Merge everything on the command line (but not --tags) */
459 for (rm
= ref_map
; rm
; rm
= rm
->next
)
460 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
463 * For any refs that we happen to be fetching via
464 * command-line arguments, the destination ref might
465 * have been missing or have been different than the
466 * remote-tracking ref that would be derived from the
467 * configured refspec. In these cases, we want to
468 * take the opportunity to update their configured
469 * remote-tracking reference. However, we do not want
470 * to mention these entries in FETCH_HEAD at all, as
471 * they would simply be duplicates of existing
472 * entries, so we set them FETCH_HEAD_IGNORE below.
474 * We compute these entries now, based only on the
475 * refspecs specified on the command line. But we add
476 * them to the list following the refspecs resulting
477 * from the tags option so that one of the latter,
478 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
479 * by ref_remove_duplicates() in favor of one of these
480 * opportunistic entries with FETCH_HEAD_IGNORE.
483 fetch_refspec
= &refmap
;
485 fetch_refspec
= &remote
->fetch
;
487 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
488 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
489 } else if (refmap
.nr
) {
490 die("--refmap option is only meaningful with command-line refspec(s).");
492 /* Use the defaults */
493 struct branch
*branch
= branch_get(NULL
);
494 int has_merge
= branch_has_merge_config(branch
);
497 /* Note: has_merge implies non-NULL branch->remote_name */
498 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
499 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
500 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
501 if (remote
->fetch
.items
[i
].dst
&&
502 remote
->fetch
.items
[i
].dst
[0])
504 if (!i
&& !has_merge
&& ref_map
&&
505 !remote
->fetch
.items
[0].pattern
)
506 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
509 * if the remote we're fetching from is the same
510 * as given in branch.<name>.remote, we add the
511 * ref given in branch.<name>.merge, too.
513 * Note: has_merge implies non-NULL branch->remote_name
516 !strcmp(branch
->remote_name
, remote
->name
))
517 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
519 ref_map
= get_remote_ref(remote_refs
, "HEAD");
521 die(_("Couldn't find remote ref HEAD"));
522 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
523 tail
= &ref_map
->next
;
527 if (tags
== TAGS_SET
)
528 /* also fetch all tags */
529 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
530 else if (tags
== TAGS_DEFAULT
&& *autotags
)
531 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
533 /* Now append any refs to be updated opportunistically: */
535 for (rm
= orefs
; rm
; rm
= rm
->next
) {
536 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
540 ref_map
= ref_remove_duplicates(ref_map
);
542 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
544 const char *refname
= rm
->peer_ref
->name
;
545 struct refname_hash_entry
*peer_item
;
546 unsigned int hash
= strhash(refname
);
548 if (!existing_refs_populated
) {
549 refname_hash_init(&existing_refs
);
550 for_each_ref(add_one_refname
, &existing_refs
);
551 existing_refs_populated
= 1;
554 peer_item
= hashmap_get_entry_from_hash(&existing_refs
,
556 struct refname_hash_entry
, ent
);
558 struct object_id
*old_oid
= &peer_item
->oid
;
559 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
563 if (existing_refs_populated
)
564 hashmap_free_entries(&existing_refs
, struct refname_hash_entry
, ent
);
569 #define STORE_REF_ERROR_OTHER 1
570 #define STORE_REF_ERROR_DF_CONFLICT 2
572 static int s_update_ref(const char *action
,
577 char *rla
= getenv("GIT_REFLOG_ACTION");
578 struct ref_transaction
*transaction
;
579 struct strbuf err
= STRBUF_INIT
;
580 int ret
, df_conflict
= 0;
585 rla
= default_rla
.buf
;
586 msg
= xstrfmt("%s: %s", rla
, action
);
588 transaction
= ref_transaction_begin(&err
);
590 ref_transaction_update(transaction
, ref
->name
,
592 check_old
? &ref
->old_oid
: NULL
,
596 ret
= ref_transaction_commit(transaction
, &err
);
598 df_conflict
= (ret
== TRANSACTION_NAME_CONFLICT
);
602 ref_transaction_free(transaction
);
603 strbuf_release(&err
);
607 ref_transaction_free(transaction
);
608 error("%s", err
.buf
);
609 strbuf_release(&err
);
611 return df_conflict
? STORE_REF_ERROR_DF_CONFLICT
612 : STORE_REF_ERROR_OTHER
;
615 static int refcol_width
= 10;
616 static int compact_format
;
618 static void adjust_refcol_width(const struct ref
*ref
)
620 int max
, rlen
, llen
, len
;
622 /* uptodate lines are only shown on high verbosity level */
623 if (!verbosity
&& oideq(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
626 max
= term_columns();
627 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
629 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
632 * rough estimation to see if the output line is too long and
633 * should not be counted (we can't do precise calculation
634 * anyway because we don't know if the error explanation part
635 * will be printed in update_local_ref)
637 if (compact_format
) {
641 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
646 * Not precise calculation for compact mode because '*' can
647 * appear on the left hand side of '->' and shrink the column
650 if (refcol_width
< rlen
)
654 static void prepare_format_display(struct ref
*ref_map
)
657 const char *format
= "full";
659 git_config_get_string_tmp("fetch.output", &format
);
660 if (!strcasecmp(format
, "full"))
662 else if (!strcasecmp(format
, "compact"))
665 die(_("configuration fetch.output contains invalid value %s"),
668 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
669 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
671 !strcmp(rm
->name
, "HEAD"))
674 adjust_refcol_width(rm
);
678 static void print_remote_to_local(struct strbuf
*display
,
679 const char *remote
, const char *local
)
681 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
684 static int find_and_replace(struct strbuf
*haystack
,
686 const char *placeholder
)
688 const char *p
= NULL
;
691 nlen
= strlen(needle
);
692 if (ends_with(haystack
->buf
, needle
))
693 p
= haystack
->buf
+ haystack
->len
- nlen
;
695 p
= strstr(haystack
->buf
, needle
);
699 if (p
> haystack
->buf
&& p
[-1] != '/')
703 if (plen
> nlen
&& p
[nlen
] != '/')
706 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
707 placeholder
, strlen(placeholder
));
711 static void print_compact(struct strbuf
*display
,
712 const char *remote
, const char *local
)
714 struct strbuf r
= STRBUF_INIT
;
715 struct strbuf l
= STRBUF_INIT
;
717 if (!strcmp(remote
, local
)) {
718 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
722 strbuf_addstr(&r
, remote
);
723 strbuf_addstr(&l
, local
);
725 if (!find_and_replace(&r
, local
, "*"))
726 find_and_replace(&l
, remote
, "*");
727 print_remote_to_local(display
, r
.buf
, l
.buf
);
733 static void format_display(struct strbuf
*display
, char code
,
734 const char *summary
, const char *error
,
735 const char *remote
, const char *local
,
738 int width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
740 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
742 print_remote_to_local(display
, remote
, local
);
744 print_compact(display
, remote
, local
);
746 strbuf_addf(display
, " (%s)", error
);
749 static int update_local_ref(struct ref
*ref
,
751 const struct ref
*remote_ref
,
752 struct strbuf
*display
,
755 struct commit
*current
= NULL
, *updated
;
756 enum object_type type
;
757 struct branch
*current_branch
= branch_get(NULL
);
758 const char *pretty_ref
= prettify_refname(ref
->name
);
759 int fast_forward
= 0;
761 type
= oid_object_info(the_repository
, &ref
->new_oid
, NULL
);
763 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
765 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
767 format_display(display
, '=', _("[up to date]"), NULL
,
768 remote
, pretty_ref
, summary_width
);
772 if (current_branch
&&
773 !strcmp(ref
->name
, current_branch
->name
) &&
774 !(update_head_ok
|| is_bare_repository()) &&
775 !is_null_oid(&ref
->old_oid
)) {
777 * If this is the head, and it's not okay to update
778 * the head, and the old value of the head isn't empty...
780 format_display(display
, '!', _("[rejected]"),
781 _("can't fetch in current branch"),
782 remote
, pretty_ref
, summary_width
);
786 if (!is_null_oid(&ref
->old_oid
) &&
787 starts_with(ref
->name
, "refs/tags/")) {
788 if (force
|| ref
->force
) {
790 r
= s_update_ref("updating tag", ref
, 0);
791 format_display(display
, r
? '!' : 't', _("[tag update]"),
792 r
? _("unable to update local ref") : NULL
,
793 remote
, pretty_ref
, summary_width
);
796 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
797 remote
, pretty_ref
, summary_width
);
802 current
= lookup_commit_reference_gently(the_repository
,
804 updated
= lookup_commit_reference_gently(the_repository
,
806 if (!current
|| !updated
) {
811 * Nicely describe the new ref we're fetching.
812 * Base this on the remote's ref name, as it's
813 * more likely to follow a standard layout.
815 const char *name
= remote_ref
? remote_ref
->name
: "";
816 if (starts_with(name
, "refs/tags/")) {
818 what
= _("[new tag]");
819 } else if (starts_with(name
, "refs/heads/")) {
820 msg
= "storing head";
821 what
= _("[new branch]");
824 what
= _("[new ref]");
827 r
= s_update_ref(msg
, ref
, 0);
828 format_display(display
, r
? '!' : '*', what
,
829 r
? _("unable to update local ref") : NULL
,
830 remote
, pretty_ref
, summary_width
);
834 if (fetch_show_forced_updates
) {
835 uint64_t t_before
= getnanotime();
836 fast_forward
= in_merge_bases(current
, updated
);
837 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
843 struct strbuf quickref
= STRBUF_INIT
;
846 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
847 strbuf_addstr(&quickref
, "..");
848 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
849 r
= s_update_ref("fast-forward", ref
, 1);
850 format_display(display
, r
? '!' : ' ', quickref
.buf
,
851 r
? _("unable to update local ref") : NULL
,
852 remote
, pretty_ref
, summary_width
);
853 strbuf_release(&quickref
);
855 } else if (force
|| ref
->force
) {
856 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("forced-update", ref
, 1);
862 format_display(display
, r
? '!' : '+', quickref
.buf
,
863 r
? _("unable to update local ref") : _("forced update"),
864 remote
, pretty_ref
, summary_width
);
865 strbuf_release(&quickref
);
868 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
869 remote
, pretty_ref
, summary_width
);
874 static int iterate_ref_map(void *cb_data
, struct object_id
*oid
)
876 struct ref
**rm
= cb_data
;
877 struct ref
*ref
= *rm
;
879 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
882 return -1; /* end of the list */
884 oidcpy(oid
, &ref
->old_oid
);
888 static const char warn_show_forced_updates
[] =
889 N_("Fetch normally indicates which branches had a forced update,\n"
890 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
891 "flag or run 'git config fetch.showForcedUpdates true'.");
892 static const char warn_time_show_forced_updates
[] =
893 N_("It took %.2f seconds to check forced updates. You can use\n"
894 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
895 " to avoid this check.\n");
897 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
898 int connectivity_checked
, struct ref
*ref_map
)
901 struct commit
*commit
;
902 int url_len
, i
, rc
= 0;
903 struct strbuf note
= STRBUF_INIT
;
904 const char *what
, *kind
;
907 const char *filename
= (!write_fetch_head
909 : git_path_fetch_head(the_repository
));
911 int summary_width
= transport_summary_width(ref_map
);
913 fp
= fopen(filename
, "a");
915 return error_errno(_("cannot open %s"), filename
);
918 url
= transport_anonymize_url(raw_url
);
920 url
= xstrdup("foreign");
922 if (!connectivity_checked
) {
923 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
926 if (check_connected(iterate_ref_map
, &rm
, &opt
)) {
927 rc
= error(_("%s did not send all necessary objects\n"), url
);
932 prepare_format_display(ref_map
);
935 * We do a pass for each fetch_head_status type in their enum order, so
936 * merged entries are written before not-for-merge. That lets readers
937 * use FETCH_HEAD as a refname to refer to the ref to be merged.
939 for (want_status
= FETCH_HEAD_MERGE
;
940 want_status
<= FETCH_HEAD_IGNORE
;
942 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
943 struct ref
*ref
= NULL
;
944 const char *merge_status_marker
= "";
946 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
947 if (want_status
== FETCH_HEAD_MERGE
)
948 warning(_("reject %s because shallow roots are not allowed to be updated"),
949 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
953 commit
= lookup_commit_reference_gently(the_repository
,
957 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
959 if (rm
->fetch_head_status
!= want_status
)
963 ref
= alloc_ref(rm
->peer_ref
->name
);
964 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
965 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
966 ref
->force
= rm
->peer_ref
->force
;
969 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)
970 check_for_new_submodule_commits(&rm
->old_oid
);
972 if (!strcmp(rm
->name
, "HEAD")) {
976 else if (skip_prefix(rm
->name
, "refs/heads/", &what
))
978 else if (skip_prefix(rm
->name
, "refs/tags/", &what
))
980 else if (skip_prefix(rm
->name
, "refs/remotes/", &what
))
981 kind
= "remote-tracking branch";
987 url_len
= strlen(url
);
988 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
991 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
997 strbuf_addf(¬e
, "%s ", kind
);
998 strbuf_addf(¬e
, "'%s' of ", what
);
1000 switch (rm
->fetch_head_status
) {
1001 case FETCH_HEAD_NOT_FOR_MERGE
:
1002 merge_status_marker
= "not-for-merge";
1004 case FETCH_HEAD_MERGE
:
1005 fprintf(fp
, "%s\t%s\t%s",
1006 oid_to_hex(&rm
->old_oid
),
1007 merge_status_marker
,
1009 for (i
= 0; i
< url_len
; ++i
)
1017 /* do not write anything to FETCH_HEAD */
1021 strbuf_reset(¬e
);
1023 rc
|= update_local_ref(ref
, what
, rm
, ¬e
,
1026 } else if (write_fetch_head
|| dry_run
) {
1028 * Display fetches written to FETCH_HEAD (or
1029 * would be written to FETCH_HEAD, if --dry-run
1032 format_display(¬e
, '*',
1033 *kind
? kind
: "branch", NULL
,
1034 *what
? what
: "HEAD",
1035 "FETCH_HEAD", summary_width
);
1038 if (verbosity
>= 0 && !shown_url
) {
1039 fprintf(stderr
, _("From %.*s\n"),
1044 fprintf(stderr
, " %s\n", note
.buf
);
1049 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1050 error(_("some local refs could not be updated; try running\n"
1051 " 'git remote prune %s' to remove any old, conflicting "
1052 "branches"), remote_name
);
1054 if (advice_fetch_show_forced_updates
) {
1055 if (!fetch_show_forced_updates
) {
1056 warning(_(warn_show_forced_updates
));
1057 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1058 warning(_(warn_time_show_forced_updates
),
1059 forced_updates_ms
/ 1000.0);
1064 strbuf_release(¬e
);
1071 * We would want to bypass the object transfer altogether if
1072 * everything we are going to fetch already exists and is connected
1075 static int check_exist_and_connected(struct ref
*ref_map
)
1077 struct ref
*rm
= ref_map
;
1078 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1082 * If we are deepening a shallow clone we already have these
1083 * objects reachable. Running rev-list here will return with
1084 * a good (0) exit status and we'll bypass the fetch that we
1085 * really need to perform. Claiming failure now will ensure
1086 * we perform the network exchange to deepen our history.
1092 * check_connected() allows objects to merely be promised, but
1093 * we need all direct targets to exist.
1095 for (r
= rm
; r
; r
= r
->next
) {
1096 if (!has_object_file_with_flags(&r
->old_oid
,
1097 OBJECT_INFO_SKIP_FETCH_OBJECT
))
1102 return check_connected(iterate_ref_map
, &rm
, &opt
);
1105 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
1107 int ret
= check_exist_and_connected(ref_map
);
1109 trace2_region_enter("fetch", "fetch_refs", the_repository
);
1110 ret
= transport_fetch_refs(transport
, ref_map
);
1111 trace2_region_leave("fetch", "fetch_refs", the_repository
);
1115 * Keep the new pack's ".keep" file around to allow the caller
1116 * time to update refs to reference the new objects.
1119 transport_unlock_pack(transport
);
1123 /* Update local refs based on the ref values fetched from a remote */
1124 static int consume_refs(struct transport
*transport
, struct ref
*ref_map
)
1126 int connectivity_checked
= transport
->smart_options
1127 ? transport
->smart_options
->connectivity_checked
: 0;
1129 trace2_region_enter("fetch", "consume_refs", the_repository
);
1130 ret
= store_updated_refs(transport
->url
,
1131 transport
->remote
->name
,
1132 connectivity_checked
,
1134 transport_unlock_pack(transport
);
1135 trace2_region_leave("fetch", "consume_refs", the_repository
);
1139 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
1140 const char *raw_url
)
1142 int url_len
, i
, result
= 0;
1143 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1145 int summary_width
= transport_summary_width(stale_refs
);
1146 const char *dangling_msg
= dry_run
1147 ? _(" (%s will become dangling)")
1148 : _(" (%s has become dangling)");
1151 url
= transport_anonymize_url(raw_url
);
1153 url
= xstrdup("foreign");
1155 url_len
= strlen(url
);
1156 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1160 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1164 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1166 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1167 string_list_append(&refnames
, ref
->name
);
1169 result
= delete_refs("fetch: prune", &refnames
, 0);
1170 string_list_clear(&refnames
, 0);
1173 if (verbosity
>= 0) {
1174 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1175 struct strbuf sb
= STRBUF_INIT
;
1177 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1180 format_display(&sb
, '-', _("[deleted]"), NULL
,
1181 _("(none)"), prettify_refname(ref
->name
),
1183 fprintf(stderr
, " %s\n",sb
.buf
);
1184 strbuf_release(&sb
);
1185 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1190 free_refs(stale_refs
);
1194 static void check_not_current_branch(struct ref
*ref_map
)
1196 struct branch
*current_branch
= branch_get(NULL
);
1198 if (is_bare_repository() || !current_branch
)
1201 for (; ref_map
; ref_map
= ref_map
->next
)
1202 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1203 ref_map
->peer_ref
->name
))
1204 die(_("Refusing to fetch into current branch %s "
1205 "of non-bare repository"), current_branch
->refname
);
1208 static int truncate_fetch_head(void)
1210 const char *filename
= git_path_fetch_head(the_repository
);
1211 FILE *fp
= fopen_for_writing(filename
);
1214 return error_errno(_("cannot open %s"), filename
);
1219 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1221 int r
= transport_set_option(transport
, name
, value
);
1223 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1224 name
, value
, transport
->url
);
1226 warning(_("Option \"%s\" is ignored for %s\n"),
1227 name
, transport
->url
);
1231 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1234 struct oid_array
*oids
= cb_data
;
1236 oid_array_append(oids
, oid
);
1240 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1242 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1245 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1246 const char *s
= negotiation_tip
.items
[i
].string
;
1248 if (!has_glob_specials(s
)) {
1249 struct object_id oid
;
1250 if (get_oid(s
, &oid
))
1251 die("%s is not a valid object", s
);
1252 oid_array_append(oids
, &oid
);
1256 for_each_glob_ref(add_oid
, s
, oids
);
1257 if (old_nr
== oids
->nr
)
1258 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1261 smart_options
->negotiation_tips
= oids
;
1264 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1266 struct transport
*transport
;
1268 transport
= transport_get(remote
, NULL
);
1269 transport_set_verbosity(transport
, verbosity
, progress
);
1270 transport
->family
= family
;
1272 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1274 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1276 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1277 if (deepen
&& deepen_since
)
1278 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1279 if (deepen
&& deepen_not
.nr
)
1280 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1281 (const char *)&deepen_not
);
1282 if (deepen_relative
)
1283 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1285 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1286 if (filter_options
.choice
) {
1288 expand_list_objects_filter_spec(&filter_options
);
1289 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1290 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1292 if (negotiation_tip
.nr
) {
1293 if (transport
->smart_options
)
1294 add_negotiation_tips(transport
->smart_options
);
1296 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1301 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1306 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1307 * when remote helper is used (setting it to an empty string
1308 * is not unsetting). We could extend the remote helper
1309 * protocol for that, but for now, just force a new connection
1310 * without deepen-since. Similar story for deepen-not.
1312 cannot_reuse
= transport
->cannot_reuse
||
1313 deepen_since
|| deepen_not
.nr
;
1315 gsecondary
= prepare_transport(transport
->remote
, 0);
1316 transport
= gsecondary
;
1319 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1320 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1321 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1322 if (!fetch_refs(transport
, ref_map
))
1323 consume_refs(transport
, ref_map
);
1326 transport_disconnect(gsecondary
);
1331 static int do_fetch(struct transport
*transport
,
1334 struct ref
*ref_map
;
1335 int autotags
= (transport
->remote
->fetch_tags
== 1);
1337 const struct ref
*remote_refs
;
1338 struct strvec ref_prefixes
= STRVEC_INIT
;
1339 int must_list_refs
= 1;
1341 if (tags
== TAGS_DEFAULT
) {
1342 if (transport
->remote
->fetch_tags
== 2)
1344 if (transport
->remote
->fetch_tags
== -1)
1348 /* if not appending, truncate FETCH_HEAD */
1349 if (!append
&& write_fetch_head
) {
1350 retcode
= truncate_fetch_head();
1358 refspec_ref_prefixes(rs
, &ref_prefixes
);
1361 * We can avoid listing refs if all of them are exact
1365 for (i
= 0; i
< rs
->nr
; i
++) {
1366 if (!rs
->items
[i
].exact_sha1
) {
1371 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1372 refspec_ref_prefixes(&transport
->remote
->fetch
, &ref_prefixes
);
1374 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1376 if (ref_prefixes
.nr
)
1377 strvec_push(&ref_prefixes
, "refs/tags/");
1380 if (must_list_refs
) {
1381 trace2_region_enter("fetch", "remote_refs", the_repository
);
1382 remote_refs
= transport_get_remote_refs(transport
, &ref_prefixes
);
1383 trace2_region_leave("fetch", "remote_refs", the_repository
);
1387 strvec_clear(&ref_prefixes
);
1389 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1391 if (!update_head_ok
)
1392 check_not_current_branch(ref_map
);
1394 if (tags
== TAGS_DEFAULT
&& autotags
)
1395 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1398 * We only prune based on refspecs specified
1399 * explicitly (via command line or configuration); we
1400 * don't care whether --tags was specified.
1403 prune_refs(rs
, ref_map
, transport
->url
);
1405 prune_refs(&transport
->remote
->fetch
,
1410 if (fetch_refs(transport
, ref_map
) || consume_refs(transport
, ref_map
)) {
1417 struct branch
*branch
= branch_get("HEAD");
1419 struct ref
*source_ref
= NULL
;
1422 * We're setting the upstream configuration for the
1423 * current branch. The relevant upstream is the
1424 * fetched branch that is meant to be merged with the
1425 * current one, i.e. the one fetched to FETCH_HEAD.
1427 * When there are several such branches, consider the
1428 * request ambiguous and err on the safe side by doing
1429 * nothing and just emit a warning.
1431 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1432 if (!rm
->peer_ref
) {
1434 warning(_("multiple branches detected, incompatible with --set-upstream"));
1442 if (!strcmp(source_ref
->name
, "HEAD") ||
1443 starts_with(source_ref
->name
, "refs/heads/"))
1444 install_branch_config(0,
1446 transport
->remote
->name
,
1448 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1449 warning(_("not setting upstream for a remote remote-tracking branch"));
1450 else if (starts_with(source_ref
->name
, "refs/tags/"))
1451 warning(_("not setting upstream for a remote tag"));
1453 warning(_("unknown branch type"));
1455 warning(_("no source branch found.\n"
1456 "you need to specify exactly one branch with the --set-upstream option."));
1462 /* if neither --no-tags nor --tags was specified, do automated tag
1464 if (tags
== TAGS_DEFAULT
&& autotags
) {
1465 struct ref
**tail
= &ref_map
;
1467 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
1469 backfill_tags(transport
, ref_map
);
1477 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1479 struct string_list
*list
= priv
;
1480 if (!remote
->skip_default_update
)
1481 string_list_append(list
, remote
->name
);
1485 struct remote_group_data
{
1487 struct string_list
*list
;
1490 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1492 struct remote_group_data
*g
= priv
;
1494 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1495 /* split list by white space */
1497 size_t wordlen
= strcspn(value
, " \t\n");
1500 string_list_append_nodup(g
->list
,
1501 xstrndup(value
, wordlen
));
1502 value
+= wordlen
+ (value
[wordlen
] != '\0');
1509 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1511 int prev_nr
= list
->nr
;
1512 struct remote_group_data g
;
1513 g
.name
= name
; g
.list
= list
;
1515 git_config(get_remote_group
, &g
);
1516 if (list
->nr
== prev_nr
) {
1517 struct remote
*remote
= remote_get(name
);
1518 if (!remote_is_configured(remote
, 0))
1520 string_list_append(list
, remote
->name
);
1525 static void add_options_to_argv(struct strvec
*argv
)
1528 strvec_push(argv
, "--dry-run");
1530 strvec_push(argv
, prune
? "--prune" : "--no-prune");
1531 if (prune_tags
!= -1)
1532 strvec_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1534 strvec_push(argv
, "--update-head-ok");
1536 strvec_push(argv
, "--force");
1538 strvec_push(argv
, "--keep");
1539 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1540 strvec_push(argv
, "--recurse-submodules");
1541 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1542 strvec_push(argv
, "--recurse-submodules=on-demand");
1543 if (tags
== TAGS_SET
)
1544 strvec_push(argv
, "--tags");
1545 else if (tags
== TAGS_UNSET
)
1546 strvec_push(argv
, "--no-tags");
1548 strvec_push(argv
, "-v");
1550 strvec_push(argv
, "-v");
1551 else if (verbosity
< 0)
1552 strvec_push(argv
, "-q");
1556 /* Fetch multiple remotes in parallel */
1558 struct parallel_fetch_state
{
1560 struct string_list
*remotes
;
1564 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1565 void *cb
, void **task_cb
)
1567 struct parallel_fetch_state
*state
= cb
;
1570 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1573 remote
= state
->remotes
->items
[state
->next
++].string
;
1576 strvec_pushv(&cp
->args
, state
->argv
);
1577 strvec_push(&cp
->args
, remote
);
1581 printf(_("Fetching %s\n"), remote
);
1586 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1588 struct parallel_fetch_state
*state
= cb
;
1589 const char *remote
= task_cb
;
1591 state
->result
= error(_("Could not fetch %s"), remote
);
1596 static int fetch_finished(int result
, struct strbuf
*out
,
1597 void *cb
, void *task_cb
)
1599 struct parallel_fetch_state
*state
= cb
;
1600 const char *remote
= task_cb
;
1603 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1611 static int fetch_multiple(struct string_list
*list
, int max_children
)
1614 struct strvec argv
= STRVEC_INIT
;
1616 if (!append
&& write_fetch_head
) {
1617 int errcode
= truncate_fetch_head();
1622 strvec_pushl(&argv
, "fetch", "--append", "--no-auto-gc",
1623 "--no-write-commit-graph", NULL
);
1624 add_options_to_argv(&argv
);
1626 if (max_children
!= 1 && list
->nr
!= 1) {
1627 struct parallel_fetch_state state
= { argv
.v
, list
, 0, 0 };
1629 strvec_push(&argv
, "--end-of-options");
1630 result
= run_processes_parallel_tr2(max_children
,
1632 &fetch_failed_to_start
,
1635 "fetch", "parallel/fetch");
1638 result
= state
.result
;
1640 for (i
= 0; i
< list
->nr
; i
++) {
1641 const char *name
= list
->items
[i
].string
;
1642 strvec_push(&argv
, name
);
1644 printf(_("Fetching %s\n"), name
);
1645 if (run_command_v_opt(argv
.v
, RUN_GIT_CMD
)) {
1646 error(_("Could not fetch %s"), name
);
1652 strvec_clear(&argv
);
1657 * Fetching from the promisor remote should use the given filter-spec
1658 * or inherit the default filter-spec from the config.
1660 static inline void fetch_one_setup_partial(struct remote
*remote
)
1663 * Explicit --no-filter argument overrides everything, regardless
1664 * of any prior partial clones and fetches.
1666 if (filter_options
.no_filter
)
1670 * If no prior partial clone/fetch and the current fetch DID NOT
1671 * request a partial-fetch, do a normal fetch.
1673 if (!has_promisor_remote() && !filter_options
.choice
)
1677 * If this is a partial-fetch request, we enable partial on
1678 * this repo if not already enabled and remember the given
1679 * filter-spec as the default for subsequent fetches to this
1682 if (filter_options
.choice
) {
1683 partial_clone_register(remote
->name
, &filter_options
);
1688 * Do a partial-fetch from the promisor remote using either the
1689 * explicitly given filter-spec or inherit the filter-spec from
1692 if (!filter_options
.choice
)
1693 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
1697 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
,
1698 int prune_tags_ok
, int use_stdin_refspecs
)
1700 struct refspec rs
= REFSPEC_INIT_FETCH
;
1703 int maybe_prune_tags
;
1704 int remote_via_config
= remote_is_configured(remote
, 0);
1707 die(_("No remote repository specified. Please, specify either a URL or a\n"
1708 "remote name from which new revisions should be fetched."));
1710 gtransport
= prepare_transport(remote
, 1);
1713 /* no command line request */
1714 if (0 <= remote
->prune
)
1715 prune
= remote
->prune
;
1716 else if (0 <= fetch_prune_config
)
1717 prune
= fetch_prune_config
;
1719 prune
= PRUNE_BY_DEFAULT
;
1722 if (prune_tags
< 0) {
1723 /* no command line request */
1724 if (0 <= remote
->prune_tags
)
1725 prune_tags
= remote
->prune_tags
;
1726 else if (0 <= fetch_prune_tags_config
)
1727 prune_tags
= fetch_prune_tags_config
;
1729 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1732 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1733 if (maybe_prune_tags
&& remote_via_config
)
1734 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1736 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1737 refspec_append(&rs
, TAG_REFSPEC
);
1739 for (i
= 0; i
< argc
; i
++) {
1740 if (!strcmp(argv
[i
], "tag")) {
1743 die(_("You need to specify a tag name."));
1745 refspec_appendf(&rs
, "refs/tags/%s:refs/tags/%s",
1748 refspec_append(&rs
, argv
[i
]);
1752 if (use_stdin_refspecs
) {
1753 struct strbuf line
= STRBUF_INIT
;
1754 while (strbuf_getline_lf(&line
, stdin
) != EOF
)
1755 refspec_append(&rs
, line
.buf
);
1756 strbuf_release(&line
);
1759 if (server_options
.nr
)
1760 gtransport
->server_options
= &server_options
;
1762 sigchain_push_common(unlock_pack_on_signal
);
1763 atexit(unlock_pack
);
1764 sigchain_push(SIGPIPE
, SIG_IGN
);
1765 exit_code
= do_fetch(gtransport
, &rs
);
1766 sigchain_pop(SIGPIPE
);
1768 transport_disconnect(gtransport
);
1773 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1776 struct string_list list
= STRING_LIST_INIT_DUP
;
1777 struct remote
*remote
= NULL
;
1779 int prune_tags_ok
= 1;
1781 packet_trace_identity("fetch");
1783 /* Record the command line for the reflog */
1784 strbuf_addstr(&default_rla
, "fetch");
1785 for (i
= 1; i
< argc
; i
++) {
1786 /* This handles non-URLs gracefully */
1787 char *anon
= transport_anonymize_url(argv
[i
]);
1789 strbuf_addf(&default_rla
, " %s", anon
);
1793 git_config(git_fetch_config
, NULL
);
1795 argc
= parse_options(argc
, argv
, prefix
,
1796 builtin_fetch_options
, builtin_fetch_usage
, 0);
1797 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
1798 int *sfjc
= submodule_fetch_jobs_config
== -1
1799 ? &submodule_fetch_jobs_config
: NULL
;
1800 int *rs
= recurse_submodules
== RECURSE_SUBMODULES_DEFAULT
1801 ? &recurse_submodules
: NULL
;
1803 fetch_config_from_gitmodules(sfjc
, rs
);
1806 if (deepen_relative
) {
1807 if (deepen_relative
< 0)
1808 die(_("Negative depth in --deepen is not supported"));
1810 die(_("--deepen and --depth are mutually exclusive"));
1811 depth
= xstrfmt("%d", deepen_relative
);
1815 die(_("--depth and --unshallow cannot be used together"));
1816 else if (!is_repository_shallow(the_repository
))
1817 die(_("--unshallow on a complete repository does not make sense"));
1819 depth
= xstrfmt("%d", INFINITE_DEPTH
);
1822 /* no need to be strict, transport_set_option() will validate it again */
1823 if (depth
&& atoi(depth
) < 1)
1824 die(_("depth %s is not a positive number"), depth
);
1825 if (depth
|| deepen_since
|| deepen_not
.nr
)
1828 /* FETCH_HEAD never gets updated in --dry-run mode */
1830 write_fetch_head
= 0;
1834 die(_("fetch --all does not take a repository argument"));
1836 die(_("fetch --all does not make sense with refspecs"));
1837 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
1838 } else if (argc
== 0) {
1839 /* No arguments -- use default remote */
1840 remote
= remote_get(NULL
);
1841 } else if (multiple
) {
1842 /* All arguments are assumed to be remotes or groups */
1843 for (i
= 0; i
< argc
; i
++)
1844 if (!add_remote_or_group(argv
[i
], &list
))
1845 die(_("No such remote or remote group: %s"), argv
[i
]);
1847 /* Single remote or group */
1848 (void) add_remote_or_group(argv
[0], &list
);
1850 /* More than one remote */
1852 die(_("Fetching a group and specifying refspecs does not make sense"));
1854 /* Zero or one remotes */
1855 remote
= remote_get(argv
[0]);
1856 prune_tags_ok
= (argc
== 1);
1863 if (filter_options
.choice
|| has_promisor_remote())
1864 fetch_one_setup_partial(remote
);
1865 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
, stdin_refspecs
);
1867 int max_children
= max_jobs
;
1869 if (filter_options
.choice
)
1870 die(_("--filter can only be used with the remote "
1871 "configured in extensions.partialclone"));
1874 die(_("--stdin can only be used when fetching "
1875 "from one remote"));
1877 if (max_children
< 0)
1878 max_children
= fetch_parallel_config
;
1880 /* TODO should this also die if we have a previous partial-clone? */
1881 result
= fetch_multiple(&list
, max_children
);
1884 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
1885 struct strvec options
= STRVEC_INIT
;
1886 int max_children
= max_jobs
;
1888 if (max_children
< 0)
1889 max_children
= submodule_fetch_jobs_config
;
1890 if (max_children
< 0)
1891 max_children
= fetch_parallel_config
;
1893 add_options_to_argv(&options
);
1894 result
= fetch_populated_submodules(the_repository
,
1898 recurse_submodules_default
,
1901 strvec_clear(&options
);
1904 string_list_clear(&list
, 0);
1906 prepare_repo_settings(the_repository
);
1907 if (fetch_write_commit_graph
> 0 ||
1908 (fetch_write_commit_graph
< 0 &&
1909 the_repository
->settings
.fetch_write_commit_graph
)) {
1910 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
1913 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
1915 write_commit_graph_reachable(the_repository
->objects
->odb
,
1920 close_object_store(the_repository
->objects
);
1923 run_auto_gc(verbosity
< 0);