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 prefetch
= 0;
52 static int prune
= -1; /* unspecified */
53 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
55 static int fetch_prune_tags_config
= -1; /* unspecified */
56 static int prune_tags
= -1; /* unspecified */
57 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
59 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
;
60 static int write_fetch_head
= 1;
61 static int verbosity
, deepen_relative
, set_upstream
;
62 static int progress
= -1;
63 static int enable_auto_gc
= 1;
64 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
, deepen
;
65 static int max_jobs
= -1, submodule_fetch_jobs_config
= -1;
66 static int fetch_parallel_config
= 1;
67 static int atomic_fetch
;
68 static enum transport_family family
;
69 static const char *depth
;
70 static const char *deepen_since
;
71 static const char *upload_pack
;
72 static struct string_list deepen_not
= STRING_LIST_INIT_NODUP
;
73 static struct strbuf default_rla
= STRBUF_INIT
;
74 static struct transport
*gtransport
;
75 static struct transport
*gsecondary
;
76 static const char *submodule_prefix
= "";
77 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
78 static int recurse_submodules_default
= RECURSE_SUBMODULES_ON_DEMAND
;
79 static int shown_url
= 0;
80 static struct refspec refmap
= REFSPEC_INIT_FETCH
;
81 static struct list_objects_filter_options filter_options
;
82 static struct string_list server_options
= STRING_LIST_INIT_DUP
;
83 static struct string_list negotiation_tip
= STRING_LIST_INIT_NODUP
;
84 static int fetch_write_commit_graph
= -1;
85 static int stdin_refspecs
= 0;
86 static int negotiate_only
;
88 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
90 if (!strcmp(k
, "fetch.prune")) {
91 fetch_prune_config
= git_config_bool(k
, v
);
95 if (!strcmp(k
, "fetch.prunetags")) {
96 fetch_prune_tags_config
= git_config_bool(k
, v
);
100 if (!strcmp(k
, "fetch.showforcedupdates")) {
101 fetch_show_forced_updates
= git_config_bool(k
, v
);
105 if (!strcmp(k
, "submodule.recurse")) {
106 int r
= git_config_bool(k
, v
) ?
107 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
108 recurse_submodules
= r
;
111 if (!strcmp(k
, "submodule.fetchjobs")) {
112 submodule_fetch_jobs_config
= parse_submodule_fetchjobs(k
, v
);
114 } else if (!strcmp(k
, "fetch.recursesubmodules")) {
115 recurse_submodules
= parse_fetch_recurse_submodules_arg(k
, v
);
119 if (!strcmp(k
, "fetch.parallel")) {
120 fetch_parallel_config
= git_config_int(k
, v
);
121 if (fetch_parallel_config
< 0)
122 die(_("fetch.parallel cannot be negative"));
126 return git_default_config(k
, v
, cb
);
129 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
131 BUG_ON_OPT_NEG(unset
);
134 * "git fetch --refmap='' origin foo"
135 * can be used to tell the command not to store anywhere
137 refspec_append(&refmap
, arg
);
142 static struct option builtin_fetch_options
[] = {
143 OPT__VERBOSITY(&verbosity
),
144 OPT_BOOL(0, "all", &all
,
145 N_("fetch from all remotes")),
146 OPT_BOOL(0, "set-upstream", &set_upstream
,
147 N_("set upstream for git pull/fetch")),
148 OPT_BOOL('a', "append", &append
,
149 N_("append to .git/FETCH_HEAD instead of overwriting")),
150 OPT_BOOL(0, "atomic", &atomic_fetch
,
151 N_("use atomic transaction to update references")),
152 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
153 N_("path to upload pack on remote end")),
154 OPT__FORCE(&force
, N_("force overwrite of local reference"), 0),
155 OPT_BOOL('m', "multiple", &multiple
,
156 N_("fetch from multiple remotes")),
157 OPT_SET_INT('t', "tags", &tags
,
158 N_("fetch all tags and associated objects"), TAGS_SET
),
159 OPT_SET_INT('n', NULL
, &tags
,
160 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
161 OPT_INTEGER('j', "jobs", &max_jobs
,
162 N_("number of submodules fetched in parallel")),
163 OPT_BOOL(0, "prefetch", &prefetch
,
164 N_("modify the refspec to place all refs within refs/prefetch/")),
165 OPT_BOOL('p', "prune", &prune
,
166 N_("prune remote-tracking branches no longer on remote")),
167 OPT_BOOL('P', "prune-tags", &prune_tags
,
168 N_("prune local tags no longer on remote and clobber changed tags")),
169 OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules
, N_("on-demand"),
170 N_("control recursive fetching of submodules"),
171 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
),
172 OPT_BOOL(0, "dry-run", &dry_run
,
174 OPT_BOOL(0, "write-fetch-head", &write_fetch_head
,
175 N_("write fetched references to the FETCH_HEAD file")),
176 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
177 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
178 N_("allow updating of HEAD ref")),
179 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
180 OPT_STRING(0, "depth", &depth
, N_("depth"),
181 N_("deepen history of shallow clone")),
182 OPT_STRING(0, "shallow-since", &deepen_since
, N_("time"),
183 N_("deepen history of shallow repository based on time")),
184 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not
, N_("revision"),
185 N_("deepen history of shallow clone, excluding rev")),
186 OPT_INTEGER(0, "deepen", &deepen_relative
,
187 N_("deepen history of shallow clone")),
188 OPT_SET_INT_F(0, "unshallow", &unshallow
,
189 N_("convert to a complete repository"),
191 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
192 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
193 OPT_CALLBACK_F(0, "recurse-submodules-default",
194 &recurse_submodules_default
, N_("on-demand"),
195 N_("default for recursive fetching of submodules "
196 "(lower priority than config files)"),
197 PARSE_OPT_HIDDEN
, option_fetch_parse_recurse_submodules
),
198 OPT_BOOL(0, "update-shallow", &update_shallow
,
199 N_("accept refs that update .git/shallow")),
200 OPT_CALLBACK_F(0, "refmap", NULL
, N_("refmap"),
201 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
),
202 OPT_STRING_LIST('o', "server-option", &server_options
, N_("server-specific"), N_("option to transmit")),
203 OPT_SET_INT('4', "ipv4", &family
, N_("use IPv4 addresses only"),
204 TRANSPORT_FAMILY_IPV4
),
205 OPT_SET_INT('6', "ipv6", &family
, N_("use IPv6 addresses only"),
206 TRANSPORT_FAMILY_IPV6
),
207 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip
, N_("revision"),
208 N_("report that we have only objects reachable from this object")),
209 OPT_BOOL(0, "negotiate-only", &negotiate_only
,
210 N_("do not fetch a packfile; instead, print ancestors of negotiation tips")),
211 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options
),
212 OPT_BOOL(0, "auto-maintenance", &enable_auto_gc
,
213 N_("run 'maintenance --auto' after fetching")),
214 OPT_BOOL(0, "auto-gc", &enable_auto_gc
,
215 N_("run 'maintenance --auto' after fetching")),
216 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates
,
217 N_("check for forced-updates on all updated branches")),
218 OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph
,
219 N_("write the commit-graph after fetching")),
220 OPT_BOOL(0, "stdin", &stdin_refspecs
,
221 N_("accept refspecs from stdin")),
225 static void unlock_pack(void)
228 transport_unlock_pack(gtransport
);
230 transport_unlock_pack(gsecondary
);
233 static void unlock_pack_on_signal(int signo
)
240 static void add_merge_config(struct ref
**head
,
241 const struct ref
*remote_refs
,
242 struct branch
*branch
,
247 for (i
= 0; i
< branch
->merge_nr
; i
++) {
248 struct ref
*rm
, **old_tail
= *tail
;
249 struct refspec_item refspec
;
251 for (rm
= *head
; rm
; rm
= rm
->next
) {
252 if (branch_merge_matches(branch
, i
, rm
->name
)) {
253 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
261 * Not fetched to a remote-tracking branch? We need to fetch
262 * it anyway to allow this branch's "branch.$name.merge"
263 * to be honored by 'git pull', but we do not have to
264 * fail if branch.$name.merge is misconfigured to point
265 * at a nonexisting branch. If we were indeed called by
266 * 'git pull', it will notice the misconfiguration because
267 * there is no entry in the resulting FETCH_HEAD marked
270 memset(&refspec
, 0, sizeof(refspec
));
271 refspec
.src
= branch
->merge
[i
]->src
;
272 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
273 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
274 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
278 static void create_fetch_oidset(struct ref
**head
, struct oidset
*out
)
280 struct ref
*rm
= *head
;
282 oidset_insert(out
, &rm
->old_oid
);
287 struct refname_hash_entry
{
288 struct hashmap_entry ent
;
289 struct object_id oid
;
291 char refname
[FLEX_ARRAY
];
294 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data
,
295 const struct hashmap_entry
*eptr
,
296 const struct hashmap_entry
*entry_or_key
,
299 const struct refname_hash_entry
*e1
, *e2
;
301 e1
= container_of(eptr
, const struct refname_hash_entry
, ent
);
302 e2
= container_of(entry_or_key
, const struct refname_hash_entry
, ent
);
303 return strcmp(e1
->refname
, keydata
? keydata
: e2
->refname
);
306 static struct refname_hash_entry
*refname_hash_add(struct hashmap
*map
,
308 const struct object_id
*oid
)
310 struct refname_hash_entry
*ent
;
311 size_t len
= strlen(refname
);
313 FLEX_ALLOC_MEM(ent
, refname
, refname
, len
);
314 hashmap_entry_init(&ent
->ent
, strhash(refname
));
315 oidcpy(&ent
->oid
, oid
);
316 hashmap_add(map
, &ent
->ent
);
320 static int add_one_refname(const char *refname
,
321 const struct object_id
*oid
,
322 int flag
, void *cbdata
)
324 struct hashmap
*refname_map
= cbdata
;
326 (void) refname_hash_add(refname_map
, refname
, oid
);
330 static void refname_hash_init(struct hashmap
*map
)
332 hashmap_init(map
, refname_hash_entry_cmp
, NULL
, 0);
335 static int refname_hash_exists(struct hashmap
*map
, const char *refname
)
337 return !!hashmap_get_from_hash(map
, strhash(refname
), refname
);
340 static void clear_item(struct refname_hash_entry
*item
)
345 static void find_non_local_tags(const struct ref
*refs
,
349 struct hashmap existing_refs
;
350 struct hashmap remote_refs
;
351 struct oidset fetch_oids
= OIDSET_INIT
;
352 struct string_list remote_refs_list
= STRING_LIST_INIT_NODUP
;
353 struct string_list_item
*remote_ref_item
;
354 const struct ref
*ref
;
355 struct refname_hash_entry
*item
= NULL
;
356 const int quick_flags
= OBJECT_INFO_QUICK
| OBJECT_INFO_SKIP_FETCH_OBJECT
;
358 refname_hash_init(&existing_refs
);
359 refname_hash_init(&remote_refs
);
360 create_fetch_oidset(head
, &fetch_oids
);
362 for_each_ref(add_one_refname
, &existing_refs
);
363 for (ref
= refs
; ref
; ref
= ref
->next
) {
364 if (!starts_with(ref
->name
, "refs/tags/"))
368 * The peeled ref always follows the matching base
369 * ref, so if we see a peeled ref that we don't want
370 * to fetch then we can mark the ref entry in the list
371 * as one to ignore by setting util to NULL.
373 if (ends_with(ref
->name
, "^{}")) {
375 !has_object_file_with_flags(&ref
->old_oid
, quick_flags
) &&
376 !oidset_contains(&fetch_oids
, &ref
->old_oid
) &&
377 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
378 !oidset_contains(&fetch_oids
, &item
->oid
))
385 * If item is non-NULL here, then we previously saw a
386 * ref not followed by a peeled reference, so we need
387 * to check if it is a lightweight tag that we want to
391 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
392 !oidset_contains(&fetch_oids
, &item
->oid
))
397 /* skip duplicates and refs that we already have */
398 if (refname_hash_exists(&remote_refs
, ref
->name
) ||
399 refname_hash_exists(&existing_refs
, ref
->name
))
402 item
= refname_hash_add(&remote_refs
, ref
->name
, &ref
->old_oid
);
403 string_list_insert(&remote_refs_list
, ref
->name
);
405 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
408 * We may have a final lightweight tag that needs to be
409 * checked to see if it needs fetching.
412 !has_object_file_with_flags(&item
->oid
, quick_flags
) &&
413 !oidset_contains(&fetch_oids
, &item
->oid
))
417 * For all the tags in the remote_refs_list,
418 * add them to the list of refs to be fetched
420 for_each_string_list_item(remote_ref_item
, &remote_refs_list
) {
421 const char *refname
= remote_ref_item
->string
;
423 unsigned int hash
= strhash(refname
);
425 item
= hashmap_get_entry_from_hash(&remote_refs
, hash
, refname
,
426 struct refname_hash_entry
, ent
);
428 BUG("unseen remote ref?");
430 /* Unless we have already decided to ignore this item... */
434 rm
= alloc_ref(item
->refname
);
435 rm
->peer_ref
= alloc_ref(item
->refname
);
436 oidcpy(&rm
->old_oid
, &item
->oid
);
440 hashmap_clear_and_free(&remote_refs
, struct refname_hash_entry
, ent
);
441 string_list_clear(&remote_refs_list
, 0);
442 oidset_clear(&fetch_oids
);
445 static void filter_prefetch_refspec(struct refspec
*rs
)
452 for (i
= 0; i
< rs
->nr
; i
++) {
453 struct strbuf new_dst
= STRBUF_INIT
;
455 const char *sub
= NULL
;
457 if (rs
->items
[i
].negative
)
459 if (!rs
->items
[i
].dst
||
461 !strncmp(rs
->items
[i
].src
, "refs/tags/", 10))) {
464 free(rs
->items
[i
].src
);
465 free(rs
->items
[i
].dst
);
467 for (j
= i
+ 1; j
< rs
->nr
; j
++) {
468 rs
->items
[j
- 1] = rs
->items
[j
];
469 rs
->raw
[j
- 1] = rs
->raw
[j
];
476 old_dst
= rs
->items
[i
].dst
;
477 strbuf_addstr(&new_dst
, "refs/prefetch/");
480 * If old_dst starts with "refs/", then place
481 * sub after that prefix. Otherwise, start at
482 * the beginning of the string.
484 if (!skip_prefix(old_dst
, "refs/", &sub
))
486 strbuf_addstr(&new_dst
, sub
);
488 rs
->items
[i
].dst
= strbuf_detach(&new_dst
, NULL
);
489 rs
->items
[i
].force
= 1;
495 static struct ref
*get_ref_map(struct remote
*remote
,
496 const struct ref
*remote_refs
,
498 int tags
, int *autotags
)
502 struct ref
*ref_map
= NULL
;
503 struct ref
**tail
= &ref_map
;
505 /* opportunistically-updated references: */
506 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
508 struct hashmap existing_refs
;
509 int existing_refs_populated
= 0;
511 filter_prefetch_refspec(rs
);
513 filter_prefetch_refspec(&remote
->fetch
);
516 struct refspec
*fetch_refspec
;
518 for (i
= 0; i
< rs
->nr
; i
++) {
519 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
520 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
523 /* Merge everything on the command line (but not --tags) */
524 for (rm
= ref_map
; rm
; rm
= rm
->next
)
525 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
528 * For any refs that we happen to be fetching via
529 * command-line arguments, the destination ref might
530 * have been missing or have been different than the
531 * remote-tracking ref that would be derived from the
532 * configured refspec. In these cases, we want to
533 * take the opportunity to update their configured
534 * remote-tracking reference. However, we do not want
535 * to mention these entries in FETCH_HEAD at all, as
536 * they would simply be duplicates of existing
537 * entries, so we set them FETCH_HEAD_IGNORE below.
539 * We compute these entries now, based only on the
540 * refspecs specified on the command line. But we add
541 * them to the list following the refspecs resulting
542 * from the tags option so that one of the latter,
543 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
544 * by ref_remove_duplicates() in favor of one of these
545 * opportunistic entries with FETCH_HEAD_IGNORE.
548 fetch_refspec
= &refmap
;
550 fetch_refspec
= &remote
->fetch
;
552 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
553 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
554 } else if (refmap
.nr
) {
555 die("--refmap option is only meaningful with command-line refspec(s).");
557 /* Use the defaults */
558 struct branch
*branch
= branch_get(NULL
);
559 int has_merge
= branch_has_merge_config(branch
);
562 /* Note: has_merge implies non-NULL branch->remote_name */
563 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
564 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
565 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
566 if (remote
->fetch
.items
[i
].dst
&&
567 remote
->fetch
.items
[i
].dst
[0])
569 if (!i
&& !has_merge
&& ref_map
&&
570 !remote
->fetch
.items
[0].pattern
)
571 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
574 * if the remote we're fetching from is the same
575 * as given in branch.<name>.remote, we add the
576 * ref given in branch.<name>.merge, too.
578 * Note: has_merge implies non-NULL branch->remote_name
581 !strcmp(branch
->remote_name
, remote
->name
))
582 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
583 } else if (!prefetch
) {
584 ref_map
= get_remote_ref(remote_refs
, "HEAD");
586 die(_("Couldn't find remote ref HEAD"));
587 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
588 tail
= &ref_map
->next
;
592 if (tags
== TAGS_SET
)
593 /* also fetch all tags */
594 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
595 else if (tags
== TAGS_DEFAULT
&& *autotags
)
596 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
598 /* Now append any refs to be updated opportunistically: */
600 for (rm
= orefs
; rm
; rm
= rm
->next
) {
601 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
606 * apply negative refspecs first, before we remove duplicates. This is
607 * necessary as negative refspecs might remove an otherwise conflicting
611 ref_map
= apply_negative_refspecs(ref_map
, rs
);
613 ref_map
= apply_negative_refspecs(ref_map
, &remote
->fetch
);
615 ref_map
= ref_remove_duplicates(ref_map
);
617 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
619 const char *refname
= rm
->peer_ref
->name
;
620 struct refname_hash_entry
*peer_item
;
621 unsigned int hash
= strhash(refname
);
623 if (!existing_refs_populated
) {
624 refname_hash_init(&existing_refs
);
625 for_each_ref(add_one_refname
, &existing_refs
);
626 existing_refs_populated
= 1;
629 peer_item
= hashmap_get_entry_from_hash(&existing_refs
,
631 struct refname_hash_entry
, ent
);
633 struct object_id
*old_oid
= &peer_item
->oid
;
634 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
638 if (existing_refs_populated
)
639 hashmap_clear_and_free(&existing_refs
, struct refname_hash_entry
, ent
);
644 #define STORE_REF_ERROR_OTHER 1
645 #define STORE_REF_ERROR_DF_CONFLICT 2
647 static int s_update_ref(const char *action
,
649 struct ref_transaction
*transaction
,
653 char *rla
= getenv("GIT_REFLOG_ACTION");
654 struct ref_transaction
*our_transaction
= NULL
;
655 struct strbuf err
= STRBUF_INIT
;
661 rla
= default_rla
.buf
;
662 msg
= xstrfmt("%s: %s", rla
, action
);
665 * If no transaction was passed to us, we manage the transaction
666 * ourselves. Otherwise, we trust the caller to handle the transaction
670 transaction
= our_transaction
= ref_transaction_begin(&err
);
672 ret
= STORE_REF_ERROR_OTHER
;
677 ret
= ref_transaction_update(transaction
, ref
->name
, &ref
->new_oid
,
678 check_old
? &ref
->old_oid
: NULL
,
681 ret
= STORE_REF_ERROR_OTHER
;
685 if (our_transaction
) {
686 switch (ref_transaction_commit(our_transaction
, &err
)) {
689 case TRANSACTION_NAME_CONFLICT
:
690 ret
= STORE_REF_ERROR_DF_CONFLICT
;
693 ret
= STORE_REF_ERROR_OTHER
;
699 ref_transaction_free(our_transaction
);
701 error("%s", err
.buf
);
702 strbuf_release(&err
);
707 static int refcol_width
= 10;
708 static int compact_format
;
710 static void adjust_refcol_width(const struct ref
*ref
)
712 int max
, rlen
, llen
, len
;
714 /* uptodate lines are only shown on high verbosity level */
715 if (!verbosity
&& oideq(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
718 max
= term_columns();
719 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
721 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
724 * rough estimation to see if the output line is too long and
725 * should not be counted (we can't do precise calculation
726 * anyway because we don't know if the error explanation part
727 * will be printed in update_local_ref)
729 if (compact_format
) {
733 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
738 * Not precise calculation for compact mode because '*' can
739 * appear on the left hand side of '->' and shrink the column
742 if (refcol_width
< rlen
)
746 static void prepare_format_display(struct ref
*ref_map
)
749 const char *format
= "full";
751 git_config_get_string_tmp("fetch.output", &format
);
752 if (!strcasecmp(format
, "full"))
754 else if (!strcasecmp(format
, "compact"))
757 die(_("configuration fetch.output contains invalid value %s"),
760 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
761 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
763 !strcmp(rm
->name
, "HEAD"))
766 adjust_refcol_width(rm
);
770 static void print_remote_to_local(struct strbuf
*display
,
771 const char *remote
, const char *local
)
773 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
776 static int find_and_replace(struct strbuf
*haystack
,
778 const char *placeholder
)
780 const char *p
= NULL
;
783 nlen
= strlen(needle
);
784 if (ends_with(haystack
->buf
, needle
))
785 p
= haystack
->buf
+ haystack
->len
- nlen
;
787 p
= strstr(haystack
->buf
, needle
);
791 if (p
> haystack
->buf
&& p
[-1] != '/')
795 if (plen
> nlen
&& p
[nlen
] != '/')
798 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
799 placeholder
, strlen(placeholder
));
803 static void print_compact(struct strbuf
*display
,
804 const char *remote
, const char *local
)
806 struct strbuf r
= STRBUF_INIT
;
807 struct strbuf l
= STRBUF_INIT
;
809 if (!strcmp(remote
, local
)) {
810 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
814 strbuf_addstr(&r
, remote
);
815 strbuf_addstr(&l
, local
);
817 if (!find_and_replace(&r
, local
, "*"))
818 find_and_replace(&l
, remote
, "*");
819 print_remote_to_local(display
, r
.buf
, l
.buf
);
825 static void format_display(struct strbuf
*display
, char code
,
826 const char *summary
, const char *error
,
827 const char *remote
, const char *local
,
830 int width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
832 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
834 print_remote_to_local(display
, remote
, local
);
836 print_compact(display
, remote
, local
);
838 strbuf_addf(display
, " (%s)", error
);
841 static int update_local_ref(struct ref
*ref
,
842 struct ref_transaction
*transaction
,
844 const struct ref
*remote_ref
,
845 struct strbuf
*display
,
848 struct commit
*current
= NULL
, *updated
;
849 struct branch
*current_branch
= branch_get(NULL
);
850 const char *pretty_ref
= prettify_refname(ref
->name
);
851 int fast_forward
= 0;
853 if (!repo_has_object_file(the_repository
, &ref
->new_oid
))
854 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
856 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
858 format_display(display
, '=', _("[up to date]"), NULL
,
859 remote
, pretty_ref
, summary_width
);
863 if (current_branch
&&
864 !strcmp(ref
->name
, current_branch
->name
) &&
865 !(update_head_ok
|| is_bare_repository()) &&
866 !is_null_oid(&ref
->old_oid
)) {
868 * If this is the head, and it's not okay to update
869 * the head, and the old value of the head isn't empty...
871 format_display(display
, '!', _("[rejected]"),
872 _("can't fetch in current branch"),
873 remote
, pretty_ref
, summary_width
);
877 if (!is_null_oid(&ref
->old_oid
) &&
878 starts_with(ref
->name
, "refs/tags/")) {
879 if (force
|| ref
->force
) {
881 r
= s_update_ref("updating tag", ref
, transaction
, 0);
882 format_display(display
, r
? '!' : 't', _("[tag update]"),
883 r
? _("unable to update local ref") : NULL
,
884 remote
, pretty_ref
, summary_width
);
887 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
888 remote
, pretty_ref
, summary_width
);
893 current
= lookup_commit_reference_gently(the_repository
,
895 updated
= lookup_commit_reference_gently(the_repository
,
897 if (!current
|| !updated
) {
902 * Nicely describe the new ref we're fetching.
903 * Base this on the remote's ref name, as it's
904 * more likely to follow a standard layout.
906 const char *name
= remote_ref
? remote_ref
->name
: "";
907 if (starts_with(name
, "refs/tags/")) {
909 what
= _("[new tag]");
910 } else if (starts_with(name
, "refs/heads/")) {
911 msg
= "storing head";
912 what
= _("[new branch]");
915 what
= _("[new ref]");
918 r
= s_update_ref(msg
, ref
, transaction
, 0);
919 format_display(display
, r
? '!' : '*', what
,
920 r
? _("unable to update local ref") : NULL
,
921 remote
, pretty_ref
, summary_width
);
925 if (fetch_show_forced_updates
) {
926 uint64_t t_before
= getnanotime();
927 fast_forward
= in_merge_bases(current
, updated
);
928 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
934 struct strbuf quickref
= STRBUF_INIT
;
937 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
938 strbuf_addstr(&quickref
, "..");
939 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
940 r
= s_update_ref("fast-forward", ref
, transaction
, 1);
941 format_display(display
, r
? '!' : ' ', quickref
.buf
,
942 r
? _("unable to update local ref") : NULL
,
943 remote
, pretty_ref
, summary_width
);
944 strbuf_release(&quickref
);
946 } else if (force
|| ref
->force
) {
947 struct strbuf quickref
= STRBUF_INIT
;
949 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
950 strbuf_addstr(&quickref
, "...");
951 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
952 r
= s_update_ref("forced-update", ref
, transaction
, 1);
953 format_display(display
, r
? '!' : '+', quickref
.buf
,
954 r
? _("unable to update local ref") : _("forced update"),
955 remote
, pretty_ref
, summary_width
);
956 strbuf_release(&quickref
);
959 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
960 remote
, pretty_ref
, summary_width
);
965 static const struct object_id
*iterate_ref_map(void *cb_data
)
967 struct ref
**rm
= cb_data
;
968 struct ref
*ref
= *rm
;
970 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
975 return &ref
->old_oid
;
983 static int open_fetch_head(struct fetch_head
*fetch_head
)
985 const char *filename
= git_path_fetch_head(the_repository
);
987 if (write_fetch_head
) {
988 fetch_head
->fp
= fopen(filename
, "a");
990 return error_errno(_("cannot open %s"), filename
);
991 strbuf_init(&fetch_head
->buf
, 0);
993 fetch_head
->fp
= NULL
;
999 static void append_fetch_head(struct fetch_head
*fetch_head
,
1000 const struct object_id
*old_oid
,
1001 enum fetch_head_status fetch_head_status
,
1003 const char *url
, size_t url_len
)
1005 char old_oid_hex
[GIT_MAX_HEXSZ
+ 1];
1006 const char *merge_status_marker
;
1009 if (!fetch_head
->fp
)
1012 switch (fetch_head_status
) {
1013 case FETCH_HEAD_NOT_FOR_MERGE
:
1014 merge_status_marker
= "not-for-merge";
1016 case FETCH_HEAD_MERGE
:
1017 merge_status_marker
= "";
1020 /* do not write anything to FETCH_HEAD */
1024 strbuf_addf(&fetch_head
->buf
, "%s\t%s\t%s",
1025 oid_to_hex_r(old_oid_hex
, old_oid
), merge_status_marker
, note
);
1026 for (i
= 0; i
< url_len
; ++i
)
1028 strbuf_addstr(&fetch_head
->buf
, "\\n");
1030 strbuf_addch(&fetch_head
->buf
, url
[i
]);
1031 strbuf_addch(&fetch_head
->buf
, '\n');
1034 * When using an atomic fetch, we do not want to update FETCH_HEAD if
1035 * any of the reference updates fails. We thus have to write all
1036 * updates to a buffer first and only commit it as soon as all
1037 * references have been successfully updated.
1039 if (!atomic_fetch
) {
1040 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1041 strbuf_reset(&fetch_head
->buf
);
1045 static void commit_fetch_head(struct fetch_head
*fetch_head
)
1047 if (!fetch_head
->fp
|| !atomic_fetch
)
1049 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1052 static void close_fetch_head(struct fetch_head
*fetch_head
)
1054 if (!fetch_head
->fp
)
1057 fclose(fetch_head
->fp
);
1058 strbuf_release(&fetch_head
->buf
);
1061 static const char warn_show_forced_updates
[] =
1062 N_("Fetch normally indicates which branches had a forced update,\n"
1063 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
1064 "flag or run 'git config fetch.showForcedUpdates true'.");
1065 static const char warn_time_show_forced_updates
[] =
1066 N_("It took %.2f seconds to check forced updates. You can use\n"
1067 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
1068 " to avoid this check.\n");
1070 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
1071 int connectivity_checked
, struct ref
*ref_map
)
1073 struct fetch_head fetch_head
;
1074 int url_len
, i
, rc
= 0;
1075 struct strbuf note
= STRBUF_INIT
, err
= STRBUF_INIT
;
1076 struct ref_transaction
*transaction
= NULL
;
1077 const char *what
, *kind
;
1081 int summary_width
= transport_summary_width(ref_map
);
1083 rc
= open_fetch_head(&fetch_head
);
1088 url
= transport_anonymize_url(raw_url
);
1090 url
= xstrdup("foreign");
1092 if (!connectivity_checked
) {
1093 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1096 if (check_connected(iterate_ref_map
, &rm
, &opt
)) {
1097 rc
= error(_("%s did not send all necessary objects\n"), url
);
1103 transaction
= ref_transaction_begin(&err
);
1105 error("%s", err
.buf
);
1110 prepare_format_display(ref_map
);
1113 * We do a pass for each fetch_head_status type in their enum order, so
1114 * merged entries are written before not-for-merge. That lets readers
1115 * use FETCH_HEAD as a refname to refer to the ref to be merged.
1117 for (want_status
= FETCH_HEAD_MERGE
;
1118 want_status
<= FETCH_HEAD_IGNORE
;
1120 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1121 struct commit
*commit
= NULL
;
1122 struct ref
*ref
= NULL
;
1124 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
1125 if (want_status
== FETCH_HEAD_MERGE
)
1126 warning(_("rejected %s because shallow roots are not allowed to be updated"),
1127 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
1132 * References in "refs/tags/" are often going to point
1133 * to annotated tags, which are not part of the
1134 * commit-graph. We thus only try to look up refs in
1135 * the graph which are not in that namespace to not
1136 * regress performance in repositories with many
1139 if (!starts_with(rm
->name
, "refs/tags/"))
1140 commit
= lookup_commit_in_graph(the_repository
, &rm
->old_oid
);
1142 commit
= lookup_commit_reference_gently(the_repository
,
1146 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
1149 if (rm
->fetch_head_status
!= want_status
)
1153 ref
= alloc_ref(rm
->peer_ref
->name
);
1154 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
1155 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
1156 ref
->force
= rm
->peer_ref
->force
;
1159 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
&&
1160 (!rm
->peer_ref
|| !oideq(&ref
->old_oid
, &ref
->new_oid
))) {
1161 check_for_new_submodule_commits(&rm
->old_oid
);
1164 if (!strcmp(rm
->name
, "HEAD")) {
1168 else if (skip_prefix(rm
->name
, "refs/heads/", &what
))
1170 else if (skip_prefix(rm
->name
, "refs/tags/", &what
))
1172 else if (skip_prefix(rm
->name
, "refs/remotes/", &what
))
1173 kind
= "remote-tracking branch";
1179 url_len
= strlen(url
);
1180 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1183 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1186 strbuf_reset(¬e
);
1189 strbuf_addf(¬e
, "%s ", kind
);
1190 strbuf_addf(¬e
, "'%s' of ", what
);
1193 append_fetch_head(&fetch_head
, &rm
->old_oid
,
1194 rm
->fetch_head_status
,
1195 note
.buf
, url
, url_len
);
1197 strbuf_reset(¬e
);
1199 rc
|= update_local_ref(ref
, transaction
, what
,
1200 rm
, ¬e
, summary_width
);
1202 } else if (write_fetch_head
|| dry_run
) {
1204 * Display fetches written to FETCH_HEAD (or
1205 * would be written to FETCH_HEAD, if --dry-run
1208 format_display(¬e
, '*',
1209 *kind
? kind
: "branch", NULL
,
1210 *what
? what
: "HEAD",
1211 "FETCH_HEAD", summary_width
);
1214 if (verbosity
>= 0 && !shown_url
) {
1215 fprintf(stderr
, _("From %.*s\n"),
1220 fprintf(stderr
, " %s\n", note
.buf
);
1225 if (!rc
&& transaction
) {
1226 rc
= ref_transaction_commit(transaction
, &err
);
1228 error("%s", err
.buf
);
1234 commit_fetch_head(&fetch_head
);
1236 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1237 error(_("some local refs could not be updated; try running\n"
1238 " 'git remote prune %s' to remove any old, conflicting "
1239 "branches"), remote_name
);
1241 if (advice_fetch_show_forced_updates
) {
1242 if (!fetch_show_forced_updates
) {
1243 warning(_(warn_show_forced_updates
));
1244 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1245 warning(_(warn_time_show_forced_updates
),
1246 forced_updates_ms
/ 1000.0);
1251 strbuf_release(¬e
);
1252 strbuf_release(&err
);
1253 ref_transaction_free(transaction
);
1255 close_fetch_head(&fetch_head
);
1260 * We would want to bypass the object transfer altogether if
1261 * everything we are going to fetch already exists and is connected
1264 static int check_exist_and_connected(struct ref
*ref_map
)
1266 struct ref
*rm
= ref_map
;
1267 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1271 * If we are deepening a shallow clone we already have these
1272 * objects reachable. Running rev-list here will return with
1273 * a good (0) exit status and we'll bypass the fetch that we
1274 * really need to perform. Claiming failure now will ensure
1275 * we perform the network exchange to deepen our history.
1281 * check_connected() allows objects to merely be promised, but
1282 * we need all direct targets to exist.
1284 for (r
= rm
; r
; r
= r
->next
) {
1285 if (!has_object_file_with_flags(&r
->old_oid
,
1286 OBJECT_INFO_SKIP_FETCH_OBJECT
))
1291 return check_connected(iterate_ref_map
, &rm
, &opt
);
1294 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
1299 * We don't need to perform a fetch in case we can already satisfy all
1302 ret
= check_exist_and_connected(ref_map
);
1304 trace2_region_enter("fetch", "fetch_refs", the_repository
);
1305 ret
= transport_fetch_refs(transport
, ref_map
);
1306 trace2_region_leave("fetch", "fetch_refs", the_repository
);
1312 * Keep the new pack's ".keep" file around to allow the caller
1313 * time to update refs to reference the new objects.
1318 transport_unlock_pack(transport
);
1322 /* Update local refs based on the ref values fetched from a remote */
1323 static int consume_refs(struct transport
*transport
, struct ref
*ref_map
)
1325 int connectivity_checked
= transport
->smart_options
1326 ? transport
->smart_options
->connectivity_checked
: 0;
1328 trace2_region_enter("fetch", "consume_refs", the_repository
);
1329 ret
= store_updated_refs(transport
->url
,
1330 transport
->remote
->name
,
1331 connectivity_checked
,
1333 transport_unlock_pack(transport
);
1334 trace2_region_leave("fetch", "consume_refs", the_repository
);
1338 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
1339 const char *raw_url
)
1341 int url_len
, i
, result
= 0;
1342 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1344 int summary_width
= transport_summary_width(stale_refs
);
1345 const char *dangling_msg
= dry_run
1346 ? _(" (%s will become dangling)")
1347 : _(" (%s has become dangling)");
1350 url
= transport_anonymize_url(raw_url
);
1352 url
= xstrdup("foreign");
1354 url_len
= strlen(url
);
1355 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1359 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1363 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1365 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1366 string_list_append(&refnames
, ref
->name
);
1368 result
= delete_refs("fetch: prune", &refnames
, 0);
1369 string_list_clear(&refnames
, 0);
1372 if (verbosity
>= 0) {
1373 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1374 struct strbuf sb
= STRBUF_INIT
;
1376 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1379 format_display(&sb
, '-', _("[deleted]"), NULL
,
1380 _("(none)"), prettify_refname(ref
->name
),
1382 fprintf(stderr
, " %s\n",sb
.buf
);
1383 strbuf_release(&sb
);
1384 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1389 free_refs(stale_refs
);
1393 static void check_not_current_branch(struct ref
*ref_map
)
1395 struct branch
*current_branch
= branch_get(NULL
);
1397 if (is_bare_repository() || !current_branch
)
1400 for (; ref_map
; ref_map
= ref_map
->next
)
1401 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1402 ref_map
->peer_ref
->name
))
1403 die(_("Refusing to fetch into current branch %s "
1404 "of non-bare repository"), current_branch
->refname
);
1407 static int truncate_fetch_head(void)
1409 const char *filename
= git_path_fetch_head(the_repository
);
1410 FILE *fp
= fopen_for_writing(filename
);
1413 return error_errno(_("cannot open %s"), filename
);
1418 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1420 int r
= transport_set_option(transport
, name
, value
);
1422 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1423 name
, value
, transport
->url
);
1425 warning(_("Option \"%s\" is ignored for %s\n"),
1426 name
, transport
->url
);
1430 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1433 struct oid_array
*oids
= cb_data
;
1435 oid_array_append(oids
, oid
);
1439 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1441 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1444 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1445 const char *s
= negotiation_tip
.items
[i
].string
;
1447 if (!has_glob_specials(s
)) {
1448 struct object_id oid
;
1449 if (get_oid(s
, &oid
))
1450 die(_("%s is not a valid object"), s
);
1451 if (!has_object(the_repository
, &oid
, 0))
1452 die(_("the object %s does not exist"), s
);
1453 oid_array_append(oids
, &oid
);
1457 for_each_glob_ref(add_oid
, s
, oids
);
1458 if (old_nr
== oids
->nr
)
1459 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1462 smart_options
->negotiation_tips
= oids
;
1465 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1467 struct transport
*transport
;
1469 transport
= transport_get(remote
, NULL
);
1470 transport_set_verbosity(transport
, verbosity
, progress
);
1471 transport
->family
= family
;
1473 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1475 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1477 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1478 if (deepen
&& deepen_since
)
1479 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1480 if (deepen
&& deepen_not
.nr
)
1481 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1482 (const char *)&deepen_not
);
1483 if (deepen_relative
)
1484 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1486 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1487 if (filter_options
.choice
) {
1489 expand_list_objects_filter_spec(&filter_options
);
1490 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1491 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1493 if (negotiation_tip
.nr
) {
1494 if (transport
->smart_options
)
1495 add_negotiation_tips(transport
->smart_options
);
1497 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1502 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1507 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1508 * when remote helper is used (setting it to an empty string
1509 * is not unsetting). We could extend the remote helper
1510 * protocol for that, but for now, just force a new connection
1511 * without deepen-since. Similar story for deepen-not.
1513 cannot_reuse
= transport
->cannot_reuse
||
1514 deepen_since
|| deepen_not
.nr
;
1516 gsecondary
= prepare_transport(transport
->remote
, 0);
1517 transport
= gsecondary
;
1520 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1521 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1522 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1523 if (!fetch_refs(transport
, ref_map
))
1524 consume_refs(transport
, ref_map
);
1527 transport_disconnect(gsecondary
);
1532 static int do_fetch(struct transport
*transport
,
1535 struct ref
*ref_map
;
1536 int autotags
= (transport
->remote
->fetch_tags
== 1);
1538 const struct ref
*remote_refs
;
1539 struct transport_ls_refs_options transport_ls_refs_options
=
1540 TRANSPORT_LS_REFS_OPTIONS_INIT
;
1541 int must_list_refs
= 1;
1543 if (tags
== TAGS_DEFAULT
) {
1544 if (transport
->remote
->fetch_tags
== 2)
1546 if (transport
->remote
->fetch_tags
== -1)
1550 /* if not appending, truncate FETCH_HEAD */
1551 if (!append
&& write_fetch_head
) {
1552 retcode
= truncate_fetch_head();
1560 refspec_ref_prefixes(rs
, &transport_ls_refs_options
.ref_prefixes
);
1563 * We can avoid listing refs if all of them are exact
1567 for (i
= 0; i
< rs
->nr
; i
++) {
1568 if (!rs
->items
[i
].exact_sha1
) {
1573 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1574 refspec_ref_prefixes(&transport
->remote
->fetch
,
1575 &transport_ls_refs_options
.ref_prefixes
);
1577 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1579 if (transport_ls_refs_options
.ref_prefixes
.nr
)
1580 strvec_push(&transport_ls_refs_options
.ref_prefixes
,
1584 if (must_list_refs
) {
1585 trace2_region_enter("fetch", "remote_refs", the_repository
);
1586 remote_refs
= transport_get_remote_refs(transport
,
1587 &transport_ls_refs_options
);
1588 trace2_region_leave("fetch", "remote_refs", the_repository
);
1592 strvec_clear(&transport_ls_refs_options
.ref_prefixes
);
1594 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1596 if (!update_head_ok
)
1597 check_not_current_branch(ref_map
);
1599 if (tags
== TAGS_DEFAULT
&& autotags
)
1600 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1603 * We only prune based on refspecs specified
1604 * explicitly (via command line or configuration); we
1605 * don't care whether --tags was specified.
1608 prune_refs(rs
, ref_map
, transport
->url
);
1610 prune_refs(&transport
->remote
->fetch
,
1615 if (fetch_refs(transport
, ref_map
) || consume_refs(transport
, ref_map
)) {
1622 struct branch
*branch
= branch_get("HEAD");
1624 struct ref
*source_ref
= NULL
;
1627 * We're setting the upstream configuration for the
1628 * current branch. The relevant upstream is the
1629 * fetched branch that is meant to be merged with the
1630 * current one, i.e. the one fetched to FETCH_HEAD.
1632 * When there are several such branches, consider the
1633 * request ambiguous and err on the safe side by doing
1634 * nothing and just emit a warning.
1636 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1637 if (!rm
->peer_ref
) {
1639 warning(_("multiple branches detected, incompatible with --set-upstream"));
1647 if (!strcmp(source_ref
->name
, "HEAD") ||
1648 starts_with(source_ref
->name
, "refs/heads/"))
1649 install_branch_config(0,
1651 transport
->remote
->name
,
1653 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1654 warning(_("not setting upstream for a remote remote-tracking branch"));
1655 else if (starts_with(source_ref
->name
, "refs/tags/"))
1656 warning(_("not setting upstream for a remote tag"));
1658 warning(_("unknown branch type"));
1660 warning(_("no source branch found.\n"
1661 "you need to specify exactly one branch with the --set-upstream option."));
1667 /* if neither --no-tags nor --tags was specified, do automated tag
1669 if (tags
== TAGS_DEFAULT
&& autotags
) {
1670 struct ref
**tail
= &ref_map
;
1672 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
1674 backfill_tags(transport
, ref_map
);
1682 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1684 struct string_list
*list
= priv
;
1685 if (!remote
->skip_default_update
)
1686 string_list_append(list
, remote
->name
);
1690 struct remote_group_data
{
1692 struct string_list
*list
;
1695 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1697 struct remote_group_data
*g
= priv
;
1699 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1700 /* split list by white space */
1702 size_t wordlen
= strcspn(value
, " \t\n");
1705 string_list_append_nodup(g
->list
,
1706 xstrndup(value
, wordlen
));
1707 value
+= wordlen
+ (value
[wordlen
] != '\0');
1714 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1716 int prev_nr
= list
->nr
;
1717 struct remote_group_data g
;
1718 g
.name
= name
; g
.list
= list
;
1720 git_config(get_remote_group
, &g
);
1721 if (list
->nr
== prev_nr
) {
1722 struct remote
*remote
= remote_get(name
);
1723 if (!remote_is_configured(remote
, 0))
1725 string_list_append(list
, remote
->name
);
1730 static void add_options_to_argv(struct strvec
*argv
)
1733 strvec_push(argv
, "--dry-run");
1735 strvec_push(argv
, prune
? "--prune" : "--no-prune");
1736 if (prune_tags
!= -1)
1737 strvec_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1739 strvec_push(argv
, "--update-head-ok");
1741 strvec_push(argv
, "--force");
1743 strvec_push(argv
, "--keep");
1744 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1745 strvec_push(argv
, "--recurse-submodules");
1746 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1747 strvec_push(argv
, "--recurse-submodules=on-demand");
1748 if (tags
== TAGS_SET
)
1749 strvec_push(argv
, "--tags");
1750 else if (tags
== TAGS_UNSET
)
1751 strvec_push(argv
, "--no-tags");
1753 strvec_push(argv
, "-v");
1755 strvec_push(argv
, "-v");
1756 else if (verbosity
< 0)
1757 strvec_push(argv
, "-q");
1758 if (family
== TRANSPORT_FAMILY_IPV4
)
1759 strvec_push(argv
, "--ipv4");
1760 else if (family
== TRANSPORT_FAMILY_IPV6
)
1761 strvec_push(argv
, "--ipv6");
1764 /* Fetch multiple remotes in parallel */
1766 struct parallel_fetch_state
{
1768 struct string_list
*remotes
;
1772 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1773 void *cb
, void **task_cb
)
1775 struct parallel_fetch_state
*state
= cb
;
1778 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1781 remote
= state
->remotes
->items
[state
->next
++].string
;
1784 strvec_pushv(&cp
->args
, state
->argv
);
1785 strvec_push(&cp
->args
, remote
);
1789 printf(_("Fetching %s\n"), remote
);
1794 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1796 struct parallel_fetch_state
*state
= cb
;
1797 const char *remote
= task_cb
;
1799 state
->result
= error(_("Could not fetch %s"), remote
);
1804 static int fetch_finished(int result
, struct strbuf
*out
,
1805 void *cb
, void *task_cb
)
1807 struct parallel_fetch_state
*state
= cb
;
1808 const char *remote
= task_cb
;
1811 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1819 static int fetch_multiple(struct string_list
*list
, int max_children
)
1822 struct strvec argv
= STRVEC_INIT
;
1824 if (!append
&& write_fetch_head
) {
1825 int errcode
= truncate_fetch_head();
1830 strvec_pushl(&argv
, "fetch", "--append", "--no-auto-gc",
1831 "--no-write-commit-graph", NULL
);
1832 add_options_to_argv(&argv
);
1834 if (max_children
!= 1 && list
->nr
!= 1) {
1835 struct parallel_fetch_state state
= { argv
.v
, list
, 0, 0 };
1837 strvec_push(&argv
, "--end-of-options");
1838 result
= run_processes_parallel_tr2(max_children
,
1840 &fetch_failed_to_start
,
1843 "fetch", "parallel/fetch");
1846 result
= state
.result
;
1848 for (i
= 0; i
< list
->nr
; i
++) {
1849 const char *name
= list
->items
[i
].string
;
1850 strvec_push(&argv
, name
);
1852 printf(_("Fetching %s\n"), name
);
1853 if (run_command_v_opt(argv
.v
, RUN_GIT_CMD
)) {
1854 error(_("Could not fetch %s"), name
);
1860 strvec_clear(&argv
);
1865 * Fetching from the promisor remote should use the given filter-spec
1866 * or inherit the default filter-spec from the config.
1868 static inline void fetch_one_setup_partial(struct remote
*remote
)
1871 * Explicit --no-filter argument overrides everything, regardless
1872 * of any prior partial clones and fetches.
1874 if (filter_options
.no_filter
)
1878 * If no prior partial clone/fetch and the current fetch DID NOT
1879 * request a partial-fetch, do a normal fetch.
1881 if (!has_promisor_remote() && !filter_options
.choice
)
1885 * If this is a partial-fetch request, we enable partial on
1886 * this repo if not already enabled and remember the given
1887 * filter-spec as the default for subsequent fetches to this
1888 * remote if there is currently no default filter-spec.
1890 if (filter_options
.choice
) {
1891 partial_clone_register(remote
->name
, &filter_options
);
1896 * Do a partial-fetch from the promisor remote using either the
1897 * explicitly given filter-spec or inherit the filter-spec from
1900 if (!filter_options
.choice
)
1901 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
1905 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
,
1906 int prune_tags_ok
, int use_stdin_refspecs
)
1908 struct refspec rs
= REFSPEC_INIT_FETCH
;
1911 int maybe_prune_tags
;
1912 int remote_via_config
= remote_is_configured(remote
, 0);
1915 die(_("No remote repository specified. Please, specify either a URL or a\n"
1916 "remote name from which new revisions should be fetched."));
1918 gtransport
= prepare_transport(remote
, 1);
1921 /* no command line request */
1922 if (0 <= remote
->prune
)
1923 prune
= remote
->prune
;
1924 else if (0 <= fetch_prune_config
)
1925 prune
= fetch_prune_config
;
1927 prune
= PRUNE_BY_DEFAULT
;
1930 if (prune_tags
< 0) {
1931 /* no command line request */
1932 if (0 <= remote
->prune_tags
)
1933 prune_tags
= remote
->prune_tags
;
1934 else if (0 <= fetch_prune_tags_config
)
1935 prune_tags
= fetch_prune_tags_config
;
1937 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1940 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1941 if (maybe_prune_tags
&& remote_via_config
)
1942 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1944 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1945 refspec_append(&rs
, TAG_REFSPEC
);
1947 for (i
= 0; i
< argc
; i
++) {
1948 if (!strcmp(argv
[i
], "tag")) {
1951 die(_("You need to specify a tag name."));
1953 refspec_appendf(&rs
, "refs/tags/%s:refs/tags/%s",
1956 refspec_append(&rs
, argv
[i
]);
1960 if (use_stdin_refspecs
) {
1961 struct strbuf line
= STRBUF_INIT
;
1962 while (strbuf_getline_lf(&line
, stdin
) != EOF
)
1963 refspec_append(&rs
, line
.buf
);
1964 strbuf_release(&line
);
1967 if (server_options
.nr
)
1968 gtransport
->server_options
= &server_options
;
1970 sigchain_push_common(unlock_pack_on_signal
);
1971 atexit(unlock_pack
);
1972 sigchain_push(SIGPIPE
, SIG_IGN
);
1973 exit_code
= do_fetch(gtransport
, &rs
);
1974 sigchain_pop(SIGPIPE
);
1976 transport_disconnect(gtransport
);
1981 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1984 struct string_list list
= STRING_LIST_INIT_DUP
;
1985 struct remote
*remote
= NULL
;
1987 int prune_tags_ok
= 1;
1989 packet_trace_identity("fetch");
1991 /* Record the command line for the reflog */
1992 strbuf_addstr(&default_rla
, "fetch");
1993 for (i
= 1; i
< argc
; i
++) {
1994 /* This handles non-URLs gracefully */
1995 char *anon
= transport_anonymize_url(argv
[i
]);
1997 strbuf_addf(&default_rla
, " %s", anon
);
2001 git_config(git_fetch_config
, NULL
);
2003 argc
= parse_options(argc
, argv
, prefix
,
2004 builtin_fetch_options
, builtin_fetch_usage
, 0);
2005 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
2006 int *sfjc
= submodule_fetch_jobs_config
== -1
2007 ? &submodule_fetch_jobs_config
: NULL
;
2008 int *rs
= recurse_submodules
== RECURSE_SUBMODULES_DEFAULT
2009 ? &recurse_submodules
: NULL
;
2011 fetch_config_from_gitmodules(sfjc
, rs
);
2014 if (negotiate_only
&& !negotiation_tip
.nr
)
2015 die(_("--negotiate-only needs one or more --negotiate-tip=*"));
2017 if (deepen_relative
) {
2018 if (deepen_relative
< 0)
2019 die(_("Negative depth in --deepen is not supported"));
2021 die(_("--deepen and --depth are mutually exclusive"));
2022 depth
= xstrfmt("%d", deepen_relative
);
2026 die(_("--depth and --unshallow cannot be used together"));
2027 else if (!is_repository_shallow(the_repository
))
2028 die(_("--unshallow on a complete repository does not make sense"));
2030 depth
= xstrfmt("%d", INFINITE_DEPTH
);
2033 /* no need to be strict, transport_set_option() will validate it again */
2034 if (depth
&& atoi(depth
) < 1)
2035 die(_("depth %s is not a positive number"), depth
);
2036 if (depth
|| deepen_since
|| deepen_not
.nr
)
2039 /* FETCH_HEAD never gets updated in --dry-run mode */
2041 write_fetch_head
= 0;
2045 die(_("fetch --all does not take a repository argument"));
2047 die(_("fetch --all does not make sense with refspecs"));
2048 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
2049 } else if (argc
== 0) {
2050 /* No arguments -- use default remote */
2051 remote
= remote_get(NULL
);
2052 } else if (multiple
) {
2053 /* All arguments are assumed to be remotes or groups */
2054 for (i
= 0; i
< argc
; i
++)
2055 if (!add_remote_or_group(argv
[i
], &list
))
2056 die(_("No such remote or remote group: %s"), argv
[i
]);
2058 /* Single remote or group */
2059 (void) add_remote_or_group(argv
[0], &list
);
2061 /* More than one remote */
2063 die(_("Fetching a group and specifying refspecs does not make sense"));
2065 /* Zero or one remotes */
2066 remote
= remote_get(argv
[0]);
2067 prune_tags_ok
= (argc
== 1);
2073 if (negotiate_only
) {
2074 struct oidset acked_commits
= OIDSET_INIT
;
2075 struct oidset_iter iter
;
2076 const struct object_id
*oid
;
2079 die(_("must supply remote when using --negotiate-only"));
2080 gtransport
= prepare_transport(remote
, 1);
2081 if (gtransport
->smart_options
) {
2082 gtransport
->smart_options
->acked_commits
= &acked_commits
;
2084 warning(_("Protocol does not support --negotiate-only, exiting."));
2087 if (server_options
.nr
)
2088 gtransport
->server_options
= &server_options
;
2089 result
= transport_fetch_refs(gtransport
, NULL
);
2091 oidset_iter_init(&acked_commits
, &iter
);
2092 while ((oid
= oidset_iter_next(&iter
)))
2093 printf("%s\n", oid_to_hex(oid
));
2094 oidset_clear(&acked_commits
);
2095 } else if (remote
) {
2096 if (filter_options
.choice
|| has_promisor_remote())
2097 fetch_one_setup_partial(remote
);
2098 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
, stdin_refspecs
);
2100 int max_children
= max_jobs
;
2102 if (filter_options
.choice
)
2103 die(_("--filter can only be used with the remote "
2104 "configured in extensions.partialclone"));
2107 die(_("--atomic can only be used when fetching "
2108 "from one remote"));
2111 die(_("--stdin can only be used when fetching "
2112 "from one remote"));
2114 if (max_children
< 0)
2115 max_children
= fetch_parallel_config
;
2117 /* TODO should this also die if we have a previous partial-clone? */
2118 result
= fetch_multiple(&list
, max_children
);
2121 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
2122 struct strvec options
= STRVEC_INIT
;
2123 int max_children
= max_jobs
;
2125 if (max_children
< 0)
2126 max_children
= submodule_fetch_jobs_config
;
2127 if (max_children
< 0)
2128 max_children
= fetch_parallel_config
;
2130 add_options_to_argv(&options
);
2131 result
= fetch_populated_submodules(the_repository
,
2135 recurse_submodules_default
,
2138 strvec_clear(&options
);
2141 string_list_clear(&list
, 0);
2143 prepare_repo_settings(the_repository
);
2144 if (fetch_write_commit_graph
> 0 ||
2145 (fetch_write_commit_graph
< 0 &&
2146 the_repository
->settings
.fetch_write_commit_graph
)) {
2147 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
2150 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
2152 write_commit_graph_reachable(the_repository
->objects
->odb
,
2157 close_object_store(the_repository
->objects
);
2160 run_auto_maintenance(verbosity
< 0);