blob: 863c858fde9afb3daac09c7ecf83cf44834574d5 [file] [log] [blame]
Daniel Barkalowb888d612007-09-10 23:03:25 -04001/*
2 * "git fetch"
3 */
4#include "cache.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07005#include "config.h"
Brandon Williamse7241972017-12-12 11:53:52 -08006#include "repository.h"
Daniel Barkalowb888d612007-09-10 23:03:25 -04007#include "refs.h"
Brandon Williamsec0cb492018-05-16 15:57:48 -07008#include "refspec.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07009#include "object-store.h"
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -070010#include "oidset.h"
Daniel Barkalowb888d612007-09-10 23:03:25 -040011#include "commit.h"
12#include "builtin.h"
Johannes Schindelinc455c872008-07-21 19:03:49 +010013#include "string-list.h"
Daniel Barkalowb888d612007-09-10 23:03:25 -040014#include "remote.h"
15#include "transport.h"
Shawn O. Pearce4191c352007-11-11 02:29:47 -050016#include "run-command.h"
Kristian Høgsberg83201992007-12-04 02:25:47 -050017#include "parse-options.h"
Jeff King4a16d072009-01-22 01:02:35 -050018#include "sigchain.h"
Heiko Voigt027771f2015-08-17 17:22:00 -070019#include "submodule-config.h"
Jens Lehmann7dce19d2010-11-12 13:54:52 +010020#include "submodule.h"
Junio C Hamanof96400c2011-09-02 16:33:22 -070021#include "connected.h"
Jeff King85556d42012-09-01 07:27:35 -040022#include "argv-array.h"
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +020023#include "utf8.h"
Jonathan Tan3836d882017-08-18 15:20:21 -070024#include "packfile.h"
Jeff Hostetleracb0c572017-12-08 15:58:44 +000025#include "list-objects-filter-options.h"
Derrick Stolee64043552018-07-20 16:33:04 +000026#include "commit-reach.h"
Corentin BOMPARD24bc1a12019-08-19 11:11:20 +020027#include "branch.h"
Christian Couderb14ed5a2019-06-25 15:40:31 +020028#include "promisor-remote.h"
Derrick Stolee50f26bd2019-09-02 19:22:02 -070029#include "commit-graph.h"
Daniel Barkalowb888d612007-09-10 23:03:25 -040030
Derrick Stolee377444b2019-06-18 13:25:27 -070031#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
32
Kristian Høgsberg83201992007-12-04 02:25:47 -050033static const char * const builtin_fetch_usage[] = {
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +070034 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
35 N_("git fetch [<options>] <group>"),
36 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
37 N_("git fetch --all [<options>]"),
Kristian Høgsberg83201992007-12-04 02:25:47 -050038 NULL
39};
Daniel Barkalowb888d612007-09-10 23:03:25 -040040
Kristian Høgsberg83201992007-12-04 02:25:47 -050041enum {
42 TAGS_UNSET = 0,
43 TAGS_DEFAULT = 1,
44 TAGS_SET = 2
45};
46
Michael Schubert737c5a92013-07-13 11:36:24 +020047static int fetch_prune_config = -1; /* unspecified */
Derrick Stoleecdbd70c2019-06-18 13:25:26 -070048static int fetch_show_forced_updates = 1;
Derrick Stolee377444b2019-06-18 13:25:27 -070049static uint64_t forced_updates_ms = 0;
Michael Schubert737c5a92013-07-13 11:36:24 +020050static int prune = -1; /* unspecified */
51#define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
52
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +000053static int fetch_prune_tags_config = -1; /* unspecified */
54static int prune_tags = -1; /* unspecified */
55#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
56
Corentin BOMPARD24bc1a12019-08-19 11:11:20 +020057static int all, append, dry_run, force, keep, multiple, update_head_ok;
58static int verbosity, deepen_relative, set_upstream;
Stefan Beller8c698322017-06-23 12:13:01 -070059static int progress = -1;
Nguyễn Thái Ngọc Duyc3d6b702019-06-19 16:46:30 +070060static int enable_auto_gc = 1;
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +070061static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
Johannes Schindelind54dea72019-10-05 11:46:40 -070062static int max_jobs = -1, submodule_fetch_jobs_config = -1;
63static int fetch_parallel_config = 1;
Eric Wongc915f112016-02-03 04:09:14 +000064static enum transport_family family;
Shawn O. Pearce4191c352007-11-11 02:29:47 -050065static const char *depth;
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +070066static const char *deepen_since;
Kristian Høgsberg83201992007-12-04 02:25:47 -050067static const char *upload_pack;
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +070068static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
Kristian Høgsberg2d324ef2007-12-04 02:25:46 -050069static struct strbuf default_rla = STRBUF_INIT;
Junio C Hamanoaf234452013-08-07 15:38:45 -070070static struct transport *gtransport;
Junio C Hamanob26ed432013-08-07 15:47:18 -070071static struct transport *gsecondary;
Jens Lehmann7dce19d2010-11-12 13:54:52 +010072static const char *submodule_prefix = "";
Stefan Beller8c698322017-06-23 12:13:01 -070073static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
Stefan Bellere8906a92017-06-27 14:31:59 -070074static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
Tom Miller4b3b33a2014-01-02 20:28:51 -060075static int shown_url = 0;
Brandon Williamse4cffac2018-05-16 15:58:05 -070076static struct refspec refmap = REFSPEC_INIT_FETCH;
Jeff Hostetleracb0c572017-12-08 15:58:44 +000077static struct list_objects_filter_options filter_options;
Brandon Williams5e3548e2018-04-23 15:46:24 -070078static struct string_list server_options = STRING_LIST_INIT_DUP;
Jonathan Tan3390e422018-07-02 15:39:44 -070079static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
Shawn O. Pearcee4022ed2007-09-14 03:31:25 -040080
Michael Schubert737c5a92013-07-13 11:36:24 +020081static int git_fetch_config(const char *k, const char *v, void *cb)
82{
83 if (!strcmp(k, "fetch.prune")) {
84 fetch_prune_config = git_config_bool(k, v);
85 return 0;
86 }
Stefan Beller58f42032017-05-31 17:30:50 -070087
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +000088 if (!strcmp(k, "fetch.prunetags")) {
89 fetch_prune_tags_config = git_config_bool(k, v);
90 return 0;
91 }
92
Derrick Stoleecdbd70c2019-06-18 13:25:26 -070093 if (!strcmp(k, "fetch.showforcedupdates")) {
94 fetch_show_forced_updates = git_config_bool(k, v);
95 return 0;
96 }
97
Stefan Beller58f42032017-05-31 17:30:50 -070098 if (!strcmp(k, "submodule.recurse")) {
99 int r = git_config_bool(k, v) ?
100 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
101 recurse_submodules = r;
102 }
103
Brandon Williamsf20e7c12017-08-02 12:49:18 -0700104 if (!strcmp(k, "submodule.fetchjobs")) {
Johannes Schindelind54dea72019-10-05 11:46:40 -0700105 submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v);
Brandon Williamsf20e7c12017-08-02 12:49:18 -0700106 return 0;
Brandon Williams8fa29152017-08-02 12:49:19 -0700107 } else if (!strcmp(k, "fetch.recursesubmodules")) {
108 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
109 return 0;
Brandon Williamsf20e7c12017-08-02 12:49:18 -0700110 }
111
Johannes Schindelind54dea72019-10-05 11:46:40 -0700112 if (!strcmp(k, "fetch.parallel")) {
113 fetch_parallel_config = git_config_int(k, v);
114 if (fetch_parallel_config < 0)
115 die(_("fetch.parallel cannot be negative"));
116 return 0;
117 }
118
Jeff King72549df2014-11-04 08:11:19 -0500119 return git_default_config(k, v, cb);
Michael Schubert737c5a92013-07-13 11:36:24 +0200120}
121
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700122static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
123{
Jeff King517fe802018-11-05 01:45:42 -0500124 BUG_ON_OPT_NEG(unset);
125
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700126 /*
127 * "git fetch --refmap='' origin foo"
128 * can be used to tell the command not to store anywhere
129 */
Brandon Williamse4cffac2018-05-16 15:58:05 -0700130 refspec_append(&refmap, arg);
131
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700132 return 0;
133}
134
Kristian Høgsberg83201992007-12-04 02:25:47 -0500135static struct option builtin_fetch_options[] = {
Tuncer Ayaz7f87aff2008-11-15 01:14:24 +0100136 OPT__VERBOSITY(&verbosity),
Stefan Bellerd5d09d42013-08-03 13:51:19 +0200137 OPT_BOOL(0, "all", &all,
138 N_("fetch from all remotes")),
Corentin BOMPARD24bc1a12019-08-19 11:11:20 +0200139 OPT_BOOL(0, "set-upstream", &set_upstream,
140 N_("set upstream for git pull/fetch")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +0200141 OPT_BOOL('a', "append", &append,
142 N_("append to .git/FETCH_HEAD instead of overwriting")),
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700143 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
144 N_("path to upload pack on remote end")),
Ævar Arnfjörð Bjarmason8cd4b7c2018-08-31 20:09:56 +0000145 OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
Stefan Bellerd5d09d42013-08-03 13:51:19 +0200146 OPT_BOOL('m', "multiple", &multiple,
147 N_("fetch from multiple remotes")),
Kristian Høgsberg83201992007-12-04 02:25:47 -0500148 OPT_SET_INT('t', "tags", &tags,
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700149 N_("fetch all tags and associated objects"), TAGS_SET),
Johannes Schindeline7951292008-03-13 08:13:15 +0100150 OPT_SET_INT('n', NULL, &tags,
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700151 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
Johannes Schindelind54dea72019-10-05 11:46:40 -0700152 OPT_INTEGER('j', "jobs", &max_jobs,
Stefan Beller62104ba2015-12-15 16:04:12 -0800153 N_("number of submodules fetched in parallel")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +0200154 OPT_BOOL('p', "prune", &prune,
155 N_("prune remote-tracking branches no longer on remote")),
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000156 OPT_BOOL('P', "prune-tags", &prune_tags,
157 N_("prune local tags no longer on remote and clobber changed tags")),
Stefan Beller886dc152017-06-23 12:13:00 -0700158 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700159 N_("control recursive fetching of submodules"),
Stefan Beller886dc152017-06-23 12:13:00 -0700160 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
Stefan Bellerd5d09d42013-08-03 13:51:19 +0200161 OPT_BOOL(0, "dry-run", &dry_run,
162 N_("dry run")),
163 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
164 OPT_BOOL('u', "update-head-ok", &update_head_ok,
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700165 N_("allow updating of HEAD ref")),
166 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
167 OPT_STRING(0, "depth", &depth, N_("depth"),
168 N_("deepen history of shallow clone")),
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +0700169 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
170 N_("deepen history of shallow repository based on time")),
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +0700171 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
Alex Henrie6d873862016-12-04 15:03:59 -0700172 N_("deepen history of shallow clone, excluding rev")),
Nguyễn Thái Ngọc Duycccf74e2016-06-12 17:54:09 +0700173 OPT_INTEGER(0, "deepen", &deepen_relative,
174 N_("deepen history of shallow clone")),
Nguyễn Thái Ngọc Duy3e4a67b2018-05-20 17:42:58 +0200175 OPT_SET_INT_F(0, "unshallow", &unshallow,
176 N_("convert to a complete repository"),
177 1, PARSE_OPT_NONEG),
Nguyễn Thái Ngọc Duy719aced2012-08-20 19:32:09 +0700178 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
179 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
Stefan Beller8c698322017-06-23 12:13:01 -0700180 { OPTION_CALLBACK, 0, "recurse-submodules-default",
181 &recurse_submodules_default, N_("on-demand"),
182 N_("default for recursive fetching of submodules "
183 "(lower priority than config files)"),
184 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
Nguyễn Thái Ngọc Duy48d25ca2013-12-05 20:02:42 +0700185 OPT_BOOL(0, "update-shallow", &update_shallow,
186 N_("accept refs that update .git/shallow")),
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700187 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
188 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
Brandon Williams5e3548e2018-04-23 15:46:24 -0700189 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
Eric Wongc915f112016-02-03 04:09:14 +0000190 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
191 TRANSPORT_FAMILY_IPV4),
192 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
193 TRANSPORT_FAMILY_IPV6),
Jonathan Tan3390e422018-07-02 15:39:44 -0700194 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
195 N_("report that we have only objects reachable from this object")),
Jeff Hostetleracb0c572017-12-08 15:58:44 +0000196 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
Nguyễn Thái Ngọc Duyc3d6b702019-06-19 16:46:30 +0700197 OPT_BOOL(0, "auto-gc", &enable_auto_gc,
198 N_("run 'gc --auto' after fetching")),
Derrick Stoleecdbd70c2019-06-18 13:25:26 -0700199 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
200 N_("check for forced-updates on all updated branches")),
Kristian Høgsberg83201992007-12-04 02:25:47 -0500201 OPT_END()
202};
203
Shawn O. Pearcee4022ed2007-09-14 03:31:25 -0400204static void unlock_pack(void)
205{
Junio C Hamanoaf234452013-08-07 15:38:45 -0700206 if (gtransport)
207 transport_unlock_pack(gtransport);
Junio C Hamanob26ed432013-08-07 15:47:18 -0700208 if (gsecondary)
209 transport_unlock_pack(gsecondary);
Shawn O. Pearcee4022ed2007-09-14 03:31:25 -0400210}
211
212static void unlock_pack_on_signal(int signo)
213{
214 unlock_pack();
Jeff King4a16d072009-01-22 01:02:35 -0500215 sigchain_pop(signo);
Shawn O. Pearcee4022ed2007-09-14 03:31:25 -0400216 raise(signo);
217}
Daniel Barkalowb888d612007-09-10 23:03:25 -0400218
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400219static void add_merge_config(struct ref **head,
Daniel Barkalow45773702007-10-29 21:05:40 -0400220 const struct ref *remote_refs,
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400221 struct branch *branch,
222 struct ref ***tail)
Daniel Barkalowb888d612007-09-10 23:03:25 -0400223{
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400224 int i;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400225
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400226 for (i = 0; i < branch->merge_nr; i++) {
227 struct ref *rm, **old_tail = *tail;
Brandon Williams0ad4a5f2018-05-16 15:57:49 -0700228 struct refspec_item refspec;
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400229
230 for (rm = *head; rm; rm = rm->next) {
231 if (branch_merge_matches(branch, i, rm->name)) {
Jeff King900f2812013-05-11 18:15:59 +0200232 rm->fetch_head_status = FETCH_HEAD_MERGE;
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400233 break;
234 }
Daniel Barkalowb888d612007-09-10 23:03:25 -0400235 }
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400236 if (rm)
237 continue;
238
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700239 /*
Matthieu Moy8b3f3f82010-11-02 16:31:23 +0100240 * Not fetched to a remote-tracking branch? We need to fetch
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400241 * it anyway to allow this branch's "branch.$name.merge"
Heikki Orsila05207a22008-09-09 13:28:30 +0300242 * to be honored by 'git pull', but we do not have to
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700243 * fail if branch.$name.merge is misconfigured to point
244 * at a nonexisting branch. If we were indeed called by
Heikki Orsila05207a22008-09-09 13:28:30 +0300245 * 'git pull', it will notice the misconfiguration because
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700246 * there is no entry in the resulting FETCH_HEAD marked
247 * for merging.
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400248 */
Andreas Gruenbacher8da61a22010-03-12 23:27:33 +0100249 memset(&refspec, 0, sizeof(refspec));
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400250 refspec.src = branch->merge[i]->src;
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700251 get_fetch_map(remote_refs, &refspec, tail, 1);
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400252 for (rm = *old_tail; rm; rm = rm->next)
Jeff King900f2812013-05-11 18:15:59 +0200253 rm->fetch_head_status = FETCH_HEAD_MERGE;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400254 }
255}
256
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700257static void create_fetch_oidset(struct ref **head, struct oidset *out)
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100258{
259 struct ref *rm = *head;
260 while (rm) {
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700261 oidset_insert(out, &rm->old_oid);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100262 rm = rm->next;
263 }
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100264}
265
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700266struct refname_hash_entry {
Eric Wonge2b50382019-10-06 23:30:43 +0000267 struct hashmap_entry ent;
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700268 struct object_id oid;
Felipe Contrerasf80d9222019-06-03 21:13:30 -0500269 int ignore;
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700270 char refname[FLEX_ARRAY];
271};
272
273static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
Eric Wong939af162019-10-06 23:30:37 +0000274 const struct hashmap_entry *eptr,
275 const struct hashmap_entry *entry_or_key,
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700276 const void *keydata)
277{
Eric Wong939af162019-10-06 23:30:37 +0000278 const struct refname_hash_entry *e1, *e2;
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700279
Eric Wong939af162019-10-06 23:30:37 +0000280 e1 = container_of(eptr, const struct refname_hash_entry, ent);
281 e2 = container_of(entry_or_key, const struct refname_hash_entry, ent);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700282 return strcmp(e1->refname, keydata ? keydata : e2->refname);
283}
284
285static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
286 const char *refname,
287 const struct object_id *oid)
288{
289 struct refname_hash_entry *ent;
290 size_t len = strlen(refname);
291
292 FLEX_ALLOC_MEM(ent, refname, refname, len);
Eric Wongd22245a2019-10-06 23:30:27 +0000293 hashmap_entry_init(&ent->ent, strhash(refname));
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700294 oidcpy(&ent->oid, oid);
Eric Wongb94e5c12019-10-06 23:30:29 +0000295 hashmap_add(map, &ent->ent);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700296 return ent;
297}
298
299static int add_one_refname(const char *refname,
300 const struct object_id *oid,
301 int flag, void *cbdata)
302{
303 struct hashmap *refname_map = cbdata;
304
305 (void) refname_hash_add(refname_map, refname, oid);
306 return 0;
307}
308
309static void refname_hash_init(struct hashmap *map)
310{
311 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
312}
313
314static int refname_hash_exists(struct hashmap *map, const char *refname)
315{
316 return !!hashmap_get_from_hash(map, strhash(refname), refname);
317}
318
Felipe Contrerasa8363b52019-06-03 21:13:28 -0500319static void clear_item(struct refname_hash_entry *item)
320{
Felipe Contrerasf80d9222019-06-03 21:13:30 -0500321 item->ignore = 1;
Felipe Contrerasa8363b52019-06-03 21:13:28 -0500322}
323
Brandon Williams6d1700d2018-06-27 15:30:21 -0700324static void find_non_local_tags(const struct ref *refs,
325 struct ref **head,
326 struct ref ***tail)
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100327{
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700328 struct hashmap existing_refs;
329 struct hashmap remote_refs;
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700330 struct oidset fetch_oids = OIDSET_INIT;
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700331 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
332 struct string_list_item *remote_ref_item;
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100333 const struct ref *ref;
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700334 struct refname_hash_entry *item = NULL;
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100335
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700336 refname_hash_init(&existing_refs);
337 refname_hash_init(&remote_refs);
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700338 create_fetch_oidset(head, &fetch_oids);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700339
340 for_each_ref(add_one_refname, &existing_refs);
Brandon Williams6d1700d2018-06-27 15:30:21 -0700341 for (ref = refs; ref; ref = ref->next) {
Junio C Hamanoad704482013-12-17 11:47:35 -0800342 if (!starts_with(ref->name, "refs/tags/"))
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100343 continue;
344
345 /*
346 * The peeled ref always follows the matching base
347 * ref, so if we see a peeled ref that we don't want
348 * to fetch then we can mark the ref entry in the list
349 * as one to ignore by setting util to NULL.
350 */
Junio C Hamanoad704482013-12-17 11:47:35 -0800351 if (ends_with(ref->name, "^{}")) {
Jeff King5827a032016-10-13 12:53:44 -0400352 if (item &&
Jonathan Tane83e71c2017-06-21 17:40:24 -0700353 !has_object_file_with_flags(&ref->old_oid,
354 OBJECT_INFO_QUICK) &&
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700355 !oidset_contains(&fetch_oids, &ref->old_oid) &&
Jeff King98374a02019-01-07 03:37:54 -0500356 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700357 !oidset_contains(&fetch_oids, &item->oid))
Felipe Contrerasa8363b52019-06-03 21:13:28 -0500358 clear_item(item);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100359 item = NULL;
360 continue;
361 }
362
363 /*
364 * If item is non-NULL here, then we previously saw a
365 * ref not followed by a peeled reference, so we need
366 * to check if it is a lightweight tag that we want to
367 * fetch.
368 */
Jeff King5827a032016-10-13 12:53:44 -0400369 if (item &&
Jeff King98374a02019-01-07 03:37:54 -0500370 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700371 !oidset_contains(&fetch_oids, &item->oid))
Felipe Contrerasa8363b52019-06-03 21:13:28 -0500372 clear_item(item);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100373
374 item = NULL;
375
376 /* skip duplicates and refs that we already have */
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700377 if (refname_hash_exists(&remote_refs, ref->name) ||
378 refname_hash_exists(&existing_refs, ref->name))
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100379 continue;
380
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700381 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
382 string_list_insert(&remote_refs_list, ref->name);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100383 }
Eric Wongc8e424c2019-10-06 23:30:40 +0000384 hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100385
386 /*
387 * We may have a final lightweight tag that needs to be
388 * checked to see if it needs fetching.
389 */
Jeff King5827a032016-10-13 12:53:44 -0400390 if (item &&
Jeff King98374a02019-01-07 03:37:54 -0500391 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700392 !oidset_contains(&fetch_oids, &item->oid))
Felipe Contrerasa8363b52019-06-03 21:13:28 -0500393 clear_item(item);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100394
395 /*
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700396 * For all the tags in the remote_refs_list,
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100397 * add them to the list of refs to be fetched
398 */
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700399 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
400 const char *refname = remote_ref_item->string;
Felipe Contreras9528b802019-06-03 21:13:29 -0500401 struct ref *rm;
Eric Wongf23a4652019-10-06 23:30:36 +0000402 unsigned int hash = strhash(refname);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700403
Eric Wongf23a4652019-10-06 23:30:36 +0000404 item = hashmap_get_entry_from_hash(&remote_refs, hash, refname,
405 struct refname_hash_entry, ent);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700406 if (!item)
407 BUG("unseen remote ref?");
408
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100409 /* Unless we have already decided to ignore this item... */
Felipe Contrerasf80d9222019-06-03 21:13:30 -0500410 if (item->ignore)
Felipe Contreras9528b802019-06-03 21:13:29 -0500411 continue;
412
413 rm = alloc_ref(item->refname);
414 rm->peer_ref = alloc_ref(item->refname);
415 oidcpy(&rm->old_oid, &item->oid);
416 **tail = rm;
417 *tail = &rm->next;
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100418 }
Eric Wongc8e424c2019-10-06 23:30:40 +0000419 hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700420 string_list_clear(&remote_refs_list, 0);
Masaya Suzukib7e2d8b2019-09-15 14:18:02 -0700421 oidset_clear(&fetch_oids);
Michael Haggertya0fbb5a2013-10-30 06:32:55 +0100422}
Shawn O. Pearce767f1762008-03-02 21:35:25 -0500423
Brandon Williams6d1700d2018-06-27 15:30:21 -0700424static struct ref *get_ref_map(struct remote *remote,
425 const struct ref *remote_refs,
Brandon Williams65d96c82018-05-16 15:58:08 -0700426 struct refspec *rs,
Michael Haggertyf137a452013-10-23 17:50:38 +0200427 int tags, int *autotags)
Daniel Barkalowb888d612007-09-10 23:03:25 -0400428{
429 int i;
430 struct ref *rm;
431 struct ref *ref_map = NULL;
432 struct ref **tail = &ref_map;
433
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100434 /* opportunistically-updated references: */
435 struct ref *orefs = NULL, **oref_tail = &orefs;
436
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700437 struct hashmap existing_refs;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400438
Brandon Williams65d96c82018-05-16 15:58:08 -0700439 if (rs->nr) {
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700440 struct refspec *fetch_refspec;
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700441
Brandon Williams65d96c82018-05-16 15:58:08 -0700442 for (i = 0; i < rs->nr; i++) {
443 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
444 if (rs->items[i].dst && rs->items[i].dst[0])
Daniel Barkalowb888d612007-09-10 23:03:25 -0400445 *autotags = 1;
446 }
Michael Haggerty0281c932013-10-30 06:32:58 +0100447 /* Merge everything on the command line (but not --tags) */
Daniel Barkalowb888d612007-09-10 23:03:25 -0400448 for (rm = ref_map; rm; rm = rm->next)
Jeff King900f2812013-05-11 18:15:59 +0200449 rm->fetch_head_status = FETCH_HEAD_MERGE;
Michael Haggerty0281c932013-10-30 06:32:58 +0100450
451 /*
452 * For any refs that we happen to be fetching via
453 * command-line arguments, the destination ref might
454 * have been missing or have been different than the
455 * remote-tracking ref that would be derived from the
456 * configured refspec. In these cases, we want to
457 * take the opportunity to update their configured
458 * remote-tracking reference. However, we do not want
459 * to mention these entries in FETCH_HEAD at all, as
460 * they would simply be duplicates of existing
461 * entries, so we set them FETCH_HEAD_IGNORE below.
462 *
463 * We compute these entries now, based only on the
464 * refspecs specified on the command line. But we add
465 * them to the list following the refspecs resulting
466 * from the tags option so that one of the latter,
467 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
468 * by ref_remove_duplicates() in favor of one of these
469 * opportunistic entries with FETCH_HEAD_IGNORE.
470 */
Brandon Williams65d96c82018-05-16 15:58:08 -0700471 if (refmap.nr)
472 fetch_refspec = &refmap;
473 else
Brandon Williams6d1700d2018-06-27 15:30:21 -0700474 fetch_refspec = &remote->fetch;
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700475
Brandon Williams65d96c82018-05-16 15:58:08 -0700476 for (i = 0; i < fetch_refspec->nr; i++)
477 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
Brandon Williamse4cffac2018-05-16 15:58:05 -0700478 } else if (refmap.nr) {
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700479 die("--refmap option is only meaningful with command-line refspec(s).");
Daniel Barkalowb888d612007-09-10 23:03:25 -0400480 } else {
481 /* Use the defaults */
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400482 struct branch *branch = branch_get(NULL);
483 int has_merge = branch_has_merge_config(branch);
Brandon Casey3ee17572010-08-25 12:52:56 -0500484 if (remote &&
Brandon Williamse5349ab2018-05-16 15:58:01 -0700485 (remote->fetch.nr ||
Brandon Caseyf31dbdc2010-09-09 13:56:36 -0500486 /* Note: has_merge implies non-NULL branch->remote_name */
Brandon Casey3ee17572010-08-25 12:52:56 -0500487 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
Brandon Williamse5349ab2018-05-16 15:58:01 -0700488 for (i = 0; i < remote->fetch.nr; i++) {
489 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
490 if (remote->fetch.items[i].dst &&
491 remote->fetch.items[i].dst[0])
Daniel Barkalowb888d612007-09-10 23:03:25 -0400492 *autotags = 1;
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400493 if (!i && !has_merge && ref_map &&
Brandon Williamse5349ab2018-05-16 15:58:01 -0700494 !remote->fetch.items[0].pattern)
Jeff King900f2812013-05-11 18:15:59 +0200495 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400496 }
Johannes Schindelinda0204d2007-10-11 01:47:55 +0100497 /*
498 * if the remote we're fetching from is the same
499 * as given in branch.<name>.remote, we add the
500 * ref given in branch.<name>.merge, too.
Brandon Caseyf31dbdc2010-09-09 13:56:36 -0500501 *
502 * Note: has_merge implies non-NULL branch->remote_name
Johannes Schindelinda0204d2007-10-11 01:47:55 +0100503 */
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700504 if (has_merge &&
505 !strcmp(branch->remote_name, remote->name))
Shawn O. Pearce85682c12007-09-18 04:54:53 -0400506 add_merge_config(&ref_map, remote_refs, branch, &tail);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400507 } else {
508 ref_map = get_remote_ref(remote_refs, "HEAD");
Junio C Hamano9ad7c5a2007-10-26 23:09:48 -0700509 if (!ref_map)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +0000510 die(_("Couldn't find remote ref HEAD"));
Jeff King900f2812013-05-11 18:15:59 +0200511 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
Shawn O. Pearce5aaf7f22008-03-02 21:34:51 -0500512 tail = &ref_map->next;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400513 }
514 }
Michael Haggerty0281c932013-10-30 06:32:58 +0100515
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100516 if (tags == TAGS_SET)
517 /* also fetch all tags */
518 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
519 else if (tags == TAGS_DEFAULT && *autotags)
Brandon Williams6d1700d2018-06-27 15:30:21 -0700520 find_non_local_tags(remote_refs, &ref_map, &tail);
Michael Haggerty0281c932013-10-30 06:32:58 +0100521
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100522 /* Now append any refs to be updated opportunistically: */
523 *tail = orefs;
524 for (rm = orefs; rm; rm = rm->next) {
525 rm->fetch_head_status = FETCH_HEAD_IGNORE;
526 tail = &rm->next;
527 }
528
Brandon Williams14b8ced2018-06-27 15:30:19 -0700529 ref_map = ref_remove_duplicates(ref_map);
530
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700531 refname_hash_init(&existing_refs);
532 for_each_ref(add_one_refname, &existing_refs);
533
Brandon Williams14b8ced2018-06-27 15:30:19 -0700534 for (rm = ref_map; rm; rm = rm->next) {
535 if (rm->peer_ref) {
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700536 const char *refname = rm->peer_ref->name;
537 struct refname_hash_entry *peer_item;
Eric Wongf23a4652019-10-06 23:30:36 +0000538 unsigned int hash = strhash(refname);
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700539
Eric Wongf23a4652019-10-06 23:30:36 +0000540 peer_item = hashmap_get_entry_from_hash(&existing_refs,
541 hash, refname,
542 struct refname_hash_entry, ent);
Brandon Williams14b8ced2018-06-27 15:30:19 -0700543 if (peer_item) {
Junio C Hamanoe198b3a2018-09-25 13:25:04 -0700544 struct object_id *old_oid = &peer_item->oid;
Brandon Williams14b8ced2018-06-27 15:30:19 -0700545 oidcpy(&rm->peer_ref->old_oid, old_oid);
546 }
547 }
548 }
Eric Wongc8e424c2019-10-06 23:30:40 +0000549 hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
Brandon Williams14b8ced2018-06-27 15:30:19 -0700550
551 return ref_map;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400552}
553
Jeff Kingfa250752009-05-25 06:40:54 -0400554#define STORE_REF_ERROR_OTHER 1
555#define STORE_REF_ERROR_DF_CONFLICT 2
556
Daniel Barkalowb888d612007-09-10 23:03:25 -0400557static int s_update_ref(const char *action,
558 struct ref *ref,
559 int check_old)
560{
Jeff King1412f762017-03-28 15:46:26 -0400561 char *msg;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400562 char *rla = getenv("GIT_REFLOG_ACTION");
Ronnie Sahlbergcd94f762014-04-28 13:49:07 -0700563 struct ref_transaction *transaction;
564 struct strbuf err = STRBUF_INIT;
565 int ret, df_conflict = 0;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400566
Jay Soffian28a15402009-11-10 09:19:43 +0100567 if (dry_run)
568 return 0;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400569 if (!rla)
Kristian Høgsberg2d324ef2007-12-04 02:25:46 -0500570 rla = default_rla.buf;
Jeff King1412f762017-03-28 15:46:26 -0400571 msg = xstrfmt("%s: %s", rla, action);
Ronnie Sahlbergcd94f762014-04-28 13:49:07 -0700572
573 transaction = ref_transaction_begin(&err);
574 if (!transaction ||
Michael Haggerty1d147bd2015-02-17 18:00:15 +0100575 ref_transaction_update(transaction, ref->name,
brian m. carlson89f3bbd2017-10-15 22:06:53 +0000576 &ref->new_oid,
577 check_old ? &ref->old_oid : NULL,
Michael Haggerty1d147bd2015-02-17 18:00:15 +0100578 0, msg, &err))
Ronnie Sahlbergcd94f762014-04-28 13:49:07 -0700579 goto fail;
580
581 ret = ref_transaction_commit(transaction, &err);
582 if (ret) {
583 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
584 goto fail;
585 }
586
587 ref_transaction_free(transaction);
588 strbuf_release(&err);
Jeff King1412f762017-03-28 15:46:26 -0400589 free(msg);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400590 return 0;
Ronnie Sahlbergcd94f762014-04-28 13:49:07 -0700591fail:
592 ref_transaction_free(transaction);
593 error("%s", err.buf);
594 strbuf_release(&err);
Jeff King1412f762017-03-28 15:46:26 -0400595 free(msg);
Ronnie Sahlbergcd94f762014-04-28 13:49:07 -0700596 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
597 : STORE_REF_ERROR_OTHER;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400598}
599
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200600static int refcol_width = 10;
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200601static int compact_format;
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200602
603static void adjust_refcol_width(const struct ref *ref)
604{
605 int max, rlen, llen, len;
606
607 /* uptodate lines are only shown on high verbosity level */
Jeff King4a7e27e2018-08-28 17:22:40 -0400608 if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200609 return;
610
611 max = term_columns();
612 rlen = utf8_strwidth(prettify_refname(ref->name));
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200613
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200614 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
615
616 /*
617 * rough estimation to see if the output line is too long and
618 * should not be counted (we can't do precise calculation
619 * anyway because we don't know if the error explanation part
620 * will be printed in update_local_ref)
621 */
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200622 if (compact_format) {
623 llen = 0;
624 max = max * 2 / 3;
625 }
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200626 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
627 if (len >= max)
628 return;
629
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200630 /*
631 * Not precise calculation for compact mode because '*' can
632 * appear on the left hand side of '->' and shrink the column
633 * back.
634 */
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200635 if (refcol_width < rlen)
636 refcol_width = rlen;
637}
638
639static void prepare_format_display(struct ref *ref_map)
640{
641 struct ref *rm;
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200642 const char *format = "full";
643
644 git_config_get_string_const("fetch.output", &format);
645 if (!strcasecmp(format, "full"))
646 compact_format = 0;
647 else if (!strcasecmp(format, "compact"))
648 compact_format = 1;
649 else
650 die(_("configuration fetch.output contains invalid value %s"),
651 format);
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200652
653 for (rm = ref_map; rm; rm = rm->next) {
654 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
655 !rm->peer_ref ||
656 !strcmp(rm->name, "HEAD"))
657 continue;
658
659 adjust_refcol_width(rm);
660 }
661}
Nicolas Pitre165f3902007-11-03 01:32:48 -0400662
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200663static void print_remote_to_local(struct strbuf *display,
664 const char *remote, const char *local)
665{
666 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
667}
668
669static int find_and_replace(struct strbuf *haystack,
670 const char *needle,
671 const char *placeholder)
672{
Nguyễn Thái Ngọc Duydc40b242019-01-25 16:51:22 +0700673 const char *p = NULL;
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200674 int plen, nlen;
675
Nguyễn Thái Ngọc Duydc40b242019-01-25 16:51:22 +0700676 nlen = strlen(needle);
677 if (ends_with(haystack->buf, needle))
678 p = haystack->buf + haystack->len - nlen;
679 else
680 p = strstr(haystack->buf, needle);
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200681 if (!p)
682 return 0;
683
684 if (p > haystack->buf && p[-1] != '/')
685 return 0;
686
687 plen = strlen(p);
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200688 if (plen > nlen && p[nlen] != '/')
689 return 0;
690
691 strbuf_splice(haystack, p - haystack->buf, nlen,
692 placeholder, strlen(placeholder));
693 return 1;
694}
695
696static void print_compact(struct strbuf *display,
697 const char *remote, const char *local)
698{
699 struct strbuf r = STRBUF_INIT;
700 struct strbuf l = STRBUF_INIT;
701
702 if (!strcmp(remote, local)) {
703 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
704 return;
705 }
706
707 strbuf_addstr(&r, remote);
708 strbuf_addstr(&l, local);
709
710 if (!find_and_replace(&r, local, "*"))
711 find_and_replace(&l, remote, "*");
712 print_remote_to_local(display, r.buf, l.buf);
713
714 strbuf_release(&r);
715 strbuf_release(&l);
716}
717
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200718static void format_display(struct strbuf *display, char code,
719 const char *summary, const char *error,
Junio C Hamano901f3d42016-10-21 15:22:55 -0700720 const char *remote, const char *local,
721 int summary_width)
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200722{
Junio C Hamano901f3d42016-10-21 15:22:55 -0700723 int width = (summary_width + strlen(summary) - gettext_width(summary));
724
725 strbuf_addf(display, "%c %-*s ", code, width, summary);
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200726 if (!compact_format)
727 print_remote_to_local(display, remote, local);
728 else
729 print_compact(display, remote, local);
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200730 if (error)
731 strbuf_addf(display, " (%s)", error);
732}
Daniel Barkalowb888d612007-09-10 23:03:25 -0400733
734static int update_local_ref(struct ref *ref,
Nicolas Pitre165f3902007-11-03 01:32:48 -0400735 const char *remote,
Marc Branchaud6da618d2012-04-16 18:08:49 -0400736 const struct ref *remote_ref,
Junio C Hamano901f3d42016-10-21 15:22:55 -0700737 struct strbuf *display,
738 int summary_width)
Daniel Barkalowb888d612007-09-10 23:03:25 -0400739{
Daniel Barkalowb888d612007-09-10 23:03:25 -0400740 struct commit *current = NULL, *updated;
741 enum object_type type;
742 struct branch *current_branch = branch_get(NULL);
Felipe Contreras4577e482009-05-14 00:22:04 +0300743 const char *pretty_ref = prettify_refname(ref->name);
Derrick Stolee377444b2019-06-18 13:25:27 -0700744 int fast_forward = 0;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400745
Stefan Beller0df8e962018-04-25 11:20:59 -0700746 type = oid_object_info(the_repository, &ref->new_oid, NULL);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400747 if (type < 0)
brian m. carlsonf4e54d02015-11-10 02:22:20 +0000748 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
Daniel Barkalowb888d612007-09-10 23:03:25 -0400749
Jeff King4a7e27e2018-08-28 17:22:40 -0400750 if (oideq(&ref->old_oid, &ref->new_oid)) {
Tuncer Ayaz7f87aff2008-11-15 01:14:24 +0100751 if (verbosity > 0)
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200752 format_display(display, '=', _("[up to date]"), NULL,
Junio C Hamano901f3d42016-10-21 15:22:55 -0700753 remote, pretty_ref, summary_width);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400754 return 0;
755 }
756
Shawn O. Pearceb3abdd92007-09-16 02:31:26 -0400757 if (current_branch &&
758 !strcmp(ref->name, current_branch->name) &&
Daniel Barkalowb888d612007-09-10 23:03:25 -0400759 !(update_head_ok || is_bare_repository()) &&
brian m. carlsonf4e54d02015-11-10 02:22:20 +0000760 !is_null_oid(&ref->old_oid)) {
Daniel Barkalowb888d612007-09-10 23:03:25 -0400761 /*
762 * If this is the head, and it's not okay to update
763 * the head, and the old value of the head isn't empty...
764 */
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200765 format_display(display, '!', _("[rejected]"),
766 _("can't fetch in current branch"),
Junio C Hamano901f3d42016-10-21 15:22:55 -0700767 remote, pretty_ref, summary_width);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400768 return 1;
769 }
770
brian m. carlsonf4e54d02015-11-10 02:22:20 +0000771 if (!is_null_oid(&ref->old_oid) &&
Christian Couder59556542013-11-30 21:55:40 +0100772 starts_with(ref->name, "refs/tags/")) {
Ævar Arnfjörð Bjarmason0bc8d712018-08-31 20:10:04 +0000773 if (force || ref->force) {
774 int r;
775 r = s_update_ref("updating tag", ref, 0);
776 format_display(display, r ? '!' : 't', _("[tag update]"),
777 r ? _("unable to update local ref") : NULL,
778 remote, pretty_ref, summary_width);
779 return r;
780 } else {
781 format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
782 remote, pretty_ref, summary_width);
783 return 1;
784 }
Daniel Barkalowb888d612007-09-10 23:03:25 -0400785 }
786
Stefan Beller21e1ee82018-06-28 18:21:57 -0700787 current = lookup_commit_reference_gently(the_repository,
788 &ref->old_oid, 1);
789 updated = lookup_commit_reference_gently(the_repository,
790 &ref->new_oid, 1);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400791 if (!current || !updated) {
Nicolas Pitre165f3902007-11-03 01:32:48 -0400792 const char *msg;
793 const char *what;
Jeff King63154722008-06-26 23:59:50 -0400794 int r;
Marc Branchaud0997ada2012-04-16 18:08:50 -0400795 /*
796 * Nicely describe the new ref we're fetching.
797 * Base this on the remote's ref name, as it's
798 * more likely to follow a standard layout.
799 */
800 const char *name = remote_ref ? remote_ref->name : "";
Christian Couder59556542013-11-30 21:55:40 +0100801 if (starts_with(name, "refs/tags/")) {
Daniel Barkalowb888d612007-09-10 23:03:25 -0400802 msg = "storing tag";
Ævar Arnfjörð Bjarmasonf7b37422011-02-22 23:41:53 +0000803 what = _("[new tag]");
Christian Couder59556542013-11-30 21:55:40 +0100804 } else if (starts_with(name, "refs/heads/")) {
Daniel Barkalowb888d612007-09-10 23:03:25 -0400805 msg = "storing head";
Ævar Arnfjörð Bjarmasonf7b37422011-02-22 23:41:53 +0000806 what = _("[new branch]");
Marc Branchaud0997ada2012-04-16 18:08:50 -0400807 } else {
808 msg = "storing ref";
809 what = _("[new ref]");
Nicolas Pitre165f3902007-11-03 01:32:48 -0400810 }
811
Jeff King63154722008-06-26 23:59:50 -0400812 r = s_update_ref(msg, ref, 0);
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200813 format_display(display, r ? '!' : '*', what,
814 r ? _("unable to update local ref") : NULL,
Junio C Hamano901f3d42016-10-21 15:22:55 -0700815 remote, pretty_ref, summary_width);
Jeff King63154722008-06-26 23:59:50 -0400816 return r;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400817 }
818
Derrick Stolee377444b2019-06-18 13:25:27 -0700819 if (fetch_show_forced_updates) {
820 uint64_t t_before = getnanotime();
821 fast_forward = in_merge_bases(current, updated);
822 forced_updates_ms += (getnanotime() - t_before) / 1000000;
823 } else {
824 fast_forward = 1;
825 }
826
827 if (fast_forward) {
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400828 struct strbuf quickref = STRBUF_INIT;
Jeff King63154722008-06-26 23:59:50 -0400829 int r;
Derrick Stoleecdbd70c2019-06-18 13:25:26 -0700830
brian m. carlson30e677e2018-03-12 02:27:28 +0000831 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400832 strbuf_addstr(&quickref, "..");
brian m. carlson30e677e2018-03-12 02:27:28 +0000833 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
Felipe Contrerasa75d7b52009-10-24 11:31:32 +0300834 r = s_update_ref("fast-forward", ref, 1);
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200835 format_display(display, r ? '!' : ' ', quickref.buf,
836 r ? _("unable to update local ref") : NULL,
Junio C Hamano901f3d42016-10-21 15:22:55 -0700837 remote, pretty_ref, summary_width);
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400838 strbuf_release(&quickref);
Jeff King63154722008-06-26 23:59:50 -0400839 return r;
Nicolas Pitre165f3902007-11-03 01:32:48 -0400840 } else if (force || ref->force) {
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400841 struct strbuf quickref = STRBUF_INIT;
Jeff King63154722008-06-26 23:59:50 -0400842 int r;
brian m. carlson30e677e2018-03-12 02:27:28 +0000843 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400844 strbuf_addstr(&quickref, "...");
brian m. carlson30e677e2018-03-12 02:27:28 +0000845 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
Jeff King63154722008-06-26 23:59:50 -0400846 r = s_update_ref("forced-update", ref, 1);
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200847 format_display(display, r ? '!' : '+', quickref.buf,
848 r ? _("unable to update local ref") : _("forced update"),
Junio C Hamano901f3d42016-10-21 15:22:55 -0700849 remote, pretty_ref, summary_width);
Jeff Kingbd22d4f2015-09-24 17:07:40 -0400850 strbuf_release(&quickref);
Jeff King63154722008-06-26 23:59:50 -0400851 return r;
Nicolas Pitre165f3902007-11-03 01:32:48 -0400852 } else {
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +0200853 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
Junio C Hamano901f3d42016-10-21 15:22:55 -0700854 remote, pretty_ref, summary_width);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400855 return 1;
856 }
Daniel Barkalowb888d612007-09-10 23:03:25 -0400857}
858
brian m. carlson6ccac9e2017-10-15 22:06:54 +0000859static int iterate_ref_map(void *cb_data, struct object_id *oid)
Junio C Hamano6b67e0d2011-09-01 15:43:35 -0700860{
Junio C Hamanof0e278b2011-09-02 16:22:47 -0700861 struct ref **rm = cb_data;
862 struct ref *ref = *rm;
Junio C Hamano6b67e0d2011-09-01 15:43:35 -0700863
Nguyễn Thái Ngọc Duy4820a332013-12-05 20:02:40 +0700864 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
865 ref = ref->next;
Junio C Hamanof0e278b2011-09-02 16:22:47 -0700866 if (!ref)
867 return -1; /* end of the list */
868 *rm = ref->next;
brian m. carlson6ccac9e2017-10-15 22:06:54 +0000869 oidcpy(oid, &ref->old_oid);
Junio C Hamanof0e278b2011-09-02 16:22:47 -0700870 return 0;
Junio C Hamano6b67e0d2011-09-01 15:43:35 -0700871}
872
Jean-Noël Avila182f59d2019-08-06 19:19:52 +0200873static const char warn_show_forced_updates[] =
874N_("Fetch normally indicates which branches had a forced update,\n"
875 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
876 "flag or run 'git config fetch.showForcedUpdates true'.");
877static const char warn_time_show_forced_updates[] =
878N_("It took %.2f seconds to check forced updates. You can use\n"
879 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
880 " to avoid this check.\n");
881
Andreas Ericsson47abd852009-04-17 10:20:11 +0200882static int store_updated_refs(const char *raw_url, const char *remote_name,
Jonathan Tancf1e7c02018-07-02 15:08:43 -0700883 int connectivity_checked, struct ref *ref_map)
Daniel Barkalowb888d612007-09-10 23:03:25 -0400884{
885 FILE *fp;
886 struct commit *commit;
Tom Miller4b3b33a2014-01-02 20:28:51 -0600887 int url_len, i, rc = 0;
Jeff King5914f2d2011-12-08 03:43:19 -0500888 struct strbuf note = STRBUF_INIT;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400889 const char *what, *kind;
890 struct ref *rm;
Nguyễn Thái Ngọc Duydcf69262014-11-30 15:24:27 +0700891 char *url;
Stefan Beller102de882018-05-17 15:51:51 -0700892 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
Jeff King900f2812013-05-11 18:15:59 +0200893 int want_status;
Junio C Hamano11fd66d2016-10-21 15:28:07 -0700894 int summary_width = transport_summary_width(ref_map);
Daniel Barkalowb888d612007-09-10 23:03:25 -0400895
André Goddard Rosad6617c72007-11-22 20:22:23 -0200896 fp = fopen(filename, "a");
897 if (!fp)
Nguyễn Thái Ngọc Duy6da31d72016-05-08 16:47:26 +0700898 return error_errno(_("cannot open %s"), filename);
Andreas Ericsson47abd852009-04-17 10:20:11 +0200899
Daniel Barkalowfb0cc872009-11-18 02:42:22 +0100900 if (raw_url)
901 url = transport_anonymize_url(raw_url);
902 else
903 url = xstrdup("foreign");
Junio C Hamano6b67e0d2011-09-01 15:43:35 -0700904
Jonathan Tancf1e7c02018-07-02 15:08:43 -0700905 if (!connectivity_checked) {
906 rm = ref_map;
907 if (check_connected(iterate_ref_map, &rm, NULL)) {
908 rc = error(_("%s did not send all necessary objects\n"), url);
909 goto abort;
910 }
Tay Ray Chuan9516a592011-10-07 15:40:22 +0800911 }
Junio C Hamano6b67e0d2011-09-01 15:43:35 -0700912
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200913 prepare_format_display(ref_map);
914
Joey Hess96890f42011-12-26 12:16:56 -0400915 /*
Jeff King900f2812013-05-11 18:15:59 +0200916 * We do a pass for each fetch_head_status type in their enum order, so
917 * merged entries are written before not-for-merge. That lets readers
918 * use FETCH_HEAD as a refname to refer to the ref to be merged.
Joey Hess96890f42011-12-26 12:16:56 -0400919 */
Jeff King900f2812013-05-11 18:15:59 +0200920 for (want_status = FETCH_HEAD_MERGE;
921 want_status <= FETCH_HEAD_IGNORE;
922 want_status++) {
Joey Hess96890f42011-12-26 12:16:56 -0400923 for (rm = ref_map; rm; rm = rm->next) {
924 struct ref *ref = NULL;
Jeff King900f2812013-05-11 18:15:59 +0200925 const char *merge_status_marker = "";
Daniel Barkalowb888d612007-09-10 23:03:25 -0400926
Nguyễn Thái Ngọc Duy4820a332013-12-05 20:02:40 +0700927 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
928 if (want_status == FETCH_HEAD_MERGE)
929 warning(_("reject %s because shallow roots are not allowed to be updated"),
930 rm->peer_ref ? rm->peer_ref->name : rm->name);
931 continue;
932 }
933
Stefan Beller21e1ee82018-06-28 18:21:57 -0700934 commit = lookup_commit_reference_gently(the_repository,
935 &rm->old_oid,
brian m. carlsonbc832662017-05-06 22:10:10 +0000936 1);
Joey Hess96890f42011-12-26 12:16:56 -0400937 if (!commit)
Jeff King900f2812013-05-11 18:15:59 +0200938 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400939
Jeff King900f2812013-05-11 18:15:59 +0200940 if (rm->fetch_head_status != want_status)
Joey Hess96890f42011-12-26 12:16:56 -0400941 continue;
Daniel Barkalowb888d612007-09-10 23:03:25 -0400942
Joey Hess96890f42011-12-26 12:16:56 -0400943 if (rm->peer_ref) {
Jeff King6f687c22015-09-24 17:08:09 -0400944 ref = alloc_ref(rm->peer_ref->name);
brian m. carlsonf4e54d02015-11-10 02:22:20 +0000945 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
946 oidcpy(&ref->new_oid, &rm->old_oid);
Joey Hess96890f42011-12-26 12:16:56 -0400947 ref->force = rm->peer_ref->force;
Nicolas Pitre165f3902007-11-03 01:32:48 -0400948 }
Joey Hess96890f42011-12-26 12:16:56 -0400949
Stefan Bellerbe76c212018-12-06 13:26:55 -0800950 if (recurse_submodules != RECURSE_SUBMODULES_OFF)
951 check_for_new_submodule_commits(&rm->old_oid);
Joey Hess96890f42011-12-26 12:16:56 -0400952
953 if (!strcmp(rm->name, "HEAD")) {
954 kind = "";
955 what = "";
956 }
Christian Couder59556542013-11-30 21:55:40 +0100957 else if (starts_with(rm->name, "refs/heads/")) {
Joey Hess96890f42011-12-26 12:16:56 -0400958 kind = "branch";
959 what = rm->name + 11;
960 }
Christian Couder59556542013-11-30 21:55:40 +0100961 else if (starts_with(rm->name, "refs/tags/")) {
Joey Hess96890f42011-12-26 12:16:56 -0400962 kind = "tag";
963 what = rm->name + 10;
964 }
Christian Couder59556542013-11-30 21:55:40 +0100965 else if (starts_with(rm->name, "refs/remotes/")) {
Joey Hess96890f42011-12-26 12:16:56 -0400966 kind = "remote-tracking branch";
967 what = rm->name + 13;
968 }
969 else {
970 kind = "";
971 what = rm->name;
972 }
973
974 url_len = strlen(url);
975 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
976 ;
977 url_len = i + 1;
978 if (4 < i && !strncmp(".git", url + i - 3, 4))
979 url_len = i - 3;
980
981 strbuf_reset(&note);
982 if (*what) {
983 if (*kind)
984 strbuf_addf(&note, "%s ", kind);
985 strbuf_addf(&note, "'%s' of ", what);
986 }
Jeff King900f2812013-05-11 18:15:59 +0200987 switch (rm->fetch_head_status) {
988 case FETCH_HEAD_NOT_FOR_MERGE:
989 merge_status_marker = "not-for-merge";
990 /* fall-through */
991 case FETCH_HEAD_MERGE:
992 fprintf(fp, "%s\t%s\t%s",
brian m. carlsonf4e54d02015-11-10 02:22:20 +0000993 oid_to_hex(&rm->old_oid),
Jeff King900f2812013-05-11 18:15:59 +0200994 merge_status_marker,
995 note.buf);
996 for (i = 0; i < url_len; ++i)
997 if ('\n' == url[i])
998 fputs("\\n", fp);
999 else
1000 fputc(url[i], fp);
1001 fputc('\n', fp);
1002 break;
1003 default:
1004 /* do not write anything to FETCH_HEAD */
1005 break;
1006 }
Joey Hess96890f42011-12-26 12:16:56 -04001007
1008 strbuf_reset(&note);
1009 if (ref) {
Junio C Hamano901f3d42016-10-21 15:22:55 -07001010 rc |= update_local_ref(ref, what, rm, &note,
1011 summary_width);
Joey Hess96890f42011-12-26 12:16:56 -04001012 free(ref);
1013 } else
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +02001014 format_display(&note, '*',
1015 *kind ? kind : "branch", NULL,
1016 *what ? what : "HEAD",
Junio C Hamano901f3d42016-10-21 15:22:55 -07001017 "FETCH_HEAD", summary_width);
Joey Hess96890f42011-12-26 12:16:56 -04001018 if (note.len) {
1019 if (verbosity >= 0 && !shown_url) {
1020 fprintf(stderr, _("From %.*s\n"),
1021 url_len, url);
1022 shown_url = 1;
1023 }
1024 if (verbosity >= 0)
1025 fprintf(stderr, " %s\n", note.buf);
1026 }
Nicolas Pitre165f3902007-11-03 01:32:48 -04001027 }
Daniel Barkalowb888d612007-09-10 23:03:25 -04001028 }
Tay Ray Chuan9516a592011-10-07 15:40:22 +08001029
Jeff Kingfa250752009-05-25 06:40:54 -04001030 if (rc & STORE_REF_ERROR_DF_CONFLICT)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001031 error(_("some local refs could not be updated; try running\n"
Jeff Kingf3cb1692008-06-27 00:01:41 -04001032 " 'git remote prune %s' to remove any old, conflicting "
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001033 "branches"), remote_name);
Tay Ray Chuan9516a592011-10-07 15:40:22 +08001034
Derrick Stolee377444b2019-06-18 13:25:27 -07001035 if (advice_fetch_show_forced_updates) {
1036 if (!fetch_show_forced_updates) {
Jean-Noël Avila182f59d2019-08-06 19:19:52 +02001037 warning(_(warn_show_forced_updates));
Derrick Stolee377444b2019-06-18 13:25:27 -07001038 } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
Jean-Noël Avila182f59d2019-08-06 19:19:52 +02001039 warning(_(warn_time_show_forced_updates),
Derrick Stolee377444b2019-06-18 13:25:27 -07001040 forced_updates_ms / 1000.0);
Derrick Stolee377444b2019-06-18 13:25:27 -07001041 }
1042 }
1043
Tay Ray Chuan9516a592011-10-07 15:40:22 +08001044 abort:
Jeff King5914f2d2011-12-08 03:43:19 -05001045 strbuf_release(&note);
Tay Ray Chuan9516a592011-10-07 15:40:22 +08001046 free(url);
1047 fclose(fp);
Dmitry V. Levinefb98b42008-05-28 19:29:36 +04001048 return rc;
Daniel Barkalowb888d612007-09-10 23:03:25 -04001049}
1050
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001051/*
1052 * We would want to bypass the object transfer altogether if
Johan Herlandd9eb0202009-07-10 01:52:30 +02001053 * everything we are going to fetch already exists and is connected
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001054 * locally.
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001055 */
Jonathan Tan35f9e3e2018-09-21 11:22:38 -07001056static int check_exist_and_connected(struct ref *ref_map)
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001057{
Junio C Hamanof0e278b2011-09-02 16:22:47 -07001058 struct ref *rm = ref_map;
Jeff King7043c702016-07-15 06:30:40 -04001059 struct check_connected_options opt = CHECK_CONNECTED_INIT;
Jonathan Tan35f9e3e2018-09-21 11:22:38 -07001060 struct ref *r;
Junio C Hamanof0e278b2011-09-02 16:22:47 -07001061
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001062 /*
1063 * If we are deepening a shallow clone we already have these
1064 * objects reachable. Running rev-list here will return with
1065 * a good (0) exit status and we'll bypass the fetch that we
1066 * really need to perform. Claiming failure now will ensure
1067 * we perform the network exchange to deepen our history.
1068 */
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001069 if (deepen)
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001070 return -1;
Jonathan Tan35f9e3e2018-09-21 11:22:38 -07001071
1072 /*
1073 * check_connected() allows objects to merely be promised, but
1074 * we need all direct targets to exist.
1075 */
1076 for (r = rm; r; r = r->next) {
1077 if (!has_object_file(&r->old_oid))
1078 return -1;
1079 }
1080
Jeff King7043c702016-07-15 06:30:40 -04001081 opt.quiet = 1;
1082 return check_connected(iterate_ref_map, &rm, &opt);
Shawn O. Pearce4191c352007-11-11 02:29:47 -05001083}
1084
Jonathan Tane2842b32018-08-01 13:13:20 -07001085static int fetch_refs(struct transport *transport, struct ref *ref_map)
Daniel Barkalowb888d612007-09-10 23:03:25 -04001086{
Jonathan Tan35f9e3e2018-09-21 11:22:38 -07001087 int ret = check_exist_and_connected(ref_map);
Josh Steadmon5fc31182019-10-02 16:49:28 -07001088 if (ret) {
1089 trace2_region_enter("fetch", "fetch_refs", the_repository);
Jonathan Tane2842b32018-08-01 13:13:20 -07001090 ret = transport_fetch_refs(transport, ref_map);
Josh Steadmon5fc31182019-10-02 16:49:28 -07001091 trace2_region_leave("fetch", "fetch_refs", the_repository);
1092 }
Daniel Barkalowb888d612007-09-10 23:03:25 -04001093 if (!ret)
Brandon Williams05c44222018-06-27 15:30:20 -07001094 /*
1095 * Keep the new pack's ".keep" file around to allow the caller
1096 * time to update refs to reference the new objects.
1097 */
1098 return 0;
1099 transport_unlock_pack(transport);
1100 return ret;
1101}
1102
1103/* Update local refs based on the ref values fetched from a remote */
1104static int consume_refs(struct transport *transport, struct ref *ref_map)
1105{
Jonathan Tancf1e7c02018-07-02 15:08:43 -07001106 int connectivity_checked = transport->smart_options
1107 ? transport->smart_options->connectivity_checked : 0;
Josh Steadmon5fc31182019-10-02 16:49:28 -07001108 int ret;
1109 trace2_region_enter("fetch", "consume_refs", the_repository);
1110 ret = store_updated_refs(transport->url,
1111 transport->remote->name,
1112 connectivity_checked,
1113 ref_map);
Shawn O. Pearce1788c392007-09-14 03:31:23 -04001114 transport_unlock_pack(transport);
Josh Steadmon5fc31182019-10-02 16:49:28 -07001115 trace2_region_leave("fetch", "consume_refs", the_repository);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001116 return ret;
1117}
1118
Brandon Williamsdef11e72018-05-16 15:58:09 -07001119static int prune_refs(struct refspec *rs, struct ref *ref_map,
1120 const char *raw_url)
Jay Soffianf360d842009-11-10 09:15:47 +01001121{
Tom Miller4b3b33a2014-01-02 20:28:51 -06001122 int url_len, i, result = 0;
Brandon Williamsa2ac50c2018-05-16 15:58:10 -07001123 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
Tom Miller4b3b33a2014-01-02 20:28:51 -06001124 char *url;
Junio C Hamano11fd66d2016-10-21 15:28:07 -07001125 int summary_width = transport_summary_width(stale_refs);
Jay Soffianf360d842009-11-10 09:15:47 +01001126 const char *dangling_msg = dry_run
Nguyễn Thái Ngọc Duy18986d52012-04-23 19:30:25 +07001127 ? _(" (%s will become dangling)")
1128 : _(" (%s has become dangling)");
Jay Soffianf360d842009-11-10 09:15:47 +01001129
Tom Miller4b3b33a2014-01-02 20:28:51 -06001130 if (raw_url)
1131 url = transport_anonymize_url(raw_url);
1132 else
1133 url = xstrdup("foreign");
1134
1135 url_len = strlen(url);
1136 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1137 ;
1138
1139 url_len = i + 1;
1140 if (4 < i && !strncmp(".git", url + i - 3, 4))
1141 url_len = i - 3;
1142
Michael Haggertya087b432015-06-22 16:02:59 +02001143 if (!dry_run) {
1144 struct string_list refnames = STRING_LIST_INIT_NODUP;
1145
1146 for (ref = stale_refs; ref; ref = ref->next)
1147 string_list_append(&refnames, ref->name);
1148
Michael Haggerty64da4192017-05-22 16:17:38 +02001149 result = delete_refs("fetch: prune", &refnames, 0);
Michael Haggertya087b432015-06-22 16:02:59 +02001150 string_list_clear(&refnames, 0);
1151 }
1152
1153 if (verbosity >= 0) {
1154 for (ref = stale_refs; ref; ref = ref->next) {
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +02001155 struct strbuf sb = STRBUF_INIT;
Michael Haggertya087b432015-06-22 16:02:59 +02001156 if (!shown_url) {
1157 fprintf(stderr, _("From %.*s\n"), url_len, url);
1158 shown_url = 1;
1159 }
Nguyễn Thái Ngọc Duy2cb040b2016-06-26 07:58:08 +02001160 format_display(&sb, '-', _("[deleted]"), NULL,
Junio C Hamano901f3d42016-10-21 15:22:55 -07001161 _("(none)"), prettify_refname(ref->name),
1162 summary_width);
Nguyễn Thái Ngọc Duyd0b39a02016-06-26 07:58:07 +02001163 fprintf(stderr, " %s\n",sb.buf);
1164 strbuf_release(&sb);
Jay Soffianf360d842009-11-10 09:15:47 +01001165 warn_dangling_symref(stderr, dangling_msg, ref->name);
1166 }
1167 }
Michael Haggertya087b432015-06-22 16:02:59 +02001168
Tom Miller4b3b33a2014-01-02 20:28:51 -06001169 free(url);
Jay Soffianf360d842009-11-10 09:15:47 +01001170 free_refs(stale_refs);
1171 return result;
1172}
1173
Johannes Schindelin8ee5d732008-10-13 11:36:52 +02001174static void check_not_current_branch(struct ref *ref_map)
1175{
1176 struct branch *current_branch = branch_get(NULL);
1177
1178 if (is_bare_repository() || !current_branch)
1179 return;
1180
1181 for (; ref_map; ref_map = ref_map->next)
1182 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1183 ref_map->peer_ref->name))
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001184 die(_("Refusing to fetch into current branch %s "
1185 "of non-bare repository"), current_branch->refname);
Johannes Schindelin8ee5d732008-10-13 11:36:52 +02001186}
1187
Junio C Hamanoe6cc5102010-02-24 11:02:05 -08001188static int truncate_fetch_head(void)
1189{
Stefan Beller102de882018-05-17 15:51:51 -07001190 const char *filename = git_path_fetch_head(the_repository);
Johannes Schindelinea565182016-01-11 19:35:54 +01001191 FILE *fp = fopen_for_writing(filename);
Junio C Hamanoe6cc5102010-02-24 11:02:05 -08001192
1193 if (!fp)
Nguyễn Thái Ngọc Duy6da31d72016-05-08 16:47:26 +07001194 return error_errno(_("cannot open %s"), filename);
Junio C Hamanoe6cc5102010-02-24 11:02:05 -08001195 fclose(fp);
1196 return 0;
1197}
1198
Junio C Hamanodb5723c2013-08-07 14:43:20 -07001199static void set_option(struct transport *transport, const char *name, const char *value)
1200{
1201 int r = transport_set_option(transport, name, value);
1202 if (r < 0)
1203 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1204 name, value, transport->url);
1205 if (r > 0)
1206 warning(_("Option \"%s\" is ignored for %s\n"),
1207 name, transport->url);
1208}
1209
Jonathan Tan3390e422018-07-02 15:39:44 -07001210
1211static int add_oid(const char *refname, const struct object_id *oid, int flags,
1212 void *cb_data)
1213{
1214 struct oid_array *oids = cb_data;
1215
1216 oid_array_append(oids, oid);
1217 return 0;
1218}
1219
1220static void add_negotiation_tips(struct git_transport_options *smart_options)
1221{
1222 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1223 int i;
1224
1225 for (i = 0; i < negotiation_tip.nr; i++) {
1226 const char *s = negotiation_tip.items[i].string;
1227 int old_nr;
1228 if (!has_glob_specials(s)) {
1229 struct object_id oid;
1230 if (get_oid(s, &oid))
1231 die("%s is not a valid object", s);
1232 oid_array_append(oids, &oid);
1233 continue;
1234 }
1235 old_nr = oids->nr;
1236 for_each_glob_ref(add_oid, s, oids);
1237 if (old_nr == oids->nr)
1238 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1239 s);
1240 }
1241 smart_options->negotiation_tips = oids;
1242}
1243
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001244static struct transport *prepare_transport(struct remote *remote, int deepen)
Junio C Hamanodb5723c2013-08-07 14:43:20 -07001245{
1246 struct transport *transport;
Josh Steadmon87c2d9d2019-01-07 16:17:09 -08001247
Junio C Hamanodb5723c2013-08-07 14:43:20 -07001248 transport = transport_get(remote, NULL);
1249 transport_set_verbosity(transport, verbosity, progress);
Eric Wongc915f112016-02-03 04:09:14 +00001250 transport->family = family;
Junio C Hamanodb5723c2013-08-07 14:43:20 -07001251 if (upload_pack)
1252 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1253 if (keep)
1254 set_option(transport, TRANS_OPT_KEEP, "yes");
1255 if (depth)
1256 set_option(transport, TRANS_OPT_DEPTH, depth);
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001257 if (deepen && deepen_since)
1258 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +07001259 if (deepen && deepen_not.nr)
1260 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1261 (const char *)&deepen_not);
Nguyễn Thái Ngọc Duycccf74e2016-06-12 17:54:09 +07001262 if (deepen_relative)
1263 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
Nguyễn Thái Ngọc Duy48d25ca2013-12-05 20:02:42 +07001264 if (update_shallow)
1265 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001266 if (filter_options.choice) {
Matthew DeVorecf9ceb52019-06-27 15:54:10 -07001267 const char *spec =
1268 expand_list_objects_filter_spec(&filter_options);
1269 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec);
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001270 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001271 }
Jonathan Tan3390e422018-07-02 15:39:44 -07001272 if (negotiation_tip.nr) {
1273 if (transport->smart_options)
1274 add_negotiation_tips(transport->smart_options);
1275 else
1276 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1277 }
Junio C Hamanodb5723c2013-08-07 14:43:20 -07001278 return transport;
1279}
1280
Junio C Hamano069d5032013-08-07 15:14:45 -07001281static void backfill_tags(struct transport *transport, struct ref *ref_map)
1282{
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001283 int cannot_reuse;
1284
1285 /*
1286 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1287 * when remote helper is used (setting it to an empty string
1288 * is not unsetting). We could extend the remote helper
1289 * protocol for that, but for now, just force a new connection
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +07001290 * without deepen-since. Similar story for deepen-not.
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001291 */
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +07001292 cannot_reuse = transport->cannot_reuse ||
1293 deepen_since || deepen_not.nr;
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001294 if (cannot_reuse) {
1295 gsecondary = prepare_transport(transport->remote, 0);
Junio C Hamanob26ed432013-08-07 15:47:18 -07001296 transport = gsecondary;
1297 }
1298
Junio C Hamano069d5032013-08-07 15:14:45 -07001299 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1300 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
Nguyễn Thái Ngọc Duycccf74e2016-06-12 17:54:09 +07001301 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
Jonathan Tane2842b32018-08-01 13:13:20 -07001302 if (!fetch_refs(transport, ref_map))
Brandon Williams05c44222018-06-27 15:30:20 -07001303 consume_refs(transport, ref_map);
Junio C Hamanob26ed432013-08-07 15:47:18 -07001304
1305 if (gsecondary) {
1306 transport_disconnect(gsecondary);
1307 gsecondary = NULL;
1308 }
Junio C Hamano069d5032013-08-07 15:14:45 -07001309}
1310
Daniel Barkalowb888d612007-09-10 23:03:25 -04001311static int do_fetch(struct transport *transport,
Brandon Williams65a13012018-05-16 15:58:07 -07001312 struct refspec *rs)
Daniel Barkalowb888d612007-09-10 23:03:25 -04001313{
Shawn O. Pearce7f984282008-03-02 21:34:43 -05001314 struct ref *ref_map;
Daniel Barkalowb888d612007-09-10 23:03:25 -04001315 int autotags = (transport->remote->fetch_tags == 1);
Michael Haggerty5b87d8d2013-05-25 11:08:16 +02001316 int retcode = 0;
Brandon Williams6d1700d2018-06-27 15:30:21 -07001317 const struct ref *remote_refs;
1318 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
Jonathan Tane70a3032018-09-27 12:24:07 -07001319 int must_list_refs = 1;
Julian Phillipsb1a01e12009-10-25 21:28:12 +00001320
Daniel Johnsoned368542010-08-11 18:57:20 -04001321 if (tags == TAGS_DEFAULT) {
1322 if (transport->remote->fetch_tags == 2)
1323 tags = TAGS_SET;
1324 if (transport->remote->fetch_tags == -1)
1325 tags = TAGS_UNSET;
1326 }
Daniel Barkalowb888d612007-09-10 23:03:25 -04001327
Daniel Barkalowb888d612007-09-10 23:03:25 -04001328 /* if not appending, truncate FETCH_HEAD */
Jay Soffian28a15402009-11-10 09:19:43 +01001329 if (!append && !dry_run) {
Michael Haggerty5b87d8d2013-05-25 11:08:16 +02001330 retcode = truncate_fetch_head();
1331 if (retcode)
1332 goto cleanup;
André Goddard Rosad6617c72007-11-22 20:22:23 -02001333 }
Daniel Barkalowb888d612007-09-10 23:03:25 -04001334
Jonathan Tane70a3032018-09-27 12:24:07 -07001335 if (rs->nr) {
1336 int i;
1337
Brandon Williams6d1700d2018-06-27 15:30:21 -07001338 refspec_ref_prefixes(rs, &ref_prefixes);
Jonathan Tane70a3032018-09-27 12:24:07 -07001339
1340 /*
1341 * We can avoid listing refs if all of them are exact
1342 * OIDs
1343 */
1344 must_list_refs = 0;
1345 for (i = 0; i < rs->nr; i++) {
1346 if (!rs->items[i].exact_sha1) {
1347 must_list_refs = 1;
1348 break;
1349 }
1350 }
1351 } else if (transport->remote && transport->remote->fetch.nr)
Brandon Williams6d1700d2018-06-27 15:30:21 -07001352 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1353
Jonathan Tane70a3032018-09-27 12:24:07 -07001354 if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1355 must_list_refs = 1;
1356 if (ref_prefixes.argc)
1357 argv_array_push(&ref_prefixes, "refs/tags/");
Brandon Williams6d1700d2018-06-27 15:30:21 -07001358 }
1359
Josh Steadmon5fc31182019-10-02 16:49:28 -07001360 if (must_list_refs) {
1361 trace2_region_enter("fetch", "remote_refs", the_repository);
Jonathan Tane70a3032018-09-27 12:24:07 -07001362 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
Josh Steadmon5fc31182019-10-02 16:49:28 -07001363 trace2_region_leave("fetch", "remote_refs", the_repository);
1364 } else
Jonathan Tane70a3032018-09-27 12:24:07 -07001365 remote_refs = NULL;
1366
Brandon Williams6d1700d2018-06-27 15:30:21 -07001367 argv_array_clear(&ref_prefixes);
1368
1369 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1370 tags, &autotags);
Johannes Schindelin8ee5d732008-10-13 11:36:52 +02001371 if (!update_head_ok)
1372 check_not_current_branch(ref_map);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001373
Shawn O. Pearce41fa7d22008-03-03 22:27:40 -05001374 if (tags == TAGS_DEFAULT && autotags)
1375 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
Carlos Martín Nietoed43de62011-10-15 07:04:25 +02001376 if (prune) {
Michael Haggerty0838bf42013-10-30 06:33:00 +01001377 /*
1378 * We only prune based on refspecs specified
1379 * explicitly (via command line or configuration); we
1380 * don't care whether --tags was specified.
1381 */
Brandon Williams65a13012018-05-16 15:58:07 -07001382 if (rs->nr) {
Brandon Williamsdef11e72018-05-16 15:58:09 -07001383 prune_refs(rs, ref_map, transport->url);
Michael Haggertyc5a84e92013-10-30 06:32:59 +01001384 } else {
Brandon Williamsdef11e72018-05-16 15:58:09 -07001385 prune_refs(&transport->remote->fetch,
Tom Miller4b3b33a2014-01-02 20:28:51 -06001386 ref_map,
1387 transport->url);
Carlos Martín Nietoe8c1e6c2011-10-15 07:04:26 +02001388 }
Carlos Martín Nietoed43de62011-10-15 07:04:25 +02001389 }
Jonathan Tane2842b32018-08-01 13:13:20 -07001390 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
Tom Miller10a6cc82014-01-02 20:28:52 -06001391 free_refs(ref_map);
1392 retcode = 1;
1393 goto cleanup;
1394 }
Corentin BOMPARD24bc1a12019-08-19 11:11:20 +02001395
1396 if (set_upstream) {
1397 struct branch *branch = branch_get("HEAD");
1398 struct ref *rm;
1399 struct ref *source_ref = NULL;
1400
1401 /*
1402 * We're setting the upstream configuration for the
1403 * current branch. The relevent upstream is the
1404 * fetched branch that is meant to be merged with the
1405 * current one, i.e. the one fetched to FETCH_HEAD.
1406 *
1407 * When there are several such branches, consider the
1408 * request ambiguous and err on the safe side by doing
1409 * nothing and just emit a warning.
1410 */
1411 for (rm = ref_map; rm; rm = rm->next) {
1412 if (!rm->peer_ref) {
1413 if (source_ref) {
1414 warning(_("multiple branch detected, incompatible with --set-upstream"));
1415 goto skip;
1416 } else {
1417 source_ref = rm;
1418 }
1419 }
1420 }
1421 if (source_ref) {
1422 if (!strcmp(source_ref->name, "HEAD") ||
1423 starts_with(source_ref->name, "refs/heads/"))
1424 install_branch_config(0,
1425 branch->name,
1426 transport->remote->name,
1427 source_ref->name);
1428 else if (starts_with(source_ref->name, "refs/remotes/"))
1429 warning(_("not setting upstream for a remote remote-tracking branch"));
1430 else if (starts_with(source_ref->name, "refs/tags/"))
1431 warning(_("not setting upstream for a remote tag"));
1432 else
1433 warning(_("unknown branch type"));
1434 } else {
1435 warning(_("no source branch found.\n"
1436 "you need to specify exactly one branch with the --set-upstream option."));
1437 }
1438 }
1439 skip:
Shawn O. Pearce7f984282008-03-02 21:34:43 -05001440 free_refs(ref_map);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001441
1442 /* if neither --no-tags nor --tags was specified, do automated tag
1443 * following ... */
Kristian Høgsberg83201992007-12-04 02:25:47 -05001444 if (tags == TAGS_DEFAULT && autotags) {
Shawn O. Pearcec50b2b42008-03-02 21:35:00 -05001445 struct ref **tail = &ref_map;
1446 ref_map = NULL;
Brandon Williams6d1700d2018-06-27 15:30:21 -07001447 find_non_local_tags(remote_refs, &ref_map, &tail);
Junio C Hamano069d5032013-08-07 15:14:45 -07001448 if (ref_map)
1449 backfill_tags(transport, ref_map);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001450 free_refs(ref_map);
1451 }
1452
Michael Haggerty5b87d8d2013-05-25 11:08:16 +02001453 cleanup:
Michael Haggerty5b87d8d2013-05-25 11:08:16 +02001454 return retcode;
Daniel Barkalowb888d612007-09-10 23:03:25 -04001455}
1456
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001457static int get_one_remote_for_fetch(struct remote *remote, void *priv)
Daniel Barkalowb888d612007-09-10 23:03:25 -04001458{
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001459 struct string_list *list = priv;
Björn Gustavsson7cc91a22009-11-09 21:11:06 +01001460 if (!remote->skip_default_update)
Julian Phillips1d2f80f2010-06-26 00:41:38 +01001461 string_list_append(list, remote->name);
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001462 return 0;
1463}
1464
1465struct remote_group_data {
1466 const char *name;
1467 struct string_list *list;
1468};
1469
1470static int get_remote_group(const char *key, const char *value, void *priv)
1471{
1472 struct remote_group_data *g = priv;
1473
Michael Haggertybc598c32015-07-28 23:08:21 +02001474 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001475 /* split list by white space */
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001476 while (*value) {
Michael Haggerty5f654992015-07-28 23:08:20 +02001477 size_t wordlen = strcspn(value, " \t\n");
1478
Michael Haggertye2865422015-07-28 23:08:19 +02001479 if (wordlen >= 1)
Keith McGuiganb7410f62016-06-14 14:28:56 -04001480 string_list_append_nodup(g->list,
Michael Haggertye2865422015-07-28 23:08:19 +02001481 xstrndup(value, wordlen));
1482 value += wordlen + (value[wordlen] != '\0');
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001483 }
1484 }
1485
1486 return 0;
1487}
1488
1489static int add_remote_or_group(const char *name, struct string_list *list)
1490{
1491 int prev_nr = list->nr;
Gary V. Vaughan66dbfd52010-05-14 09:31:33 +00001492 struct remote_group_data g;
1493 g.name = name; g.list = list;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001494
1495 git_config(get_remote_group, &g);
1496 if (list->nr == prev_nr) {
Thomas Gummerer674468b2016-02-16 10:47:50 +01001497 struct remote *remote = remote_get(name);
Johannes Schindeline459b072017-01-19 22:20:02 +01001498 if (!remote_is_configured(remote, 0))
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001499 return 0;
Julian Phillips1d2f80f2010-06-26 00:41:38 +01001500 string_list_append(list, remote->name);
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001501 }
1502 return 1;
1503}
1504
Jeff King85556d42012-09-01 07:27:35 -04001505static void add_options_to_argv(struct argv_array *argv)
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001506{
1507 if (dry_run)
Jeff King85556d42012-09-01 07:27:35 -04001508 argv_array_push(argv, "--dry-run");
Michael Haggerty90765fa2013-10-30 06:33:04 +01001509 if (prune != -1)
1510 argv_array_push(argv, prune ? "--prune" : "--no-prune");
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +00001511 if (prune_tags != -1)
1512 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001513 if (update_head_ok)
Jeff King85556d42012-09-01 07:27:35 -04001514 argv_array_push(argv, "--update-head-ok");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001515 if (force)
Jeff King85556d42012-09-01 07:27:35 -04001516 argv_array_push(argv, "--force");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001517 if (keep)
Jeff King85556d42012-09-01 07:27:35 -04001518 argv_array_push(argv, "--keep");
Jens Lehmannbe254a02010-11-11 00:55:02 +01001519 if (recurse_submodules == RECURSE_SUBMODULES_ON)
Jeff King85556d42012-09-01 07:27:35 -04001520 argv_array_push(argv, "--recurse-submodules");
Jens Lehmann8f0700d2011-03-06 23:11:21 +01001521 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
Jeff King85556d42012-09-01 07:27:35 -04001522 argv_array_push(argv, "--recurse-submodules=on-demand");
Dan Johnson85566462012-09-05 17:22:19 -04001523 if (tags == TAGS_SET)
1524 argv_array_push(argv, "--tags");
1525 else if (tags == TAGS_UNSET)
1526 argv_array_push(argv, "--no-tags");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001527 if (verbosity >= 2)
Jeff King85556d42012-09-01 07:27:35 -04001528 argv_array_push(argv, "-v");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001529 if (verbosity >= 1)
Jeff King85556d42012-09-01 07:27:35 -04001530 argv_array_push(argv, "-v");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001531 else if (verbosity < 0)
Jeff King85556d42012-09-01 07:27:35 -04001532 argv_array_push(argv, "-q");
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001533
1534}
1535
Johannes Schindelind54dea72019-10-05 11:46:40 -07001536/* Fetch multiple remotes in parallel */
1537
1538struct parallel_fetch_state {
1539 const char **argv;
1540 struct string_list *remotes;
1541 int next, result;
1542};
1543
1544static int fetch_next_remote(struct child_process *cp, struct strbuf *out,
1545 void *cb, void **task_cb)
1546{
1547 struct parallel_fetch_state *state = cb;
1548 char *remote;
1549
1550 if (state->next < 0 || state->next >= state->remotes->nr)
1551 return 0;
1552
1553 remote = state->remotes->items[state->next++].string;
1554 *task_cb = remote;
1555
1556 argv_array_pushv(&cp->args, state->argv);
1557 argv_array_push(&cp->args, remote);
1558 cp->git_cmd = 1;
1559
1560 if (verbosity >= 0)
1561 printf(_("Fetching %s\n"), remote);
1562
1563 return 1;
1564}
1565
1566static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb)
1567{
1568 struct parallel_fetch_state *state = cb;
1569 const char *remote = task_cb;
1570
1571 state->result = error(_("Could not fetch %s"), remote);
1572
1573 return 0;
1574}
1575
1576static int fetch_finished(int result, struct strbuf *out,
1577 void *cb, void *task_cb)
1578{
1579 struct parallel_fetch_state *state = cb;
1580 const char *remote = task_cb;
1581
1582 if (result) {
1583 strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"),
1584 remote, result);
1585 state->result = -1;
1586 }
1587
1588 return 0;
1589}
1590
1591static int fetch_multiple(struct string_list *list, int max_children)
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001592{
1593 int i, result = 0;
Jeff King85556d42012-09-01 07:27:35 -04001594 struct argv_array argv = ARGV_ARRAY_INIT;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001595
Junio C Hamanoe6cc5102010-02-24 11:02:05 -08001596 if (!append && !dry_run) {
1597 int errcode = truncate_fetch_head();
1598 if (errcode)
1599 return errcode;
1600 }
1601
Nguyễn Thái Ngọc Duyc3d6b702019-06-19 16:46:30 +07001602 argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
Jeff King85556d42012-09-01 07:27:35 -04001603 add_options_to_argv(&argv);
1604
Johannes Schindelind54dea72019-10-05 11:46:40 -07001605 if (max_children != 1 && list->nr != 1) {
1606 struct parallel_fetch_state state = { argv.argv, list, 0, 0 };
1607
1608 argv_array_push(&argv, "--end-of-options");
1609 result = run_processes_parallel_tr2(max_children,
1610 &fetch_next_remote,
1611 &fetch_failed_to_start,
1612 &fetch_finished,
1613 &state,
1614 "fetch", "parallel/fetch");
1615
1616 if (!result)
1617 result = state.result;
1618 } else
1619 for (i = 0; i < list->nr; i++) {
1620 const char *name = list->items[i].string;
1621 argv_array_push(&argv, name);
1622 if (verbosity >= 0)
1623 printf(_("Fetching %s\n"), name);
1624 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1625 error(_("Could not fetch %s"), name);
1626 result = 1;
1627 }
1628 argv_array_pop(&argv);
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001629 }
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001630
Jeff King85556d42012-09-01 07:27:35 -04001631 argv_array_clear(&argv);
Johannes Schindelind54dea72019-10-05 11:46:40 -07001632 return !!result;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001633}
1634
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001635/*
1636 * Fetching from the promisor remote should use the given filter-spec
1637 * or inherit the default filter-spec from the config.
1638 */
1639static inline void fetch_one_setup_partial(struct remote *remote)
1640{
1641 /*
1642 * Explicit --no-filter argument overrides everything, regardless
1643 * of any prior partial clones and fetches.
1644 */
1645 if (filter_options.no_filter)
1646 return;
1647
1648 /*
1649 * If no prior partial clone/fetch and the current fetch DID NOT
1650 * request a partial-fetch, do a normal fetch.
1651 */
Christian Couderb14ed5a2019-06-25 15:40:31 +02001652 if (!has_promisor_remote() && !filter_options.choice)
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001653 return;
1654
1655 /*
Christian Couder5e461392019-06-25 15:40:33 +02001656 * If this is a partial-fetch request, we enable partial on
1657 * this repo if not already enabled and remember the given
1658 * filter-spec as the default for subsequent fetches to this
1659 * remote.
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001660 */
Christian Couder5e461392019-06-25 15:40:33 +02001661 if (filter_options.choice) {
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001662 partial_clone_register(remote->name, &filter_options);
1663 return;
1664 }
1665
1666 /*
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001667 * Do a partial-fetch from the promisor remote using either the
1668 * explicitly given filter-spec or inherit the filter-spec from
1669 * the config.
1670 */
1671 if (!filter_options.choice)
Christian Couderfa3d1b62019-06-25 15:40:32 +02001672 partial_clone_get_default_filter_spec(&filter_options, remote->name);
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001673 return;
1674}
1675
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +00001676static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001677{
Brandon Williamsd7c8e302018-05-16 15:58:04 -07001678 struct refspec rs = REFSPEC_INIT_FETCH;
1679 int i;
Alex Riesen7b7f39e2008-04-28 22:23:35 +02001680 int exit_code;
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +00001681 int maybe_prune_tags;
1682 int remote_via_config = remote_is_configured(remote, 0);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001683
Daniel Barkalowfa685bd2009-03-11 01:47:20 -04001684 if (!remote)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001685 die(_("No remote repository specified. Please, specify either a URL or a\n"
1686 "remote name from which new revisions should be fetched."));
Daniel Barkalowfa685bd2009-03-11 01:47:20 -04001687
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001688 gtransport = prepare_transport(remote, 1);
Michael Schubert737c5a92013-07-13 11:36:24 +02001689
1690 if (prune < 0) {
1691 /* no command line request */
Ævar Arnfjörð Bjarmason07118832018-02-09 20:32:02 +00001692 if (0 <= remote->prune)
1693 prune = remote->prune;
Michael Schubert737c5a92013-07-13 11:36:24 +02001694 else if (0 <= fetch_prune_config)
1695 prune = fetch_prune_config;
1696 else
1697 prune = PRUNE_BY_DEFAULT;
1698 }
1699
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +00001700 if (prune_tags < 0) {
1701 /* no command line request */
1702 if (0 <= remote->prune_tags)
1703 prune_tags = remote->prune_tags;
1704 else if (0 <= fetch_prune_tags_config)
1705 prune_tags = fetch_prune_tags_config;
1706 else
1707 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1708 }
1709
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +00001710 maybe_prune_tags = prune_tags_ok && prune_tags;
1711 if (maybe_prune_tags && remote_via_config)
Brandon Williams95303502018-05-16 15:58:02 -07001712 refspec_append(&remote->fetch, TAG_REFSPEC);
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +00001713
Brandon Williamsd7c8e302018-05-16 15:58:04 -07001714 if (maybe_prune_tags && (argc || !remote_via_config))
1715 refspec_append(&rs, TAG_REFSPEC);
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +00001716
Brandon Williamsd7c8e302018-05-16 15:58:04 -07001717 for (i = 0; i < argc; i++) {
1718 if (!strcmp(argv[i], "tag")) {
1719 char *tag;
1720 i++;
1721 if (i >= argc)
1722 die(_("You need to specify a tag name."));
1723
1724 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1725 argv[i], argv[i]);
1726 refspec_append(&rs, tag);
1727 free(tag);
1728 } else {
1729 refspec_append(&rs, argv[i]);
Daniel Barkalowb888d612007-09-10 23:03:25 -04001730 }
Daniel Barkalowb888d612007-09-10 23:03:25 -04001731 }
1732
Brandon Williams5e3548e2018-04-23 15:46:24 -07001733 if (server_options.nr)
1734 gtransport->server_options = &server_options;
1735
Jeff King57b235a2009-01-22 01:03:08 -05001736 sigchain_push_common(unlock_pack_on_signal);
Shawn O. Pearcee4022ed2007-09-14 03:31:25 -04001737 atexit(unlock_pack);
Jeff King14358892019-03-03 11:58:43 -05001738 sigchain_push(SIGPIPE, SIG_IGN);
Brandon Williams65a13012018-05-16 15:58:07 -07001739 exit_code = do_fetch(gtransport, &rs);
Jeff King14358892019-03-03 11:58:43 -05001740 sigchain_pop(SIGPIPE);
Brandon Williamsd7c8e302018-05-16 15:58:04 -07001741 refspec_clear(&rs);
Junio C Hamanoaf234452013-08-07 15:38:45 -07001742 transport_disconnect(gtransport);
1743 gtransport = NULL;
Alex Riesen7b7f39e2008-04-28 22:23:35 +02001744 return exit_code;
Daniel Barkalowb888d612007-09-10 23:03:25 -04001745}
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001746
1747int cmd_fetch(int argc, const char **argv, const char *prefix)
1748{
1749 int i;
Keith McGuiganb7410f62016-06-14 14:28:56 -04001750 struct string_list list = STRING_LIST_INIT_DUP;
Jonathan Tana1743342017-12-08 15:58:43 +00001751 struct remote *remote = NULL;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001752 int result = 0;
Junio C Hamanoc1a79022018-03-06 14:54:01 -08001753 int prune_tags_ok = 1;
Nguyễn Thái Ngọc Duy19910062014-08-16 08:19:27 +07001754 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001755
Jeff Kingbbc30f92011-02-24 09:30:19 -05001756 packet_trace_identity("fetch");
1757
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001758 /* Record the command line for the reflog */
1759 strbuf_addstr(&default_rla, "fetch");
1760 for (i = 1; i < argc; i++)
1761 strbuf_addf(&default_rla, " %s", argv[i]);
1762
Johannes Schindelind54dea72019-10-05 11:46:40 -07001763 fetch_config_from_gitmodules(&submodule_fetch_jobs_config,
1764 &recurse_submodules);
Michael Schubert737c5a92013-07-13 11:36:24 +02001765 git_config(git_fetch_config, NULL);
1766
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001767 argc = parse_options(argc, argv, prefix,
1768 builtin_fetch_options, builtin_fetch_usage, 0);
1769
Nguyễn Thái Ngọc Duycccf74e2016-06-12 17:54:09 +07001770 if (deepen_relative) {
1771 if (deepen_relative < 0)
1772 die(_("Negative depth in --deepen is not supported"));
1773 if (depth)
1774 die(_("--deepen and --depth are mutually exclusive"));
1775 depth = xstrfmt("%d", deepen_relative);
1776 }
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +07001777 if (unshallow) {
1778 if (depth)
1779 die(_("--depth and --unshallow cannot be used together"));
Stefan Bellerc8813482018-05-17 15:51:46 -07001780 else if (!is_repository_shallow(the_repository))
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +07001781 die(_("--unshallow on a complete repository does not make sense"));
Jeff King2805bb52015-09-24 17:07:07 -04001782 else
1783 depth = xstrfmt("%d", INFINITE_DEPTH);
Nguyễn Thái Ngọc Duy4dcb1672013-01-11 16:05:46 +07001784 }
1785
Nguyễn Thái Ngọc Duy5594bca2013-12-05 10:31:11 +07001786 /* no need to be strict, transport_set_option() will validate it again */
1787 if (depth && atoi(depth) < 1)
1788 die(_("depth %s is not a positive number"), depth);
Nguyễn Thái Ngọc Duya45a2602016-06-12 17:54:04 +07001789 if (depth || deepen_since || deepen_not.nr)
Nguyễn Thái Ngọc Duy508ea882016-06-12 17:53:59 +07001790 deepen = 1;
Nguyễn Thái Ngọc Duy5594bca2013-12-05 10:31:11 +07001791
Christian Couderb14ed5a2019-06-25 15:40:31 +02001792 if (filter_options.choice && !has_promisor_remote())
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001793 die("--filter can only be used when extensions.partialClone is set");
1794
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001795 if (all) {
1796 if (argc == 1)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001797 die(_("fetch --all does not take a repository argument"));
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001798 else if (argc > 1)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001799 die(_("fetch --all does not make sense with refspecs"));
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001800 (void) for_each_remote(get_one_remote_for_fetch, &list);
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001801 } else if (argc == 0) {
1802 /* No arguments -- use default remote */
1803 remote = remote_get(NULL);
Björn Gustavsson16679e32009-11-09 21:10:32 +01001804 } else if (multiple) {
1805 /* All arguments are assumed to be remotes or groups */
1806 for (i = 0; i < argc; i++)
1807 if (!add_remote_or_group(argv[i], &list))
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001808 die(_("No such remote or remote group: %s"), argv[i]);
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001809 } else {
1810 /* Single remote or group */
1811 (void) add_remote_or_group(argv[0], &list);
1812 if (list.nr > 1) {
1813 /* More than one remote */
1814 if (argc > 1)
Ævar Arnfjörð Bjarmasonbd4a51f2011-02-22 23:41:51 +00001815 die(_("Fetching a group and specifying refspecs does not make sense"));
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001816 } else {
1817 /* Zero or one remotes */
1818 remote = remote_get(argv[0]);
Junio C Hamanoc1a79022018-03-06 14:54:01 -08001819 prune_tags_ok = (argc == 1);
Jonathan Tana1743342017-12-08 15:58:43 +00001820 argc--;
1821 argv++;
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001822 }
1823 }
1824
Jonathan Tanc7aadcc2019-10-23 16:34:03 -07001825 fetch_if_missing = 0;
1826
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001827 if (remote) {
Christian Couderb14ed5a2019-06-25 15:40:31 +02001828 if (filter_options.choice || has_promisor_remote())
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001829 fetch_one_setup_partial(remote);
Junio C Hamanoc1a79022018-03-06 14:54:01 -08001830 result = fetch_one(remote, argc, argv, prune_tags_ok);
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001831 } else {
Johannes Schindelind54dea72019-10-05 11:46:40 -07001832 int max_children = max_jobs;
1833
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001834 if (filter_options.choice)
Christian Coudere0137872019-01-13 09:52:19 +01001835 die(_("--filter can only be used with the remote "
1836 "configured in extensions.partialclone"));
Johannes Schindelind54dea72019-10-05 11:46:40 -07001837
1838 if (max_children < 0)
1839 max_children = fetch_parallel_config;
1840
Jeff Hostetleraa57b872017-12-08 15:58:50 +00001841 /* TODO should this also die if we have a previous partial-clone? */
Johannes Schindelind54dea72019-10-05 11:46:40 -07001842 result = fetch_multiple(&list, max_children);
Jeff Hostetleracb0c572017-12-08 15:58:44 +00001843 }
Jonathan Tana1743342017-12-08 15:58:43 +00001844
Jens Lehmannbe254a02010-11-11 00:55:02 +01001845 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
Jeff King85556d42012-09-01 07:27:35 -04001846 struct argv_array options = ARGV_ARRAY_INIT;
Johannes Schindelind54dea72019-10-05 11:46:40 -07001847 int max_children = max_jobs;
1848
1849 if (max_children < 0)
1850 max_children = submodule_fetch_jobs_config;
1851 if (max_children < 0)
1852 max_children = fetch_parallel_config;
Jeff King85556d42012-09-01 07:27:35 -04001853
1854 add_options_to_argv(&options);
Brandon Williamse7241972017-12-12 11:53:52 -08001855 result = fetch_populated_submodules(the_repository,
1856 &options,
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001857 submodule_prefix,
Jens Lehmann8f0700d2011-03-06 23:11:21 +01001858 recurse_submodules,
Brandon Williams8fa29152017-08-02 12:49:19 -07001859 recurse_submodules_default,
Stefan Beller62104ba2015-12-15 16:04:12 -08001860 verbosity < 0,
1861 max_children);
Jeff King85556d42012-09-01 07:27:35 -04001862 argv_array_clear(&options);
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001863 }
1864
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001865 string_list_clear(&list, 0);
1866
Derrick Stolee50f26bd2019-09-02 19:22:02 -07001867 prepare_repo_settings(the_repository);
1868 if (the_repository->settings.fetch_write_commit_graph) {
Junio C Hamano5a535092019-09-30 13:19:32 +09001869 int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
Derrick Stolee50f26bd2019-09-02 19:22:02 -07001870 struct split_commit_graph_opts split_opts;
1871 memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
1872
1873 if (progress)
Junio C Hamano5a535092019-09-30 13:19:32 +09001874 commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
Derrick Stolee50f26bd2019-09-02 19:22:02 -07001875
1876 write_commit_graph_reachable(get_object_directory(),
1877 commit_graph_flags,
1878 &split_opts);
1879 }
1880
Derrick Stolee2d511cf2019-05-17 11:41:49 -07001881 close_object_store(the_repository->objects);
Johannes Schindelin0898c962016-01-13 18:20:11 +01001882
Nguyễn Thái Ngọc Duyc3d6b702019-06-19 16:46:30 +07001883 if (enable_auto_gc) {
1884 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1885 if (verbosity < 0)
1886 argv_array_push(&argv_gc_auto, "--quiet");
1887 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1888 argv_array_clear(&argv_gc_auto);
1889 }
Jeff King131b8fc2013-01-26 17:40:38 -05001890
Björn Gustavsson9c4a0362009-11-09 21:09:56 +01001891 return result;
1892}