6 #include "repository.h"
9 #include "object-store.h"
12 #include "string-list.h"
14 #include "transport.h"
15 #include "run-command.h"
16 #include "parse-options.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
20 #include "connected.h"
21 #include "argv-array.h"
24 #include "list-objects-filter-options.h"
26 static const char * const builtin_fetch_usage
[] = {
27 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
28 N_("git fetch [<options>] <group>"),
29 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
30 N_("git fetch --all [<options>]"),
40 static int fetch_prune_config
= -1; /* unspecified */
41 static int prune
= -1; /* unspecified */
42 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
44 static int fetch_prune_tags_config
= -1; /* unspecified */
45 static int prune_tags
= -1; /* unspecified */
46 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
48 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
, verbosity
, deepen_relative
;
49 static int progress
= -1;
50 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
, deepen
;
51 static int max_children
= 1;
52 static enum transport_family family
;
53 static const char *depth
;
54 static const char *deepen_since
;
55 static const char *upload_pack
;
56 static struct string_list deepen_not
= STRING_LIST_INIT_NODUP
;
57 static struct strbuf default_rla
= STRBUF_INIT
;
58 static struct transport
*gtransport
;
59 static struct transport
*gsecondary
;
60 static const char *submodule_prefix
= "";
61 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
62 static int recurse_submodules_default
= RECURSE_SUBMODULES_ON_DEMAND
;
63 static int shown_url
= 0;
64 static struct refspec refmap
= REFSPEC_INIT_FETCH
;
65 static struct list_objects_filter_options filter_options
;
66 static struct string_list server_options
= STRING_LIST_INIT_DUP
;
68 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
70 if (!strcmp(k
, "fetch.prune")) {
71 fetch_prune_config
= git_config_bool(k
, v
);
75 if (!strcmp(k
, "fetch.prunetags")) {
76 fetch_prune_tags_config
= git_config_bool(k
, v
);
80 if (!strcmp(k
, "submodule.recurse")) {
81 int r
= git_config_bool(k
, v
) ?
82 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
83 recurse_submodules
= r
;
86 if (!strcmp(k
, "submodule.fetchjobs")) {
87 max_children
= parse_submodule_fetchjobs(k
, v
);
89 } else if (!strcmp(k
, "fetch.recursesubmodules")) {
90 recurse_submodules
= parse_fetch_recurse_submodules_arg(k
, v
);
94 return git_default_config(k
, v
, cb
);
97 static int gitmodules_fetch_config(const char *var
, const char *value
, void *cb
)
99 if (!strcmp(var
, "submodule.fetchjobs")) {
100 max_children
= parse_submodule_fetchjobs(var
, value
);
102 } else if (!strcmp(var
, "fetch.recursesubmodules")) {
103 recurse_submodules
= parse_fetch_recurse_submodules_arg(var
, value
);
110 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
113 * "git fetch --refmap='' origin foo"
114 * can be used to tell the command not to store anywhere
116 refspec_append(&refmap
, arg
);
121 static struct option builtin_fetch_options
[] = {
122 OPT__VERBOSITY(&verbosity
),
123 OPT_BOOL(0, "all", &all
,
124 N_("fetch from all remotes")),
125 OPT_BOOL('a', "append", &append
,
126 N_("append to .git/FETCH_HEAD instead of overwriting")),
127 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
128 N_("path to upload pack on remote end")),
129 OPT__FORCE(&force
, N_("force overwrite of local branch"), 0),
130 OPT_BOOL('m', "multiple", &multiple
,
131 N_("fetch from multiple remotes")),
132 OPT_SET_INT('t', "tags", &tags
,
133 N_("fetch all tags and associated objects"), TAGS_SET
),
134 OPT_SET_INT('n', NULL
, &tags
,
135 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
136 OPT_INTEGER('j', "jobs", &max_children
,
137 N_("number of submodules fetched in parallel")),
138 OPT_BOOL('p', "prune", &prune
,
139 N_("prune remote-tracking branches no longer on remote")),
140 OPT_BOOL('P', "prune-tags", &prune_tags
,
141 N_("prune local tags no longer on remote and clobber changed tags")),
142 { OPTION_CALLBACK
, 0, "recurse-submodules", &recurse_submodules
, N_("on-demand"),
143 N_("control recursive fetching of submodules"),
144 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
},
145 OPT_BOOL(0, "dry-run", &dry_run
,
147 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
148 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
149 N_("allow updating of HEAD ref")),
150 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
151 OPT_STRING(0, "depth", &depth
, N_("depth"),
152 N_("deepen history of shallow clone")),
153 OPT_STRING(0, "shallow-since", &deepen_since
, N_("time"),
154 N_("deepen history of shallow repository based on time")),
155 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not
, N_("revision"),
156 N_("deepen history of shallow clone, excluding rev")),
157 OPT_INTEGER(0, "deepen", &deepen_relative
,
158 N_("deepen history of shallow clone")),
159 OPT_SET_INT_F(0, "unshallow", &unshallow
,
160 N_("convert to a complete repository"),
162 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
163 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
164 { OPTION_CALLBACK
, 0, "recurse-submodules-default",
165 &recurse_submodules_default
, N_("on-demand"),
166 N_("default for recursive fetching of submodules "
167 "(lower priority than config files)"),
168 PARSE_OPT_HIDDEN
, option_fetch_parse_recurse_submodules
},
169 OPT_BOOL(0, "update-shallow", &update_shallow
,
170 N_("accept refs that update .git/shallow")),
171 { OPTION_CALLBACK
, 0, "refmap", NULL
, N_("refmap"),
172 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
},
173 OPT_STRING_LIST('o', "server-option", &server_options
, N_("server-specific"), N_("option to transmit")),
174 OPT_SET_INT('4', "ipv4", &family
, N_("use IPv4 addresses only"),
175 TRANSPORT_FAMILY_IPV4
),
176 OPT_SET_INT('6', "ipv6", &family
, N_("use IPv6 addresses only"),
177 TRANSPORT_FAMILY_IPV6
),
178 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options
),
182 static void unlock_pack(void)
185 transport_unlock_pack(gtransport
);
187 transport_unlock_pack(gsecondary
);
190 static void unlock_pack_on_signal(int signo
)
197 static void add_merge_config(struct ref
**head
,
198 const struct ref
*remote_refs
,
199 struct branch
*branch
,
204 for (i
= 0; i
< branch
->merge_nr
; i
++) {
205 struct ref
*rm
, **old_tail
= *tail
;
206 struct refspec_item refspec
;
208 for (rm
= *head
; rm
; rm
= rm
->next
) {
209 if (branch_merge_matches(branch
, i
, rm
->name
)) {
210 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
218 * Not fetched to a remote-tracking branch? We need to fetch
219 * it anyway to allow this branch's "branch.$name.merge"
220 * to be honored by 'git pull', but we do not have to
221 * fail if branch.$name.merge is misconfigured to point
222 * at a nonexisting branch. If we were indeed called by
223 * 'git pull', it will notice the misconfiguration because
224 * there is no entry in the resulting FETCH_HEAD marked
227 memset(&refspec
, 0, sizeof(refspec
));
228 refspec
.src
= branch
->merge
[i
]->src
;
229 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
230 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
231 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
235 static int add_existing(const char *refname
, const struct object_id
*oid
,
236 int flag
, void *cbdata
)
238 struct string_list
*list
= (struct string_list
*)cbdata
;
239 struct string_list_item
*item
= string_list_insert(list
, refname
);
240 struct object_id
*old_oid
= xmalloc(sizeof(*old_oid
));
242 oidcpy(old_oid
, oid
);
243 item
->util
= old_oid
;
247 static int will_fetch(struct ref
**head
, const unsigned char *sha1
)
249 struct ref
*rm
= *head
;
251 if (!hashcmp(rm
->old_oid
.hash
, sha1
))
258 static void find_non_local_tags(struct transport
*transport
,
262 struct string_list existing_refs
= STRING_LIST_INIT_DUP
;
263 struct string_list remote_refs
= STRING_LIST_INIT_NODUP
;
264 const struct ref
*ref
;
265 struct string_list_item
*item
= NULL
;
267 for_each_ref(add_existing
, &existing_refs
);
268 for (ref
= transport_get_remote_refs(transport
, NULL
); ref
; ref
= ref
->next
) {
269 if (!starts_with(ref
->name
, "refs/tags/"))
273 * The peeled ref always follows the matching base
274 * ref, so if we see a peeled ref that we don't want
275 * to fetch then we can mark the ref entry in the list
276 * as one to ignore by setting util to NULL.
278 if (ends_with(ref
->name
, "^{}")) {
280 !has_object_file_with_flags(&ref
->old_oid
,
281 OBJECT_INFO_QUICK
) &&
282 !will_fetch(head
, ref
->old_oid
.hash
) &&
283 !has_sha1_file_with_flags(item
->util
,
284 OBJECT_INFO_QUICK
) &&
285 !will_fetch(head
, item
->util
))
292 * If item is non-NULL here, then we previously saw a
293 * ref not followed by a peeled reference, so we need
294 * to check if it is a lightweight tag that we want to
298 !has_sha1_file_with_flags(item
->util
, OBJECT_INFO_QUICK
) &&
299 !will_fetch(head
, item
->util
))
304 /* skip duplicates and refs that we already have */
305 if (string_list_has_string(&remote_refs
, ref
->name
) ||
306 string_list_has_string(&existing_refs
, ref
->name
))
309 item
= string_list_insert(&remote_refs
, ref
->name
);
310 item
->util
= (void *)&ref
->old_oid
;
312 string_list_clear(&existing_refs
, 1);
315 * We may have a final lightweight tag that needs to be
316 * checked to see if it needs fetching.
319 !has_sha1_file_with_flags(item
->util
, OBJECT_INFO_QUICK
) &&
320 !will_fetch(head
, item
->util
))
324 * For all the tags in the remote_refs string list,
325 * add them to the list of refs to be fetched
327 for_each_string_list_item(item
, &remote_refs
) {
328 /* Unless we have already decided to ignore this item... */
331 struct ref
*rm
= alloc_ref(item
->string
);
332 rm
->peer_ref
= alloc_ref(item
->string
);
333 oidcpy(&rm
->old_oid
, item
->util
);
339 string_list_clear(&remote_refs
, 0);
342 static struct ref
*get_ref_map(struct transport
*transport
,
344 int tags
, int *autotags
)
348 struct ref
*ref_map
= NULL
;
349 struct ref
**tail
= &ref_map
;
350 struct argv_array ref_prefixes
= ARGV_ARRAY_INIT
;
352 /* opportunistically-updated references: */
353 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
355 const struct ref
*remote_refs
;
358 refspec_ref_prefixes(rs
, &ref_prefixes
);
359 else if (transport
->remote
&& transport
->remote
->fetch
.nr
)
360 refspec_ref_prefixes(&transport
->remote
->fetch
, &ref_prefixes
);
362 if (ref_prefixes
.argc
&&
363 (tags
== TAGS_SET
|| (tags
== TAGS_DEFAULT
&& !rs
->nr
))) {
364 argv_array_push(&ref_prefixes
, "refs/tags/");
367 remote_refs
= transport_get_remote_refs(transport
, &ref_prefixes
);
369 argv_array_clear(&ref_prefixes
);
372 struct refspec
*fetch_refspec
;
374 for (i
= 0; i
< rs
->nr
; i
++) {
375 get_fetch_map(remote_refs
, &rs
->items
[i
], &tail
, 0);
376 if (rs
->items
[i
].dst
&& rs
->items
[i
].dst
[0])
379 /* Merge everything on the command line (but not --tags) */
380 for (rm
= ref_map
; rm
; rm
= rm
->next
)
381 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
384 * For any refs that we happen to be fetching via
385 * command-line arguments, the destination ref might
386 * have been missing or have been different than the
387 * remote-tracking ref that would be derived from the
388 * configured refspec. In these cases, we want to
389 * take the opportunity to update their configured
390 * remote-tracking reference. However, we do not want
391 * to mention these entries in FETCH_HEAD at all, as
392 * they would simply be duplicates of existing
393 * entries, so we set them FETCH_HEAD_IGNORE below.
395 * We compute these entries now, based only on the
396 * refspecs specified on the command line. But we add
397 * them to the list following the refspecs resulting
398 * from the tags option so that one of the latter,
399 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
400 * by ref_remove_duplicates() in favor of one of these
401 * opportunistic entries with FETCH_HEAD_IGNORE.
404 fetch_refspec
= &refmap
;
406 fetch_refspec
= &transport
->remote
->fetch
;
408 for (i
= 0; i
< fetch_refspec
->nr
; i
++)
409 get_fetch_map(ref_map
, &fetch_refspec
->items
[i
], &oref_tail
, 1);
410 } else if (refmap
.nr
) {
411 die("--refmap option is only meaningful with command-line refspec(s).");
413 /* Use the defaults */
414 struct remote
*remote
= transport
->remote
;
415 struct branch
*branch
= branch_get(NULL
);
416 int has_merge
= branch_has_merge_config(branch
);
419 /* Note: has_merge implies non-NULL branch->remote_name */
420 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
421 for (i
= 0; i
< remote
->fetch
.nr
; i
++) {
422 get_fetch_map(remote_refs
, &remote
->fetch
.items
[i
], &tail
, 0);
423 if (remote
->fetch
.items
[i
].dst
&&
424 remote
->fetch
.items
[i
].dst
[0])
426 if (!i
&& !has_merge
&& ref_map
&&
427 !remote
->fetch
.items
[0].pattern
)
428 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
431 * if the remote we're fetching from is the same
432 * as given in branch.<name>.remote, we add the
433 * ref given in branch.<name>.merge, too.
435 * Note: has_merge implies non-NULL branch->remote_name
438 !strcmp(branch
->remote_name
, remote
->name
))
439 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
441 ref_map
= get_remote_ref(remote_refs
, "HEAD");
443 die(_("Couldn't find remote ref HEAD"));
444 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
445 tail
= &ref_map
->next
;
449 if (tags
== TAGS_SET
)
450 /* also fetch all tags */
451 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
452 else if (tags
== TAGS_DEFAULT
&& *autotags
)
453 find_non_local_tags(transport
, &ref_map
, &tail
);
455 /* Now append any refs to be updated opportunistically: */
457 for (rm
= orefs
; rm
; rm
= rm
->next
) {
458 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
462 return ref_remove_duplicates(ref_map
);
465 #define STORE_REF_ERROR_OTHER 1
466 #define STORE_REF_ERROR_DF_CONFLICT 2
468 static int s_update_ref(const char *action
,
473 char *rla
= getenv("GIT_REFLOG_ACTION");
474 struct ref_transaction
*transaction
;
475 struct strbuf err
= STRBUF_INIT
;
476 int ret
, df_conflict
= 0;
481 rla
= default_rla
.buf
;
482 msg
= xstrfmt("%s: %s", rla
, action
);
484 transaction
= ref_transaction_begin(&err
);
486 ref_transaction_update(transaction
, ref
->name
,
488 check_old
? &ref
->old_oid
: NULL
,
492 ret
= ref_transaction_commit(transaction
, &err
);
494 df_conflict
= (ret
== TRANSACTION_NAME_CONFLICT
);
498 ref_transaction_free(transaction
);
499 strbuf_release(&err
);
503 ref_transaction_free(transaction
);
504 error("%s", err
.buf
);
505 strbuf_release(&err
);
507 return df_conflict
? STORE_REF_ERROR_DF_CONFLICT
508 : STORE_REF_ERROR_OTHER
;
511 static int refcol_width
= 10;
512 static int compact_format
;
514 static void adjust_refcol_width(const struct ref
*ref
)
516 int max
, rlen
, llen
, len
;
518 /* uptodate lines are only shown on high verbosity level */
519 if (!verbosity
&& !oidcmp(&ref
->peer_ref
->old_oid
, &ref
->old_oid
))
522 max
= term_columns();
523 rlen
= utf8_strwidth(prettify_refname(ref
->name
));
525 llen
= utf8_strwidth(prettify_refname(ref
->peer_ref
->name
));
528 * rough estimation to see if the output line is too long and
529 * should not be counted (we can't do precise calculation
530 * anyway because we don't know if the error explanation part
531 * will be printed in update_local_ref)
533 if (compact_format
) {
537 len
= 21 /* flag and summary */ + rlen
+ 4 /* -> */ + llen
;
542 * Not precise calculation for compact mode because '*' can
543 * appear on the left hand side of '->' and shrink the column
546 if (refcol_width
< rlen
)
550 static void prepare_format_display(struct ref
*ref_map
)
553 const char *format
= "full";
555 git_config_get_string_const("fetch.output", &format
);
556 if (!strcasecmp(format
, "full"))
558 else if (!strcasecmp(format
, "compact"))
561 die(_("configuration fetch.output contains invalid value %s"),
564 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
565 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
||
567 !strcmp(rm
->name
, "HEAD"))
570 adjust_refcol_width(rm
);
574 static void print_remote_to_local(struct strbuf
*display
,
575 const char *remote
, const char *local
)
577 strbuf_addf(display
, "%-*s -> %s", refcol_width
, remote
, local
);
580 static int find_and_replace(struct strbuf
*haystack
,
582 const char *placeholder
)
584 const char *p
= strstr(haystack
->buf
, needle
);
590 if (p
> haystack
->buf
&& p
[-1] != '/')
594 nlen
= strlen(needle
);
595 if (plen
> nlen
&& p
[nlen
] != '/')
598 strbuf_splice(haystack
, p
- haystack
->buf
, nlen
,
599 placeholder
, strlen(placeholder
));
603 static void print_compact(struct strbuf
*display
,
604 const char *remote
, const char *local
)
606 struct strbuf r
= STRBUF_INIT
;
607 struct strbuf l
= STRBUF_INIT
;
609 if (!strcmp(remote
, local
)) {
610 strbuf_addf(display
, "%-*s -> *", refcol_width
, remote
);
614 strbuf_addstr(&r
, remote
);
615 strbuf_addstr(&l
, local
);
617 if (!find_and_replace(&r
, local
, "*"))
618 find_and_replace(&l
, remote
, "*");
619 print_remote_to_local(display
, r
.buf
, l
.buf
);
625 static void format_display(struct strbuf
*display
, char code
,
626 const char *summary
, const char *error
,
627 const char *remote
, const char *local
,
630 int width
= (summary_width
+ strlen(summary
) - gettext_width(summary
));
632 strbuf_addf(display
, "%c %-*s ", code
, width
, summary
);
634 print_remote_to_local(display
, remote
, local
);
636 print_compact(display
, remote
, local
);
638 strbuf_addf(display
, " (%s)", error
);
641 static int update_local_ref(struct ref
*ref
,
643 const struct ref
*remote_ref
,
644 struct strbuf
*display
,
647 struct commit
*current
= NULL
, *updated
;
648 enum object_type type
;
649 struct branch
*current_branch
= branch_get(NULL
);
650 const char *pretty_ref
= prettify_refname(ref
->name
);
652 type
= oid_object_info(the_repository
, &ref
->new_oid
, NULL
);
654 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
656 if (!oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
658 format_display(display
, '=', _("[up to date]"), NULL
,
659 remote
, pretty_ref
, summary_width
);
663 if (current_branch
&&
664 !strcmp(ref
->name
, current_branch
->name
) &&
665 !(update_head_ok
|| is_bare_repository()) &&
666 !is_null_oid(&ref
->old_oid
)) {
668 * If this is the head, and it's not okay to update
669 * the head, and the old value of the head isn't empty...
671 format_display(display
, '!', _("[rejected]"),
672 _("can't fetch in current branch"),
673 remote
, pretty_ref
, summary_width
);
677 if (!is_null_oid(&ref
->old_oid
) &&
678 starts_with(ref
->name
, "refs/tags/")) {
680 r
= s_update_ref("updating tag", ref
, 0);
681 format_display(display
, r
? '!' : 't', _("[tag update]"),
682 r
? _("unable to update local ref") : NULL
,
683 remote
, pretty_ref
, summary_width
);
687 current
= lookup_commit_reference_gently(&ref
->old_oid
, 1);
688 updated
= lookup_commit_reference_gently(&ref
->new_oid
, 1);
689 if (!current
|| !updated
) {
694 * Nicely describe the new ref we're fetching.
695 * Base this on the remote's ref name, as it's
696 * more likely to follow a standard layout.
698 const char *name
= remote_ref
? remote_ref
->name
: "";
699 if (starts_with(name
, "refs/tags/")) {
701 what
= _("[new tag]");
702 } else if (starts_with(name
, "refs/heads/")) {
703 msg
= "storing head";
704 what
= _("[new branch]");
707 what
= _("[new ref]");
710 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
711 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
712 check_for_new_submodule_commits(&ref
->new_oid
);
713 r
= s_update_ref(msg
, ref
, 0);
714 format_display(display
, r
? '!' : '*', what
,
715 r
? _("unable to update local ref") : NULL
,
716 remote
, pretty_ref
, summary_width
);
720 if (in_merge_bases(current
, updated
)) {
721 struct strbuf quickref
= STRBUF_INIT
;
723 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
724 strbuf_addstr(&quickref
, "..");
725 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
726 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
727 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
728 check_for_new_submodule_commits(&ref
->new_oid
);
729 r
= s_update_ref("fast-forward", ref
, 1);
730 format_display(display
, r
? '!' : ' ', quickref
.buf
,
731 r
? _("unable to update local ref") : NULL
,
732 remote
, pretty_ref
, summary_width
);
733 strbuf_release(&quickref
);
735 } else if (force
|| ref
->force
) {
736 struct strbuf quickref
= STRBUF_INIT
;
738 strbuf_add_unique_abbrev(&quickref
, ¤t
->object
.oid
, DEFAULT_ABBREV
);
739 strbuf_addstr(&quickref
, "...");
740 strbuf_add_unique_abbrev(&quickref
, &ref
->new_oid
, DEFAULT_ABBREV
);
741 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
742 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
743 check_for_new_submodule_commits(&ref
->new_oid
);
744 r
= s_update_ref("forced-update", ref
, 1);
745 format_display(display
, r
? '!' : '+', quickref
.buf
,
746 r
? _("unable to update local ref") : _("forced update"),
747 remote
, pretty_ref
, summary_width
);
748 strbuf_release(&quickref
);
751 format_display(display
, '!', _("[rejected]"), _("non-fast-forward"),
752 remote
, pretty_ref
, summary_width
);
757 static int iterate_ref_map(void *cb_data
, struct object_id
*oid
)
759 struct ref
**rm
= cb_data
;
760 struct ref
*ref
= *rm
;
762 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
765 return -1; /* end of the list */
767 oidcpy(oid
, &ref
->old_oid
);
771 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
775 struct commit
*commit
;
776 int url_len
, i
, rc
= 0;
777 struct strbuf note
= STRBUF_INIT
;
778 const char *what
, *kind
;
781 const char *filename
= dry_run
? "/dev/null" : git_path_fetch_head(the_repository
);
783 int summary_width
= transport_summary_width(ref_map
);
785 fp
= fopen(filename
, "a");
787 return error_errno(_("cannot open %s"), filename
);
790 url
= transport_anonymize_url(raw_url
);
792 url
= xstrdup("foreign");
795 if (check_connected(iterate_ref_map
, &rm
, NULL
)) {
796 rc
= error(_("%s did not send all necessary objects\n"), url
);
800 prepare_format_display(ref_map
);
803 * We do a pass for each fetch_head_status type in their enum order, so
804 * merged entries are written before not-for-merge. That lets readers
805 * use FETCH_HEAD as a refname to refer to the ref to be merged.
807 for (want_status
= FETCH_HEAD_MERGE
;
808 want_status
<= FETCH_HEAD_IGNORE
;
810 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
811 struct ref
*ref
= NULL
;
812 const char *merge_status_marker
= "";
814 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
815 if (want_status
== FETCH_HEAD_MERGE
)
816 warning(_("reject %s because shallow roots are not allowed to be updated"),
817 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
821 commit
= lookup_commit_reference_gently(&rm
->old_oid
,
824 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
826 if (rm
->fetch_head_status
!= want_status
)
830 ref
= alloc_ref(rm
->peer_ref
->name
);
831 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
832 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
833 ref
->force
= rm
->peer_ref
->force
;
837 if (!strcmp(rm
->name
, "HEAD")) {
841 else if (starts_with(rm
->name
, "refs/heads/")) {
843 what
= rm
->name
+ 11;
845 else if (starts_with(rm
->name
, "refs/tags/")) {
847 what
= rm
->name
+ 10;
849 else if (starts_with(rm
->name
, "refs/remotes/")) {
850 kind
= "remote-tracking branch";
851 what
= rm
->name
+ 13;
858 url_len
= strlen(url
);
859 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
862 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
868 strbuf_addf(¬e
, "%s ", kind
);
869 strbuf_addf(¬e
, "'%s' of ", what
);
871 switch (rm
->fetch_head_status
) {
872 case FETCH_HEAD_NOT_FOR_MERGE
:
873 merge_status_marker
= "not-for-merge";
875 case FETCH_HEAD_MERGE
:
876 fprintf(fp
, "%s\t%s\t%s",
877 oid_to_hex(&rm
->old_oid
),
880 for (i
= 0; i
< url_len
; ++i
)
888 /* do not write anything to FETCH_HEAD */
894 rc
|= update_local_ref(ref
, what
, rm
, ¬e
,
898 format_display(¬e
, '*',
899 *kind
? kind
: "branch", NULL
,
900 *what
? what
: "HEAD",
901 "FETCH_HEAD", summary_width
);
903 if (verbosity
>= 0 && !shown_url
) {
904 fprintf(stderr
, _("From %.*s\n"),
909 fprintf(stderr
, " %s\n", note
.buf
);
914 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
915 error(_("some local refs could not be updated; try running\n"
916 " 'git remote prune %s' to remove any old, conflicting "
917 "branches"), remote_name
);
920 strbuf_release(¬e
);
927 * We would want to bypass the object transfer altogether if
928 * everything we are going to fetch already exists and is connected
931 static int quickfetch(struct ref
*ref_map
)
933 struct ref
*rm
= ref_map
;
934 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
937 * If we are deepening a shallow clone we already have these
938 * objects reachable. Running rev-list here will return with
939 * a good (0) exit status and we'll bypass the fetch that we
940 * really need to perform. Claiming failure now will ensure
941 * we perform the network exchange to deepen our history.
946 return check_connected(iterate_ref_map
, &rm
, &opt
);
949 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
951 int ret
= quickfetch(ref_map
);
953 ret
= transport_fetch_refs(transport
, ref_map
);
955 ret
|= store_updated_refs(transport
->url
,
956 transport
->remote
->name
,
958 transport_unlock_pack(transport
);
962 static int prune_refs(struct refspec
*rs
, struct ref
*ref_map
,
965 int url_len
, i
, result
= 0;
966 struct ref
*ref
, *stale_refs
= get_stale_heads(rs
, ref_map
);
968 int summary_width
= transport_summary_width(stale_refs
);
969 const char *dangling_msg
= dry_run
970 ? _(" (%s will become dangling)")
971 : _(" (%s has become dangling)");
974 url
= transport_anonymize_url(raw_url
);
976 url
= xstrdup("foreign");
978 url_len
= strlen(url
);
979 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
983 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
987 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
989 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
990 string_list_append(&refnames
, ref
->name
);
992 result
= delete_refs("fetch: prune", &refnames
, 0);
993 string_list_clear(&refnames
, 0);
996 if (verbosity
>= 0) {
997 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
998 struct strbuf sb
= STRBUF_INIT
;
1000 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
1003 format_display(&sb
, '-', _("[deleted]"), NULL
,
1004 _("(none)"), prettify_refname(ref
->name
),
1006 fprintf(stderr
, " %s\n",sb
.buf
);
1007 strbuf_release(&sb
);
1008 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
1013 free_refs(stale_refs
);
1017 static void check_not_current_branch(struct ref
*ref_map
)
1019 struct branch
*current_branch
= branch_get(NULL
);
1021 if (is_bare_repository() || !current_branch
)
1024 for (; ref_map
; ref_map
= ref_map
->next
)
1025 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
1026 ref_map
->peer_ref
->name
))
1027 die(_("Refusing to fetch into current branch %s "
1028 "of non-bare repository"), current_branch
->refname
);
1031 static int truncate_fetch_head(void)
1033 const char *filename
= git_path_fetch_head(the_repository
);
1034 FILE *fp
= fopen_for_writing(filename
);
1037 return error_errno(_("cannot open %s"), filename
);
1042 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
1044 int r
= transport_set_option(transport
, name
, value
);
1046 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1047 name
, value
, transport
->url
);
1049 warning(_("Option \"%s\" is ignored for %s\n"),
1050 name
, transport
->url
);
1053 static struct transport
*prepare_transport(struct remote
*remote
, int deepen
)
1055 struct transport
*transport
;
1056 transport
= transport_get(remote
, NULL
);
1057 transport_set_verbosity(transport
, verbosity
, progress
);
1058 transport
->family
= family
;
1060 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
1062 set_option(transport
, TRANS_OPT_KEEP
, "yes");
1064 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
1065 if (deepen
&& deepen_since
)
1066 set_option(transport
, TRANS_OPT_DEEPEN_SINCE
, deepen_since
);
1067 if (deepen
&& deepen_not
.nr
)
1068 set_option(transport
, TRANS_OPT_DEEPEN_NOT
,
1069 (const char *)&deepen_not
);
1070 if (deepen_relative
)
1071 set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, "yes");
1073 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
1074 if (filter_options
.choice
) {
1075 set_option(transport
, TRANS_OPT_LIST_OBJECTS_FILTER
,
1076 filter_options
.filter_spec
);
1077 set_option(transport
, TRANS_OPT_FROM_PROMISOR
, "1");
1082 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
1087 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1088 * when remote helper is used (setting it to an empty string
1089 * is not unsetting). We could extend the remote helper
1090 * protocol for that, but for now, just force a new connection
1091 * without deepen-since. Similar story for deepen-not.
1093 cannot_reuse
= transport
->cannot_reuse
||
1094 deepen_since
|| deepen_not
.nr
;
1096 gsecondary
= prepare_transport(transport
->remote
, 0);
1097 transport
= gsecondary
;
1100 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
1101 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
1102 transport_set_option(transport
, TRANS_OPT_DEEPEN_RELATIVE
, NULL
);
1103 fetch_refs(transport
, ref_map
);
1106 transport_disconnect(gsecondary
);
1111 static int do_fetch(struct transport
*transport
,
1114 struct string_list existing_refs
= STRING_LIST_INIT_DUP
;
1115 struct ref
*ref_map
;
1117 int autotags
= (transport
->remote
->fetch_tags
== 1);
1120 for_each_ref(add_existing
, &existing_refs
);
1122 if (tags
== TAGS_DEFAULT
) {
1123 if (transport
->remote
->fetch_tags
== 2)
1125 if (transport
->remote
->fetch_tags
== -1)
1129 /* if not appending, truncate FETCH_HEAD */
1130 if (!append
&& !dry_run
) {
1131 retcode
= truncate_fetch_head();
1136 ref_map
= get_ref_map(transport
, rs
, tags
, &autotags
);
1137 if (!update_head_ok
)
1138 check_not_current_branch(ref_map
);
1140 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
1142 struct string_list_item
*peer_item
=
1143 string_list_lookup(&existing_refs
,
1144 rm
->peer_ref
->name
);
1146 struct object_id
*old_oid
= peer_item
->util
;
1147 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
1152 if (tags
== TAGS_DEFAULT
&& autotags
)
1153 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
1156 * We only prune based on refspecs specified
1157 * explicitly (via command line or configuration); we
1158 * don't care whether --tags was specified.
1161 prune_refs(rs
, ref_map
, transport
->url
);
1163 prune_refs(&transport
->remote
->fetch
,
1168 if (fetch_refs(transport
, ref_map
)) {
1175 /* if neither --no-tags nor --tags was specified, do automated tag
1177 if (tags
== TAGS_DEFAULT
&& autotags
) {
1178 struct ref
**tail
= &ref_map
;
1180 find_non_local_tags(transport
, &ref_map
, &tail
);
1182 backfill_tags(transport
, ref_map
);
1187 string_list_clear(&existing_refs
, 1);
1191 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
1193 struct string_list
*list
= priv
;
1194 if (!remote
->skip_default_update
)
1195 string_list_append(list
, remote
->name
);
1199 struct remote_group_data
{
1201 struct string_list
*list
;
1204 static int get_remote_group(const char *key
, const char *value
, void *priv
)
1206 struct remote_group_data
*g
= priv
;
1208 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
1209 /* split list by white space */
1211 size_t wordlen
= strcspn(value
, " \t\n");
1214 string_list_append_nodup(g
->list
,
1215 xstrndup(value
, wordlen
));
1216 value
+= wordlen
+ (value
[wordlen
] != '\0');
1223 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1225 int prev_nr
= list
->nr
;
1226 struct remote_group_data g
;
1227 g
.name
= name
; g
.list
= list
;
1229 git_config(get_remote_group
, &g
);
1230 if (list
->nr
== prev_nr
) {
1231 struct remote
*remote
= remote_get(name
);
1232 if (!remote_is_configured(remote
, 0))
1234 string_list_append(list
, remote
->name
);
1239 static void add_options_to_argv(struct argv_array
*argv
)
1242 argv_array_push(argv
, "--dry-run");
1244 argv_array_push(argv
, prune
? "--prune" : "--no-prune");
1245 if (prune_tags
!= -1)
1246 argv_array_push(argv
, prune_tags
? "--prune-tags" : "--no-prune-tags");
1248 argv_array_push(argv
, "--update-head-ok");
1250 argv_array_push(argv
, "--force");
1252 argv_array_push(argv
, "--keep");
1253 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1254 argv_array_push(argv
, "--recurse-submodules");
1255 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1256 argv_array_push(argv
, "--recurse-submodules=on-demand");
1257 if (tags
== TAGS_SET
)
1258 argv_array_push(argv
, "--tags");
1259 else if (tags
== TAGS_UNSET
)
1260 argv_array_push(argv
, "--no-tags");
1262 argv_array_push(argv
, "-v");
1264 argv_array_push(argv
, "-v");
1265 else if (verbosity
< 0)
1266 argv_array_push(argv
, "-q");
1270 static int fetch_multiple(struct string_list
*list
)
1273 struct argv_array argv
= ARGV_ARRAY_INIT
;
1275 if (!append
&& !dry_run
) {
1276 int errcode
= truncate_fetch_head();
1281 argv_array_pushl(&argv
, "fetch", "--append", NULL
);
1282 add_options_to_argv(&argv
);
1284 for (i
= 0; i
< list
->nr
; i
++) {
1285 const char *name
= list
->items
[i
].string
;
1286 argv_array_push(&argv
, name
);
1288 printf(_("Fetching %s\n"), name
);
1289 if (run_command_v_opt(argv
.argv
, RUN_GIT_CMD
)) {
1290 error(_("Could not fetch %s"), name
);
1293 argv_array_pop(&argv
);
1296 argv_array_clear(&argv
);
1301 * Fetching from the promisor remote should use the given filter-spec
1302 * or inherit the default filter-spec from the config.
1304 static inline void fetch_one_setup_partial(struct remote
*remote
)
1307 * Explicit --no-filter argument overrides everything, regardless
1308 * of any prior partial clones and fetches.
1310 if (filter_options
.no_filter
)
1314 * If no prior partial clone/fetch and the current fetch DID NOT
1315 * request a partial-fetch, do a normal fetch.
1317 if (!repository_format_partial_clone
&& !filter_options
.choice
)
1321 * If this is the FIRST partial-fetch request, we enable partial
1322 * on this repo and remember the given filter-spec as the default
1323 * for subsequent fetches to this remote.
1325 if (!repository_format_partial_clone
&& filter_options
.choice
) {
1326 partial_clone_register(remote
->name
, &filter_options
);
1331 * We are currently limited to only ONE promisor remote and only
1332 * allow partial-fetches from the promisor remote.
1334 if (strcmp(remote
->name
, repository_format_partial_clone
)) {
1335 if (filter_options
.choice
)
1336 die(_("--filter can only be used with the remote configured in core.partialClone"));
1341 * Do a partial-fetch from the promisor remote using either the
1342 * explicitly given filter-spec or inherit the filter-spec from
1345 if (!filter_options
.choice
)
1346 partial_clone_get_default_filter_spec(&filter_options
);
1350 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
, int prune_tags_ok
)
1352 struct refspec rs
= REFSPEC_INIT_FETCH
;
1355 int maybe_prune_tags
;
1356 int remote_via_config
= remote_is_configured(remote
, 0);
1359 die(_("No remote repository specified. Please, specify either a URL or a\n"
1360 "remote name from which new revisions should be fetched."));
1362 gtransport
= prepare_transport(remote
, 1);
1365 /* no command line request */
1366 if (0 <= remote
->prune
)
1367 prune
= remote
->prune
;
1368 else if (0 <= fetch_prune_config
)
1369 prune
= fetch_prune_config
;
1371 prune
= PRUNE_BY_DEFAULT
;
1374 if (prune_tags
< 0) {
1375 /* no command line request */
1376 if (0 <= remote
->prune_tags
)
1377 prune_tags
= remote
->prune_tags
;
1378 else if (0 <= fetch_prune_tags_config
)
1379 prune_tags
= fetch_prune_tags_config
;
1381 prune_tags
= PRUNE_TAGS_BY_DEFAULT
;
1384 maybe_prune_tags
= prune_tags_ok
&& prune_tags
;
1385 if (maybe_prune_tags
&& remote_via_config
)
1386 refspec_append(&remote
->fetch
, TAG_REFSPEC
);
1388 if (maybe_prune_tags
&& (argc
|| !remote_via_config
))
1389 refspec_append(&rs
, TAG_REFSPEC
);
1391 for (i
= 0; i
< argc
; i
++) {
1392 if (!strcmp(argv
[i
], "tag")) {
1396 die(_("You need to specify a tag name."));
1398 tag
= xstrfmt("refs/tags/%s:refs/tags/%s",
1400 refspec_append(&rs
, tag
);
1403 refspec_append(&rs
, argv
[i
]);
1407 if (server_options
.nr
)
1408 gtransport
->server_options
= &server_options
;
1410 sigchain_push_common(unlock_pack_on_signal
);
1411 atexit(unlock_pack
);
1412 exit_code
= do_fetch(gtransport
, &rs
);
1414 transport_disconnect(gtransport
);
1419 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1422 struct string_list list
= STRING_LIST_INIT_DUP
;
1423 struct remote
*remote
= NULL
;
1425 int prune_tags_ok
= 1;
1426 struct argv_array argv_gc_auto
= ARGV_ARRAY_INIT
;
1428 packet_trace_identity("fetch");
1430 fetch_if_missing
= 0;
1432 /* Record the command line for the reflog */
1433 strbuf_addstr(&default_rla
, "fetch");
1434 for (i
= 1; i
< argc
; i
++)
1435 strbuf_addf(&default_rla
, " %s", argv
[i
]);
1437 config_from_gitmodules(gitmodules_fetch_config
, NULL
);
1438 git_config(git_fetch_config
, NULL
);
1440 argc
= parse_options(argc
, argv
, prefix
,
1441 builtin_fetch_options
, builtin_fetch_usage
, 0);
1443 if (deepen_relative
) {
1444 if (deepen_relative
< 0)
1445 die(_("Negative depth in --deepen is not supported"));
1447 die(_("--deepen and --depth are mutually exclusive"));
1448 depth
= xstrfmt("%d", deepen_relative
);
1452 die(_("--depth and --unshallow cannot be used together"));
1453 else if (!is_repository_shallow(the_repository
))
1454 die(_("--unshallow on a complete repository does not make sense"));
1456 depth
= xstrfmt("%d", INFINITE_DEPTH
);
1459 /* no need to be strict, transport_set_option() will validate it again */
1460 if (depth
&& atoi(depth
) < 1)
1461 die(_("depth %s is not a positive number"), depth
);
1462 if (depth
|| deepen_since
|| deepen_not
.nr
)
1465 if (filter_options
.choice
&& !repository_format_partial_clone
)
1466 die("--filter can only be used when extensions.partialClone is set");
1470 die(_("fetch --all does not take a repository argument"));
1472 die(_("fetch --all does not make sense with refspecs"));
1473 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
1474 } else if (argc
== 0) {
1475 /* No arguments -- use default remote */
1476 remote
= remote_get(NULL
);
1477 } else if (multiple
) {
1478 /* All arguments are assumed to be remotes or groups */
1479 for (i
= 0; i
< argc
; i
++)
1480 if (!add_remote_or_group(argv
[i
], &list
))
1481 die(_("No such remote or remote group: %s"), argv
[i
]);
1483 /* Single remote or group */
1484 (void) add_remote_or_group(argv
[0], &list
);
1486 /* More than one remote */
1488 die(_("Fetching a group and specifying refspecs does not make sense"));
1490 /* Zero or one remotes */
1491 remote
= remote_get(argv
[0]);
1492 prune_tags_ok
= (argc
== 1);
1499 if (filter_options
.choice
|| repository_format_partial_clone
)
1500 fetch_one_setup_partial(remote
);
1501 result
= fetch_one(remote
, argc
, argv
, prune_tags_ok
);
1503 if (filter_options
.choice
)
1504 die(_("--filter can only be used with the remote configured in core.partialClone"));
1505 /* TODO should this also die if we have a previous partial-clone? */
1506 result
= fetch_multiple(&list
);
1509 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
1510 struct argv_array options
= ARGV_ARRAY_INIT
;
1512 add_options_to_argv(&options
);
1513 result
= fetch_populated_submodules(the_repository
,
1517 recurse_submodules_default
,
1520 argv_array_clear(&options
);
1523 string_list_clear(&list
, 0);
1525 close_all_packs(the_repository
->objects
);
1527 argv_array_pushl(&argv_gc_auto
, "gc", "--auto", NULL
);
1529 argv_array_push(&argv_gc_auto
, "--quiet");
1530 run_command_v_opt(argv_gc_auto
.argv
, RUN_GIT_CMD
);
1531 argv_array_clear(&argv_gc_auto
);