8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
14 #include "submodule-config.h"
15 #include "submodule.h"
16 #include "connected.h"
17 #include "argv-array.h"
19 static const char * const builtin_fetch_usage
[] = {
20 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
21 N_("git fetch [<options>] <group>"),
22 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
23 N_("git fetch --all [<options>]"),
33 static int fetch_prune_config
= -1; /* unspecified */
34 static int prune
= -1; /* unspecified */
35 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
37 static int all
, append
, dry_run
, force
, keep
, multiple
, update_head_ok
, verbosity
;
38 static int progress
= -1, recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
39 static int tags
= TAGS_DEFAULT
, unshallow
, update_shallow
;
40 static const char *depth
;
41 static const char *upload_pack
;
42 static struct strbuf default_rla
= STRBUF_INIT
;
43 static struct transport
*gtransport
;
44 static struct transport
*gsecondary
;
45 static const char *submodule_prefix
= "";
46 static const char *recurse_submodules_default
;
47 static int shown_url
= 0;
48 static int refmap_alloc
, refmap_nr
;
49 static const char **refmap_array
;
51 static int option_parse_recurse_submodules(const struct option
*opt
,
52 const char *arg
, int unset
)
55 recurse_submodules
= RECURSE_SUBMODULES_OFF
;
58 recurse_submodules
= parse_fetch_recurse_submodules_arg(opt
->long_name
, arg
);
60 recurse_submodules
= RECURSE_SUBMODULES_ON
;
65 static int git_fetch_config(const char *k
, const char *v
, void *cb
)
67 if (!strcmp(k
, "fetch.prune")) {
68 fetch_prune_config
= git_config_bool(k
, v
);
71 return git_default_config(k
, v
, cb
);
74 static int parse_refmap_arg(const struct option
*opt
, const char *arg
, int unset
)
76 ALLOC_GROW(refmap_array
, refmap_nr
+ 1, refmap_alloc
);
79 * "git fetch --refmap='' origin foo"
80 * can be used to tell the command not to store anywhere
83 refmap_array
[refmap_nr
++] = arg
;
87 static struct option builtin_fetch_options
[] = {
88 OPT__VERBOSITY(&verbosity
),
89 OPT_BOOL(0, "all", &all
,
90 N_("fetch from all remotes")),
91 OPT_BOOL('a', "append", &append
,
92 N_("append to .git/FETCH_HEAD instead of overwriting")),
93 OPT_STRING(0, "upload-pack", &upload_pack
, N_("path"),
94 N_("path to upload pack on remote end")),
95 OPT__FORCE(&force
, N_("force overwrite of local branch")),
96 OPT_BOOL('m', "multiple", &multiple
,
97 N_("fetch from multiple remotes")),
98 OPT_SET_INT('t', "tags", &tags
,
99 N_("fetch all tags and associated objects"), TAGS_SET
),
100 OPT_SET_INT('n', NULL
, &tags
,
101 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET
),
102 OPT_BOOL('p', "prune", &prune
,
103 N_("prune remote-tracking branches no longer on remote")),
104 { OPTION_CALLBACK
, 0, "recurse-submodules", NULL
, N_("on-demand"),
105 N_("control recursive fetching of submodules"),
106 PARSE_OPT_OPTARG
, option_parse_recurse_submodules
},
107 OPT_BOOL(0, "dry-run", &dry_run
,
109 OPT_BOOL('k', "keep", &keep
, N_("keep downloaded pack")),
110 OPT_BOOL('u', "update-head-ok", &update_head_ok
,
111 N_("allow updating of HEAD ref")),
112 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
113 OPT_STRING(0, "depth", &depth
, N_("depth"),
114 N_("deepen history of shallow clone")),
115 { OPTION_SET_INT
, 0, "unshallow", &unshallow
, NULL
,
116 N_("convert to a complete repository"),
117 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
, NULL
, 1 },
118 { OPTION_STRING
, 0, "submodule-prefix", &submodule_prefix
, N_("dir"),
119 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN
},
120 { OPTION_STRING
, 0, "recurse-submodules-default",
121 &recurse_submodules_default
, NULL
,
122 N_("default mode for recursion"), PARSE_OPT_HIDDEN
},
123 OPT_BOOL(0, "update-shallow", &update_shallow
,
124 N_("accept refs that update .git/shallow")),
125 { OPTION_CALLBACK
, 0, "refmap", NULL
, N_("refmap"),
126 N_("specify fetch refmap"), PARSE_OPT_NONEG
, parse_refmap_arg
},
130 static void unlock_pack(void)
133 transport_unlock_pack(gtransport
);
135 transport_unlock_pack(gsecondary
);
138 static void unlock_pack_on_signal(int signo
)
145 static void add_merge_config(struct ref
**head
,
146 const struct ref
*remote_refs
,
147 struct branch
*branch
,
152 for (i
= 0; i
< branch
->merge_nr
; i
++) {
153 struct ref
*rm
, **old_tail
= *tail
;
154 struct refspec refspec
;
156 for (rm
= *head
; rm
; rm
= rm
->next
) {
157 if (branch_merge_matches(branch
, i
, rm
->name
)) {
158 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
166 * Not fetched to a remote-tracking branch? We need to fetch
167 * it anyway to allow this branch's "branch.$name.merge"
168 * to be honored by 'git pull', but we do not have to
169 * fail if branch.$name.merge is misconfigured to point
170 * at a nonexisting branch. If we were indeed called by
171 * 'git pull', it will notice the misconfiguration because
172 * there is no entry in the resulting FETCH_HEAD marked
175 memset(&refspec
, 0, sizeof(refspec
));
176 refspec
.src
= branch
->merge
[i
]->src
;
177 get_fetch_map(remote_refs
, &refspec
, tail
, 1);
178 for (rm
= *old_tail
; rm
; rm
= rm
->next
)
179 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
183 static int add_existing(const char *refname
, const struct object_id
*oid
,
184 int flag
, void *cbdata
)
186 struct string_list
*list
= (struct string_list
*)cbdata
;
187 struct string_list_item
*item
= string_list_insert(list
, refname
);
188 struct object_id
*old_oid
= xmalloc(sizeof(*old_oid
));
190 oidcpy(old_oid
, oid
);
191 item
->util
= old_oid
;
195 static int will_fetch(struct ref
**head
, const unsigned char *sha1
)
197 struct ref
*rm
= *head
;
199 if (!hashcmp(rm
->old_oid
.hash
, sha1
))
206 static void find_non_local_tags(struct transport
*transport
,
210 struct string_list existing_refs
= STRING_LIST_INIT_DUP
;
211 struct string_list remote_refs
= STRING_LIST_INIT_NODUP
;
212 const struct ref
*ref
;
213 struct string_list_item
*item
= NULL
;
215 for_each_ref(add_existing
, &existing_refs
);
216 for (ref
= transport_get_remote_refs(transport
); ref
; ref
= ref
->next
) {
217 if (!starts_with(ref
->name
, "refs/tags/"))
221 * The peeled ref always follows the matching base
222 * ref, so if we see a peeled ref that we don't want
223 * to fetch then we can mark the ref entry in the list
224 * as one to ignore by setting util to NULL.
226 if (ends_with(ref
->name
, "^{}")) {
227 if (item
&& !has_object_file(&ref
->old_oid
) &&
228 !will_fetch(head
, ref
->old_oid
.hash
) &&
229 !has_sha1_file(item
->util
) &&
230 !will_fetch(head
, item
->util
))
237 * If item is non-NULL here, then we previously saw a
238 * ref not followed by a peeled reference, so we need
239 * to check if it is a lightweight tag that we want to
242 if (item
&& !has_sha1_file(item
->util
) &&
243 !will_fetch(head
, item
->util
))
248 /* skip duplicates and refs that we already have */
249 if (string_list_has_string(&remote_refs
, ref
->name
) ||
250 string_list_has_string(&existing_refs
, ref
->name
))
253 item
= string_list_insert(&remote_refs
, ref
->name
);
254 item
->util
= (void *)&ref
->old_oid
;
256 string_list_clear(&existing_refs
, 1);
259 * We may have a final lightweight tag that needs to be
260 * checked to see if it needs fetching.
262 if (item
&& !has_sha1_file(item
->util
) &&
263 !will_fetch(head
, item
->util
))
267 * For all the tags in the remote_refs string list,
268 * add them to the list of refs to be fetched
270 for_each_string_list_item(item
, &remote_refs
) {
271 /* Unless we have already decided to ignore this item... */
274 struct ref
*rm
= alloc_ref(item
->string
);
275 rm
->peer_ref
= alloc_ref(item
->string
);
276 oidcpy(&rm
->old_oid
, item
->util
);
282 string_list_clear(&remote_refs
, 0);
285 static struct ref
*get_ref_map(struct transport
*transport
,
286 struct refspec
*refspecs
, int refspec_count
,
287 int tags
, int *autotags
)
291 struct ref
*ref_map
= NULL
;
292 struct ref
**tail
= &ref_map
;
294 /* opportunistically-updated references: */
295 struct ref
*orefs
= NULL
, **oref_tail
= &orefs
;
297 const struct ref
*remote_refs
= transport_get_remote_refs(transport
);
300 struct refspec
*fetch_refspec
;
301 int fetch_refspec_nr
;
303 for (i
= 0; i
< refspec_count
; i
++) {
304 get_fetch_map(remote_refs
, &refspecs
[i
], &tail
, 0);
305 if (refspecs
[i
].dst
&& refspecs
[i
].dst
[0])
308 /* Merge everything on the command line (but not --tags) */
309 for (rm
= ref_map
; rm
; rm
= rm
->next
)
310 rm
->fetch_head_status
= FETCH_HEAD_MERGE
;
313 * For any refs that we happen to be fetching via
314 * command-line arguments, the destination ref might
315 * have been missing or have been different than the
316 * remote-tracking ref that would be derived from the
317 * configured refspec. In these cases, we want to
318 * take the opportunity to update their configured
319 * remote-tracking reference. However, we do not want
320 * to mention these entries in FETCH_HEAD at all, as
321 * they would simply be duplicates of existing
322 * entries, so we set them FETCH_HEAD_IGNORE below.
324 * We compute these entries now, based only on the
325 * refspecs specified on the command line. But we add
326 * them to the list following the refspecs resulting
327 * from the tags option so that one of the latter,
328 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
329 * by ref_remove_duplicates() in favor of one of these
330 * opportunistic entries with FETCH_HEAD_IGNORE.
333 fetch_refspec
= parse_fetch_refspec(refmap_nr
, refmap_array
);
334 fetch_refspec_nr
= refmap_nr
;
336 fetch_refspec
= transport
->remote
->fetch
;
337 fetch_refspec_nr
= transport
->remote
->fetch_refspec_nr
;
340 for (i
= 0; i
< fetch_refspec_nr
; i
++)
341 get_fetch_map(ref_map
, &fetch_refspec
[i
], &oref_tail
, 1);
343 if (tags
== TAGS_SET
)
344 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
345 } else if (refmap_array
) {
346 die("--refmap option is only meaningful with command-line refspec(s).");
348 /* Use the defaults */
349 struct remote
*remote
= transport
->remote
;
350 struct branch
*branch
= branch_get(NULL
);
351 int has_merge
= branch_has_merge_config(branch
);
353 (remote
->fetch_refspec_nr
||
354 /* Note: has_merge implies non-NULL branch->remote_name */
355 (has_merge
&& !strcmp(branch
->remote_name
, remote
->name
)))) {
356 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++) {
357 get_fetch_map(remote_refs
, &remote
->fetch
[i
], &tail
, 0);
358 if (remote
->fetch
[i
].dst
&&
359 remote
->fetch
[i
].dst
[0])
361 if (!i
&& !has_merge
&& ref_map
&&
362 !remote
->fetch
[0].pattern
)
363 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
366 * if the remote we're fetching from is the same
367 * as given in branch.<name>.remote, we add the
368 * ref given in branch.<name>.merge, too.
370 * Note: has_merge implies non-NULL branch->remote_name
373 !strcmp(branch
->remote_name
, remote
->name
))
374 add_merge_config(&ref_map
, remote_refs
, branch
, &tail
);
376 ref_map
= get_remote_ref(remote_refs
, "HEAD");
378 die(_("Couldn't find remote ref HEAD"));
379 ref_map
->fetch_head_status
= FETCH_HEAD_MERGE
;
380 tail
= &ref_map
->next
;
384 if (tags
== TAGS_SET
)
385 /* also fetch all tags */
386 get_fetch_map(remote_refs
, tag_refspec
, &tail
, 0);
387 else if (tags
== TAGS_DEFAULT
&& *autotags
)
388 find_non_local_tags(transport
, &ref_map
, &tail
);
390 /* Now append any refs to be updated opportunistically: */
392 for (rm
= orefs
; rm
; rm
= rm
->next
) {
393 rm
->fetch_head_status
= FETCH_HEAD_IGNORE
;
397 return ref_remove_duplicates(ref_map
);
400 #define STORE_REF_ERROR_OTHER 1
401 #define STORE_REF_ERROR_DF_CONFLICT 2
403 static int s_update_ref(const char *action
,
408 char *rla
= getenv("GIT_REFLOG_ACTION");
409 struct ref_transaction
*transaction
;
410 struct strbuf err
= STRBUF_INIT
;
411 int ret
, df_conflict
= 0;
416 rla
= default_rla
.buf
;
417 snprintf(msg
, sizeof(msg
), "%s: %s", rla
, action
);
419 transaction
= ref_transaction_begin(&err
);
421 ref_transaction_update(transaction
, ref
->name
,
423 check_old
? ref
->old_oid
.hash
: NULL
,
427 ret
= ref_transaction_commit(transaction
, &err
);
429 df_conflict
= (ret
== TRANSACTION_NAME_CONFLICT
);
433 ref_transaction_free(transaction
);
434 strbuf_release(&err
);
437 ref_transaction_free(transaction
);
438 error("%s", err
.buf
);
439 strbuf_release(&err
);
440 return df_conflict
? STORE_REF_ERROR_DF_CONFLICT
441 : STORE_REF_ERROR_OTHER
;
444 #define REFCOL_WIDTH 10
446 static int update_local_ref(struct ref
*ref
,
448 const struct ref
*remote_ref
,
449 struct strbuf
*display
)
451 struct commit
*current
= NULL
, *updated
;
452 enum object_type type
;
453 struct branch
*current_branch
= branch_get(NULL
);
454 const char *pretty_ref
= prettify_refname(ref
->name
);
456 type
= sha1_object_info(ref
->new_oid
.hash
, NULL
);
458 die(_("object %s not found"), oid_to_hex(&ref
->new_oid
));
460 if (!oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
462 strbuf_addf(display
, "= %-*s %-*s -> %s",
463 TRANSPORT_SUMMARY(_("[up to date]")),
464 REFCOL_WIDTH
, remote
, pretty_ref
);
468 if (current_branch
&&
469 !strcmp(ref
->name
, current_branch
->name
) &&
470 !(update_head_ok
|| is_bare_repository()) &&
471 !is_null_oid(&ref
->old_oid
)) {
473 * If this is the head, and it's not okay to update
474 * the head, and the old value of the head isn't empty...
477 _("! %-*s %-*s -> %s (can't fetch in current branch)"),
478 TRANSPORT_SUMMARY(_("[rejected]")),
479 REFCOL_WIDTH
, remote
, pretty_ref
);
483 if (!is_null_oid(&ref
->old_oid
) &&
484 starts_with(ref
->name
, "refs/tags/")) {
486 r
= s_update_ref("updating tag", ref
, 0);
487 strbuf_addf(display
, "%c %-*s %-*s -> %s%s",
489 TRANSPORT_SUMMARY(_("[tag update]")),
490 REFCOL_WIDTH
, remote
, pretty_ref
,
491 r
? _(" (unable to update local ref)") : "");
495 current
= lookup_commit_reference_gently(ref
->old_oid
.hash
, 1);
496 updated
= lookup_commit_reference_gently(ref
->new_oid
.hash
, 1);
497 if (!current
|| !updated
) {
502 * Nicely describe the new ref we're fetching.
503 * Base this on the remote's ref name, as it's
504 * more likely to follow a standard layout.
506 const char *name
= remote_ref
? remote_ref
->name
: "";
507 if (starts_with(name
, "refs/tags/")) {
509 what
= _("[new tag]");
510 } else if (starts_with(name
, "refs/heads/")) {
511 msg
= "storing head";
512 what
= _("[new branch]");
515 what
= _("[new ref]");
518 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
519 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
520 check_for_new_submodule_commits(ref
->new_oid
.hash
);
521 r
= s_update_ref(msg
, ref
, 0);
522 strbuf_addf(display
, "%c %-*s %-*s -> %s%s",
524 TRANSPORT_SUMMARY(what
),
525 REFCOL_WIDTH
, remote
, pretty_ref
,
526 r
? _(" (unable to update local ref)") : "");
530 if (in_merge_bases(current
, updated
)) {
531 struct strbuf quickref
= STRBUF_INIT
;
533 strbuf_add_unique_abbrev(&quickref
, current
->object
.oid
.hash
, DEFAULT_ABBREV
);
534 strbuf_addstr(&quickref
, "..");
535 strbuf_add_unique_abbrev(&quickref
, ref
->new_oid
.hash
, DEFAULT_ABBREV
);
536 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
537 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
538 check_for_new_submodule_commits(ref
->new_oid
.hash
);
539 r
= s_update_ref("fast-forward", ref
, 1);
540 strbuf_addf(display
, "%c %-*s %-*s -> %s%s",
542 TRANSPORT_SUMMARY_WIDTH
, quickref
.buf
,
543 REFCOL_WIDTH
, remote
, pretty_ref
,
544 r
? _(" (unable to update local ref)") : "");
545 strbuf_release(&quickref
);
547 } else if (force
|| ref
->force
) {
548 struct strbuf quickref
= STRBUF_INIT
;
550 strbuf_add_unique_abbrev(&quickref
, current
->object
.oid
.hash
, DEFAULT_ABBREV
);
551 strbuf_addstr(&quickref
, "...");
552 strbuf_add_unique_abbrev(&quickref
, ref
->new_oid
.hash
, DEFAULT_ABBREV
);
553 if ((recurse_submodules
!= RECURSE_SUBMODULES_OFF
) &&
554 (recurse_submodules
!= RECURSE_SUBMODULES_ON
))
555 check_for_new_submodule_commits(ref
->new_oid
.hash
);
556 r
= s_update_ref("forced-update", ref
, 1);
557 strbuf_addf(display
, "%c %-*s %-*s -> %s (%s)",
559 TRANSPORT_SUMMARY_WIDTH
, quickref
.buf
,
560 REFCOL_WIDTH
, remote
, pretty_ref
,
561 r
? _("unable to update local ref") : _("forced update"));
562 strbuf_release(&quickref
);
565 strbuf_addf(display
, "! %-*s %-*s -> %s %s",
566 TRANSPORT_SUMMARY(_("[rejected]")),
567 REFCOL_WIDTH
, remote
, pretty_ref
,
568 _("(non-fast-forward)"));
573 static int iterate_ref_map(void *cb_data
, unsigned char sha1
[20])
575 struct ref
**rm
= cb_data
;
576 struct ref
*ref
= *rm
;
578 while (ref
&& ref
->status
== REF_STATUS_REJECT_SHALLOW
)
581 return -1; /* end of the list */
583 hashcpy(sha1
, ref
->old_oid
.hash
);
587 static int store_updated_refs(const char *raw_url
, const char *remote_name
,
591 struct commit
*commit
;
592 int url_len
, i
, rc
= 0;
593 struct strbuf note
= STRBUF_INIT
;
594 const char *what
, *kind
;
597 const char *filename
= dry_run
? "/dev/null" : git_path_fetch_head();
600 fp
= fopen(filename
, "a");
602 return error(_("cannot open %s: %s\n"), filename
, strerror(errno
));
605 url
= transport_anonymize_url(raw_url
);
607 url
= xstrdup("foreign");
610 if (check_everything_connected(iterate_ref_map
, 0, &rm
)) {
611 rc
= error(_("%s did not send all necessary objects\n"), url
);
616 * We do a pass for each fetch_head_status type in their enum order, so
617 * merged entries are written before not-for-merge. That lets readers
618 * use FETCH_HEAD as a refname to refer to the ref to be merged.
620 for (want_status
= FETCH_HEAD_MERGE
;
621 want_status
<= FETCH_HEAD_IGNORE
;
623 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
624 struct ref
*ref
= NULL
;
625 const char *merge_status_marker
= "";
627 if (rm
->status
== REF_STATUS_REJECT_SHALLOW
) {
628 if (want_status
== FETCH_HEAD_MERGE
)
629 warning(_("reject %s because shallow roots are not allowed to be updated"),
630 rm
->peer_ref
? rm
->peer_ref
->name
: rm
->name
);
634 commit
= lookup_commit_reference_gently(rm
->old_oid
.hash
, 1);
636 rm
->fetch_head_status
= FETCH_HEAD_NOT_FOR_MERGE
;
638 if (rm
->fetch_head_status
!= want_status
)
642 ref
= alloc_ref(rm
->peer_ref
->name
);
643 oidcpy(&ref
->old_oid
, &rm
->peer_ref
->old_oid
);
644 oidcpy(&ref
->new_oid
, &rm
->old_oid
);
645 ref
->force
= rm
->peer_ref
->force
;
649 if (!strcmp(rm
->name
, "HEAD")) {
653 else if (starts_with(rm
->name
, "refs/heads/")) {
655 what
= rm
->name
+ 11;
657 else if (starts_with(rm
->name
, "refs/tags/")) {
659 what
= rm
->name
+ 10;
661 else if (starts_with(rm
->name
, "refs/remotes/")) {
662 kind
= "remote-tracking branch";
663 what
= rm
->name
+ 13;
670 url_len
= strlen(url
);
671 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
674 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
680 strbuf_addf(¬e
, "%s ", kind
);
681 strbuf_addf(¬e
, "'%s' of ", what
);
683 switch (rm
->fetch_head_status
) {
684 case FETCH_HEAD_NOT_FOR_MERGE
:
685 merge_status_marker
= "not-for-merge";
687 case FETCH_HEAD_MERGE
:
688 fprintf(fp
, "%s\t%s\t%s",
689 oid_to_hex(&rm
->old_oid
),
692 for (i
= 0; i
< url_len
; ++i
)
700 /* do not write anything to FETCH_HEAD */
706 rc
|= update_local_ref(ref
, what
, rm
, ¬e
);
709 strbuf_addf(¬e
, "* %-*s %-*s -> FETCH_HEAD",
710 TRANSPORT_SUMMARY_WIDTH
,
711 *kind
? kind
: "branch",
713 *what
? what
: "HEAD");
715 if (verbosity
>= 0 && !shown_url
) {
716 fprintf(stderr
, _("From %.*s\n"),
721 fprintf(stderr
, " %s\n", note
.buf
);
726 if (rc
& STORE_REF_ERROR_DF_CONFLICT
)
727 error(_("some local refs could not be updated; try running\n"
728 " 'git remote prune %s' to remove any old, conflicting "
729 "branches"), remote_name
);
732 strbuf_release(¬e
);
739 * We would want to bypass the object transfer altogether if
740 * everything we are going to fetch already exists and is connected
743 static int quickfetch(struct ref
*ref_map
)
745 struct ref
*rm
= ref_map
;
748 * If we are deepening a shallow clone we already have these
749 * objects reachable. Running rev-list here will return with
750 * a good (0) exit status and we'll bypass the fetch that we
751 * really need to perform. Claiming failure now will ensure
752 * we perform the network exchange to deepen our history.
756 return check_everything_connected(iterate_ref_map
, 1, &rm
);
759 static int fetch_refs(struct transport
*transport
, struct ref
*ref_map
)
761 int ret
= quickfetch(ref_map
);
763 ret
= transport_fetch_refs(transport
, ref_map
);
765 ret
|= store_updated_refs(transport
->url
,
766 transport
->remote
->name
,
768 transport_unlock_pack(transport
);
772 static int prune_refs(struct refspec
*refs
, int ref_count
, struct ref
*ref_map
,
775 int url_len
, i
, result
= 0;
776 struct ref
*ref
, *stale_refs
= get_stale_heads(refs
, ref_count
, ref_map
);
778 const char *dangling_msg
= dry_run
779 ? _(" (%s will become dangling)")
780 : _(" (%s has become dangling)");
783 url
= transport_anonymize_url(raw_url
);
785 url
= xstrdup("foreign");
787 url_len
= strlen(url
);
788 for (i
= url_len
- 1; url
[i
] == '/' && 0 <= i
; i
--)
792 if (4 < i
&& !strncmp(".git", url
+ i
- 3, 4))
796 struct string_list refnames
= STRING_LIST_INIT_NODUP
;
798 for (ref
= stale_refs
; ref
; ref
= ref
->next
)
799 string_list_append(&refnames
, ref
->name
);
801 result
= delete_refs(&refnames
);
802 string_list_clear(&refnames
, 0);
805 if (verbosity
>= 0) {
806 for (ref
= stale_refs
; ref
; ref
= ref
->next
) {
808 fprintf(stderr
, _("From %.*s\n"), url_len
, url
);
811 fprintf(stderr
, " x %-*s %-*s -> %s\n",
812 TRANSPORT_SUMMARY(_("[deleted]")),
813 REFCOL_WIDTH
, _("(none)"), prettify_refname(ref
->name
));
814 warn_dangling_symref(stderr
, dangling_msg
, ref
->name
);
819 free_refs(stale_refs
);
823 static void check_not_current_branch(struct ref
*ref_map
)
825 struct branch
*current_branch
= branch_get(NULL
);
827 if (is_bare_repository() || !current_branch
)
830 for (; ref_map
; ref_map
= ref_map
->next
)
831 if (ref_map
->peer_ref
&& !strcmp(current_branch
->refname
,
832 ref_map
->peer_ref
->name
))
833 die(_("Refusing to fetch into current branch %s "
834 "of non-bare repository"), current_branch
->refname
);
837 static int truncate_fetch_head(void)
839 const char *filename
= git_path_fetch_head();
840 FILE *fp
= fopen_for_writing(filename
);
843 return error(_("cannot open %s: %s\n"), filename
, strerror(errno
));
848 static void set_option(struct transport
*transport
, const char *name
, const char *value
)
850 int r
= transport_set_option(transport
, name
, value
);
852 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
853 name
, value
, transport
->url
);
855 warning(_("Option \"%s\" is ignored for %s\n"),
856 name
, transport
->url
);
859 static struct transport
*prepare_transport(struct remote
*remote
)
861 struct transport
*transport
;
862 transport
= transport_get(remote
, NULL
);
863 transport_set_verbosity(transport
, verbosity
, progress
);
865 set_option(transport
, TRANS_OPT_UPLOADPACK
, upload_pack
);
867 set_option(transport
, TRANS_OPT_KEEP
, "yes");
869 set_option(transport
, TRANS_OPT_DEPTH
, depth
);
871 set_option(transport
, TRANS_OPT_UPDATE_SHALLOW
, "yes");
875 static void backfill_tags(struct transport
*transport
, struct ref
*ref_map
)
877 if (transport
->cannot_reuse
) {
878 gsecondary
= prepare_transport(transport
->remote
);
879 transport
= gsecondary
;
882 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, NULL
);
883 transport_set_option(transport
, TRANS_OPT_DEPTH
, "0");
884 fetch_refs(transport
, ref_map
);
887 transport_disconnect(gsecondary
);
892 static int do_fetch(struct transport
*transport
,
893 struct refspec
*refs
, int ref_count
)
895 struct string_list existing_refs
= STRING_LIST_INIT_DUP
;
898 int autotags
= (transport
->remote
->fetch_tags
== 1);
901 for_each_ref(add_existing
, &existing_refs
);
903 if (tags
== TAGS_DEFAULT
) {
904 if (transport
->remote
->fetch_tags
== 2)
906 if (transport
->remote
->fetch_tags
== -1)
910 if (!transport
->get_refs_list
|| !transport
->fetch
)
911 die(_("Don't know how to fetch from %s"), transport
->url
);
913 /* if not appending, truncate FETCH_HEAD */
914 if (!append
&& !dry_run
) {
915 retcode
= truncate_fetch_head();
920 ref_map
= get_ref_map(transport
, refs
, ref_count
, tags
, &autotags
);
922 check_not_current_branch(ref_map
);
924 for (rm
= ref_map
; rm
; rm
= rm
->next
) {
926 struct string_list_item
*peer_item
=
927 string_list_lookup(&existing_refs
,
930 struct object_id
*old_oid
= peer_item
->util
;
931 oidcpy(&rm
->peer_ref
->old_oid
, old_oid
);
936 if (tags
== TAGS_DEFAULT
&& autotags
)
937 transport_set_option(transport
, TRANS_OPT_FOLLOWTAGS
, "1");
940 * We only prune based on refspecs specified
941 * explicitly (via command line or configuration); we
942 * don't care whether --tags was specified.
945 prune_refs(refs
, ref_count
, ref_map
, transport
->url
);
947 prune_refs(transport
->remote
->fetch
,
948 transport
->remote
->fetch_refspec_nr
,
953 if (fetch_refs(transport
, ref_map
)) {
960 /* if neither --no-tags nor --tags was specified, do automated tag
962 if (tags
== TAGS_DEFAULT
&& autotags
) {
963 struct ref
**tail
= &ref_map
;
965 find_non_local_tags(transport
, &ref_map
, &tail
);
967 backfill_tags(transport
, ref_map
);
972 string_list_clear(&existing_refs
, 1);
976 static int get_one_remote_for_fetch(struct remote
*remote
, void *priv
)
978 struct string_list
*list
= priv
;
979 if (!remote
->skip_default_update
)
980 string_list_append(list
, remote
->name
);
984 struct remote_group_data
{
986 struct string_list
*list
;
989 static int get_remote_group(const char *key
, const char *value
, void *priv
)
991 struct remote_group_data
*g
= priv
;
993 if (skip_prefix(key
, "remotes.", &key
) && !strcmp(key
, g
->name
)) {
994 /* split list by white space */
996 size_t wordlen
= strcspn(value
, " \t\n");
999 string_list_append(g
->list
,
1000 xstrndup(value
, wordlen
));
1001 value
+= wordlen
+ (value
[wordlen
] != '\0');
1008 static int add_remote_or_group(const char *name
, struct string_list
*list
)
1010 int prev_nr
= list
->nr
;
1011 struct remote_group_data g
;
1012 g
.name
= name
; g
.list
= list
;
1014 git_config(get_remote_group
, &g
);
1015 if (list
->nr
== prev_nr
) {
1016 struct remote
*remote
;
1017 if (!remote_is_configured(name
))
1019 remote
= remote_get(name
);
1020 string_list_append(list
, remote
->name
);
1025 static void add_options_to_argv(struct argv_array
*argv
)
1028 argv_array_push(argv
, "--dry-run");
1030 argv_array_push(argv
, prune
? "--prune" : "--no-prune");
1032 argv_array_push(argv
, "--update-head-ok");
1034 argv_array_push(argv
, "--force");
1036 argv_array_push(argv
, "--keep");
1037 if (recurse_submodules
== RECURSE_SUBMODULES_ON
)
1038 argv_array_push(argv
, "--recurse-submodules");
1039 else if (recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
)
1040 argv_array_push(argv
, "--recurse-submodules=on-demand");
1041 if (tags
== TAGS_SET
)
1042 argv_array_push(argv
, "--tags");
1043 else if (tags
== TAGS_UNSET
)
1044 argv_array_push(argv
, "--no-tags");
1046 argv_array_push(argv
, "-v");
1048 argv_array_push(argv
, "-v");
1049 else if (verbosity
< 0)
1050 argv_array_push(argv
, "-q");
1054 static int fetch_multiple(struct string_list
*list
)
1057 struct argv_array argv
= ARGV_ARRAY_INIT
;
1059 if (!append
&& !dry_run
) {
1060 int errcode
= truncate_fetch_head();
1065 argv_array_pushl(&argv
, "fetch", "--append", NULL
);
1066 add_options_to_argv(&argv
);
1068 for (i
= 0; i
< list
->nr
; i
++) {
1069 const char *name
= list
->items
[i
].string
;
1070 argv_array_push(&argv
, name
);
1072 printf(_("Fetching %s\n"), name
);
1073 if (run_command_v_opt(argv
.argv
, RUN_GIT_CMD
)) {
1074 error(_("Could not fetch %s"), name
);
1077 argv_array_pop(&argv
);
1080 argv_array_clear(&argv
);
1084 static int fetch_one(struct remote
*remote
, int argc
, const char **argv
)
1086 static const char **refs
= NULL
;
1087 struct refspec
*refspec
;
1092 die(_("No remote repository specified. Please, specify either a URL or a\n"
1093 "remote name from which new revisions should be fetched."));
1095 gtransport
= prepare_transport(remote
);
1098 /* no command line request */
1099 if (0 <= gtransport
->remote
->prune
)
1100 prune
= gtransport
->remote
->prune
;
1101 else if (0 <= fetch_prune_config
)
1102 prune
= fetch_prune_config
;
1104 prune
= PRUNE_BY_DEFAULT
;
1110 refs
= xcalloc(st_add(argc
, 1), sizeof(const char *));
1111 for (i
= 0; i
< argc
; i
++) {
1112 if (!strcmp(argv
[i
], "tag")) {
1115 die(_("You need to specify a tag name."));
1116 refs
[j
++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1119 refs
[j
++] = argv
[i
];
1125 sigchain_push_common(unlock_pack_on_signal
);
1126 atexit(unlock_pack
);
1127 refspec
= parse_fetch_refspec(ref_nr
, refs
);
1128 exit_code
= do_fetch(gtransport
, refspec
, ref_nr
);
1129 free_refspec(ref_nr
, refspec
);
1130 transport_disconnect(gtransport
);
1135 int cmd_fetch(int argc
, const char **argv
, const char *prefix
)
1138 struct string_list list
= STRING_LIST_INIT_NODUP
;
1139 struct remote
*remote
;
1141 struct argv_array argv_gc_auto
= ARGV_ARRAY_INIT
;
1143 packet_trace_identity("fetch");
1145 /* Record the command line for the reflog */
1146 strbuf_addstr(&default_rla
, "fetch");
1147 for (i
= 1; i
< argc
; i
++)
1148 strbuf_addf(&default_rla
, " %s", argv
[i
]);
1150 git_config(git_fetch_config
, NULL
);
1152 argc
= parse_options(argc
, argv
, prefix
,
1153 builtin_fetch_options
, builtin_fetch_usage
, 0);
1157 die(_("--depth and --unshallow cannot be used together"));
1158 else if (!is_repository_shallow())
1159 die(_("--unshallow on a complete repository does not make sense"));
1161 depth
= xstrfmt("%d", INFINITE_DEPTH
);
1164 /* no need to be strict, transport_set_option() will validate it again */
1165 if (depth
&& atoi(depth
) < 1)
1166 die(_("depth %s is not a positive number"), depth
);
1168 if (recurse_submodules
!= RECURSE_SUBMODULES_OFF
) {
1169 if (recurse_submodules_default
) {
1170 int arg
= parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default
);
1171 set_config_fetch_recurse_submodules(arg
);
1173 gitmodules_config();
1174 git_config(submodule_config
, NULL
);
1179 die(_("fetch --all does not take a repository argument"));
1181 die(_("fetch --all does not make sense with refspecs"));
1182 (void) for_each_remote(get_one_remote_for_fetch
, &list
);
1183 result
= fetch_multiple(&list
);
1184 } else if (argc
== 0) {
1185 /* No arguments -- use default remote */
1186 remote
= remote_get(NULL
);
1187 result
= fetch_one(remote
, argc
, argv
);
1188 } else if (multiple
) {
1189 /* All arguments are assumed to be remotes or groups */
1190 for (i
= 0; i
< argc
; i
++)
1191 if (!add_remote_or_group(argv
[i
], &list
))
1192 die(_("No such remote or remote group: %s"), argv
[i
]);
1193 result
= fetch_multiple(&list
);
1195 /* Single remote or group */
1196 (void) add_remote_or_group(argv
[0], &list
);
1198 /* More than one remote */
1200 die(_("Fetching a group and specifying refspecs does not make sense"));
1201 result
= fetch_multiple(&list
);
1203 /* Zero or one remotes */
1204 remote
= remote_get(argv
[0]);
1205 result
= fetch_one(remote
, argc
-1, argv
+1);
1209 if (!result
&& (recurse_submodules
!= RECURSE_SUBMODULES_OFF
)) {
1210 struct argv_array options
= ARGV_ARRAY_INIT
;
1212 add_options_to_argv(&options
);
1213 result
= fetch_populated_submodules(&options
,
1217 argv_array_clear(&options
);
1220 /* All names were strdup()ed or strndup()ed */
1221 list
.strdup_strings
= 1;
1222 string_list_clear(&list
, 0);
1226 argv_array_pushl(&argv_gc_auto
, "gc", "--auto", NULL
);
1228 argv_array_push(&argv_gc_auto
, "--quiet");
1229 run_command_v_opt(argv_gc_auto
.argv
, RUN_GIT_CMD
);
1230 argv_array_clear(&argv_gc_auto
);