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"
33 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
35 static const char * const builtin_fetch_usage
[] = {
36 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
37 N_("git fetch [<options>] <group>"),
38 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
39 N_("git fetch --all [<options>]"),
49 static int fetch_prune_config
= -1; /* unspecified */
50 static int fetch_show_forced_updates
= 1;
51 static uint64_t forced_updates_ms
= 0;
52 static int prefetch
= 0;
53 static int prune
= -1; /* unspecified */
54 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
56 static int fetch_prune_tags_config
= -1; /* unspecified */
57 static int prune_tags
= -1; /* unspecified */
58 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
60 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
;
61 static int write_fetch_head
= 1;
62 static int verbosity
, deepen_relative
, set_upstream
;
63 static int progress
= -1;
64 static int enable_auto_gc
= 1;
65 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
, deepen
;
66 static int max_jobs
= -1, submodule_fetch_jobs_config
= -1;
67 static int fetch_parallel_config
= 1;
68 static int atomic_fetch
;
69 static enum transport_family family
;
70 static const char *depth
;
71 static const char *deepen_since
;
72 static const char *upload_pack
;
73 static struct string_list deepen_not
= STRING_LIST_INIT_NODUP
;
74 static struct strbuf default_rla
= STRBUF_INIT
;
75 static struct transport
*gtransport
;
76 static struct transport
*gsecondary
;
77 static const char *submodule_prefix
= "";
78 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
79 static int recurse_submodules_cli
= RECURSE_SUBMODULES_DEFAULT
;
80 static int recurse_submodules_default
= RECURSE_SUBMODULES_ON_DEMAND
;
81 static int shown_url
= 0;
82 static struct refspec refmap
= REFSPEC_INIT_FETCH
;
83 static struct list_objects_filter_options filter_options
;
84 static struct string_list server_options
= STRING_LIST_INIT_DUP
;
85 static struct string_list negotiation_tip
= STRING_LIST_INIT_NODUP
;
86 static int fetch_write_commit_graph
= -1;
87 static int stdin_refspecs
= 0;
88 static int negotiate_only
;
90 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
92 if (!strcmp(k
, "fetch.prune")) {
93 fetch_prune_config
= git_config_bool(k
, v
);
97 if (!strcmp(k
, "fetch.prunetags")) {
98 fetch_prune_tags_config
= git_config_bool(k
, v
);
102 if (!strcmp(k
, "fetch.showforcedupdates")) {
103 fetch_show_forced_updates
= git_config_bool(k
, v
);
107 if (!strcmp(k
, "submodule.recurse")) {
108 int r
= git_config_bool(k
, v
) ?
109 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
110 recurse_submodules
= r
;
113 if (!strcmp(k
, "submodule.fetchjobs")) {
114 submodule_fetch_jobs_config
= parse_submodule_fetchjobs(k
, v
);
116 } else if (!strcmp(k
, "fetch.recursesubmodules")) {
117 recurse_submodules
= parse_fetch_recurse_submodules_arg(k
, v
);
121 if (!strcmp(k
, "fetch.parallel")) {
122 fetch_parallel_config
= git_config_int(k
, v
);
123 if (fetch_parallel_config
< 0)
124 die(_("fetch.parallel cannot be negative"));
128 return git_default_config(k
, v
, cb
);
131 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
133 BUG_ON_OPT_NEG(unset
);
136 * "git fetch --refmap='' origin foo"
137 * can be used to tell the command not to store anywhere
139 refspec_append(&refmap
, arg
);
144 static struct option builtin_fetch_options
[] = {
145 OPT__VERBOSITY(&verbosity
),
146 OPT_BOOL(0, "all", &all
,
147 N_("fetch from all remotes")),
148 OPT_BOOL(0, "set-upstream", &set_upstream
,
149 N_("set upstream for git pull/fetch")),
150 OPT_BOOL('a', "append", &append
,
151 N_("append to .git/FETCH_HEAD instead of overwriting")),
152 OPT_BOOL(0, "atomic", &atomic_fetch
,
153 N_("use atomic transaction to update references")),
154 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
155 N_("path to upload pack on remote end")),
156 OPT__FORCE(&force
, N_("force overwrite of local reference"), 0),
157 OPT_BOOL('m', "multiple", &multiple
,
158 N_("fetch from multiple remotes")),
159 OPT_SET_INT('t', "tags", &tags
,
160 N_("fetch all tags and associated objects"), TAGS_SET
),
161 OPT_SET_INT('n', NULL
, &tags
,
162 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
163 OPT_INTEGER('j', "jobs", &max_jobs
,
164 N_("number of submodules fetched in parallel")),
165 OPT_BOOL(0, "prefetch", &prefetch
,
166 N_("modify the refspec to place all refs within refs/prefetch/")),
167 OPT_BOOL('p', "prune", &prune
,
168 N_("prune remote-tracking branches no longer on remote")),
169 OPT_BOOL('P', "prune-tags", &prune_tags
,
170 N_("prune local tags no longer on remote and clobber changed tags")),
171 OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli
, N_("on-demand"),
172 N_("control recursive fetching of submodules"),
173 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
),
174 OPT_BOOL(0, "dry-run", &dry_run
,
176 OPT_BOOL(0, "write-fetch-head", &write_fetch_head
,
177 N_("write fetched references to the FETCH_HEAD file")),
178 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
179 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
180 N_("allow updating of HEAD ref")),
181 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
182 OPT_STRING(0, "depth", &depth
, N_("depth"),
183 N_("deepen history of shallow clone")),
184 OPT_STRING(0, "shallow-since", &deepen_since
, N_("time"),
185 N_("deepen history of shallow repository based on time")),
186 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not
, N_("revision"),
187 N_("deepen history of shallow clone, excluding rev")),
188 OPT_INTEGER(0, "deepen", &deepen_relative
,
189 N_("deepen history of shallow clone")),
190 OPT_SET_INT_F(0, "unshallow", &unshallow
,
191 N_("convert to a complete repository"),
193 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
194 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
195 OPT_CALLBACK_F(0, "recurse-submodules-default",
196 &recurse_submodules_default
, N_("on-demand"),
197 N_("default for recursive fetching of submodules "
198 "(lower priority than config files)"),
199 PARSE_OPT_HIDDEN
, option_fetch_parse_recurse_submodules
),
200 OPT_BOOL(0, "update-shallow", &update_shallow
,
201 N_("accept refs that update .git/shallow")),
202 OPT_CALLBACK_F(0, "refmap", NULL
, N_("refmap"),
203 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
),
204 OPT_STRING_LIST('o', "server-option", &server_options
, N_("server-specific"), N_("option to transmit")),
205 OPT_SET_INT('4', "ipv4", &family
, N_("use IPv4 addresses only"),
206 TRANSPORT_FAMILY_IPV4
),
207 OPT_SET_INT('6', "ipv6", &family
, N_("use IPv6 addresses only"),
208 TRANSPORT_FAMILY_IPV6
),
209 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip
, N_("revision"),
210 N_("report that we have only objects reachable from this object")),
211 OPT_BOOL(0, "negotiate-only", &negotiate_only
,
212 N_("do not fetch a packfile; instead, print ancestors of negotiation tips")),
213 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options
),
214 OPT_BOOL(0, "auto-maintenance", &enable_auto_gc
,
215 N_("run 'maintenance --auto' after fetching")),
216 OPT_BOOL(0, "auto-gc", &enable_auto_gc
,
217 N_("run 'maintenance --auto' after fetching")),
218 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates
,
219 N_("check for forced-updates on all updated branches")),
220 OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph
,
221 N_("write the commit-graph after fetching")),
222 OPT_BOOL(0, "stdin", &stdin_refspecs
,
223 N_("accept refspecs from stdin")),
227 static void unlock_pack(unsigned int flags
)
230 transport_unlock_pack(gtransport
, flags
);
232 transport_unlock_pack(gsecondary
, flags
);
235 static void unlock_pack_atexit(void)
240 static void unlock_pack_on_signal(int signo
)
242 unlock_pack(TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER
);
247 static void add_merge_config(struct ref
**head
,
248 const struct ref
*remote_refs
,
249 struct branch
*branch
,
254 for (i
= 0; i
< branch
->merge_nr
; i
++) {
255 struct ref
*rm
, **old_tail
= *tail
;
256 struct refspec_item refspec
;
258 for (rm
= *head
; rm
; rm
= rm
->next
) {
259 if (branch_merge_matches(branch
, i
, rm
->name
)) {
260 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
268 * Not fetched to a remote-tracking branch? We need to fetch
269 * it anyway to allow this branch's "branch.$name.merge"
270 * to be honored by 'git pull', but we do not have to
271 * fail if branch.$name.merge is misconfigured to point
272 * at a nonexisting branch. If we were indeed called by
273 * 'git pull', it will notice the misconfiguration because
274 * there is no entry in the resulting FETCH_HEAD marked
277 memset(&refspec
, 0, sizeof(refspec
));
278 refspec
.src
= branch
->merge
[i
]->src
;
279 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
280 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
281 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
285 static void create_fetch_oidset(struct ref
**head
, struct oidset
*out
)
287 struct ref
*rm
= *head
;
289 oidset_insert(out
, &rm
->old_oid
);
294 struct refname_hash_entry
{
295 struct hashmap_entry ent
;
296 struct object_id oid
;
298 char refname
[FLEX_ARRAY
];
301 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data
,
302 const struct hashmap_entry
*eptr
,
303 const struct hashmap_entry
*entry_or_key
,
306 const struct refname_hash_entry
*e1
, *e2
;
308 e1
= container_of(eptr
, const struct refname_hash_entry
, ent
);
309 e2
= container_of(entry_or_key
, const struct refname_hash_entry
, ent
);
310 return strcmp(e1
->refname
, keydata
? keydata
: e2
->refname
);
313 static struct refname_hash_entry
*refname_hash_add(struct hashmap
*map
,
315 const struct object_id
*oid
)
317 struct refname_hash_entry
*ent
;
318 size_t len
= strlen(refname
);
320 FLEX_ALLOC_MEM(ent
, refname
, refname
, len
);
321 hashmap_entry_init(&ent
->ent
, strhash(refname
));
322 oidcpy(&ent
->oid
, oid
);
323 hashmap_add(map
, &ent
->ent
);
327 static int add_one_refname(const char *refname
,
328 const struct object_id
*oid
,
329 int flag
, void *cbdata
)
331 struct hashmap
*refname_map
= cbdata
;
333 (void) refname_hash_add(refname_map
, refname
, oid
);
337 static void refname_hash_init(struct hashmap
*map
)
339 hashmap_init(map
, refname_hash_entry_cmp
, NULL
, 0);
342 static int refname_hash_exists(struct hashmap
*map
, const char *refname
)
344 return !!hashmap_get_from_hash(map
, strhash(refname
), refname
);
347 static void clear_item(struct refname_hash_entry
*item
)
353 static void add_already_queued_tags(const char *refname
,
354 const struct object_id
*old_oid
,
355 const struct object_id
*new_oid
,
358 struct hashmap
*queued_tags
= cb_data
;
359 if (starts_with(refname
, "refs/tags/") && new_oid
)
360 (void) refname_hash_add(queued_tags
, refname
, new_oid
);
363 static void find_non_local_tags(const struct ref
*refs
,
364 struct ref_transaction
*transaction
,
368 struct hashmap existing_refs
;
369 struct hashmap remote_refs
;
370 struct oidset fetch_oids
= OIDSET_INIT
;
371 struct string_list remote_refs_list
= STRING_LIST_INIT_NODUP
;
372 struct string_list_item
*remote_ref_item
;
373 const struct ref
*ref
;
374 struct refname_hash_entry
*item
= NULL
;
375 const int quick_flags
= OBJECT_INFO_QUICK
| OBJECT_INFO_SKIP_FETCH_OBJECT
;
377 refname_hash_init(&existing_refs
);
378 refname_hash_init(&remote_refs
);
379 create_fetch_oidset(head
, &fetch_oids
);
381 for_each_ref(add_one_refname
, &existing_refs
);
384 * If we already have a transaction, then we need to filter out all
385 * tags which have already been queued up.
388 ref_transaction_for_each_queued_update(transaction
,
389 add_already_queued_tags
,
392 for (ref
= refs
; ref
; ref
= ref
->next
) {
393 if (!starts_with(ref
->name
, "refs/tags/"))
397 * The peeled ref always follows the matching base
398 * ref, so if we see a peeled ref that we don't want
399 * to fetch then we can mark the ref entry in the list
400 * as one to ignore by setting util to NULL.
402 if (ends_with(ref
->name
, "^{}")) {
404 !has_object_file_with_flags(&ref
->old_oid
, quick_flags
) &&
405 !oidset_contains(&fetch_oids
, &ref
->old_oid
) &&
406 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
407 !oidset_contains(&fetch_oids
, &item
->oid
))
414 * If item is non-NULL here, then we previously saw a
415 * ref not followed by a peeled reference, so we need
416 * to check if it is a lightweight tag that we want to
420 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
421 !oidset_contains(&fetch_oids
, &item
->oid
))
426 /* skip duplicates and refs that we already have */
427 if (refname_hash_exists(&remote_refs
, ref
->name
) ||
428 refname_hash_exists(&existing_refs
, ref
->name
))
431 item
= refname_hash_add(&remote_refs
, ref
->name
, &ref
->old_oid
);
432 string_list_insert(&remote_refs_list
, ref
->name
);
434 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
437 * We may have a final lightweight tag that needs to be
438 * checked to see if it needs fetching.
441 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
442 !oidset_contains(&fetch_oids
, &item
->oid
))
446 * For all the tags in the remote_refs_list,
447 * add them to the list of refs to be fetched
449 for_each_string_list_item(remote_ref_item
, &remote_refs_list
) {
450 const char *refname
= remote_ref_item
->string
;
452 unsigned int hash
= strhash(refname
);
454 item
= hashmap_get_entry_from_hash(&remote_refs
, hash
, refname
,
455 struct refname_hash_entry
, ent
);
457 BUG("unseen remote ref?");
459 /* Unless we have already decided to ignore this item... */
463 rm
= alloc_ref(item
->refname
);
464 rm
->peer_ref
= alloc_ref(item
->refname
);
465 oidcpy(&rm
->old_oid
, &item
->oid
);
469 hashmap_clear_and_free(&remote_refs
, struct refname_hash_entry
, ent
);
470 string_list_clear(&remote_refs_list
, 0);
471 oidset_clear(&fetch_oids
);
474 static void filter_prefetch_refspec(struct refspec
*rs
)
481 for (i
= 0; i
< rs
->nr
; i
++) {
482 struct strbuf new_dst
= STRBUF_INIT
;
484 const char *sub
= NULL
;
486 if (rs
->items
[i
].negative
)
488 if (!rs
->items
[i
].dst
||
490 !strncmp(rs
->items
[i
].src
, "refs/tags/", 10))) {
493 free(rs
->items
[i
].src
);
494 free(rs
->items
[i
].dst
);
496 for (j
= i
+ 1; j
< rs
->nr
; j
++) {
497 rs
->items
[j
- 1] = rs
->items
[j
];
498 rs
->raw
[j
- 1] = rs
->raw
[j
];
505 old_dst
= rs
->items
[i
].dst
;
506 strbuf_addstr(&new_dst
, "refs/prefetch/");
509 * If old_dst starts with "refs/", then place
510 * sub after that prefix. Otherwise, start at
511 * the beginning of the string.
513 if (!skip_prefix(old_dst
, "refs/", &sub
))
515 strbuf_addstr(&new_dst
, sub
);
517 rs
->items
[i
].dst
= strbuf_detach(&new_dst
, NULL
);
518 rs
->items
[i
].force
= 1;
524 static struct ref
*get_ref_map(struct remote
*remote
,
525 const struct ref
*remote_refs
,
527 int tags
, int *autotags
)
531 struct ref
*ref_map
= NULL
;
532 struct ref
**tail
= &ref_map
;
534 /* opportunistically-updated references: */
535 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
537 struct hashmap existing_refs
;
538 int existing_refs_populated
= 0;
540 filter_prefetch_refspec(rs
);
542 filter_prefetch_refspec(&remote
->fetch
);
545 struct refspec
*fetch_refspec
;
547 for (i
= 0; i
< rs
->nr
; i
++) {
548 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
549 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
552 /* Merge everything on the command line (but not --tags) */
553 for (rm
= ref_map
; rm
; rm
= rm
->next
)
554 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
557 * For any refs that we happen to be fetching via
558 * command-line arguments, the destination ref might
559 * have been missing or have been different than the
560 * remote-tracking ref that would be derived from the
561 * configured refspec. In these cases, we want to
562 * take the opportunity to update their configured
563 * remote-tracking reference. However, we do not want
564 * to mention these entries in FETCH_HEAD at all, as
565 * they would simply be duplicates of existing
566 * entries, so we set them FETCH_HEAD_IGNORE below.
568 * We compute these entries now, based only on the
569 * refspecs specified on the command line. But we add
570 * them to the list following the refspecs resulting
571 * from the tags option so that one of the latter,
572 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
573 * by ref_remove_duplicates() in favor of one of these
574 * opportunistic entries with FETCH_HEAD_IGNORE.
577 fetch_refspec
= &refmap
;
579 fetch_refspec
= &remote
->fetch
;
581 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
582 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
583 } else if (refmap
.nr
) {
584 die("--refmap option is only meaningful with command-line refspec(s)");
586 /* Use the defaults */
587 struct branch
*branch
= branch_get(NULL
);
588 int has_merge
= branch_has_merge_config(branch
);
591 /* Note: has_merge implies non-NULL branch->remote_name */
592 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
593 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
594 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
595 if (remote
->fetch
.items
[i
].dst
&&
596 remote
->fetch
.items
[i
].dst
[0])
598 if (!i
&& !has_merge
&& ref_map
&&
599 !remote
->fetch
.items
[0].pattern
)
600 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
603 * if the remote we're fetching from is the same
604 * as given in branch.<name>.remote, we add the
605 * ref given in branch.<name>.merge, too.
607 * Note: has_merge implies non-NULL branch->remote_name
610 !strcmp(branch
->remote_name
, remote
->name
))
611 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
612 } else if (!prefetch
) {
613 ref_map
= get_remote_ref(remote_refs
, "HEAD");
615 die(_("couldn't find remote ref HEAD"));
616 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
617 tail
= &ref_map
->next
;
621 if (tags
== TAGS_SET
)
622 /* also fetch all tags */
623 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
624 else if (tags
== TAGS_DEFAULT
&& *autotags
)
625 find_non_local_tags(remote_refs
, NULL
, &ref_map
, &tail
);
627 /* Now append any refs to be updated opportunistically: */
629 for (rm
= orefs
; rm
; rm
= rm
->next
) {
630 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
635 * apply negative refspecs first, before we remove duplicates. This is
636 * necessary as negative refspecs might remove an otherwise conflicting
640 ref_map
= apply_negative_refspecs(ref_map
, rs
);
642 ref_map
= apply_negative_refspecs(ref_map
, &remote
->fetch
);
644 ref_map
= ref_remove_duplicates(ref_map
);
646 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
648 const char *refname
= rm
->peer_ref
->name
;
649 struct refname_hash_entry
*peer_item
;
650 unsigned int hash
= strhash(refname
);
652 if (!existing_refs_populated
) {
653 refname_hash_init(&existing_refs
);
654 for_each_ref(add_one_refname
, &existing_refs
);
655 existing_refs_populated
= 1;
658 peer_item
= hashmap_get_entry_from_hash(&existing_refs
,
660 struct refname_hash_entry
, ent
);
662 struct object_id
*old_oid
= &peer_item
->oid
;
663 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
667 if (existing_refs_populated
)
668 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
673 #define STORE_REF_ERROR_OTHER 1
674 #define STORE_REF_ERROR_DF_CONFLICT 2
676 static int s_update_ref(const char *action
,
678 struct ref_transaction
*transaction
,
682 char *rla
= getenv("GIT_REFLOG_ACTION");
683 struct ref_transaction
*our_transaction
= NULL
;
684 struct strbuf err
= STRBUF_INIT
;
690 rla
= default_rla
.buf
;
691 msg
= xstrfmt("%s: %s", rla
, action
);
694 * If no transaction was passed to us, we manage the transaction
695 * ourselves. Otherwise, we trust the caller to handle the transaction
699 transaction
= our_transaction
= ref_transaction_begin(&err
);
701 ret
= STORE_REF_ERROR_OTHER
;
706 ret
= ref_transaction_update(transaction
, ref
->name
, &ref
->new_oid
,
707 check_old
? &ref
->old_oid
: NULL
,
710 ret
= STORE_REF_ERROR_OTHER
;
714 if (our_transaction
) {
715 switch (ref_transaction_commit(our_transaction
, &err
)) {
718 case TRANSACTION_NAME_CONFLICT
:
719 ret
= STORE_REF_ERROR_DF_CONFLICT
;
722 ret
= STORE_REF_ERROR_OTHER
;
728 ref_transaction_free(our_transaction
);
730 error("%s", err
.buf
);
731 strbuf_release(&err
);
736 static int refcol_width
= 10;
737 static int compact_format
;
739 static void adjust_refcol_width(const struct ref
*ref
)
741 int max
, rlen
, llen
, len
;
743 /* uptodate lines are only shown on high verbosity level */
744 if (verbosity
<= 0 && oideq(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
747 max
= term_columns();
748 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
750 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
753 * rough estimation to see if the output line is too long and
754 * should not be counted (we can't do precise calculation
755 * anyway because we don't know if the error explanation part
756 * will be printed in update_local_ref)
758 if (compact_format
) {
762 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
767 * Not precise calculation for compact mode because '*' can
768 * appear on the left hand side of '->' and shrink the column
771 if (refcol_width
< rlen
)
775 static void prepare_format_display(struct ref
*ref_map
)
778 const char *format
= "full";
783 git_config_get_string_tmp("fetch.output", &format
);
784 if (!strcasecmp(format
, "full"))
786 else if (!strcasecmp(format
, "compact"))
789 die(_("invalid value for '%s': '%s'"),
790 "fetch.output", format
);
792 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
793 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
795 !strcmp(rm
->name
, "HEAD"))
798 adjust_refcol_width(rm
);
802 static void print_remote_to_local(struct strbuf
*display
,
803 const char *remote
, const char *local
)
805 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
808 static int find_and_replace(struct strbuf
*haystack
,
810 const char *placeholder
)
812 const char *p
= NULL
;
815 nlen
= strlen(needle
);
816 if (ends_with(haystack
->buf
, needle
))
817 p
= haystack
->buf
+ haystack
->len
- nlen
;
819 p
= strstr(haystack
->buf
, needle
);
823 if (p
> haystack
->buf
&& p
[-1] != '/')
827 if (plen
> nlen
&& p
[nlen
] != '/')
830 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
831 placeholder
, strlen(placeholder
));
835 static void print_compact(struct strbuf
*display
,
836 const char *remote
, const char *local
)
838 struct strbuf r
= STRBUF_INIT
;
839 struct strbuf l
= STRBUF_INIT
;
841 if (!strcmp(remote
, local
)) {
842 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
846 strbuf_addstr(&r
, remote
);
847 strbuf_addstr(&l
, local
);
849 if (!find_and_replace(&r
, local
, "*"))
850 find_and_replace(&l
, remote
, "*");
851 print_remote_to_local(display
, r
.buf
, l
.buf
);
857 static void format_display(struct strbuf
*display
, char code
,
858 const char *summary
, const char *error
,
859 const char *remote
, const char *local
,
867 width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
869 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
871 print_remote_to_local(display
, remote
, local
);
873 print_compact(display
, remote
, local
);
875 strbuf_addf(display
, " (%s)", error
);
878 static int update_local_ref(struct ref
*ref
,
879 struct ref_transaction
*transaction
,
880 const char *remote
, const struct ref
*remote_ref
,
881 struct strbuf
*display
, int summary_width
,
882 struct worktree
**worktrees
)
884 struct commit
*current
= NULL
, *updated
;
885 const struct worktree
*wt
;
886 const char *pretty_ref
= prettify_refname(ref
->name
);
887 int fast_forward
= 0;
889 if (!repo_has_object_file(the_repository
, &ref
->new_oid
))
890 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
892 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
894 format_display(display
, '=', _("[up to date]"), NULL
,
895 remote
, pretty_ref
, summary_width
);
899 if (!update_head_ok
&&
900 (wt
= find_shared_symref(worktrees
, "HEAD", ref
->name
)) &&
901 !wt
->is_bare
&& !is_null_oid(&ref
->old_oid
)) {
903 * If this is the head, and it's not okay to update
904 * the head, and the old value of the head isn't empty...
906 format_display(display
, '!', _("[rejected]"),
908 _("can't fetch in current branch") :
909 _("checked out in another worktree"),
910 remote
, pretty_ref
, summary_width
);
914 if (!is_null_oid(&ref
->old_oid
) &&
915 starts_with(ref
->name
, "refs/tags/")) {
916 if (force
|| ref
->force
) {
918 r
= s_update_ref("updating tag", ref
, transaction
, 0);
919 format_display(display
, r
? '!' : 't', _("[tag update]"),
920 r
? _("unable to update local ref") : NULL
,
921 remote
, pretty_ref
, summary_width
);
924 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
925 remote
, pretty_ref
, summary_width
);
930 current
= lookup_commit_reference_gently(the_repository
,
932 updated
= lookup_commit_reference_gently(the_repository
,
934 if (!current
|| !updated
) {
939 * Nicely describe the new ref we're fetching.
940 * Base this on the remote's ref name, as it's
941 * more likely to follow a standard layout.
943 const char *name
= remote_ref
? remote_ref
->name
: "";
944 if (starts_with(name
, "refs/tags/")) {
946 what
= _("[new tag]");
947 } else if (starts_with(name
, "refs/heads/")) {
948 msg
= "storing head";
949 what
= _("[new branch]");
952 what
= _("[new ref]");
955 r
= s_update_ref(msg
, ref
, transaction
, 0);
956 format_display(display
, r
? '!' : '*', what
,
957 r
? _("unable to update local ref") : NULL
,
958 remote
, pretty_ref
, summary_width
);
962 if (fetch_show_forced_updates
) {
963 uint64_t t_before
= getnanotime();
964 fast_forward
= in_merge_bases(current
, updated
);
965 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
971 struct strbuf quickref
= STRBUF_INIT
;
974 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
975 strbuf_addstr(&quickref
, "..");
976 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
977 r
= s_update_ref("fast-forward", ref
, transaction
, 1);
978 format_display(display
, r
? '!' : ' ', quickref
.buf
,
979 r
? _("unable to update local ref") : NULL
,
980 remote
, pretty_ref
, summary_width
);
981 strbuf_release(&quickref
);
983 } else if (force
|| ref
->force
) {
984 struct strbuf quickref
= STRBUF_INIT
;
986 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
987 strbuf_addstr(&quickref
, "...");
988 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
989 r
= s_update_ref("forced-update", ref
, transaction
, 1);
990 format_display(display
, r
? '!' : '+', quickref
.buf
,
991 r
? _("unable to update local ref") : _("forced update"),
992 remote
, pretty_ref
, summary_width
);
993 strbuf_release(&quickref
);
996 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
997 remote
, pretty_ref
, summary_width
);
1002 static const struct object_id
*iterate_ref_map(void *cb_data
)
1004 struct ref
**rm
= cb_data
;
1005 struct ref
*ref
= *rm
;
1007 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
1012 return &ref
->old_oid
;
1020 static int open_fetch_head(struct fetch_head
*fetch_head
)
1022 const char *filename
= git_path_fetch_head(the_repository
);
1024 if (write_fetch_head
) {
1025 fetch_head
->fp
= fopen(filename
, "a");
1026 if (!fetch_head
->fp
)
1027 return error_errno(_("cannot open '%s'"), filename
);
1028 strbuf_init(&fetch_head
->buf
, 0);
1030 fetch_head
->fp
= NULL
;
1036 static void append_fetch_head(struct fetch_head
*fetch_head
,
1037 const struct object_id
*old_oid
,
1038 enum fetch_head_status fetch_head_status
,
1040 const char *url
, size_t url_len
)
1042 char old_oid_hex
[GIT_MAX_HEXSZ
+ 1];
1043 const char *merge_status_marker
;
1046 if (!fetch_head
->fp
)
1049 switch (fetch_head_status
) {
1050 case FETCH_HEAD_NOT_FOR_MERGE
:
1051 merge_status_marker
= "not-for-merge";
1053 case FETCH_HEAD_MERGE
:
1054 merge_status_marker
= "";
1057 /* do not write anything to FETCH_HEAD */
1061 strbuf_addf(&fetch_head
->buf
, "%s\t%s\t%s",
1062 oid_to_hex_r(old_oid_hex
, old_oid
), merge_status_marker
, note
);
1063 for (i
= 0; i
< url_len
; ++i
)
1065 strbuf_addstr(&fetch_head
->buf
, "\\n");
1067 strbuf_addch(&fetch_head
->buf
, url
[i
]);
1068 strbuf_addch(&fetch_head
->buf
, '\n');
1071 * When using an atomic fetch, we do not want to update FETCH_HEAD if
1072 * any of the reference updates fails. We thus have to write all
1073 * updates to a buffer first and only commit it as soon as all
1074 * references have been successfully updated.
1076 if (!atomic_fetch
) {
1077 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1078 strbuf_reset(&fetch_head
->buf
);
1082 static void commit_fetch_head(struct fetch_head
*fetch_head
)
1084 if (!fetch_head
->fp
|| !atomic_fetch
)
1086 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1089 static void close_fetch_head(struct fetch_head
*fetch_head
)
1091 if (!fetch_head
->fp
)
1094 fclose(fetch_head
->fp
);
1095 strbuf_release(&fetch_head
->buf
);
1098 static const char warn_show_forced_updates
[] =
1099 N_("fetch normally indicates which branches had a forced update,\n"
1100 "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
1101 "flag or run 'git config fetch.showForcedUpdates true'");
1102 static const char warn_time_show_forced_updates
[] =
1103 N_("it took %.2f seconds to check forced updates; you can use\n"
1104 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
1105 "to avoid this check\n");
1107 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
1108 int connectivity_checked
,
1109 struct ref_transaction
*transaction
, struct ref
*ref_map
,
1110 struct fetch_head
*fetch_head
, struct worktree
**worktrees
)
1112 int url_len
, i
, rc
= 0;
1113 struct strbuf note
= STRBUF_INIT
, err
= STRBUF_INIT
;
1114 const char *what
, *kind
;
1118 int summary_width
= 0;
1121 summary_width
= transport_summary_width(ref_map
);
1124 url
= transport_anonymize_url(raw_url
);
1126 url
= xstrdup("foreign");
1128 if (!connectivity_checked
) {
1129 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1132 if (check_connected(iterate_ref_map
, &rm
, &opt
)) {
1133 rc
= error(_("%s did not send all necessary objects\n"), url
);
1138 prepare_format_display(ref_map
);
1141 * We do a pass for each fetch_head_status type in their enum order, so
1142 * merged entries are written before not-for-merge. That lets readers
1143 * use FETCH_HEAD as a refname to refer to the ref to be merged.
1145 for (want_status
= FETCH_HEAD_MERGE
;
1146 want_status
<= FETCH_HEAD_IGNORE
;
1148 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1149 struct ref
*ref
= NULL
;
1151 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
1152 if (want_status
== FETCH_HEAD_MERGE
)
1153 warning(_("rejected %s because shallow roots are not allowed to be updated"),
1154 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
1159 * When writing FETCH_HEAD we need to determine whether
1160 * we already have the commit or not. If not, then the
1161 * reference is not for merge and needs to be written
1162 * to the reflog after other commits which we already
1163 * have. We're not interested in this property though
1164 * in case FETCH_HEAD is not to be updated, so we can
1165 * skip the classification in that case.
1167 if (fetch_head
->fp
) {
1168 struct commit
*commit
= NULL
;
1171 * References in "refs/tags/" are often going to point
1172 * to annotated tags, which are not part of the
1173 * commit-graph. We thus only try to look up refs in
1174 * the graph which are not in that namespace to not
1175 * regress performance in repositories with many
1178 if (!starts_with(rm
->name
, "refs/tags/"))
1179 commit
= lookup_commit_in_graph(the_repository
, &rm
->old_oid
);
1181 commit
= lookup_commit_reference_gently(the_repository
,
1185 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
1189 if (rm
->fetch_head_status
!= want_status
)
1193 ref
= alloc_ref(rm
->peer_ref
->name
);
1194 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
1195 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
1196 ref
->force
= rm
->peer_ref
->force
;
1199 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
&&
1200 (!rm
->peer_ref
|| !oideq(&ref
->old_oid
, &ref
->new_oid
))) {
1201 check_for_new_submodule_commits(&rm
->old_oid
);
1204 if (!strcmp(rm
->name
, "HEAD")) {
1208 else if (skip_prefix(rm
->name
, "refs/heads/", &what
))
1210 else if (skip_prefix(rm
->name
, "refs/tags/", &what
))
1212 else if (skip_prefix(rm
->name
, "refs/remotes/", &what
))
1213 kind
= "remote-tracking branch";
1219 url_len
= strlen(url
);
1220 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1223 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1226 strbuf_reset(¬e
);
1229 strbuf_addf(¬e
, "%s ", kind
);
1230 strbuf_addf(¬e
, "'%s' of ", what
);
1233 append_fetch_head(fetch_head
, &rm
->old_oid
,
1234 rm
->fetch_head_status
,
1235 note
.buf
, url
, url_len
);
1237 strbuf_reset(¬e
);
1239 rc
|= update_local_ref(ref
, transaction
, what
,
1240 rm
, ¬e
, summary_width
,
1243 } else if (write_fetch_head
|| dry_run
) {
1245 * Display fetches written to FETCH_HEAD (or
1246 * would be written to FETCH_HEAD, if --dry-run
1249 format_display(¬e
, '*',
1250 *kind
? kind
: "branch", NULL
,
1251 *what
? what
: "HEAD",
1252 "FETCH_HEAD", summary_width
);
1256 fprintf(stderr
, _("From %.*s\n"),
1260 fprintf(stderr
, " %s\n", note
.buf
);
1265 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1266 error(_("some local refs could not be updated; try running\n"
1267 " 'git remote prune %s' to remove any old, conflicting "
1268 "branches"), remote_name
);
1270 if (advice_enabled(ADVICE_FETCH_SHOW_FORCED_UPDATES
)) {
1271 if (!fetch_show_forced_updates
) {
1272 warning(_(warn_show_forced_updates
));
1273 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1274 warning(_(warn_time_show_forced_updates
),
1275 forced_updates_ms
/ 1000.0);
1280 strbuf_release(¬e
);
1281 strbuf_release(&err
);
1287 * We would want to bypass the object transfer altogether if
1288 * everything we are going to fetch already exists and is connected
1291 static int check_exist_and_connected(struct ref
*ref_map
)
1293 struct ref
*rm
= ref_map
;
1294 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1298 * If we are deepening a shallow clone we already have these
1299 * objects reachable. Running rev-list here will return with
1300 * a good (0) exit status and we'll bypass the fetch that we
1301 * really need to perform. Claiming failure now will ensure
1302 * we perform the network exchange to deepen our history.
1308 * check_connected() allows objects to merely be promised, but
1309 * we need all direct targets to exist.
1311 for (r
= rm
; r
; r
= r
->next
) {
1312 if (!has_object_file_with_flags(&r
->old_oid
,
1313 OBJECT_INFO_SKIP_FETCH_OBJECT
))
1318 return check_connected(iterate_ref_map
, &rm
, &opt
);
1321 static int fetch_and_consume_refs(struct transport
*transport
,
1322 struct ref_transaction
*transaction
,
1323 struct ref
*ref_map
,
1324 struct fetch_head
*fetch_head
,
1325 struct worktree
**worktrees
)
1327 int connectivity_checked
= 1;
1331 * We don't need to perform a fetch in case we can already satisfy all
1334 ret
= check_exist_and_connected(ref_map
);
1336 trace2_region_enter("fetch", "fetch_refs", the_repository
);
1337 ret
= transport_fetch_refs(transport
, ref_map
);
1338 trace2_region_leave("fetch", "fetch_refs", the_repository
);
1341 connectivity_checked
= transport
->smart_options
?
1342 transport
->smart_options
->connectivity_checked
: 0;
1345 trace2_region_enter("fetch", "consume_refs", the_repository
);
1346 ret
= store_updated_refs(transport
->url
, transport
->remote
->name
,
1347 connectivity_checked
, transaction
, ref_map
,
1348 fetch_head
, worktrees
);
1349 trace2_region_leave("fetch", "consume_refs", the_repository
);
1352 transport_unlock_pack(transport
, 0);
1356 static int prune_refs(struct refspec
*rs
,
1357 struct ref_transaction
*transaction
,
1358 struct ref
*ref_map
,
1359 const char *raw_url
)
1361 int url_len
, i
, result
= 0;
1362 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1363 struct strbuf err
= STRBUF_INIT
;
1365 const char *dangling_msg
= dry_run
1366 ? _(" (%s will become dangling)")
1367 : _(" (%s has become dangling)");
1370 url
= transport_anonymize_url(raw_url
);
1372 url
= xstrdup("foreign");
1374 url_len
= strlen(url
);
1375 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1379 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1384 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1385 result
= ref_transaction_delete(transaction
, ref
->name
, NULL
, 0,
1386 "fetch: prune", &err
);
1391 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1393 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1394 string_list_append(&refnames
, ref
->name
);
1396 result
= delete_refs("fetch: prune", &refnames
, 0);
1397 string_list_clear(&refnames
, 0);
1401 if (verbosity
>= 0) {
1402 int summary_width
= transport_summary_width(stale_refs
);
1404 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1405 struct strbuf sb
= STRBUF_INIT
;
1407 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1410 format_display(&sb
, '-', _("[deleted]"), NULL
,
1411 _("(none)"), prettify_refname(ref
->name
),
1413 fprintf(stderr
, " %s\n",sb
.buf
);
1414 strbuf_release(&sb
);
1415 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1420 strbuf_release(&err
);
1422 free_refs(stale_refs
);
1426 static void check_not_current_branch(struct ref
*ref_map
,
1427 struct worktree
**worktrees
)
1429 const struct worktree
*wt
;
1430 for (; ref_map
; ref_map
= ref_map
->next
)
1431 if (ref_map
->peer_ref
&&
1432 (wt
= find_shared_symref(worktrees
, "HEAD",
1433 ref_map
->peer_ref
->name
)) &&
1435 die(_("refusing to fetch into branch '%s' "
1436 "checked out at '%s'"),
1437 ref_map
->peer_ref
->name
, wt
->path
);
1440 static int truncate_fetch_head(void)
1442 const char *filename
= git_path_fetch_head(the_repository
);
1443 FILE *fp
= fopen_for_writing(filename
);
1446 return error_errno(_("cannot open '%s'"), filename
);
1451 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1453 int r
= transport_set_option(transport
, name
, value
);
1455 die(_("option \"%s\" value \"%s\" is not valid for %s"),
1456 name
, value
, transport
->url
);
1458 warning(_("option \"%s\" is ignored for %s\n"),
1459 name
, transport
->url
);
1463 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1466 struct oid_array
*oids
= cb_data
;
1468 oid_array_append(oids
, oid
);
1472 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1474 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1477 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1478 const char *s
= negotiation_tip
.items
[i
].string
;
1480 if (!has_glob_specials(s
)) {
1481 struct object_id oid
;
1482 if (get_oid(s
, &oid
))
1483 die(_("%s is not a valid object"), s
);
1484 if (!has_object(the_repository
, &oid
, 0))
1485 die(_("the object %s does not exist"), s
);
1486 oid_array_append(oids
, &oid
);
1490 for_each_glob_ref(add_oid
, s
, oids
);
1491 if (old_nr
== oids
->nr
)
1492 warning("ignoring --negotiation-tip=%s because it does not match any refs",
1495 smart_options
->negotiation_tips
= oids
;
1498 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1500 struct transport
*transport
;
1502 transport
= transport_get(remote
, NULL
);
1503 transport_set_verbosity(transport
, verbosity
, progress
);
1504 transport
->family
= family
;
1506 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1508 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1510 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1511 if (deepen
&& deepen_since
)
1512 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1513 if (deepen
&& deepen_not
.nr
)
1514 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1515 (const char *)&deepen_not
);
1516 if (deepen_relative
)
1517 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1519 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1520 if (filter_options
.choice
) {
1522 expand_list_objects_filter_spec(&filter_options
);
1523 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1524 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1526 if (negotiation_tip
.nr
) {
1527 if (transport
->smart_options
)
1528 add_negotiation_tips(transport
->smart_options
);
1530 warning("ignoring --negotiation-tip because the protocol does not support it");
1535 static int backfill_tags(struct transport
*transport
,
1536 struct ref_transaction
*transaction
,
1537 struct ref
*ref_map
,
1538 struct fetch_head
*fetch_head
,
1539 struct worktree
**worktrees
)
1541 int retcode
, cannot_reuse
;
1544 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1545 * when remote helper is used (setting it to an empty string
1546 * is not unsetting). We could extend the remote helper
1547 * protocol for that, but for now, just force a new connection
1548 * without deepen-since. Similar story for deepen-not.
1550 cannot_reuse
= transport
->cannot_reuse
||
1551 deepen_since
|| deepen_not
.nr
;
1553 gsecondary
= prepare_transport(transport
->remote
, 0);
1554 transport
= gsecondary
;
1557 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1558 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1559 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1560 retcode
= fetch_and_consume_refs(transport
, transaction
, ref_map
, fetch_head
, worktrees
);
1563 transport_disconnect(gsecondary
);
1570 static int do_fetch(struct transport
*transport
,
1573 struct ref_transaction
*transaction
= NULL
;
1574 struct ref
*ref_map
= NULL
;
1575 int autotags
= (transport
->remote
->fetch_tags
== 1);
1577 const struct ref
*remote_refs
;
1578 struct transport_ls_refs_options transport_ls_refs_options
=
1579 TRANSPORT_LS_REFS_OPTIONS_INIT
;
1580 int must_list_refs
= 1;
1581 struct worktree
**worktrees
= get_worktrees();
1582 struct fetch_head fetch_head
= { 0 };
1583 struct strbuf err
= STRBUF_INIT
;
1585 if (tags
== TAGS_DEFAULT
) {
1586 if (transport
->remote
->fetch_tags
== 2)
1588 if (transport
->remote
->fetch_tags
== -1)
1592 /* if not appending, truncate FETCH_HEAD */
1593 if (!append
&& write_fetch_head
) {
1594 retcode
= truncate_fetch_head();
1602 refspec_ref_prefixes(rs
, &transport_ls_refs_options
.ref_prefixes
);
1605 * We can avoid listing refs if all of them are exact
1609 for (i
= 0; i
< rs
->nr
; i
++) {
1610 if (!rs
->items
[i
].exact_sha1
) {
1615 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1616 refspec_ref_prefixes(&transport
->remote
->fetch
,
1617 &transport_ls_refs_options
.ref_prefixes
);
1619 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1621 if (transport_ls_refs_options
.ref_prefixes
.nr
)
1622 strvec_push(&transport_ls_refs_options
.ref_prefixes
,
1626 if (must_list_refs
) {
1627 trace2_region_enter("fetch", "remote_refs", the_repository
);
1628 remote_refs
= transport_get_remote_refs(transport
,
1629 &transport_ls_refs_options
);
1630 trace2_region_leave("fetch", "remote_refs", the_repository
);
1634 transport_ls_refs_options_release(&transport_ls_refs_options
);
1636 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1638 if (!update_head_ok
)
1639 check_not_current_branch(ref_map
, worktrees
);
1641 retcode
= open_fetch_head(&fetch_head
);
1646 transaction
= ref_transaction_begin(&err
);
1648 retcode
= error("%s", err
.buf
);
1653 if (tags
== TAGS_DEFAULT
&& autotags
)
1654 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1657 * We only prune based on refspecs specified
1658 * explicitly (via command line or configuration); we
1659 * don't care whether --tags was specified.
1662 retcode
= prune_refs(rs
, transaction
, ref_map
, transport
->url
);
1664 retcode
= prune_refs(&transport
->remote
->fetch
,
1665 transaction
, ref_map
,
1672 if (fetch_and_consume_refs(transport
, transaction
, ref_map
, &fetch_head
, worktrees
)) {
1678 * If neither --no-tags nor --tags was specified, do automated tag
1681 if (tags
== TAGS_DEFAULT
&& autotags
) {
1682 struct ref
*tags_ref_map
= NULL
, **tail
= &tags_ref_map
;
1684 find_non_local_tags(remote_refs
, transaction
, &tags_ref_map
, &tail
);
1687 * If backfilling of tags fails then we want to tell
1688 * the user so, but we have to continue regardless to
1689 * populate upstream information of the references we
1690 * have already fetched above. The exception though is
1691 * when `--atomic` is passed: in that case we'll abort
1692 * the transaction and don't commit anything.
1694 if (backfill_tags(transport
, transaction
, tags_ref_map
,
1695 &fetch_head
, worktrees
))
1699 free_refs(tags_ref_map
);
1706 retcode
= ref_transaction_commit(transaction
, &err
);
1708 error("%s", err
.buf
);
1709 ref_transaction_free(transaction
);
1715 commit_fetch_head(&fetch_head
);
1718 struct branch
*branch
= branch_get("HEAD");
1720 struct ref
*source_ref
= NULL
;
1723 * We're setting the upstream configuration for the
1724 * current branch. The relevant upstream is the
1725 * fetched branch that is meant to be merged with the
1726 * current one, i.e. the one fetched to FETCH_HEAD.
1728 * When there are several such branches, consider the
1729 * request ambiguous and err on the safe side by doing
1730 * nothing and just emit a warning.
1732 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1733 if (!rm
->peer_ref
) {
1735 warning(_("multiple branches detected, incompatible with --set-upstream"));
1744 const char *shortname
= source_ref
->name
;
1745 skip_prefix(shortname
, "refs/heads/", &shortname
);
1747 warning(_("could not set upstream of HEAD to '%s' from '%s' when "
1748 "it does not point to any branch."),
1749 shortname
, transport
->remote
->name
);
1753 if (!strcmp(source_ref
->name
, "HEAD") ||
1754 starts_with(source_ref
->name
, "refs/heads/"))
1755 install_branch_config(0,
1757 transport
->remote
->name
,
1759 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1760 warning(_("not setting upstream for a remote remote-tracking branch"));
1761 else if (starts_with(source_ref
->name
, "refs/tags/"))
1762 warning(_("not setting upstream for a remote tag"));
1764 warning(_("unknown branch type"));
1766 warning(_("no source branch found;\n"
1767 "you need to specify exactly one branch with the --set-upstream option"));
1772 if (retcode
&& transaction
) {
1773 ref_transaction_abort(transaction
, &err
);
1774 error("%s", err
.buf
);
1777 close_fetch_head(&fetch_head
);
1778 strbuf_release(&err
);
1780 free_worktrees(worktrees
);
1784 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1786 struct string_list
*list
= priv
;
1787 if (!remote
->skip_default_update
)
1788 string_list_append(list
, remote
->name
);
1792 struct remote_group_data
{
1794 struct string_list
*list
;
1797 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1799 struct remote_group_data
*g
= priv
;
1801 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1802 /* split list by white space */
1804 size_t wordlen
= strcspn(value
, " \t\n");
1807 string_list_append_nodup(g
->list
,
1808 xstrndup(value
, wordlen
));
1809 value
+= wordlen
+ (value
[wordlen
] != '\0');
1816 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1818 int prev_nr
= list
->nr
;
1819 struct remote_group_data g
;
1820 g
.name
= name
; g
.list
= list
;
1822 git_config(get_remote_group
, &g
);
1823 if (list
->nr
== prev_nr
) {
1824 struct remote
*remote
= remote_get(name
);
1825 if (!remote_is_configured(remote
, 0))
1827 string_list_append(list
, remote
->name
);
1832 static void add_options_to_argv(struct strvec
*argv
)
1835 strvec_push(argv
, "--dry-run");
1837 strvec_push(argv
, prune
? "--prune" : "--no-prune");
1838 if (prune_tags
!= -1)
1839 strvec_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1841 strvec_push(argv
, "--update-head-ok");
1843 strvec_push(argv
, "--force");
1845 strvec_push(argv
, "--keep");
1846 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1847 strvec_push(argv
, "--recurse-submodules");
1848 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1849 strvec_push(argv
, "--recurse-submodules=on-demand");
1850 if (tags
== TAGS_SET
)
1851 strvec_push(argv
, "--tags");
1852 else if (tags
== TAGS_UNSET
)
1853 strvec_push(argv
, "--no-tags");
1855 strvec_push(argv
, "-v");
1857 strvec_push(argv
, "-v");
1858 else if (verbosity
< 0)
1859 strvec_push(argv
, "-q");
1860 if (family
== TRANSPORT_FAMILY_IPV4
)
1861 strvec_push(argv
, "--ipv4");
1862 else if (family
== TRANSPORT_FAMILY_IPV6
)
1863 strvec_push(argv
, "--ipv6");
1866 /* Fetch multiple remotes in parallel */
1868 struct parallel_fetch_state
{
1870 struct string_list
*remotes
;
1874 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1875 void *cb
, void **task_cb
)
1877 struct parallel_fetch_state
*state
= cb
;
1880 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1883 remote
= state
->remotes
->items
[state
->next
++].string
;
1886 strvec_pushv(&cp
->args
, state
->argv
);
1887 strvec_push(&cp
->args
, remote
);
1891 printf(_("Fetching %s\n"), remote
);
1896 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1898 struct parallel_fetch_state
*state
= cb
;
1899 const char *remote
= task_cb
;
1901 state
->result
= error(_("could not fetch %s"), remote
);
1906 static int fetch_finished(int result
, struct strbuf
*out
,
1907 void *cb
, void *task_cb
)
1909 struct parallel_fetch_state
*state
= cb
;
1910 const char *remote
= task_cb
;
1913 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1921 static int fetch_multiple(struct string_list
*list
, int max_children
)
1924 struct strvec argv
= STRVEC_INIT
;
1926 if (!append
&& write_fetch_head
) {
1927 int errcode
= truncate_fetch_head();
1932 strvec_pushl(&argv
, "fetch", "--append", "--no-auto-gc",
1933 "--no-write-commit-graph", NULL
);
1934 add_options_to_argv(&argv
);
1936 if (max_children
!= 1 && list
->nr
!= 1) {
1937 struct parallel_fetch_state state
= { argv
.v
, list
, 0, 0 };
1939 strvec_push(&argv
, "--end-of-options");
1940 result
= run_processes_parallel_tr2(max_children
,
1942 &fetch_failed_to_start
,
1945 "fetch", "parallel/fetch");
1948 result
= state
.result
;
1950 for (i
= 0; i
< list
->nr
; i
++) {
1951 const char *name
= list
->items
[i
].string
;
1952 strvec_push(&argv
, name
);
1954 printf(_("Fetching %s\n"), name
);
1955 if (run_command_v_opt(argv
.v
, RUN_GIT_CMD
)) {
1956 error(_("could not fetch %s"), name
);
1962 strvec_clear(&argv
);
1967 * Fetching from the promisor remote should use the given filter-spec
1968 * or inherit the default filter-spec from the config.
1970 static inline void fetch_one_setup_partial(struct remote
*remote
)
1973 * Explicit --no-filter argument overrides everything, regardless
1974 * of any prior partial clones and fetches.
1976 if (filter_options
.no_filter
)
1980 * If no prior partial clone/fetch and the current fetch DID NOT
1981 * request a partial-fetch, do a normal fetch.
1983 if (!has_promisor_remote() && !filter_options
.choice
)
1987 * If this is a partial-fetch request, we enable partial on
1988 * this repo if not already enabled and remember the given
1989 * filter-spec as the default for subsequent fetches to this
1990 * remote if there is currently no default filter-spec.
1992 if (filter_options
.choice
) {
1993 partial_clone_register(remote
->name
, &filter_options
);
1998 * Do a partial-fetch from the promisor remote using either the
1999 * explicitly given filter-spec or inherit the filter-spec from
2002 if (!filter_options
.choice
)
2003 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
2007 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
,
2008 int prune_tags_ok
, int use_stdin_refspecs
)
2010 struct refspec rs
= REFSPEC_INIT_FETCH
;
2013 int maybe_prune_tags
;
2014 int remote_via_config
= remote_is_configured(remote
, 0);
2017 die(_("no remote repository specified; please specify either a URL or a\n"
2018 "remote name from which new revisions should be fetched"));
2020 gtransport
= prepare_transport(remote
, 1);
2023 /* no command line request */
2024 if (0 <= remote
->prune
)
2025 prune
= remote
->prune
;
2026 else if (0 <= fetch_prune_config
)
2027 prune
= fetch_prune_config
;
2029 prune
= PRUNE_BY_DEFAULT
;
2032 if (prune_tags
< 0) {
2033 /* no command line request */
2034 if (0 <= remote
->prune_tags
)
2035 prune_tags
= remote
->prune_tags
;
2036 else if (0 <= fetch_prune_tags_config
)
2037 prune_tags
= fetch_prune_tags_config
;
2039 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
2042 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
2043 if (maybe_prune_tags
&& remote_via_config
)
2044 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
2046 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
2047 refspec_append(&rs
, TAG_REFSPEC
);
2049 for (i
= 0; i
< argc
; i
++) {
2050 if (!strcmp(argv
[i
], "tag")) {
2053 die(_("you need to specify a tag name"));
2055 refspec_appendf(&rs
, "refs/tags/%s:refs/tags/%s",
2058 refspec_append(&rs
, argv
[i
]);
2062 if (use_stdin_refspecs
) {
2063 struct strbuf line
= STRBUF_INIT
;
2064 while (strbuf_getline_lf(&line
, stdin
) != EOF
)
2065 refspec_append(&rs
, line
.buf
);
2066 strbuf_release(&line
);
2069 if (server_options
.nr
)
2070 gtransport
->server_options
= &server_options
;
2072 sigchain_push_common(unlock_pack_on_signal
);
2073 atexit(unlock_pack_atexit
);
2074 sigchain_push(SIGPIPE
, SIG_IGN
);
2075 exit_code
= do_fetch(gtransport
, &rs
);
2076 sigchain_pop(SIGPIPE
);
2078 transport_disconnect(gtransport
);
2083 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
2086 struct string_list list
= STRING_LIST_INIT_DUP
;
2087 struct remote
*remote
= NULL
;
2089 int prune_tags_ok
= 1;
2091 packet_trace_identity("fetch");
2093 /* Record the command line for the reflog */
2094 strbuf_addstr(&default_rla
, "fetch");
2095 for (i
= 1; i
< argc
; i
++) {
2096 /* This handles non-URLs gracefully */
2097 char *anon
= transport_anonymize_url(argv
[i
]);
2099 strbuf_addf(&default_rla
, " %s", anon
);
2103 git_config(git_fetch_config
, NULL
);
2104 if (the_repository
->gitdir
) {
2105 prepare_repo_settings(the_repository
);
2106 the_repository
->settings
.command_requires_full_index
= 0;
2109 argc
= parse_options(argc
, argv
, prefix
,
2110 builtin_fetch_options
, builtin_fetch_usage
, 0);
2112 if (recurse_submodules_cli
!= RECURSE_SUBMODULES_DEFAULT
)
2113 recurse_submodules
= recurse_submodules_cli
;
2115 if (negotiate_only
) {
2116 switch (recurse_submodules_cli
) {
2117 case RECURSE_SUBMODULES_OFF
:
2118 case RECURSE_SUBMODULES_DEFAULT
:
2120 * --negotiate-only should never recurse into
2121 * submodules. Skip it by setting recurse_submodules to
2122 * RECURSE_SUBMODULES_OFF.
2124 recurse_submodules
= RECURSE_SUBMODULES_OFF
;
2128 die(_("options '%s' and '%s' cannot be used together"),
2129 "--negotiate-only", "--recurse-submodules");
2133 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
2134 int *sfjc
= submodule_fetch_jobs_config
== -1
2135 ? &submodule_fetch_jobs_config
: NULL
;
2136 int *rs
= recurse_submodules
== RECURSE_SUBMODULES_DEFAULT
2137 ? &recurse_submodules
: NULL
;
2139 fetch_config_from_gitmodules(sfjc
, rs
);
2142 if (negotiate_only
&& !negotiation_tip
.nr
)
2143 die(_("--negotiate-only needs one or more --negotiation-tip=*"));
2145 if (deepen_relative
) {
2146 if (deepen_relative
< 0)
2147 die(_("negative depth in --deepen is not supported"));
2149 die(_("options '%s' and '%s' cannot be used together"), "--deepen", "--depth");
2150 depth
= xstrfmt("%d", deepen_relative
);
2154 die(_("options '%s' and '%s' cannot be used together"), "--depth", "--unshallow");
2155 else if (!is_repository_shallow(the_repository
))
2156 die(_("--unshallow on a complete repository does not make sense"));
2158 depth
= xstrfmt("%d", INFINITE_DEPTH
);
2161 /* no need to be strict, transport_set_option() will validate it again */
2162 if (depth
&& atoi(depth
) < 1)
2163 die(_("depth %s is not a positive number"), depth
);
2164 if (depth
|| deepen_since
|| deepen_not
.nr
)
2167 /* FETCH_HEAD never gets updated in --dry-run mode */
2169 write_fetch_head
= 0;
2173 die(_("fetch --all does not take a repository argument"));
2175 die(_("fetch --all does not make sense with refspecs"));
2176 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
2177 } else if (argc
== 0) {
2178 /* No arguments -- use default remote */
2179 remote
= remote_get(NULL
);
2180 } else if (multiple
) {
2181 /* All arguments are assumed to be remotes or groups */
2182 for (i
= 0; i
< argc
; i
++)
2183 if (!add_remote_or_group(argv
[i
], &list
))
2184 die(_("no such remote or remote group: %s"),
2187 /* Single remote or group */
2188 (void) add_remote_or_group(argv
[0], &list
);
2190 /* More than one remote */
2192 die(_("fetching a group and specifying refspecs does not make sense"));
2194 /* Zero or one remotes */
2195 remote
= remote_get(argv
[0]);
2196 prune_tags_ok
= (argc
== 1);
2202 if (negotiate_only
) {
2203 struct oidset acked_commits
= OIDSET_INIT
;
2204 struct oidset_iter iter
;
2205 const struct object_id
*oid
;
2208 die(_("must supply remote when using --negotiate-only"));
2209 gtransport
= prepare_transport(remote
, 1);
2210 if (gtransport
->smart_options
) {
2211 gtransport
->smart_options
->acked_commits
= &acked_commits
;
2213 warning(_("protocol does not support --negotiate-only, exiting"));
2217 if (server_options
.nr
)
2218 gtransport
->server_options
= &server_options
;
2219 result
= transport_fetch_refs(gtransport
, NULL
);
2221 oidset_iter_init(&acked_commits
, &iter
);
2222 while ((oid
= oidset_iter_next(&iter
)))
2223 printf("%s\n", oid_to_hex(oid
));
2224 oidset_clear(&acked_commits
);
2225 } else if (remote
) {
2226 if (filter_options
.choice
|| has_promisor_remote())
2227 fetch_one_setup_partial(remote
);
2228 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
, stdin_refspecs
);
2230 int max_children
= max_jobs
;
2232 if (filter_options
.choice
)
2233 die(_("--filter can only be used with the remote "
2234 "configured in extensions.partialclone"));
2237 die(_("--atomic can only be used when fetching "
2238 "from one remote"));
2241 die(_("--stdin can only be used when fetching "
2242 "from one remote"));
2244 if (max_children
< 0)
2245 max_children
= fetch_parallel_config
;
2247 /* TODO should this also die if we have a previous partial-clone? */
2248 result
= fetch_multiple(&list
, max_children
);
2251 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
2252 struct strvec options
= STRVEC_INIT
;
2253 int max_children
= max_jobs
;
2255 if (max_children
< 0)
2256 max_children
= submodule_fetch_jobs_config
;
2257 if (max_children
< 0)
2258 max_children
= fetch_parallel_config
;
2260 add_options_to_argv(&options
);
2261 result
= fetch_populated_submodules(the_repository
,
2265 recurse_submodules_default
,
2268 strvec_clear(&options
);
2272 * Skip irrelevant tasks because we know objects were not
2275 * NEEDSWORK: as a future optimization, we can return early
2276 * whenever objects were not fetched e.g. if we already have all
2282 prepare_repo_settings(the_repository
);
2283 if (fetch_write_commit_graph
> 0 ||
2284 (fetch_write_commit_graph
< 0 &&
2285 the_repository
->settings
.fetch_write_commit_graph
)) {
2286 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
2289 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
2291 write_commit_graph_reachable(the_repository
->objects
->odb
,
2297 run_auto_maintenance(verbosity
< 0);
2300 string_list_clear(&list
, 0);