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
<= 0 && 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";
754 git_config_get_string_tmp("fetch.output", &format
);
755 if (!strcasecmp(format
, "full"))
757 else if (!strcasecmp(format
, "compact"))
760 die(_("configuration fetch.output contains invalid value %s"),
763 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
764 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
766 !strcmp(rm
->name
, "HEAD"))
769 adjust_refcol_width(rm
);
773 static void print_remote_to_local(struct strbuf
*display
,
774 const char *remote
, const char *local
)
776 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
779 static int find_and_replace(struct strbuf
*haystack
,
781 const char *placeholder
)
783 const char *p
= NULL
;
786 nlen
= strlen(needle
);
787 if (ends_with(haystack
->buf
, needle
))
788 p
= haystack
->buf
+ haystack
->len
- nlen
;
790 p
= strstr(haystack
->buf
, needle
);
794 if (p
> haystack
->buf
&& p
[-1] != '/')
798 if (plen
> nlen
&& p
[nlen
] != '/')
801 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
802 placeholder
, strlen(placeholder
));
806 static void print_compact(struct strbuf
*display
,
807 const char *remote
, const char *local
)
809 struct strbuf r
= STRBUF_INIT
;
810 struct strbuf l
= STRBUF_INIT
;
812 if (!strcmp(remote
, local
)) {
813 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
817 strbuf_addstr(&r
, remote
);
818 strbuf_addstr(&l
, local
);
820 if (!find_and_replace(&r
, local
, "*"))
821 find_and_replace(&l
, remote
, "*");
822 print_remote_to_local(display
, r
.buf
, l
.buf
);
828 static void format_display(struct strbuf
*display
, char code
,
829 const char *summary
, const char *error
,
830 const char *remote
, const char *local
,
838 width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
840 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
842 print_remote_to_local(display
, remote
, local
);
844 print_compact(display
, remote
, local
);
846 strbuf_addf(display
, " (%s)", error
);
849 static int update_local_ref(struct ref
*ref
,
850 struct ref_transaction
*transaction
,
852 const struct ref
*remote_ref
,
853 struct strbuf
*display
,
856 struct commit
*current
= NULL
, *updated
;
857 enum object_type type
;
858 struct branch
*current_branch
= branch_get(NULL
);
859 const char *pretty_ref
= prettify_refname(ref
->name
);
860 int fast_forward
= 0;
862 type
= oid_object_info(the_repository
, &ref
->new_oid
, NULL
);
864 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
866 if (oideq(&ref
->old_oid
, &ref
->new_oid
)) {
868 format_display(display
, '=', _("[up to date]"), NULL
,
869 remote
, pretty_ref
, summary_width
);
873 if (current_branch
&&
874 !strcmp(ref
->name
, current_branch
->name
) &&
875 !(update_head_ok
|| is_bare_repository()) &&
876 !is_null_oid(&ref
->old_oid
)) {
878 * If this is the head, and it's not okay to update
879 * the head, and the old value of the head isn't empty...
881 format_display(display
, '!', _("[rejected]"),
882 _("can't fetch in current branch"),
883 remote
, pretty_ref
, summary_width
);
887 if (!is_null_oid(&ref
->old_oid
) &&
888 starts_with(ref
->name
, "refs/tags/")) {
889 if (force
|| ref
->force
) {
891 r
= s_update_ref("updating tag", ref
, transaction
, 0);
892 format_display(display
, r
? '!' : 't', _("[tag update]"),
893 r
? _("unable to update local ref") : NULL
,
894 remote
, pretty_ref
, summary_width
);
897 format_display(display
, '!', _("[rejected]"), _("would clobber existing tag"),
898 remote
, pretty_ref
, summary_width
);
903 current
= lookup_commit_reference_gently(the_repository
,
905 updated
= lookup_commit_reference_gently(the_repository
,
907 if (!current
|| !updated
) {
912 * Nicely describe the new ref we're fetching.
913 * Base this on the remote's ref name, as it's
914 * more likely to follow a standard layout.
916 const char *name
= remote_ref
? remote_ref
->name
: "";
917 if (starts_with(name
, "refs/tags/")) {
919 what
= _("[new tag]");
920 } else if (starts_with(name
, "refs/heads/")) {
921 msg
= "storing head";
922 what
= _("[new branch]");
925 what
= _("[new ref]");
928 r
= s_update_ref(msg
, ref
, transaction
, 0);
929 format_display(display
, r
? '!' : '*', what
,
930 r
? _("unable to update local ref") : NULL
,
931 remote
, pretty_ref
, summary_width
);
935 if (fetch_show_forced_updates
) {
936 uint64_t t_before
= getnanotime();
937 fast_forward
= in_merge_bases(current
, updated
);
938 forced_updates_ms
+= (getnanotime() - t_before
) / 1000000;
944 struct strbuf quickref
= STRBUF_INIT
;
947 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
948 strbuf_addstr(&quickref
, "..");
949 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
950 r
= s_update_ref("fast-forward", ref
, transaction
, 1);
951 format_display(display
, r
? '!' : ' ', quickref
.buf
,
952 r
? _("unable to update local ref") : NULL
,
953 remote
, pretty_ref
, summary_width
);
954 strbuf_release(&quickref
);
956 } else if (force
|| ref
->force
) {
957 struct strbuf quickref
= STRBUF_INIT
;
959 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
960 strbuf_addstr(&quickref
, "...");
961 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
962 r
= s_update_ref("forced-update", ref
, transaction
, 1);
963 format_display(display
, r
? '!' : '+', quickref
.buf
,
964 r
? _("unable to update local ref") : _("forced update"),
965 remote
, pretty_ref
, summary_width
);
966 strbuf_release(&quickref
);
969 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
970 remote
, pretty_ref
, summary_width
);
975 static int iterate_ref_map(void *cb_data
, struct object_id
*oid
)
977 struct ref
**rm
= cb_data
;
978 struct ref
*ref
= *rm
;
980 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
983 return -1; /* end of the list */
985 oidcpy(oid
, &ref
->old_oid
);
994 static int open_fetch_head(struct fetch_head
*fetch_head
)
996 const char *filename
= git_path_fetch_head(the_repository
);
998 if (write_fetch_head
) {
999 fetch_head
->fp
= fopen(filename
, "a");
1000 if (!fetch_head
->fp
)
1001 return error_errno(_("cannot open %s"), filename
);
1002 strbuf_init(&fetch_head
->buf
, 0);
1004 fetch_head
->fp
= NULL
;
1010 static void append_fetch_head(struct fetch_head
*fetch_head
,
1011 const struct object_id
*old_oid
,
1012 enum fetch_head_status fetch_head_status
,
1014 const char *url
, size_t url_len
)
1016 char old_oid_hex
[GIT_MAX_HEXSZ
+ 1];
1017 const char *merge_status_marker
;
1020 if (!fetch_head
->fp
)
1023 switch (fetch_head_status
) {
1024 case FETCH_HEAD_NOT_FOR_MERGE
:
1025 merge_status_marker
= "not-for-merge";
1027 case FETCH_HEAD_MERGE
:
1028 merge_status_marker
= "";
1031 /* do not write anything to FETCH_HEAD */
1035 strbuf_addf(&fetch_head
->buf
, "%s\t%s\t%s",
1036 oid_to_hex_r(old_oid_hex
, old_oid
), merge_status_marker
, note
);
1037 for (i
= 0; i
< url_len
; ++i
)
1039 strbuf_addstr(&fetch_head
->buf
, "\\n");
1041 strbuf_addch(&fetch_head
->buf
, url
[i
]);
1042 strbuf_addch(&fetch_head
->buf
, '\n');
1045 * When using an atomic fetch, we do not want to update FETCH_HEAD if
1046 * any of the reference updates fails. We thus have to write all
1047 * updates to a buffer first and only commit it as soon as all
1048 * references have been successfully updated.
1050 if (!atomic_fetch
) {
1051 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1052 strbuf_reset(&fetch_head
->buf
);
1056 static void commit_fetch_head(struct fetch_head
*fetch_head
)
1058 if (!fetch_head
->fp
|| !atomic_fetch
)
1060 strbuf_write(&fetch_head
->buf
, fetch_head
->fp
);
1063 static void close_fetch_head(struct fetch_head
*fetch_head
)
1065 if (!fetch_head
->fp
)
1068 fclose(fetch_head
->fp
);
1069 strbuf_release(&fetch_head
->buf
);
1072 static const char warn_show_forced_updates
[] =
1073 N_("Fetch normally indicates which branches had a forced update,\n"
1074 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
1075 "flag or run 'git config fetch.showForcedUpdates true'.");
1076 static const char warn_time_show_forced_updates
[] =
1077 N_("It took %.2f seconds to check forced updates. You can use\n"
1078 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
1079 " to avoid this check.\n");
1081 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
1082 int connectivity_checked
, struct ref
*ref_map
)
1084 struct fetch_head fetch_head
;
1085 struct commit
*commit
;
1086 int url_len
, i
, rc
= 0;
1087 struct strbuf note
= STRBUF_INIT
, err
= STRBUF_INIT
;
1088 struct ref_transaction
*transaction
= NULL
;
1089 const char *what
, *kind
;
1093 int summary_width
= transport_summary_width(ref_map
);
1095 rc
= open_fetch_head(&fetch_head
);
1100 url
= transport_anonymize_url(raw_url
);
1102 url
= xstrdup("foreign");
1104 if (!connectivity_checked
) {
1105 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1108 if (check_connected(iterate_ref_map
, &rm
, &opt
)) {
1109 rc
= error(_("%s did not send all necessary objects\n"), url
);
1115 transaction
= ref_transaction_begin(&err
);
1117 error("%s", err
.buf
);
1122 prepare_format_display(ref_map
);
1125 * We do a pass for each fetch_head_status type in their enum order, so
1126 * merged entries are written before not-for-merge. That lets readers
1127 * use FETCH_HEAD as a refname to refer to the ref to be merged.
1129 for (want_status
= FETCH_HEAD_MERGE
;
1130 want_status
<= FETCH_HEAD_IGNORE
;
1132 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1133 struct ref
*ref
= NULL
;
1135 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
1136 if (want_status
== FETCH_HEAD_MERGE
)
1137 warning(_("rejected %s because shallow roots are not allowed to be updated"),
1138 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
1142 commit
= lookup_commit_reference_gently(the_repository
,
1146 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
1148 if (rm
->fetch_head_status
!= want_status
)
1152 ref
= alloc_ref(rm
->peer_ref
->name
);
1153 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
1154 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
1155 ref
->force
= rm
->peer_ref
->force
;
1158 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
&&
1159 (!rm
->peer_ref
|| !oideq(&ref
->old_oid
, &ref
->new_oid
))) {
1160 check_for_new_submodule_commits(&rm
->old_oid
);
1163 if (!strcmp(rm
->name
, "HEAD")) {
1167 else if (skip_prefix(rm
->name
, "refs/heads/", &what
))
1169 else if (skip_prefix(rm
->name
, "refs/tags/", &what
))
1171 else if (skip_prefix(rm
->name
, "refs/remotes/", &what
))
1172 kind
= "remote-tracking branch";
1178 url_len
= strlen(url
);
1179 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1182 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1185 strbuf_reset(¬e
);
1188 strbuf_addf(¬e
, "%s ", kind
);
1189 strbuf_addf(¬e
, "'%s' of ", what
);
1192 append_fetch_head(&fetch_head
, &rm
->old_oid
,
1193 rm
->fetch_head_status
,
1194 note
.buf
, url
, url_len
);
1196 strbuf_reset(¬e
);
1198 rc
|= update_local_ref(ref
, transaction
, what
,
1199 rm
, ¬e
, summary_width
);
1201 } else if (write_fetch_head
|| dry_run
) {
1203 * Display fetches written to FETCH_HEAD (or
1204 * would be written to FETCH_HEAD, if --dry-run
1207 format_display(¬e
, '*',
1208 *kind
? kind
: "branch", NULL
,
1209 *what
? what
: "HEAD",
1210 "FETCH_HEAD", summary_width
);
1214 fprintf(stderr
, _("From %.*s\n"),
1218 fprintf(stderr
, " %s\n", note
.buf
);
1223 if (!rc
&& transaction
) {
1224 rc
= ref_transaction_commit(transaction
, &err
);
1226 error("%s", err
.buf
);
1232 commit_fetch_head(&fetch_head
);
1234 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
1235 error(_("some local refs could not be updated; try running\n"
1236 " 'git remote prune %s' to remove any old, conflicting "
1237 "branches"), remote_name
);
1239 if (advice_enabled(ADVICE_FETCH_SHOW_FORCED_UPDATES
)) {
1240 if (!fetch_show_forced_updates
) {
1241 warning(_(warn_show_forced_updates
));
1242 } else if (forced_updates_ms
> FORCED_UPDATES_DELAY_WARNING_IN_MS
) {
1243 warning(_(warn_time_show_forced_updates
),
1244 forced_updates_ms
/ 1000.0);
1249 strbuf_release(¬e
);
1250 strbuf_release(&err
);
1251 ref_transaction_free(transaction
);
1253 close_fetch_head(&fetch_head
);
1258 * We would want to bypass the object transfer altogether if
1259 * everything we are going to fetch already exists and is connected
1262 static int check_exist_and_connected(struct ref
*ref_map
)
1264 struct ref
*rm
= ref_map
;
1265 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1269 * If we are deepening a shallow clone we already have these
1270 * objects reachable. Running rev-list here will return with
1271 * a good (0) exit status and we'll bypass the fetch that we
1272 * really need to perform. Claiming failure now will ensure
1273 * we perform the network exchange to deepen our history.
1279 * check_connected() allows objects to merely be promised, but
1280 * we need all direct targets to exist.
1282 for (r
= rm
; r
; r
= r
->next
) {
1283 if (!has_object_file_with_flags(&r
->old_oid
,
1284 OBJECT_INFO_SKIP_FETCH_OBJECT
))
1289 return check_connected(iterate_ref_map
, &rm
, &opt
);
1292 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
1294 int ret
= check_exist_and_connected(ref_map
);
1296 trace2_region_enter("fetch", "fetch_refs", the_repository
);
1297 ret
= transport_fetch_refs(transport
, ref_map
);
1298 trace2_region_leave("fetch", "fetch_refs", the_repository
);
1302 * Keep the new pack's ".keep" file around to allow the caller
1303 * time to update refs to reference the new objects.
1306 transport_unlock_pack(transport
);
1310 /* Update local refs based on the ref values fetched from a remote */
1311 static int consume_refs(struct transport
*transport
, struct ref
*ref_map
)
1313 int connectivity_checked
= transport
->smart_options
1314 ? transport
->smart_options
->connectivity_checked
: 0;
1316 trace2_region_enter("fetch", "consume_refs", the_repository
);
1317 ret
= store_updated_refs(transport
->url
,
1318 transport
->remote
->name
,
1319 connectivity_checked
,
1321 transport_unlock_pack(transport
);
1322 trace2_region_leave("fetch", "consume_refs", the_repository
);
1326 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
1327 const char *raw_url
)
1329 int url_len
, i
, result
= 0;
1330 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
1332 int summary_width
= transport_summary_width(stale_refs
);
1333 const char *dangling_msg
= dry_run
1334 ? _(" (%s will become dangling)")
1335 : _(" (%s has become dangling)");
1338 url
= transport_anonymize_url(raw_url
);
1340 url
= xstrdup("foreign");
1342 url_len
= strlen(url
);
1343 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
1347 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
1351 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
1353 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
1354 string_list_append(&refnames
, ref
->name
);
1356 result
= delete_refs("fetch: prune", &refnames
, 0);
1357 string_list_clear(&refnames
, 0);
1360 if (verbosity
>= 0) {
1361 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
1362 struct strbuf sb
= STRBUF_INIT
;
1364 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1367 format_display(&sb
, '-', _("[deleted]"), NULL
,
1368 _("(none)"), prettify_refname(ref
->name
),
1370 fprintf(stderr
, " %s\n",sb
.buf
);
1371 strbuf_release(&sb
);
1372 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1377 free_refs(stale_refs
);
1381 static void check_not_current_branch(struct ref
*ref_map
)
1383 struct branch
*current_branch
= branch_get(NULL
);
1385 if (is_bare_repository() || !current_branch
)
1388 for (; ref_map
; ref_map
= ref_map
->next
)
1389 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1390 ref_map
->peer_ref
->name
))
1391 die(_("Refusing to fetch into current branch %s "
1392 "of non-bare repository"), current_branch
->refname
);
1395 static int truncate_fetch_head(void)
1397 const char *filename
= git_path_fetch_head(the_repository
);
1398 FILE *fp
= fopen_for_writing(filename
);
1401 return error_errno(_("cannot open %s"), filename
);
1406 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1408 int r
= transport_set_option(transport
, name
, value
);
1410 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1411 name
, value
, transport
->url
);
1413 warning(_("Option \"%s\" is ignored for %s\n"),
1414 name
, transport
->url
);
1418 static int add_oid(const char *refname
, const struct object_id
*oid
, int flags
,
1421 struct oid_array
*oids
= cb_data
;
1423 oid_array_append(oids
, oid
);
1427 static void add_negotiation_tips(struct git_transport_options
*smart_options
)
1429 struct oid_array
*oids
= xcalloc(1, sizeof(*oids
));
1432 for (i
= 0; i
< negotiation_tip
.nr
; i
++) {
1433 const char *s
= negotiation_tip
.items
[i
].string
;
1435 if (!has_glob_specials(s
)) {
1436 struct object_id oid
;
1437 if (get_oid(s
, &oid
))
1438 die(_("%s is not a valid object"), s
);
1439 if (!has_object(the_repository
, &oid
, 0))
1440 die(_("the object %s does not exist"), s
);
1441 oid_array_append(oids
, &oid
);
1445 for_each_glob_ref(add_oid
, s
, oids
);
1446 if (old_nr
== oids
->nr
)
1447 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1450 smart_options
->negotiation_tips
= oids
;
1453 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1455 struct transport
*transport
;
1457 transport
= transport_get(remote
, NULL
);
1458 transport_set_verbosity(transport
, verbosity
, progress
);
1459 transport
->family
= family
;
1461 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1463 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1465 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1466 if (deepen
&& deepen_since
)
1467 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1468 if (deepen
&& deepen_not
.nr
)
1469 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1470 (const char *)&deepen_not
);
1471 if (deepen_relative
)
1472 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1474 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1475 if (filter_options
.choice
) {
1477 expand_list_objects_filter_spec(&filter_options
);
1478 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
, spec
);
1479 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1481 if (negotiation_tip
.nr
) {
1482 if (transport
->smart_options
)
1483 add_negotiation_tips(transport
->smart_options
);
1485 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1490 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1495 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1496 * when remote helper is used (setting it to an empty string
1497 * is not unsetting). We could extend the remote helper
1498 * protocol for that, but for now, just force a new connection
1499 * without deepen-since. Similar story for deepen-not.
1501 cannot_reuse
= transport
->cannot_reuse
||
1502 deepen_since
|| deepen_not
.nr
;
1504 gsecondary
= prepare_transport(transport
->remote
, 0);
1505 transport
= gsecondary
;
1508 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1509 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1510 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1511 if (!fetch_refs(transport
, ref_map
))
1512 consume_refs(transport
, ref_map
);
1515 transport_disconnect(gsecondary
);
1520 static int do_fetch(struct transport
*transport
,
1523 struct ref
*ref_map
;
1524 int autotags
= (transport
->remote
->fetch_tags
== 1);
1526 const struct ref
*remote_refs
;
1527 struct transport_ls_refs_options transport_ls_refs_options
=
1528 TRANSPORT_LS_REFS_OPTIONS_INIT
;
1529 int must_list_refs
= 1;
1531 if (tags
== TAGS_DEFAULT
) {
1532 if (transport
->remote
->fetch_tags
== 2)
1534 if (transport
->remote
->fetch_tags
== -1)
1538 /* if not appending, truncate FETCH_HEAD */
1539 if (!append
&& write_fetch_head
) {
1540 retcode
= truncate_fetch_head();
1548 refspec_ref_prefixes(rs
, &transport_ls_refs_options
.ref_prefixes
);
1551 * We can avoid listing refs if all of them are exact
1555 for (i
= 0; i
< rs
->nr
; i
++) {
1556 if (!rs
->items
[i
].exact_sha1
) {
1561 } else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
1562 refspec_ref_prefixes(&transport
->remote
->fetch
,
1563 &transport_ls_refs_options
.ref_prefixes
);
1565 if (tags
== TAGS_SET
|| tags
== TAGS_DEFAULT
) {
1567 if (transport_ls_refs_options
.ref_prefixes
.nr
)
1568 strvec_push(&transport_ls_refs_options
.ref_prefixes
,
1572 if (must_list_refs
) {
1573 trace2_region_enter("fetch", "remote_refs", the_repository
);
1574 remote_refs
= transport_get_remote_refs(transport
,
1575 &transport_ls_refs_options
);
1576 trace2_region_leave("fetch", "remote_refs", the_repository
);
1580 strvec_clear(&transport_ls_refs_options
.ref_prefixes
);
1582 ref_map
= get_ref_map(transport
->remote
, remote_refs
, rs
,
1584 if (!update_head_ok
)
1585 check_not_current_branch(ref_map
);
1587 if (tags
== TAGS_DEFAULT
&& autotags
)
1588 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1591 * We only prune based on refspecs specified
1592 * explicitly (via command line or configuration); we
1593 * don't care whether --tags was specified.
1596 prune_refs(rs
, ref_map
, transport
->url
);
1598 prune_refs(&transport
->remote
->fetch
,
1603 if (fetch_refs(transport
, ref_map
) || consume_refs(transport
, ref_map
)) {
1610 struct branch
*branch
= branch_get("HEAD");
1612 struct ref
*source_ref
= NULL
;
1615 * We're setting the upstream configuration for the
1616 * current branch. The relevant upstream is the
1617 * fetched branch that is meant to be merged with the
1618 * current one, i.e. the one fetched to FETCH_HEAD.
1620 * When there are several such branches, consider the
1621 * request ambiguous and err on the safe side by doing
1622 * nothing and just emit a warning.
1624 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1625 if (!rm
->peer_ref
) {
1627 warning(_("multiple branches detected, incompatible with --set-upstream"));
1635 if (!strcmp(source_ref
->name
, "HEAD") ||
1636 starts_with(source_ref
->name
, "refs/heads/"))
1637 install_branch_config(0,
1639 transport
->remote
->name
,
1641 else if (starts_with(source_ref
->name
, "refs/remotes/"))
1642 warning(_("not setting upstream for a remote remote-tracking branch"));
1643 else if (starts_with(source_ref
->name
, "refs/tags/"))
1644 warning(_("not setting upstream for a remote tag"));
1646 warning(_("unknown branch type"));
1648 warning(_("no source branch found.\n"
1649 "you need to specify exactly one branch with the --set-upstream option."));
1655 /* if neither --no-tags nor --tags was specified, do automated tag
1657 if (tags
== TAGS_DEFAULT
&& autotags
) {
1658 struct ref
**tail
= &ref_map
;
1660 find_non_local_tags(remote_refs
, &ref_map
, &tail
);
1662 backfill_tags(transport
, ref_map
);
1670 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1672 struct string_list
*list
= priv
;
1673 if (!remote
->skip_default_update
)
1674 string_list_append(list
, remote
->name
);
1678 struct remote_group_data
{
1680 struct string_list
*list
;
1683 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1685 struct remote_group_data
*g
= priv
;
1687 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1688 /* split list by white space */
1690 size_t wordlen
= strcspn(value
, " \t\n");
1693 string_list_append_nodup(g
->list
,
1694 xstrndup(value
, wordlen
));
1695 value
+= wordlen
+ (value
[wordlen
] != '\0');
1702 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1704 int prev_nr
= list
->nr
;
1705 struct remote_group_data g
;
1706 g
.name
= name
; g
.list
= list
;
1708 git_config(get_remote_group
, &g
);
1709 if (list
->nr
== prev_nr
) {
1710 struct remote
*remote
= remote_get(name
);
1711 if (!remote_is_configured(remote
, 0))
1713 string_list_append(list
, remote
->name
);
1718 static void add_options_to_argv(struct strvec
*argv
)
1721 strvec_push(argv
, "--dry-run");
1723 strvec_push(argv
, prune
? "--prune" : "--no-prune");
1724 if (prune_tags
!= -1)
1725 strvec_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1727 strvec_push(argv
, "--update-head-ok");
1729 strvec_push(argv
, "--force");
1731 strvec_push(argv
, "--keep");
1732 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1733 strvec_push(argv
, "--recurse-submodules");
1734 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1735 strvec_push(argv
, "--recurse-submodules=on-demand");
1736 if (tags
== TAGS_SET
)
1737 strvec_push(argv
, "--tags");
1738 else if (tags
== TAGS_UNSET
)
1739 strvec_push(argv
, "--no-tags");
1741 strvec_push(argv
, "-v");
1743 strvec_push(argv
, "-v");
1744 else if (verbosity
< 0)
1745 strvec_push(argv
, "-q");
1746 if (family
== TRANSPORT_FAMILY_IPV4
)
1747 strvec_push(argv
, "--ipv4");
1748 else if (family
== TRANSPORT_FAMILY_IPV6
)
1749 strvec_push(argv
, "--ipv6");
1752 /* Fetch multiple remotes in parallel */
1754 struct parallel_fetch_state
{
1756 struct string_list
*remotes
;
1760 static int fetch_next_remote(struct child_process
*cp
, struct strbuf
*out
,
1761 void *cb
, void **task_cb
)
1763 struct parallel_fetch_state
*state
= cb
;
1766 if (state
->next
< 0 || state
->next
>= state
->remotes
->nr
)
1769 remote
= state
->remotes
->items
[state
->next
++].string
;
1772 strvec_pushv(&cp
->args
, state
->argv
);
1773 strvec_push(&cp
->args
, remote
);
1777 printf(_("Fetching %s\n"), remote
);
1782 static int fetch_failed_to_start(struct strbuf
*out
, void *cb
, void *task_cb
)
1784 struct parallel_fetch_state
*state
= cb
;
1785 const char *remote
= task_cb
;
1787 state
->result
= error(_("Could not fetch %s"), remote
);
1792 static int fetch_finished(int result
, struct strbuf
*out
,
1793 void *cb
, void *task_cb
)
1795 struct parallel_fetch_state
*state
= cb
;
1796 const char *remote
= task_cb
;
1799 strbuf_addf(out
, _("could not fetch '%s' (exit code: %d)\n"),
1807 static int fetch_multiple(struct string_list
*list
, int max_children
)
1810 struct strvec argv
= STRVEC_INIT
;
1812 if (!append
&& write_fetch_head
) {
1813 int errcode
= truncate_fetch_head();
1818 strvec_pushl(&argv
, "fetch", "--append", "--no-auto-gc",
1819 "--no-write-commit-graph", NULL
);
1820 add_options_to_argv(&argv
);
1822 if (max_children
!= 1 && list
->nr
!= 1) {
1823 struct parallel_fetch_state state
= { argv
.v
, list
, 0, 0 };
1825 strvec_push(&argv
, "--end-of-options");
1826 result
= run_processes_parallel_tr2(max_children
,
1828 &fetch_failed_to_start
,
1831 "fetch", "parallel/fetch");
1834 result
= state
.result
;
1836 for (i
= 0; i
< list
->nr
; i
++) {
1837 const char *name
= list
->items
[i
].string
;
1838 strvec_push(&argv
, name
);
1840 printf(_("Fetching %s\n"), name
);
1841 if (run_command_v_opt(argv
.v
, RUN_GIT_CMD
)) {
1842 error(_("Could not fetch %s"), name
);
1848 strvec_clear(&argv
);
1853 * Fetching from the promisor remote should use the given filter-spec
1854 * or inherit the default filter-spec from the config.
1856 static inline void fetch_one_setup_partial(struct remote
*remote
)
1859 * Explicit --no-filter argument overrides everything, regardless
1860 * of any prior partial clones and fetches.
1862 if (filter_options
.no_filter
)
1866 * If no prior partial clone/fetch and the current fetch DID NOT
1867 * request a partial-fetch, do a normal fetch.
1869 if (!has_promisor_remote() && !filter_options
.choice
)
1873 * If this is a partial-fetch request, we enable partial on
1874 * this repo if not already enabled and remember the given
1875 * filter-spec as the default for subsequent fetches to this
1876 * remote if there is currently no default filter-spec.
1878 if (filter_options
.choice
) {
1879 partial_clone_register(remote
->name
, &filter_options
);
1884 * Do a partial-fetch from the promisor remote using either the
1885 * explicitly given filter-spec or inherit the filter-spec from
1888 if (!filter_options
.choice
)
1889 partial_clone_get_default_filter_spec(&filter_options
, remote
->name
);
1893 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
,
1894 int prune_tags_ok
, int use_stdin_refspecs
)
1896 struct refspec rs
= REFSPEC_INIT_FETCH
;
1899 int maybe_prune_tags
;
1900 int remote_via_config
= remote_is_configured(remote
, 0);
1903 die(_("No remote repository specified. Please, specify either a URL or a\n"
1904 "remote name from which new revisions should be fetched."));
1906 gtransport
= prepare_transport(remote
, 1);
1909 /* no command line request */
1910 if (0 <= remote
->prune
)
1911 prune
= remote
->prune
;
1912 else if (0 <= fetch_prune_config
)
1913 prune
= fetch_prune_config
;
1915 prune
= PRUNE_BY_DEFAULT
;
1918 if (prune_tags
< 0) {
1919 /* no command line request */
1920 if (0 <= remote
->prune_tags
)
1921 prune_tags
= remote
->prune_tags
;
1922 else if (0 <= fetch_prune_tags_config
)
1923 prune_tags
= fetch_prune_tags_config
;
1925 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1928 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1929 if (maybe_prune_tags
&& remote_via_config
)
1930 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1932 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1933 refspec_append(&rs
, TAG_REFSPEC
);
1935 for (i
= 0; i
< argc
; i
++) {
1936 if (!strcmp(argv
[i
], "tag")) {
1939 die(_("You need to specify a tag name."));
1941 refspec_appendf(&rs
, "refs/tags/%s:refs/tags/%s",
1944 refspec_append(&rs
, argv
[i
]);
1948 if (use_stdin_refspecs
) {
1949 struct strbuf line
= STRBUF_INIT
;
1950 while (strbuf_getline_lf(&line
, stdin
) != EOF
)
1951 refspec_append(&rs
, line
.buf
);
1952 strbuf_release(&line
);
1955 if (server_options
.nr
)
1956 gtransport
->server_options
= &server_options
;
1958 sigchain_push_common(unlock_pack_on_signal
);
1959 atexit(unlock_pack
);
1960 sigchain_push(SIGPIPE
, SIG_IGN
);
1961 exit_code
= do_fetch(gtransport
, &rs
);
1962 sigchain_pop(SIGPIPE
);
1964 transport_disconnect(gtransport
);
1969 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1972 struct string_list list
= STRING_LIST_INIT_DUP
;
1973 struct remote
*remote
= NULL
;
1975 int prune_tags_ok
= 1;
1977 packet_trace_identity("fetch");
1979 /* Record the command line for the reflog */
1980 strbuf_addstr(&default_rla
, "fetch");
1981 for (i
= 1; i
< argc
; i
++) {
1982 /* This handles non-URLs gracefully */
1983 char *anon
= transport_anonymize_url(argv
[i
]);
1985 strbuf_addf(&default_rla
, " %s", anon
);
1989 git_config(git_fetch_config
, NULL
);
1991 argc
= parse_options(argc
, argv
, prefix
,
1992 builtin_fetch_options
, builtin_fetch_usage
, 0);
1993 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
1994 int *sfjc
= submodule_fetch_jobs_config
== -1
1995 ? &submodule_fetch_jobs_config
: NULL
;
1996 int *rs
= recurse_submodules
== RECURSE_SUBMODULES_DEFAULT
1997 ? &recurse_submodules
: NULL
;
1999 fetch_config_from_gitmodules(sfjc
, rs
);
2002 if (negotiate_only
&& !negotiation_tip
.nr
)
2003 die(_("--negotiate-only needs one or more --negotiate-tip=*"));
2005 if (deepen_relative
) {
2006 if (deepen_relative
< 0)
2007 die(_("Negative depth in --deepen is not supported"));
2009 die(_("--deepen and --depth are mutually exclusive"));
2010 depth
= xstrfmt("%d", deepen_relative
);
2014 die(_("--depth and --unshallow cannot be used together"));
2015 else if (!is_repository_shallow(the_repository
))
2016 die(_("--unshallow on a complete repository does not make sense"));
2018 depth
= xstrfmt("%d", INFINITE_DEPTH
);
2021 /* no need to be strict, transport_set_option() will validate it again */
2022 if (depth
&& atoi(depth
) < 1)
2023 die(_("depth %s is not a positive number"), depth
);
2024 if (depth
|| deepen_since
|| deepen_not
.nr
)
2027 /* FETCH_HEAD never gets updated in --dry-run mode */
2029 write_fetch_head
= 0;
2033 die(_("fetch --all does not take a repository argument"));
2035 die(_("fetch --all does not make sense with refspecs"));
2036 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
2037 } else if (argc
== 0) {
2038 /* No arguments -- use default remote */
2039 remote
= remote_get(NULL
);
2040 } else if (multiple
) {
2041 /* All arguments are assumed to be remotes or groups */
2042 for (i
= 0; i
< argc
; i
++)
2043 if (!add_remote_or_group(argv
[i
], &list
))
2044 die(_("No such remote or remote group: %s"), argv
[i
]);
2046 /* Single remote or group */
2047 (void) add_remote_or_group(argv
[0], &list
);
2049 /* More than one remote */
2051 die(_("Fetching a group and specifying refspecs does not make sense"));
2053 /* Zero or one remotes */
2054 remote
= remote_get(argv
[0]);
2055 prune_tags_ok
= (argc
== 1);
2061 if (negotiate_only
) {
2062 struct oidset acked_commits
= OIDSET_INIT
;
2063 struct oidset_iter iter
;
2064 const struct object_id
*oid
;
2067 die(_("must supply remote when using --negotiate-only"));
2068 gtransport
= prepare_transport(remote
, 1);
2069 if (gtransport
->smart_options
) {
2070 gtransport
->smart_options
->acked_commits
= &acked_commits
;
2072 warning(_("Protocol does not support --negotiate-only, exiting."));
2075 if (server_options
.nr
)
2076 gtransport
->server_options
= &server_options
;
2077 result
= transport_fetch_refs(gtransport
, NULL
);
2079 oidset_iter_init(&acked_commits
, &iter
);
2080 while ((oid
= oidset_iter_next(&iter
)))
2081 printf("%s\n", oid_to_hex(oid
));
2082 oidset_clear(&acked_commits
);
2083 } else if (remote
) {
2084 if (filter_options
.choice
|| has_promisor_remote())
2085 fetch_one_setup_partial(remote
);
2086 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
, stdin_refspecs
);
2088 int max_children
= max_jobs
;
2090 if (filter_options
.choice
)
2091 die(_("--filter can only be used with the remote "
2092 "configured in extensions.partialclone"));
2095 die(_("--atomic can only be used when fetching "
2096 "from one remote"));
2099 die(_("--stdin can only be used when fetching "
2100 "from one remote"));
2102 if (max_children
< 0)
2103 max_children
= fetch_parallel_config
;
2105 /* TODO should this also die if we have a previous partial-clone? */
2106 result
= fetch_multiple(&list
, max_children
);
2109 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
2110 struct strvec options
= STRVEC_INIT
;
2111 int max_children
= max_jobs
;
2113 if (max_children
< 0)
2114 max_children
= submodule_fetch_jobs_config
;
2115 if (max_children
< 0)
2116 max_children
= fetch_parallel_config
;
2118 add_options_to_argv(&options
);
2119 result
= fetch_populated_submodules(the_repository
,
2123 recurse_submodules_default
,
2126 strvec_clear(&options
);
2129 string_list_clear(&list
, 0);
2131 prepare_repo_settings(the_repository
);
2132 if (fetch_write_commit_graph
> 0 ||
2133 (fetch_write_commit_graph
< 0 &&
2134 the_repository
->settings
.fetch_write_commit_graph
)) {
2135 int commit_graph_flags
= COMMIT_GRAPH_WRITE_SPLIT
;
2138 commit_graph_flags
|= COMMIT_GRAPH_WRITE_PROGRESS
;
2140 write_commit_graph_reachable(the_repository
->objects
->odb
,
2145 close_object_store(the_repository
->objects
);
2148 run_auto_maintenance(verbosity
< 0);