]>
Commit | Line | Data |
---|---|---|
b888d61c DB |
1 | /* |
2 | * "git fetch" | |
3 | */ | |
4 | #include "cache.h" | |
6c6ddf92 | 5 | #include "advice.h" |
b2141fc1 | 6 | #include "config.h" |
f394e093 | 7 | #include "gettext.h" |
32a8f510 | 8 | #include "environment.h" |
41771fa4 | 9 | #include "hex.h" |
e724197f | 10 | #include "repository.h" |
b888d61c | 11 | #include "refs.h" |
ec0cb496 | 12 | #include "refspec.h" |
dabab1d6 | 13 | #include "object-name.h" |
cbd53a21 | 14 | #include "object-store.h" |
b7e2d8bc | 15 | #include "oidset.h" |
6f2d7430 | 16 | #include "oid-array.h" |
b888d61c DB |
17 | #include "commit.h" |
18 | #include "builtin.h" | |
c455c87c | 19 | #include "string-list.h" |
b888d61c DB |
20 | #include "remote.h" |
21 | #include "transport.h" | |
4191c356 | 22 | #include "run-command.h" |
83201998 | 23 | #include "parse-options.h" |
4a16d072 | 24 | #include "sigchain.h" |
027771fc | 25 | #include "submodule-config.h" |
7dce19d3 | 26 | #include "submodule.h" |
f96400cb | 27 | #include "connected.h" |
dbbcd44f | 28 | #include "strvec.h" |
6bc91f23 | 29 | #include "utf8.h" |
3836d88a | 30 | #include "packfile.h" |
acb0c572 | 31 | #include "list-objects-filter-options.h" |
64043556 | 32 | #include "commit-reach.h" |
24bc1a12 | 33 | #include "branch.h" |
b14ed5ad | 34 | #include "promisor-remote.h" |
50f26bd0 | 35 | #include "commit-graph.h" |
120ad2b0 | 36 | #include "shallow.h" |
74ea5c95 EN |
37 | #include "trace.h" |
38 | #include "trace2.h" | |
8bc1f39f | 39 | #include "worktree.h" |
7f0cc04f | 40 | #include "bundle-uri.h" |
b888d61c | 41 | |
377444b4 DS |
42 | #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) |
43 | ||
83201998 | 44 | static const char * const builtin_fetch_usage[] = { |
719acedb NTND |
45 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
46 | N_("git fetch [<options>] <group>"), | |
47 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), | |
48 | N_("git fetch --all [<options>]"), | |
83201998 KH |
49 | NULL |
50 | }; | |
b888d61c | 51 | |
83201998 KH |
52 | enum { |
53 | TAGS_UNSET = 0, | |
54 | TAGS_DEFAULT = 1, | |
55 | TAGS_SET = 2 | |
56 | }; | |
57 | ||
737c5a9c | 58 | static int fetch_prune_config = -1; /* unspecified */ |
cdbd70c4 | 59 | static int fetch_show_forced_updates = 1; |
377444b4 | 60 | static uint64_t forced_updates_ms = 0; |
2e03115d | 61 | static int prefetch = 0; |
737c5a9c MS |
62 | static int prune = -1; /* unspecified */ |
63 | #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */ | |
64 | ||
97716d21 ÆAB |
65 | static int fetch_prune_tags_config = -1; /* unspecified */ |
66 | static int prune_tags = -1; /* unspecified */ | |
67 | #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ | |
68 | ||
24bc1a12 | 69 | static int all, append, dry_run, force, keep, multiple, update_head_ok; |
887952b8 | 70 | static int write_fetch_head = 1; |
3c7bab06 | 71 | static int verbosity, deepen_relative, set_upstream, refetch; |
8c69832d | 72 | static int progress = -1; |
c3d6b703 | 73 | static int enable_auto_gc = 1; |
508ea882 | 74 | static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; |
d54dea77 JS |
75 | static int max_jobs = -1, submodule_fetch_jobs_config = -1; |
76 | static int fetch_parallel_config = 1; | |
c7b190da | 77 | static int atomic_fetch; |
c915f11e | 78 | static enum transport_family family; |
4191c356 | 79 | static const char *depth; |
508ea882 | 80 | static const char *deepen_since; |
83201998 | 81 | static const char *upload_pack; |
a45a2600 | 82 | static struct string_list deepen_not = STRING_LIST_INIT_NODUP; |
2d324efa | 83 | static struct strbuf default_rla = STRBUF_INIT; |
af234459 | 84 | static struct transport *gtransport; |
b26ed430 | 85 | static struct transport *gsecondary; |
7dce19d3 | 86 | static const char *submodule_prefix = ""; |
8c69832d | 87 | static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
386c076a | 88 | static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT; |
e8906a90 | 89 | static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND; |
4b3b33a7 | 90 | static int shown_url = 0; |
e4cffacc | 91 | static struct refspec refmap = REFSPEC_INIT_FETCH; |
2a01bded | 92 | static struct list_objects_filter_options filter_options = LIST_OBJECTS_FILTER_INIT; |
5e3548ef | 93 | static struct string_list server_options = STRING_LIST_INIT_DUP; |
3390e42a | 94 | static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; |
c14e6e79 | 95 | static int fetch_write_commit_graph = -1; |
2b713c27 | 96 | static int stdin_refspecs = 0; |
9c1e657a | 97 | static int negotiate_only; |
e4022ed2 | 98 | |
737c5a9c MS |
99 | static int git_fetch_config(const char *k, const char *v, void *cb) |
100 | { | |
101 | if (!strcmp(k, "fetch.prune")) { | |
102 | fetch_prune_config = git_config_bool(k, v); | |
103 | return 0; | |
104 | } | |
58f4203e | 105 | |
97716d21 ÆAB |
106 | if (!strcmp(k, "fetch.prunetags")) { |
107 | fetch_prune_tags_config = git_config_bool(k, v); | |
108 | return 0; | |
109 | } | |
110 | ||
cdbd70c4 DS |
111 | if (!strcmp(k, "fetch.showforcedupdates")) { |
112 | fetch_show_forced_updates = git_config_bool(k, v); | |
113 | return 0; | |
114 | } | |
115 | ||
58f4203e SB |
116 | if (!strcmp(k, "submodule.recurse")) { |
117 | int r = git_config_bool(k, v) ? | |
118 | RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; | |
119 | recurse_submodules = r; | |
120 | } | |
121 | ||
f20e7c1e | 122 | if (!strcmp(k, "submodule.fetchjobs")) { |
d54dea77 | 123 | submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); |
f20e7c1e | 124 | return 0; |
8fa29159 BW |
125 | } else if (!strcmp(k, "fetch.recursesubmodules")) { |
126 | recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); | |
127 | return 0; | |
f20e7c1e BW |
128 | } |
129 | ||
d54dea77 JS |
130 | if (!strcmp(k, "fetch.parallel")) { |
131 | fetch_parallel_config = git_config_int(k, v); | |
132 | if (fetch_parallel_config < 0) | |
133 | die(_("fetch.parallel cannot be negative")); | |
51243f9f ÆAB |
134 | if (!fetch_parallel_config) |
135 | fetch_parallel_config = online_cpus(); | |
d54dea77 JS |
136 | return 0; |
137 | } | |
138 | ||
72549dfd | 139 | return git_default_config(k, v, cb); |
737c5a9c MS |
140 | } |
141 | ||
c5558f80 JH |
142 | static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |
143 | { | |
517fe807 JK |
144 | BUG_ON_OPT_NEG(unset); |
145 | ||
c5558f80 JH |
146 | /* |
147 | * "git fetch --refmap='' origin foo" | |
148 | * can be used to tell the command not to store anywhere | |
149 | */ | |
e4cffacc BW |
150 | refspec_append(&refmap, arg); |
151 | ||
c5558f80 JH |
152 | return 0; |
153 | } | |
154 | ||
83201998 | 155 | static struct option builtin_fetch_options[] = { |
7f87aff2 | 156 | OPT__VERBOSITY(&verbosity), |
d5d09d47 SB |
157 | OPT_BOOL(0, "all", &all, |
158 | N_("fetch from all remotes")), | |
24bc1a12 CB |
159 | OPT_BOOL(0, "set-upstream", &set_upstream, |
160 | N_("set upstream for git pull/fetch")), | |
d5d09d47 SB |
161 | OPT_BOOL('a', "append", &append, |
162 | N_("append to .git/FETCH_HEAD instead of overwriting")), | |
c7b190da PS |
163 | OPT_BOOL(0, "atomic", &atomic_fetch, |
164 | N_("use atomic transaction to update references")), | |
719acedb NTND |
165 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
166 | N_("path to upload pack on remote end")), | |
8cd4b7c1 | 167 | OPT__FORCE(&force, N_("force overwrite of local reference"), 0), |
d5d09d47 SB |
168 | OPT_BOOL('m', "multiple", &multiple, |
169 | N_("fetch from multiple remotes")), | |
83201998 | 170 | OPT_SET_INT('t', "tags", &tags, |
719acedb | 171 | N_("fetch all tags and associated objects"), TAGS_SET), |
e7951290 | 172 | OPT_SET_INT('n', NULL, &tags, |
719acedb | 173 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
d54dea77 | 174 | OPT_INTEGER('j', "jobs", &max_jobs, |
62104ba1 | 175 | N_("number of submodules fetched in parallel")), |
2e03115d DS |
176 | OPT_BOOL(0, "prefetch", &prefetch, |
177 | N_("modify the refspec to place all refs within refs/prefetch/")), | |
d5d09d47 SB |
178 | OPT_BOOL('p', "prune", &prune, |
179 | N_("prune remote-tracking branches no longer on remote")), | |
97716d21 ÆAB |
180 | OPT_BOOL('P', "prune-tags", &prune_tags, |
181 | N_("prune local tags no longer on remote and clobber changed tags")), | |
386c076a | 182 | OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"), |
719acedb | 183 | N_("control recursive fetching of submodules"), |
203c8533 | 184 | PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), |
d5d09d47 SB |
185 | OPT_BOOL(0, "dry-run", &dry_run, |
186 | N_("dry run")), | |
887952b8 JH |
187 | OPT_BOOL(0, "write-fetch-head", &write_fetch_head, |
188 | N_("write fetched references to the FETCH_HEAD file")), | |
d5d09d47 SB |
189 | OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), |
190 | OPT_BOOL('u', "update-head-ok", &update_head_ok, | |
719acedb NTND |
191 | N_("allow updating of HEAD ref")), |
192 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), | |
193 | OPT_STRING(0, "depth", &depth, N_("depth"), | |
194 | N_("deepen history of shallow clone")), | |
508ea882 NTND |
195 | OPT_STRING(0, "shallow-since", &deepen_since, N_("time"), |
196 | N_("deepen history of shallow repository based on time")), | |
a45a2600 | 197 | OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"), |
6d873865 | 198 | N_("deepen history of shallow clone, excluding rev")), |
cccf74e2 NTND |
199 | OPT_INTEGER(0, "deepen", &deepen_relative, |
200 | N_("deepen history of shallow clone")), | |
3e4a67b4 NTND |
201 | OPT_SET_INT_F(0, "unshallow", &unshallow, |
202 | N_("convert to a complete repository"), | |
203 | 1, PARSE_OPT_NONEG), | |
3c7bab06 RC |
204 | OPT_SET_INT_F(0, "refetch", &refetch, |
205 | N_("re-fetch without negotiating common commits"), | |
206 | 1, PARSE_OPT_NONEG), | |
719acedb NTND |
207 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
208 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, | |
203c8533 | 209 | OPT_CALLBACK_F(0, "recurse-submodules-default", |
8c69832d SB |
210 | &recurse_submodules_default, N_("on-demand"), |
211 | N_("default for recursive fetching of submodules " | |
212 | "(lower priority than config files)"), | |
203c8533 | 213 | PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), |
48d25cae NTND |
214 | OPT_BOOL(0, "update-shallow", &update_shallow, |
215 | N_("accept refs that update .git/shallow")), | |
203c8533 DL |
216 | OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), |
217 | N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), | |
5e3548ef | 218 | OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), |
c915f11e EW |
219 | OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), |
220 | TRANSPORT_FAMILY_IPV4), | |
221 | OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), | |
222 | TRANSPORT_FAMILY_IPV6), | |
3390e42a JT |
223 | OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), |
224 | N_("report that we have only objects reachable from this object")), | |
9c1e657a JT |
225 | OPT_BOOL(0, "negotiate-only", &negotiate_only, |
226 | N_("do not fetch a packfile; instead, print ancestors of negotiation tips")), | |
acb0c572 | 227 | OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), |
a95ce124 DS |
228 | OPT_BOOL(0, "auto-maintenance", &enable_auto_gc, |
229 | N_("run 'maintenance --auto' after fetching")), | |
c3d6b703 | 230 | OPT_BOOL(0, "auto-gc", &enable_auto_gc, |
a95ce124 | 231 | N_("run 'maintenance --auto' after fetching")), |
cdbd70c4 DS |
232 | OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, |
233 | N_("check for forced-updates on all updated branches")), | |
c14e6e79 JS |
234 | OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, |
235 | N_("write the commit-graph after fetching")), | |
2b713c27 JT |
236 | OPT_BOOL(0, "stdin", &stdin_refspecs, |
237 | N_("accept refspecs from stdin")), | |
83201998 KH |
238 | OPT_END() |
239 | }; | |
240 | ||
58d4d7f1 | 241 | static void unlock_pack(unsigned int flags) |
e4022ed2 | 242 | { |
af234459 | 243 | if (gtransport) |
58d4d7f1 | 244 | transport_unlock_pack(gtransport, flags); |
b26ed430 | 245 | if (gsecondary) |
58d4d7f1 PS |
246 | transport_unlock_pack(gsecondary, flags); |
247 | } | |
248 | ||
249 | static void unlock_pack_atexit(void) | |
250 | { | |
251 | unlock_pack(0); | |
e4022ed2 SP |
252 | } |
253 | ||
254 | static void unlock_pack_on_signal(int signo) | |
255 | { | |
58d4d7f1 | 256 | unlock_pack(TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER); |
4a16d072 | 257 | sigchain_pop(signo); |
e4022ed2 SP |
258 | raise(signo); |
259 | } | |
b888d61c | 260 | |
85682c19 | 261 | static void add_merge_config(struct ref **head, |
4577370e | 262 | const struct ref *remote_refs, |
85682c19 SP |
263 | struct branch *branch, |
264 | struct ref ***tail) | |
b888d61c | 265 | { |
85682c19 | 266 | int i; |
b888d61c | 267 | |
85682c19 SP |
268 | for (i = 0; i < branch->merge_nr; i++) { |
269 | struct ref *rm, **old_tail = *tail; | |
0ad4a5ff | 270 | struct refspec_item refspec; |
85682c19 SP |
271 | |
272 | for (rm = *head; rm; rm = rm->next) { | |
273 | if (branch_merge_matches(branch, i, rm->name)) { | |
900f2814 | 274 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
85682c19 SP |
275 | break; |
276 | } | |
b888d61c | 277 | } |
85682c19 SP |
278 | if (rm) |
279 | continue; | |
280 | ||
9ad7c5ae | 281 | /* |
8b3f3f84 | 282 | * Not fetched to a remote-tracking branch? We need to fetch |
85682c19 | 283 | * it anyway to allow this branch's "branch.$name.merge" |
05207a28 | 284 | * to be honored by 'git pull', but we do not have to |
9ad7c5ae JH |
285 | * fail if branch.$name.merge is misconfigured to point |
286 | * at a nonexisting branch. If we were indeed called by | |
05207a28 | 287 | * 'git pull', it will notice the misconfiguration because |
9ad7c5ae JH |
288 | * there is no entry in the resulting FETCH_HEAD marked |
289 | * for merging. | |
85682c19 | 290 | */ |
8da61a2a | 291 | memset(&refspec, 0, sizeof(refspec)); |
85682c19 | 292 | refspec.src = branch->merge[i]->src; |
9ad7c5ae | 293 | get_fetch_map(remote_refs, &refspec, tail, 1); |
85682c19 | 294 | for (rm = *old_tail; rm; rm = rm->next) |
900f2814 | 295 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c DB |
296 | } |
297 | } | |
298 | ||
b7e2d8bc | 299 | static void create_fetch_oidset(struct ref **head, struct oidset *out) |
a0fbb5a3 MH |
300 | { |
301 | struct ref *rm = *head; | |
302 | while (rm) { | |
b7e2d8bc | 303 | oidset_insert(out, &rm->old_oid); |
a0fbb5a3 MH |
304 | rm = rm->next; |
305 | } | |
a0fbb5a3 MH |
306 | } |
307 | ||
e198b3a7 | 308 | struct refname_hash_entry { |
e2b5038d | 309 | struct hashmap_entry ent; |
e198b3a7 | 310 | struct object_id oid; |
f80d9223 | 311 | int ignore; |
e198b3a7 JH |
312 | char refname[FLEX_ARRAY]; |
313 | }; | |
314 | ||
5cf88fd8 | 315 | static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data UNUSED, |
939af16e EW |
316 | const struct hashmap_entry *eptr, |
317 | const struct hashmap_entry *entry_or_key, | |
e198b3a7 JH |
318 | const void *keydata) |
319 | { | |
939af16e | 320 | const struct refname_hash_entry *e1, *e2; |
e198b3a7 | 321 | |
939af16e EW |
322 | e1 = container_of(eptr, const struct refname_hash_entry, ent); |
323 | e2 = container_of(entry_or_key, const struct refname_hash_entry, ent); | |
e198b3a7 JH |
324 | return strcmp(e1->refname, keydata ? keydata : e2->refname); |
325 | } | |
326 | ||
327 | static struct refname_hash_entry *refname_hash_add(struct hashmap *map, | |
328 | const char *refname, | |
329 | const struct object_id *oid) | |
330 | { | |
331 | struct refname_hash_entry *ent; | |
332 | size_t len = strlen(refname); | |
333 | ||
334 | FLEX_ALLOC_MEM(ent, refname, refname, len); | |
d22245a2 | 335 | hashmap_entry_init(&ent->ent, strhash(refname)); |
e198b3a7 | 336 | oidcpy(&ent->oid, oid); |
b94e5c1d | 337 | hashmap_add(map, &ent->ent); |
e198b3a7 JH |
338 | return ent; |
339 | } | |
340 | ||
341 | static int add_one_refname(const char *refname, | |
342 | const struct object_id *oid, | |
5cf88fd8 | 343 | int flag UNUSED, void *cbdata) |
e198b3a7 JH |
344 | { |
345 | struct hashmap *refname_map = cbdata; | |
346 | ||
347 | (void) refname_hash_add(refname_map, refname, oid); | |
348 | return 0; | |
349 | } | |
350 | ||
351 | static void refname_hash_init(struct hashmap *map) | |
352 | { | |
353 | hashmap_init(map, refname_hash_entry_cmp, NULL, 0); | |
354 | } | |
355 | ||
356 | static int refname_hash_exists(struct hashmap *map, const char *refname) | |
357 | { | |
358 | return !!hashmap_get_from_hash(map, strhash(refname), refname); | |
359 | } | |
360 | ||
a8363b57 FC |
361 | static void clear_item(struct refname_hash_entry *item) |
362 | { | |
f80d9223 | 363 | item->ignore = 1; |
a8363b57 FC |
364 | } |
365 | ||
b3a80466 PS |
366 | |
367 | static void add_already_queued_tags(const char *refname, | |
368 | const struct object_id *old_oid, | |
369 | const struct object_id *new_oid, | |
370 | void *cb_data) | |
371 | { | |
372 | struct hashmap *queued_tags = cb_data; | |
373 | if (starts_with(refname, "refs/tags/") && new_oid) | |
374 | (void) refname_hash_add(queued_tags, refname, new_oid); | |
375 | } | |
376 | ||
6d1700d5 | 377 | static void find_non_local_tags(const struct ref *refs, |
b3a80466 | 378 | struct ref_transaction *transaction, |
6d1700d5 BW |
379 | struct ref **head, |
380 | struct ref ***tail) | |
a0fbb5a3 | 381 | { |
e198b3a7 JH |
382 | struct hashmap existing_refs; |
383 | struct hashmap remote_refs; | |
b7e2d8bc | 384 | struct oidset fetch_oids = OIDSET_INIT; |
e198b3a7 JH |
385 | struct string_list remote_refs_list = STRING_LIST_INIT_NODUP; |
386 | struct string_list_item *remote_ref_item; | |
a0fbb5a3 | 387 | const struct ref *ref; |
e198b3a7 | 388 | struct refname_hash_entry *item = NULL; |
3e96c668 | 389 | const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT; |
e198b3a7 JH |
390 | |
391 | refname_hash_init(&existing_refs); | |
392 | refname_hash_init(&remote_refs); | |
b7e2d8bc | 393 | create_fetch_oidset(head, &fetch_oids); |
a0fbb5a3 | 394 | |
e198b3a7 | 395 | for_each_ref(add_one_refname, &existing_refs); |
b3a80466 PS |
396 | |
397 | /* | |
398 | * If we already have a transaction, then we need to filter out all | |
399 | * tags which have already been queued up. | |
400 | */ | |
401 | if (transaction) | |
402 | ref_transaction_for_each_queued_update(transaction, | |
403 | add_already_queued_tags, | |
404 | &existing_refs); | |
405 | ||
6d1700d5 | 406 | for (ref = refs; ref; ref = ref->next) { |
ad704485 | 407 | if (!starts_with(ref->name, "refs/tags/")) |
a0fbb5a3 MH |
408 | continue; |
409 | ||
410 | /* | |
411 | * The peeled ref always follows the matching base | |
412 | * ref, so if we see a peeled ref that we don't want | |
413 | * to fetch then we can mark the ref entry in the list | |
414 | * as one to ignore by setting util to NULL. | |
415 | */ | |
ad704485 | 416 | if (ends_with(ref->name, "^{}")) { |
5827a035 | 417 | if (item && |
bc726bd0 | 418 | !repo_has_object_file_with_flags(the_repository, &ref->old_oid, quick_flags) && |
b7e2d8bc | 419 | !oidset_contains(&fetch_oids, &ref->old_oid) && |
bc726bd0 | 420 | !repo_has_object_file_with_flags(the_repository, &item->oid, quick_flags) && |
b7e2d8bc | 421 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 422 | clear_item(item); |
a0fbb5a3 MH |
423 | item = NULL; |
424 | continue; | |
425 | } | |
426 | ||
427 | /* | |
428 | * If item is non-NULL here, then we previously saw a | |
429 | * ref not followed by a peeled reference, so we need | |
430 | * to check if it is a lightweight tag that we want to | |
431 | * fetch. | |
432 | */ | |
5827a035 | 433 | if (item && |
bc726bd0 | 434 | !repo_has_object_file_with_flags(the_repository, &item->oid, quick_flags) && |
b7e2d8bc | 435 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 436 | clear_item(item); |
a0fbb5a3 MH |
437 | |
438 | item = NULL; | |
439 | ||
440 | /* skip duplicates and refs that we already have */ | |
e198b3a7 JH |
441 | if (refname_hash_exists(&remote_refs, ref->name) || |
442 | refname_hash_exists(&existing_refs, ref->name)) | |
a0fbb5a3 MH |
443 | continue; |
444 | ||
e198b3a7 JH |
445 | item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid); |
446 | string_list_insert(&remote_refs_list, ref->name); | |
a0fbb5a3 | 447 | } |
6da1a258 | 448 | hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent); |
a0fbb5a3 MH |
449 | |
450 | /* | |
451 | * We may have a final lightweight tag that needs to be | |
452 | * checked to see if it needs fetching. | |
453 | */ | |
5827a035 | 454 | if (item && |
bc726bd0 | 455 | !repo_has_object_file_with_flags(the_repository, &item->oid, quick_flags) && |
b7e2d8bc | 456 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 457 | clear_item(item); |
a0fbb5a3 MH |
458 | |
459 | /* | |
e198b3a7 | 460 | * For all the tags in the remote_refs_list, |
a0fbb5a3 MH |
461 | * add them to the list of refs to be fetched |
462 | */ | |
e198b3a7 JH |
463 | for_each_string_list_item(remote_ref_item, &remote_refs_list) { |
464 | const char *refname = remote_ref_item->string; | |
9528b80b | 465 | struct ref *rm; |
f23a4651 | 466 | unsigned int hash = strhash(refname); |
e198b3a7 | 467 | |
f23a4651 EW |
468 | item = hashmap_get_entry_from_hash(&remote_refs, hash, refname, |
469 | struct refname_hash_entry, ent); | |
e198b3a7 JH |
470 | if (!item) |
471 | BUG("unseen remote ref?"); | |
472 | ||
a0fbb5a3 | 473 | /* Unless we have already decided to ignore this item... */ |
f80d9223 | 474 | if (item->ignore) |
9528b80b FC |
475 | continue; |
476 | ||
477 | rm = alloc_ref(item->refname); | |
478 | rm->peer_ref = alloc_ref(item->refname); | |
479 | oidcpy(&rm->old_oid, &item->oid); | |
480 | **tail = rm; | |
481 | *tail = &rm->next; | |
a0fbb5a3 | 482 | } |
6da1a258 | 483 | hashmap_clear_and_free(&remote_refs, struct refname_hash_entry, ent); |
e198b3a7 | 484 | string_list_clear(&remote_refs_list, 0); |
b7e2d8bc | 485 | oidset_clear(&fetch_oids); |
a0fbb5a3 | 486 | } |
767f176a | 487 | |
2e03115d DS |
488 | static void filter_prefetch_refspec(struct refspec *rs) |
489 | { | |
490 | int i; | |
491 | ||
492 | if (!prefetch) | |
493 | return; | |
494 | ||
495 | for (i = 0; i < rs->nr; i++) { | |
496 | struct strbuf new_dst = STRBUF_INIT; | |
497 | char *old_dst; | |
498 | const char *sub = NULL; | |
499 | ||
500 | if (rs->items[i].negative) | |
501 | continue; | |
502 | if (!rs->items[i].dst || | |
503 | (rs->items[i].src && | |
992f25d7 DS |
504 | !strncmp(rs->items[i].src, |
505 | ref_namespace[NAMESPACE_TAGS].ref, | |
506 | strlen(ref_namespace[NAMESPACE_TAGS].ref)))) { | |
2e03115d DS |
507 | int j; |
508 | ||
509 | free(rs->items[i].src); | |
510 | free(rs->items[i].dst); | |
511 | ||
512 | for (j = i + 1; j < rs->nr; j++) { | |
513 | rs->items[j - 1] = rs->items[j]; | |
514 | rs->raw[j - 1] = rs->raw[j]; | |
515 | } | |
516 | rs->nr--; | |
517 | i--; | |
518 | continue; | |
519 | } | |
520 | ||
521 | old_dst = rs->items[i].dst; | |
992f25d7 | 522 | strbuf_addstr(&new_dst, ref_namespace[NAMESPACE_PREFETCH].ref); |
2e03115d DS |
523 | |
524 | /* | |
525 | * If old_dst starts with "refs/", then place | |
526 | * sub after that prefix. Otherwise, start at | |
527 | * the beginning of the string. | |
528 | */ | |
529 | if (!skip_prefix(old_dst, "refs/", &sub)) | |
530 | sub = old_dst; | |
531 | strbuf_addstr(&new_dst, sub); | |
532 | ||
533 | rs->items[i].dst = strbuf_detach(&new_dst, NULL); | |
534 | rs->items[i].force = 1; | |
535 | ||
536 | free(old_dst); | |
537 | } | |
538 | } | |
539 | ||
6d1700d5 BW |
540 | static struct ref *get_ref_map(struct remote *remote, |
541 | const struct ref *remote_refs, | |
65d96c8b | 542 | struct refspec *rs, |
f137a45e | 543 | int tags, int *autotags) |
b888d61c DB |
544 | { |
545 | int i; | |
546 | struct ref *rm; | |
547 | struct ref *ref_map = NULL; | |
548 | struct ref **tail = &ref_map; | |
549 | ||
c5a84e92 MH |
550 | /* opportunistically-updated references: */ |
551 | struct ref *orefs = NULL, **oref_tail = &orefs; | |
b888d61c | 552 | |
e198b3a7 | 553 | struct hashmap existing_refs; |
abcb7eeb | 554 | int existing_refs_populated = 0; |
f2690487 | 555 | |
2e03115d DS |
556 | filter_prefetch_refspec(rs); |
557 | if (remote) | |
558 | filter_prefetch_refspec(&remote->fetch); | |
559 | ||
65d96c8b | 560 | if (rs->nr) { |
c5558f80 | 561 | struct refspec *fetch_refspec; |
c5558f80 | 562 | |
65d96c8b BW |
563 | for (i = 0; i < rs->nr; i++) { |
564 | get_fetch_map(remote_refs, &rs->items[i], &tail, 0); | |
565 | if (rs->items[i].dst && rs->items[i].dst[0]) | |
b888d61c DB |
566 | *autotags = 1; |
567 | } | |
0281c930 | 568 | /* Merge everything on the command line (but not --tags) */ |
b888d61c | 569 | for (rm = ref_map; rm; rm = rm->next) |
900f2814 | 570 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
f2690487 JK |
571 | |
572 | /* | |
0281c930 MH |
573 | * For any refs that we happen to be fetching via |
574 | * command-line arguments, the destination ref might | |
575 | * have been missing or have been different than the | |
576 | * remote-tracking ref that would be derived from the | |
577 | * configured refspec. In these cases, we want to | |
578 | * take the opportunity to update their configured | |
579 | * remote-tracking reference. However, we do not want | |
580 | * to mention these entries in FETCH_HEAD at all, as | |
581 | * they would simply be duplicates of existing | |
582 | * entries, so we set them FETCH_HEAD_IGNORE below. | |
583 | * | |
584 | * We compute these entries now, based only on the | |
585 | * refspecs specified on the command line. But we add | |
586 | * them to the list following the refspecs resulting | |
587 | * from the tags option so that one of the latter, | |
588 | * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed | |
589 | * by ref_remove_duplicates() in favor of one of these | |
590 | * opportunistic entries with FETCH_HEAD_IGNORE. | |
f2690487 | 591 | */ |
65d96c8b BW |
592 | if (refmap.nr) |
593 | fetch_refspec = &refmap; | |
594 | else | |
6d1700d5 | 595 | fetch_refspec = &remote->fetch; |
c5558f80 | 596 | |
65d96c8b BW |
597 | for (i = 0; i < fetch_refspec->nr; i++) |
598 | get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1); | |
e4cffacc | 599 | } else if (refmap.nr) { |
66996bea | 600 | die("--refmap option is only meaningful with command-line refspec(s)"); |
b888d61c DB |
601 | } else { |
602 | /* Use the defaults */ | |
85682c19 SP |
603 | struct branch *branch = branch_get(NULL); |
604 | int has_merge = branch_has_merge_config(branch); | |
3ee1757b | 605 | if (remote && |
e5349abf | 606 | (remote->fetch.nr || |
f31dbdc7 | 607 | /* Note: has_merge implies non-NULL branch->remote_name */ |
3ee1757b | 608 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
e5349abf BW |
609 | for (i = 0; i < remote->fetch.nr; i++) { |
610 | get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0); | |
611 | if (remote->fetch.items[i].dst && | |
612 | remote->fetch.items[i].dst[0]) | |
b888d61c | 613 | *autotags = 1; |
85682c19 | 614 | if (!i && !has_merge && ref_map && |
e5349abf | 615 | !remote->fetch.items[0].pattern) |
900f2814 | 616 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c | 617 | } |
da0204df JS |
618 | /* |
619 | * if the remote we're fetching from is the same | |
620 | * as given in branch.<name>.remote, we add the | |
621 | * ref given in branch.<name>.merge, too. | |
f31dbdc7 BC |
622 | * |
623 | * Note: has_merge implies non-NULL branch->remote_name | |
da0204df | 624 | */ |
9ad7c5ae JH |
625 | if (has_merge && |
626 | !strcmp(branch->remote_name, remote->name)) | |
85682c19 | 627 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
2e03115d | 628 | } else if (!prefetch) { |
b888d61c | 629 | ref_map = get_remote_ref(remote_refs, "HEAD"); |
9ad7c5ae | 630 | if (!ref_map) |
66996bea | 631 | die(_("couldn't find remote ref HEAD")); |
900f2814 | 632 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
5aaf7f2a | 633 | tail = &ref_map->next; |
b888d61c DB |
634 | } |
635 | } | |
0281c930 | 636 | |
c5a84e92 MH |
637 | if (tags == TAGS_SET) |
638 | /* also fetch all tags */ | |
639 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); | |
640 | else if (tags == TAGS_DEFAULT && *autotags) | |
b3a80466 | 641 | find_non_local_tags(remote_refs, NULL, &ref_map, &tail); |
0281c930 | 642 | |
c5a84e92 MH |
643 | /* Now append any refs to be updated opportunistically: */ |
644 | *tail = orefs; | |
645 | for (rm = orefs; rm; rm = rm->next) { | |
646 | rm->fetch_head_status = FETCH_HEAD_IGNORE; | |
647 | tail = &rm->next; | |
648 | } | |
649 | ||
c0192df6 JK |
650 | /* |
651 | * apply negative refspecs first, before we remove duplicates. This is | |
652 | * necessary as negative refspecs might remove an otherwise conflicting | |
653 | * duplicate. | |
654 | */ | |
655 | if (rs->nr) | |
656 | ref_map = apply_negative_refspecs(ref_map, rs); | |
657 | else | |
658 | ref_map = apply_negative_refspecs(ref_map, &remote->fetch); | |
659 | ||
14b8ced3 BW |
660 | ref_map = ref_remove_duplicates(ref_map); |
661 | ||
14b8ced3 BW |
662 | for (rm = ref_map; rm; rm = rm->next) { |
663 | if (rm->peer_ref) { | |
e198b3a7 JH |
664 | const char *refname = rm->peer_ref->name; |
665 | struct refname_hash_entry *peer_item; | |
f23a4651 | 666 | unsigned int hash = strhash(refname); |
e198b3a7 | 667 | |
abcb7eeb JT |
668 | if (!existing_refs_populated) { |
669 | refname_hash_init(&existing_refs); | |
670 | for_each_ref(add_one_refname, &existing_refs); | |
671 | existing_refs_populated = 1; | |
672 | } | |
673 | ||
f23a4651 EW |
674 | peer_item = hashmap_get_entry_from_hash(&existing_refs, |
675 | hash, refname, | |
676 | struct refname_hash_entry, ent); | |
14b8ced3 | 677 | if (peer_item) { |
e198b3a7 | 678 | struct object_id *old_oid = &peer_item->oid; |
14b8ced3 BW |
679 | oidcpy(&rm->peer_ref->old_oid, old_oid); |
680 | } | |
681 | } | |
682 | } | |
abcb7eeb | 683 | if (existing_refs_populated) |
6da1a258 | 684 | hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent); |
14b8ced3 BW |
685 | |
686 | return ref_map; | |
b888d61c DB |
687 | } |
688 | ||
fa250759 JK |
689 | #define STORE_REF_ERROR_OTHER 1 |
690 | #define STORE_REF_ERROR_DF_CONFLICT 2 | |
691 | ||
b888d61c DB |
692 | static int s_update_ref(const char *action, |
693 | struct ref *ref, | |
d4c8db8f | 694 | struct ref_transaction *transaction, |
b888d61c DB |
695 | int check_old) |
696 | { | |
1412f762 | 697 | char *msg; |
b888d61c | 698 | char *rla = getenv("GIT_REFLOG_ACTION"); |
d4c8db8f | 699 | struct ref_transaction *our_transaction = NULL; |
cd94f765 | 700 | struct strbuf err = STRBUF_INIT; |
c45889f1 | 701 | int ret; |
b888d61c | 702 | |
28a15401 JS |
703 | if (dry_run) |
704 | return 0; | |
b888d61c | 705 | if (!rla) |
2d324efa | 706 | rla = default_rla.buf; |
1412f762 | 707 | msg = xstrfmt("%s: %s", rla, action); |
cd94f765 | 708 | |
d4c8db8f PS |
709 | /* |
710 | * If no transaction was passed to us, we manage the transaction | |
711 | * ourselves. Otherwise, we trust the caller to handle the transaction | |
712 | * lifecycle. | |
713 | */ | |
c45889f1 | 714 | if (!transaction) { |
d4c8db8f PS |
715 | transaction = our_transaction = ref_transaction_begin(&err); |
716 | if (!transaction) { | |
717 | ret = STORE_REF_ERROR_OTHER; | |
718 | goto out; | |
719 | } | |
c45889f1 PS |
720 | } |
721 | ||
722 | ret = ref_transaction_update(transaction, ref->name, &ref->new_oid, | |
723 | check_old ? &ref->old_oid : NULL, | |
724 | 0, msg, &err); | |
cd94f765 | 725 | if (ret) { |
c45889f1 PS |
726 | ret = STORE_REF_ERROR_OTHER; |
727 | goto out; | |
cd94f765 RS |
728 | } |
729 | ||
d4c8db8f PS |
730 | if (our_transaction) { |
731 | switch (ref_transaction_commit(our_transaction, &err)) { | |
732 | case 0: | |
733 | break; | |
734 | case TRANSACTION_NAME_CONFLICT: | |
735 | ret = STORE_REF_ERROR_DF_CONFLICT; | |
736 | goto out; | |
737 | default: | |
738 | ret = STORE_REF_ERROR_OTHER; | |
739 | goto out; | |
740 | } | |
c45889f1 PS |
741 | } |
742 | ||
743 | out: | |
d4c8db8f | 744 | ref_transaction_free(our_transaction); |
c45889f1 PS |
745 | if (ret) |
746 | error("%s", err.buf); | |
cd94f765 | 747 | strbuf_release(&err); |
1412f762 | 748 | free(msg); |
c45889f1 | 749 | return ret; |
b888d61c DB |
750 | } |
751 | ||
6bc91f23 | 752 | static int refcol_width = 10; |
bc437d10 | 753 | static int compact_format; |
6bc91f23 NTND |
754 | |
755 | static void adjust_refcol_width(const struct ref *ref) | |
756 | { | |
757 | int max, rlen, llen, len; | |
758 | ||
759 | /* uptodate lines are only shown on high verbosity level */ | |
f6bb64df | 760 | if (verbosity <= 0 && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) |
6bc91f23 NTND |
761 | return; |
762 | ||
763 | max = term_columns(); | |
764 | rlen = utf8_strwidth(prettify_refname(ref->name)); | |
bc437d10 | 765 | |
6bc91f23 NTND |
766 | llen = utf8_strwidth(prettify_refname(ref->peer_ref->name)); |
767 | ||
768 | /* | |
769 | * rough estimation to see if the output line is too long and | |
770 | * should not be counted (we can't do precise calculation | |
771 | * anyway because we don't know if the error explanation part | |
772 | * will be printed in update_local_ref) | |
773 | */ | |
bc437d10 NTND |
774 | if (compact_format) { |
775 | llen = 0; | |
776 | max = max * 2 / 3; | |
777 | } | |
6bc91f23 NTND |
778 | len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen; |
779 | if (len >= max) | |
780 | return; | |
781 | ||
bc437d10 NTND |
782 | /* |
783 | * Not precise calculation for compact mode because '*' can | |
784 | * appear on the left hand side of '->' and shrink the column | |
785 | * back. | |
786 | */ | |
6bc91f23 NTND |
787 | if (refcol_width < rlen) |
788 | refcol_width = rlen; | |
789 | } | |
790 | ||
791 | static void prepare_format_display(struct ref *ref_map) | |
792 | { | |
793 | struct ref *rm; | |
bc437d10 NTND |
794 | const char *format = "full"; |
795 | ||
f6bb64df PS |
796 | if (verbosity < 0) |
797 | return; | |
798 | ||
f1de981e | 799 | git_config_get_string_tmp("fetch.output", &format); |
bc437d10 NTND |
800 | if (!strcasecmp(format, "full")) |
801 | compact_format = 0; | |
802 | else if (!strcasecmp(format, "compact")) | |
803 | compact_format = 1; | |
804 | else | |
1a8aea85 JNA |
805 | die(_("invalid value for '%s': '%s'"), |
806 | "fetch.output", format); | |
6bc91f23 NTND |
807 | |
808 | for (rm = ref_map; rm; rm = rm->next) { | |
809 | if (rm->status == REF_STATUS_REJECT_SHALLOW || | |
810 | !rm->peer_ref || | |
811 | !strcmp(rm->name, "HEAD")) | |
812 | continue; | |
813 | ||
814 | adjust_refcol_width(rm); | |
815 | } | |
816 | } | |
165f3902 | 817 | |
bc437d10 NTND |
818 | static void print_remote_to_local(struct strbuf *display, |
819 | const char *remote, const char *local) | |
820 | { | |
821 | strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local); | |
822 | } | |
823 | ||
824 | static int find_and_replace(struct strbuf *haystack, | |
825 | const char *needle, | |
826 | const char *placeholder) | |
827 | { | |
dc40b24d | 828 | const char *p = NULL; |
bc437d10 NTND |
829 | int plen, nlen; |
830 | ||
dc40b24d NTND |
831 | nlen = strlen(needle); |
832 | if (ends_with(haystack->buf, needle)) | |
833 | p = haystack->buf + haystack->len - nlen; | |
834 | else | |
835 | p = strstr(haystack->buf, needle); | |
bc437d10 NTND |
836 | if (!p) |
837 | return 0; | |
838 | ||
839 | if (p > haystack->buf && p[-1] != '/') | |
840 | return 0; | |
841 | ||
842 | plen = strlen(p); | |
bc437d10 NTND |
843 | if (plen > nlen && p[nlen] != '/') |
844 | return 0; | |
845 | ||
846 | strbuf_splice(haystack, p - haystack->buf, nlen, | |
847 | placeholder, strlen(placeholder)); | |
848 | return 1; | |
849 | } | |
850 | ||
851 | static void print_compact(struct strbuf *display, | |
852 | const char *remote, const char *local) | |
853 | { | |
854 | struct strbuf r = STRBUF_INIT; | |
855 | struct strbuf l = STRBUF_INIT; | |
856 | ||
857 | if (!strcmp(remote, local)) { | |
858 | strbuf_addf(display, "%-*s -> *", refcol_width, remote); | |
859 | return; | |
860 | } | |
861 | ||
862 | strbuf_addstr(&r, remote); | |
863 | strbuf_addstr(&l, local); | |
864 | ||
865 | if (!find_and_replace(&r, local, "*")) | |
866 | find_and_replace(&l, remote, "*"); | |
867 | print_remote_to_local(display, r.buf, l.buf); | |
868 | ||
869 | strbuf_release(&r); | |
870 | strbuf_release(&l); | |
871 | } | |
872 | ||
d0b39a03 NTND |
873 | static void format_display(struct strbuf *display, char code, |
874 | const char *summary, const char *error, | |
901f3d40 JH |
875 | const char *remote, const char *local, |
876 | int summary_width) | |
d0b39a03 | 877 | { |
f6bb64df PS |
878 | int width; |
879 | ||
880 | if (verbosity < 0) | |
881 | return; | |
882 | ||
883 | width = (summary_width + strlen(summary) - gettext_width(summary)); | |
901f3d40 JH |
884 | |
885 | strbuf_addf(display, "%c %-*s ", code, width, summary); | |
bc437d10 NTND |
886 | if (!compact_format) |
887 | print_remote_to_local(display, remote, local); | |
888 | else | |
889 | print_compact(display, remote, local); | |
d0b39a03 NTND |
890 | if (error) |
891 | strbuf_addf(display, " (%s)", error); | |
892 | } | |
165f3902 | 893 | |
b888d61c | 894 | static int update_local_ref(struct ref *ref, |
d4c8db8f | 895 | struct ref_transaction *transaction, |
8bc1f39f | 896 | const char *remote, const struct ref *remote_ref, |
b2463fc3 | 897 | struct strbuf *display, int summary_width) |
b888d61c | 898 | { |
b888d61c | 899 | struct commit *current = NULL, *updated; |
4577e483 | 900 | const char *pretty_ref = prettify_refname(ref->name); |
377444b4 | 901 | int fast_forward = 0; |
b888d61c | 902 | |
47c61004 | 903 | if (!repo_has_object_file(the_repository, &ref->new_oid)) |
f4e54d02 | 904 | die(_("object %s not found"), oid_to_hex(&ref->new_oid)); |
b888d61c | 905 | |
4a7e27e9 | 906 | if (oideq(&ref->old_oid, &ref->new_oid)) { |
7f87aff2 | 907 | if (verbosity > 0) |
d0b39a03 | 908 | format_display(display, '=', _("[up to date]"), NULL, |
901f3d40 | 909 | remote, pretty_ref, summary_width); |
b888d61c DB |
910 | return 0; |
911 | } | |
912 | ||
8bc1f39f | 913 | if (!update_head_ok && |
12d47e3b DS |
914 | !is_null_oid(&ref->old_oid) && |
915 | branch_checked_out(ref->name)) { | |
b888d61c DB |
916 | /* |
917 | * If this is the head, and it's not okay to update | |
918 | * the head, and the old value of the head isn't empty... | |
919 | */ | |
d0b39a03 | 920 | format_display(display, '!', _("[rejected]"), |
12d47e3b | 921 | _("can't fetch into checked-out branch"), |
901f3d40 | 922 | remote, pretty_ref, summary_width); |
b888d61c DB |
923 | return 1; |
924 | } | |
925 | ||
f4e54d02 | 926 | if (!is_null_oid(&ref->old_oid) && |
59556548 | 927 | starts_with(ref->name, "refs/tags/")) { |
0bc8d71b ÆAB |
928 | if (force || ref->force) { |
929 | int r; | |
d4c8db8f | 930 | r = s_update_ref("updating tag", ref, transaction, 0); |
0bc8d71b ÆAB |
931 | format_display(display, r ? '!' : 't', _("[tag update]"), |
932 | r ? _("unable to update local ref") : NULL, | |
933 | remote, pretty_ref, summary_width); | |
934 | return r; | |
935 | } else { | |
936 | format_display(display, '!', _("[rejected]"), _("would clobber existing tag"), | |
937 | remote, pretty_ref, summary_width); | |
938 | return 1; | |
939 | } | |
b888d61c DB |
940 | } |
941 | ||
21e1ee8f SB |
942 | current = lookup_commit_reference_gently(the_repository, |
943 | &ref->old_oid, 1); | |
944 | updated = lookup_commit_reference_gently(the_repository, | |
945 | &ref->new_oid, 1); | |
b888d61c | 946 | if (!current || !updated) { |
165f3902 NP |
947 | const char *msg; |
948 | const char *what; | |
6315472e | 949 | int r; |
0997adaa MB |
950 | /* |
951 | * Nicely describe the new ref we're fetching. | |
952 | * Base this on the remote's ref name, as it's | |
953 | * more likely to follow a standard layout. | |
954 | */ | |
955 | const char *name = remote_ref ? remote_ref->name : ""; | |
59556548 | 956 | if (starts_with(name, "refs/tags/")) { |
b888d61c | 957 | msg = "storing tag"; |
f7b3742a | 958 | what = _("[new tag]"); |
59556548 | 959 | } else if (starts_with(name, "refs/heads/")) { |
b888d61c | 960 | msg = "storing head"; |
f7b3742a | 961 | what = _("[new branch]"); |
0997adaa MB |
962 | } else { |
963 | msg = "storing ref"; | |
964 | what = _("[new ref]"); | |
165f3902 NP |
965 | } |
966 | ||
d4c8db8f | 967 | r = s_update_ref(msg, ref, transaction, 0); |
d0b39a03 NTND |
968 | format_display(display, r ? '!' : '*', what, |
969 | r ? _("unable to update local ref") : NULL, | |
901f3d40 | 970 | remote, pretty_ref, summary_width); |
6315472e | 971 | return r; |
b888d61c DB |
972 | } |
973 | ||
377444b4 DS |
974 | if (fetch_show_forced_updates) { |
975 | uint64_t t_before = getnanotime(); | |
cb338c23 ÆAB |
976 | fast_forward = repo_in_merge_bases(the_repository, current, |
977 | updated); | |
377444b4 DS |
978 | forced_updates_ms += (getnanotime() - t_before) / 1000000; |
979 | } else { | |
980 | fast_forward = 1; | |
981 | } | |
982 | ||
983 | if (fast_forward) { | |
bd22d4ff | 984 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 985 | int r; |
cdbd70c4 | 986 | |
30e677e0 | 987 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
bd22d4ff | 988 | strbuf_addstr(&quickref, ".."); |
30e677e0 | 989 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
d4c8db8f | 990 | r = s_update_ref("fast-forward", ref, transaction, 1); |
d0b39a03 NTND |
991 | format_display(display, r ? '!' : ' ', quickref.buf, |
992 | r ? _("unable to update local ref") : NULL, | |
901f3d40 | 993 | remote, pretty_ref, summary_width); |
bd22d4ff | 994 | strbuf_release(&quickref); |
6315472e | 995 | return r; |
165f3902 | 996 | } else if (force || ref->force) { |
bd22d4ff | 997 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 998 | int r; |
30e677e0 | 999 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
bd22d4ff | 1000 | strbuf_addstr(&quickref, "..."); |
30e677e0 | 1001 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
d4c8db8f | 1002 | r = s_update_ref("forced-update", ref, transaction, 1); |
d0b39a03 NTND |
1003 | format_display(display, r ? '!' : '+', quickref.buf, |
1004 | r ? _("unable to update local ref") : _("forced update"), | |
901f3d40 | 1005 | remote, pretty_ref, summary_width); |
bd22d4ff | 1006 | strbuf_release(&quickref); |
6315472e | 1007 | return r; |
165f3902 | 1008 | } else { |
d0b39a03 | 1009 | format_display(display, '!', _("[rejected]"), _("non-fast-forward"), |
901f3d40 | 1010 | remote, pretty_ref, summary_width); |
b888d61c DB |
1011 | return 1; |
1012 | } | |
b888d61c DB |
1013 | } |
1014 | ||
9fec7b21 | 1015 | static const struct object_id *iterate_ref_map(void *cb_data) |
6b67e0dc | 1016 | { |
f0e278b1 JH |
1017 | struct ref **rm = cb_data; |
1018 | struct ref *ref = *rm; | |
6b67e0dc | 1019 | |
4820a33b NTND |
1020 | while (ref && ref->status == REF_STATUS_REJECT_SHALLOW) |
1021 | ref = ref->next; | |
f0e278b1 | 1022 | if (!ref) |
9fec7b21 | 1023 | return NULL; |
f0e278b1 | 1024 | *rm = ref->next; |
9fec7b21 | 1025 | return &ref->old_oid; |
6b67e0dc JH |
1026 | } |
1027 | ||
58a646a3 PS |
1028 | struct fetch_head { |
1029 | FILE *fp; | |
929d0445 | 1030 | struct strbuf buf; |
58a646a3 PS |
1031 | }; |
1032 | ||
1033 | static int open_fetch_head(struct fetch_head *fetch_head) | |
1034 | { | |
1035 | const char *filename = git_path_fetch_head(the_repository); | |
1036 | ||
1037 | if (write_fetch_head) { | |
1038 | fetch_head->fp = fopen(filename, "a"); | |
1039 | if (!fetch_head->fp) | |
c4904377 | 1040 | return error_errno(_("cannot open '%s'"), filename); |
929d0445 | 1041 | strbuf_init(&fetch_head->buf, 0); |
58a646a3 PS |
1042 | } else { |
1043 | fetch_head->fp = NULL; | |
1044 | } | |
1045 | ||
1046 | return 0; | |
1047 | } | |
1048 | ||
1049 | static void append_fetch_head(struct fetch_head *fetch_head, | |
1050 | const struct object_id *old_oid, | |
1051 | enum fetch_head_status fetch_head_status, | |
1052 | const char *note, | |
1053 | const char *url, size_t url_len) | |
1054 | { | |
1055 | char old_oid_hex[GIT_MAX_HEXSZ + 1]; | |
1056 | const char *merge_status_marker; | |
1057 | size_t i; | |
1058 | ||
1059 | if (!fetch_head->fp) | |
1060 | return; | |
1061 | ||
1062 | switch (fetch_head_status) { | |
1063 | case FETCH_HEAD_NOT_FOR_MERGE: | |
1064 | merge_status_marker = "not-for-merge"; | |
1065 | break; | |
1066 | case FETCH_HEAD_MERGE: | |
1067 | merge_status_marker = ""; | |
1068 | break; | |
1069 | default: | |
1070 | /* do not write anything to FETCH_HEAD */ | |
1071 | return; | |
1072 | } | |
1073 | ||
929d0445 PS |
1074 | strbuf_addf(&fetch_head->buf, "%s\t%s\t%s", |
1075 | oid_to_hex_r(old_oid_hex, old_oid), merge_status_marker, note); | |
58a646a3 PS |
1076 | for (i = 0; i < url_len; ++i) |
1077 | if ('\n' == url[i]) | |
929d0445 | 1078 | strbuf_addstr(&fetch_head->buf, "\\n"); |
58a646a3 | 1079 | else |
929d0445 PS |
1080 | strbuf_addch(&fetch_head->buf, url[i]); |
1081 | strbuf_addch(&fetch_head->buf, '\n'); | |
1082 | ||
c7b190da PS |
1083 | /* |
1084 | * When using an atomic fetch, we do not want to update FETCH_HEAD if | |
1085 | * any of the reference updates fails. We thus have to write all | |
1086 | * updates to a buffer first and only commit it as soon as all | |
1087 | * references have been successfully updated. | |
1088 | */ | |
1089 | if (!atomic_fetch) { | |
1090 | strbuf_write(&fetch_head->buf, fetch_head->fp); | |
1091 | strbuf_reset(&fetch_head->buf); | |
1092 | } | |
58a646a3 PS |
1093 | } |
1094 | ||
1095 | static void commit_fetch_head(struct fetch_head *fetch_head) | |
1096 | { | |
c7b190da PS |
1097 | if (!fetch_head->fp || !atomic_fetch) |
1098 | return; | |
1099 | strbuf_write(&fetch_head->buf, fetch_head->fp); | |
58a646a3 PS |
1100 | } |
1101 | ||
1102 | static void close_fetch_head(struct fetch_head *fetch_head) | |
1103 | { | |
1104 | if (!fetch_head->fp) | |
1105 | return; | |
1106 | ||
1107 | fclose(fetch_head->fp); | |
929d0445 | 1108 | strbuf_release(&fetch_head->buf); |
58a646a3 PS |
1109 | } |
1110 | ||
182f59da | 1111 | static const char warn_show_forced_updates[] = |
66996bea AK |
1112 | N_("fetch normally indicates which branches had a forced update,\n" |
1113 | "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" | |
1114 | "flag or run 'git config fetch.showForcedUpdates true'"); | |
182f59da | 1115 | static const char warn_time_show_forced_updates[] = |
66996bea | 1116 | N_("it took %.2f seconds to check forced updates; you can use\n" |
182f59da | 1117 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" |
66996bea | 1118 | "to avoid this check\n"); |
182f59da | 1119 | |
47abd85b | 1120 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
b3a80466 PS |
1121 | int connectivity_checked, |
1122 | struct ref_transaction *transaction, struct ref *ref_map, | |
b2463fc3 | 1123 | struct fetch_head *fetch_head) |
b888d61c | 1124 | { |
4b3b33a7 | 1125 | int url_len, i, rc = 0; |
4f40f6cb | 1126 | struct strbuf note = STRBUF_INIT; |
b888d61c DB |
1127 | const char *what, *kind; |
1128 | struct ref *rm; | |
dcf69262 | 1129 | char *url; |
900f2814 | 1130 | int want_status; |
b18aaaa5 | 1131 | int summary_width = 0; |
b888d61c | 1132 | |
b18aaaa5 PS |
1133 | if (verbosity >= 0) |
1134 | summary_width = transport_summary_width(ref_map); | |
1135 | ||
fb0cc87e DB |
1136 | if (raw_url) |
1137 | url = transport_anonymize_url(raw_url); | |
1138 | else | |
1139 | url = xstrdup("foreign"); | |
6b67e0dc | 1140 | |
cf1e7c07 | 1141 | if (!connectivity_checked) { |
2df1aa23 JT |
1142 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
1143 | ||
c6ce27ab | 1144 | opt.exclude_hidden_refs_section = "fetch"; |
cf1e7c07 | 1145 | rm = ref_map; |
2df1aa23 | 1146 | if (check_connected(iterate_ref_map, &rm, &opt)) { |
cf1e7c07 JT |
1147 | rc = error(_("%s did not send all necessary objects\n"), url); |
1148 | goto abort; | |
1149 | } | |
9516a598 | 1150 | } |
6b67e0dc | 1151 | |
6bc91f23 NTND |
1152 | prepare_format_display(ref_map); |
1153 | ||
96890f4c | 1154 | /* |
900f2814 JK |
1155 | * We do a pass for each fetch_head_status type in their enum order, so |
1156 | * merged entries are written before not-for-merge. That lets readers | |
1157 | * use FETCH_HEAD as a refname to refer to the ref to be merged. | |
96890f4c | 1158 | */ |
900f2814 JK |
1159 | for (want_status = FETCH_HEAD_MERGE; |
1160 | want_status <= FETCH_HEAD_IGNORE; | |
1161 | want_status++) { | |
96890f4c JH |
1162 | for (rm = ref_map; rm; rm = rm->next) { |
1163 | struct ref *ref = NULL; | |
1164 | ||
4820a33b NTND |
1165 | if (rm->status == REF_STATUS_REJECT_SHALLOW) { |
1166 | if (want_status == FETCH_HEAD_MERGE) | |
09667e95 | 1167 | warning(_("rejected %s because shallow roots are not allowed to be updated"), |
4820a33b NTND |
1168 | rm->peer_ref ? rm->peer_ref->name : rm->name); |
1169 | continue; | |
1170 | } | |
1171 | ||
fe7df03a | 1172 | /* |
8e55634b PS |
1173 | * When writing FETCH_HEAD we need to determine whether |
1174 | * we already have the commit or not. If not, then the | |
1175 | * reference is not for merge and needs to be written | |
1176 | * to the reflog after other commits which we already | |
1177 | * have. We're not interested in this property though | |
1178 | * in case FETCH_HEAD is not to be updated, so we can | |
1179 | * skip the classification in that case. | |
fe7df03a | 1180 | */ |
8e55634b PS |
1181 | if (fetch_head->fp) { |
1182 | struct commit *commit = NULL; | |
1183 | ||
1184 | /* | |
1185 | * References in "refs/tags/" are often going to point | |
1186 | * to annotated tags, which are not part of the | |
1187 | * commit-graph. We thus only try to look up refs in | |
1188 | * the graph which are not in that namespace to not | |
1189 | * regress performance in repositories with many | |
1190 | * annotated tags. | |
1191 | */ | |
1192 | if (!starts_with(rm->name, "refs/tags/")) | |
1193 | commit = lookup_commit_in_graph(the_repository, &rm->old_oid); | |
1194 | if (!commit) { | |
1195 | commit = lookup_commit_reference_gently(the_repository, | |
1196 | &rm->old_oid, | |
1197 | 1); | |
1198 | if (!commit) | |
1199 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; | |
1200 | } | |
fe7df03a | 1201 | } |
96890f4c | 1202 | |
900f2814 | 1203 | if (rm->fetch_head_status != want_status) |
96890f4c JH |
1204 | continue; |
1205 | ||
1206 | if (rm->peer_ref) { | |
6f687c21 | 1207 | ref = alloc_ref(rm->peer_ref->name); |
f4e54d02 | 1208 | oidcpy(&ref->old_oid, &rm->peer_ref->old_oid); |
1209 | oidcpy(&ref->new_oid, &rm->old_oid); | |
96890f4c JH |
1210 | ref->force = rm->peer_ref->force; |
1211 | } | |
b888d61c | 1212 | |
7ea0c2f4 OS |
1213 | if (recurse_submodules != RECURSE_SUBMODULES_OFF && |
1214 | (!rm->peer_ref || !oideq(&ref->old_oid, &ref->new_oid))) { | |
be76c212 | 1215 | check_for_new_submodule_commits(&rm->old_oid); |
7ea0c2f4 | 1216 | } |
b888d61c | 1217 | |
96890f4c JH |
1218 | if (!strcmp(rm->name, "HEAD")) { |
1219 | kind = ""; | |
1220 | what = ""; | |
1221 | } | |
a6293f5d | 1222 | else if (skip_prefix(rm->name, "refs/heads/", &what)) |
96890f4c | 1223 | kind = "branch"; |
a6293f5d | 1224 | else if (skip_prefix(rm->name, "refs/tags/", &what)) |
96890f4c | 1225 | kind = "tag"; |
a6293f5d | 1226 | else if (skip_prefix(rm->name, "refs/remotes/", &what)) |
96890f4c | 1227 | kind = "remote-tracking branch"; |
96890f4c JH |
1228 | else { |
1229 | kind = ""; | |
1230 | what = rm->name; | |
1231 | } | |
b888d61c | 1232 | |
96890f4c JH |
1233 | url_len = strlen(url); |
1234 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
1235 | ; | |
1236 | url_len = i + 1; | |
1237 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
1238 | url_len = i - 3; | |
1239 | ||
1240 | strbuf_reset(¬e); | |
1241 | if (*what) { | |
1242 | if (*kind) | |
1243 | strbuf_addf(¬e, "%s ", kind); | |
1244 | strbuf_addf(¬e, "'%s' of ", what); | |
1245 | } | |
58a646a3 | 1246 | |
2983cec0 | 1247 | append_fetch_head(fetch_head, &rm->old_oid, |
58a646a3 PS |
1248 | rm->fetch_head_status, |
1249 | note.buf, url, url_len); | |
96890f4c JH |
1250 | |
1251 | strbuf_reset(¬e); | |
1252 | if (ref) { | |
c7b190da | 1253 | rc |= update_local_ref(ref, transaction, what, |
b2463fc3 | 1254 | rm, ¬e, summary_width); |
96890f4c | 1255 | free(ref); |
db3c293e JT |
1256 | } else if (write_fetch_head || dry_run) { |
1257 | /* | |
1258 | * Display fetches written to FETCH_HEAD (or | |
1259 | * would be written to FETCH_HEAD, if --dry-run | |
1260 | * is set). | |
1261 | */ | |
d0b39a03 NTND |
1262 | format_display(¬e, '*', |
1263 | *kind ? kind : "branch", NULL, | |
1264 | *what ? what : "HEAD", | |
901f3d40 | 1265 | "FETCH_HEAD", summary_width); |
db3c293e | 1266 | } |
96890f4c | 1267 | if (note.len) { |
f6bb64df | 1268 | if (!shown_url) { |
96890f4c JH |
1269 | fprintf(stderr, _("From %.*s\n"), |
1270 | url_len, url); | |
1271 | shown_url = 1; | |
1272 | } | |
f6bb64df | 1273 | fprintf(stderr, " %s\n", note.buf); |
165f3902 NP |
1274 | } |
1275 | } | |
b888d61c | 1276 | } |
9516a598 | 1277 | |
fa250759 | 1278 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
bd4a51fc | 1279 | error(_("some local refs could not be updated; try running\n" |
f3cb169b | 1280 | " 'git remote prune %s' to remove any old, conflicting " |
bd4a51fc | 1281 | "branches"), remote_name); |
9516a598 | 1282 | |
ed9bff08 | 1283 | if (advice_enabled(ADVICE_FETCH_SHOW_FORCED_UPDATES)) { |
377444b4 | 1284 | if (!fetch_show_forced_updates) { |
182f59da | 1285 | warning(_(warn_show_forced_updates)); |
377444b4 | 1286 | } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) { |
182f59da | 1287 | warning(_(warn_time_show_forced_updates), |
377444b4 | 1288 | forced_updates_ms / 1000.0); |
377444b4 DS |
1289 | } |
1290 | } | |
1291 | ||
9516a598 | 1292 | abort: |
5914f2d0 | 1293 | strbuf_release(¬e); |
9516a598 | 1294 | free(url); |
efb98b44 | 1295 | return rc; |
b888d61c DB |
1296 | } |
1297 | ||
4191c356 SP |
1298 | /* |
1299 | * We would want to bypass the object transfer altogether if | |
d9eb0205 | 1300 | * everything we are going to fetch already exists and is connected |
4191c356 | 1301 | * locally. |
4191c356 | 1302 | */ |
35f9e3e5 | 1303 | static int check_exist_and_connected(struct ref *ref_map) |
4191c356 | 1304 | { |
f0e278b1 | 1305 | struct ref *rm = ref_map; |
7043c707 | 1306 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
35f9e3e5 | 1307 | struct ref *r; |
f0e278b1 | 1308 | |
4191c356 SP |
1309 | /* |
1310 | * If we are deepening a shallow clone we already have these | |
1311 | * objects reachable. Running rev-list here will return with | |
1312 | * a good (0) exit status and we'll bypass the fetch that we | |
1313 | * really need to perform. Claiming failure now will ensure | |
1314 | * we perform the network exchange to deepen our history. | |
1315 | */ | |
508ea882 | 1316 | if (deepen) |
4191c356 | 1317 | return -1; |
35f9e3e5 | 1318 | |
3c7bab06 RC |
1319 | /* |
1320 | * Similarly, if we need to refetch, we always want to perform a full | |
1321 | * fetch ignoring existing objects. | |
1322 | */ | |
1323 | if (refetch) | |
1324 | return -1; | |
1325 | ||
1326 | ||
35f9e3e5 JT |
1327 | /* |
1328 | * check_connected() allows objects to merely be promised, but | |
1329 | * we need all direct targets to exist. | |
1330 | */ | |
1331 | for (r = rm; r; r = r->next) { | |
bc726bd0 ÆAB |
1332 | if (!repo_has_object_file_with_flags(the_repository, &r->old_oid, |
1333 | OBJECT_INFO_SKIP_FETCH_OBJECT)) | |
35f9e3e5 JT |
1334 | return -1; |
1335 | } | |
1336 | ||
7043c707 | 1337 | opt.quiet = 1; |
c6ce27ab | 1338 | opt.exclude_hidden_refs_section = "fetch"; |
7043c707 | 1339 | return check_connected(iterate_ref_map, &rm, &opt); |
4191c356 SP |
1340 | } |
1341 | ||
8bc1f39f | 1342 | static int fetch_and_consume_refs(struct transport *transport, |
b3a80466 | 1343 | struct ref_transaction *transaction, |
8bc1f39f | 1344 | struct ref *ref_map, |
b2463fc3 | 1345 | struct fetch_head *fetch_head) |
b888d61c | 1346 | { |
caff8b73 | 1347 | int connectivity_checked = 1; |
284b2ce8 PS |
1348 | int ret; |
1349 | ||
1350 | /* | |
1351 | * We don't need to perform a fetch in case we can already satisfy all | |
1352 | * refs. | |
1353 | */ | |
1354 | ret = check_exist_and_connected(ref_map); | |
5fc31180 JS |
1355 | if (ret) { |
1356 | trace2_region_enter("fetch", "fetch_refs", the_repository); | |
e2842b39 | 1357 | ret = transport_fetch_refs(transport, ref_map); |
5fc31180 | 1358 | trace2_region_leave("fetch", "fetch_refs", the_repository); |
284b2ce8 PS |
1359 | if (ret) |
1360 | goto out; | |
caff8b73 PS |
1361 | connectivity_checked = transport->smart_options ? |
1362 | transport->smart_options->connectivity_checked : 0; | |
5fc31180 | 1363 | } |
05c44226 | 1364 | |
5fc31180 | 1365 | trace2_region_enter("fetch", "consume_refs", the_repository); |
8bc1f39f | 1366 | ret = store_updated_refs(transport->url, transport->remote->name, |
b3a80466 | 1367 | connectivity_checked, transaction, ref_map, |
b2463fc3 | 1368 | fetch_head); |
5fc31180 | 1369 | trace2_region_leave("fetch", "consume_refs", the_repository); |
1c7d1ab6 PS |
1370 | |
1371 | out: | |
58d4d7f1 | 1372 | transport_unlock_pack(transport, 0); |
b888d61c DB |
1373 | return ret; |
1374 | } | |
1375 | ||
583bc419 PS |
1376 | static int prune_refs(struct refspec *rs, |
1377 | struct ref_transaction *transaction, | |
1378 | struct ref *ref_map, | |
def11e71 | 1379 | const char *raw_url) |
f360d844 | 1380 | { |
4b3b33a7 | 1381 | int url_len, i, result = 0; |
a2ac50cb | 1382 | struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map); |
583bc419 | 1383 | struct strbuf err = STRBUF_INIT; |
4b3b33a7 | 1384 | char *url; |
f360d844 | 1385 | const char *dangling_msg = dry_run |
18986d53 NTND |
1386 | ? _(" (%s will become dangling)") |
1387 | : _(" (%s has become dangling)"); | |
f360d844 | 1388 | |
4b3b33a7 TM |
1389 | if (raw_url) |
1390 | url = transport_anonymize_url(raw_url); | |
1391 | else | |
1392 | url = xstrdup("foreign"); | |
1393 | ||
1394 | url_len = strlen(url); | |
1395 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
1396 | ; | |
1397 | ||
1398 | url_len = i + 1; | |
1399 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
1400 | url_len = i - 3; | |
1401 | ||
a087b432 | 1402 | if (!dry_run) { |
583bc419 PS |
1403 | if (transaction) { |
1404 | for (ref = stale_refs; ref; ref = ref->next) { | |
1405 | result = ref_transaction_delete(transaction, ref->name, NULL, 0, | |
1406 | "fetch: prune", &err); | |
1407 | if (result) | |
1408 | goto cleanup; | |
1409 | } | |
1410 | } else { | |
1411 | struct string_list refnames = STRING_LIST_INIT_NODUP; | |
a087b432 | 1412 | |
583bc419 PS |
1413 | for (ref = stale_refs; ref; ref = ref->next) |
1414 | string_list_append(&refnames, ref->name); | |
a087b432 | 1415 | |
583bc419 PS |
1416 | result = delete_refs("fetch: prune", &refnames, 0); |
1417 | string_list_clear(&refnames, 0); | |
1418 | } | |
a087b432 MH |
1419 | } |
1420 | ||
1421 | if (verbosity >= 0) { | |
b18aaaa5 PS |
1422 | int summary_width = transport_summary_width(stale_refs); |
1423 | ||
a087b432 | 1424 | for (ref = stale_refs; ref; ref = ref->next) { |
d0b39a03 | 1425 | struct strbuf sb = STRBUF_INIT; |
a087b432 MH |
1426 | if (!shown_url) { |
1427 | fprintf(stderr, _("From %.*s\n"), url_len, url); | |
1428 | shown_url = 1; | |
1429 | } | |
2cb040ba | 1430 | format_display(&sb, '-', _("[deleted]"), NULL, |
901f3d40 JH |
1431 | _("(none)"), prettify_refname(ref->name), |
1432 | summary_width); | |
d0b39a03 NTND |
1433 | fprintf(stderr, " %s\n",sb.buf); |
1434 | strbuf_release(&sb); | |
f360d844 JS |
1435 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
1436 | } | |
1437 | } | |
a087b432 | 1438 | |
583bc419 PS |
1439 | cleanup: |
1440 | strbuf_release(&err); | |
4b3b33a7 | 1441 | free(url); |
f360d844 JS |
1442 | free_refs(stale_refs); |
1443 | return result; | |
1444 | } | |
1445 | ||
12d47e3b | 1446 | static void check_not_current_branch(struct ref *ref_map) |
8ee5d731 | 1447 | { |
12d47e3b | 1448 | const char *path; |
8ee5d731 | 1449 | for (; ref_map; ref_map = ref_map->next) |
8bc1f39f | 1450 | if (ref_map->peer_ref && |
f7400da8 | 1451 | starts_with(ref_map->peer_ref->name, "refs/heads/") && |
12d47e3b | 1452 | (path = branch_checked_out(ref_map->peer_ref->name))) |
8bc1f39f AK |
1453 | die(_("refusing to fetch into branch '%s' " |
1454 | "checked out at '%s'"), | |
12d47e3b | 1455 | ref_map->peer_ref->name, path); |
8ee5d731 JS |
1456 | } |
1457 | ||
e6cc5104 JH |
1458 | static int truncate_fetch_head(void) |
1459 | { | |
102de880 | 1460 | const char *filename = git_path_fetch_head(the_repository); |
ea56518d | 1461 | FILE *fp = fopen_for_writing(filename); |
e6cc5104 JH |
1462 | |
1463 | if (!fp) | |
c4904377 | 1464 | return error_errno(_("cannot open '%s'"), filename); |
e6cc5104 JH |
1465 | fclose(fp); |
1466 | return 0; | |
1467 | } | |
1468 | ||
db5723c6 JH |
1469 | static void set_option(struct transport *transport, const char *name, const char *value) |
1470 | { | |
1471 | int r = transport_set_option(transport, name, value); | |
1472 | if (r < 0) | |
66996bea | 1473 | die(_("option \"%s\" value \"%s\" is not valid for %s"), |
db5723c6 JH |
1474 | name, value, transport->url); |
1475 | if (r > 0) | |
66996bea | 1476 | warning(_("option \"%s\" is ignored for %s\n"), |
db5723c6 JH |
1477 | name, transport->url); |
1478 | } | |
1479 | ||
3390e42a | 1480 | |
5cf88fd8 | 1481 | static int add_oid(const char *refname UNUSED, |
63e14ee2 | 1482 | const struct object_id *oid, |
5cf88fd8 | 1483 | int flags UNUSED, void *cb_data) |
3390e42a JT |
1484 | { |
1485 | struct oid_array *oids = cb_data; | |
1486 | ||
1487 | oid_array_append(oids, oid); | |
1488 | return 0; | |
1489 | } | |
1490 | ||
1491 | static void add_negotiation_tips(struct git_transport_options *smart_options) | |
1492 | { | |
1493 | struct oid_array *oids = xcalloc(1, sizeof(*oids)); | |
1494 | int i; | |
1495 | ||
1496 | for (i = 0; i < negotiation_tip.nr; i++) { | |
1497 | const char *s = negotiation_tip.items[i].string; | |
1498 | int old_nr; | |
1499 | if (!has_glob_specials(s)) { | |
1500 | struct object_id oid; | |
d850b7a5 | 1501 | if (repo_get_oid(the_repository, s, &oid)) |
82823118 JT |
1502 | die(_("%s is not a valid object"), s); |
1503 | if (!has_object(the_repository, &oid, 0)) | |
1504 | die(_("the object %s does not exist"), s); | |
3390e42a JT |
1505 | oid_array_append(oids, &oid); |
1506 | continue; | |
1507 | } | |
1508 | old_nr = oids->nr; | |
1509 | for_each_glob_ref(add_oid, s, oids); | |
1510 | if (old_nr == oids->nr) | |
66996bea | 1511 | warning("ignoring --negotiation-tip=%s because it does not match any refs", |
3390e42a JT |
1512 | s); |
1513 | } | |
1514 | smart_options->negotiation_tips = oids; | |
1515 | } | |
1516 | ||
508ea882 | 1517 | static struct transport *prepare_transport(struct remote *remote, int deepen) |
db5723c6 JH |
1518 | { |
1519 | struct transport *transport; | |
87c2d9d3 | 1520 | |
db5723c6 JH |
1521 | transport = transport_get(remote, NULL); |
1522 | transport_set_verbosity(transport, verbosity, progress); | |
c915f11e | 1523 | transport->family = family; |
db5723c6 JH |
1524 | if (upload_pack) |
1525 | set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack); | |
1526 | if (keep) | |
1527 | set_option(transport, TRANS_OPT_KEEP, "yes"); | |
1528 | if (depth) | |
1529 | set_option(transport, TRANS_OPT_DEPTH, depth); | |
508ea882 NTND |
1530 | if (deepen && deepen_since) |
1531 | set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since); | |
a45a2600 NTND |
1532 | if (deepen && deepen_not.nr) |
1533 | set_option(transport, TRANS_OPT_DEEPEN_NOT, | |
1534 | (const char *)&deepen_not); | |
cccf74e2 NTND |
1535 | if (deepen_relative) |
1536 | set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes"); | |
48d25cae NTND |
1537 | if (update_shallow) |
1538 | set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); | |
3c7bab06 RC |
1539 | if (refetch) |
1540 | set_option(transport, TRANS_OPT_REFETCH, "yes"); | |
acb0c572 | 1541 | if (filter_options.choice) { |
cf9ceb5a MD |
1542 | const char *spec = |
1543 | expand_list_objects_filter_spec(&filter_options); | |
1544 | set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec); | |
acb0c572 JH |
1545 | set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); |
1546 | } | |
3390e42a JT |
1547 | if (negotiation_tip.nr) { |
1548 | if (transport->smart_options) | |
1549 | add_negotiation_tips(transport->smart_options); | |
1550 | else | |
66996bea | 1551 | warning("ignoring --negotiation-tip because the protocol does not support it"); |
3390e42a | 1552 | } |
db5723c6 JH |
1553 | return transport; |
1554 | } | |
1555 | ||
62091b4c | 1556 | static int backfill_tags(struct transport *transport, |
b3a80466 | 1557 | struct ref_transaction *transaction, |
62091b4c | 1558 | struct ref *ref_map, |
b2463fc3 | 1559 | struct fetch_head *fetch_head) |
069d5032 | 1560 | { |
62091b4c | 1561 | int retcode, cannot_reuse; |
508ea882 NTND |
1562 | |
1563 | /* | |
1564 | * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it | |
1565 | * when remote helper is used (setting it to an empty string | |
1566 | * is not unsetting). We could extend the remote helper | |
1567 | * protocol for that, but for now, just force a new connection | |
a45a2600 | 1568 | * without deepen-since. Similar story for deepen-not. |
508ea882 | 1569 | */ |
a45a2600 NTND |
1570 | cannot_reuse = transport->cannot_reuse || |
1571 | deepen_since || deepen_not.nr; | |
508ea882 NTND |
1572 | if (cannot_reuse) { |
1573 | gsecondary = prepare_transport(transport->remote, 0); | |
b26ed430 JH |
1574 | transport = gsecondary; |
1575 | } | |
1576 | ||
069d5032 JH |
1577 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
1578 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); | |
cccf74e2 | 1579 | transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL); |
b2463fc3 | 1580 | retcode = fetch_and_consume_refs(transport, transaction, ref_map, fetch_head); |
b26ed430 JH |
1581 | |
1582 | if (gsecondary) { | |
1583 | transport_disconnect(gsecondary); | |
1584 | gsecondary = NULL; | |
1585 | } | |
62091b4c PS |
1586 | |
1587 | return retcode; | |
069d5032 JH |
1588 | } |
1589 | ||
b888d61c | 1590 | static int do_fetch(struct transport *transport, |
65a1301f | 1591 | struct refspec *rs) |
b888d61c | 1592 | { |
b3a80466 | 1593 | struct ref_transaction *transaction = NULL; |
efbade06 | 1594 | struct ref *ref_map = NULL; |
b888d61c | 1595 | int autotags = (transport->remote->fetch_tags == 1); |
5b87d8d3 | 1596 | int retcode = 0; |
6d1700d5 | 1597 | const struct ref *remote_refs; |
39835409 JT |
1598 | struct transport_ls_refs_options transport_ls_refs_options = |
1599 | TRANSPORT_LS_REFS_OPTIONS_INIT; | |
e70a3030 | 1600 | int must_list_refs = 1; |
2983cec0 | 1601 | struct fetch_head fetch_head = { 0 }; |
b3a80466 | 1602 | struct strbuf err = STRBUF_INIT; |
b1a01e1c | 1603 | |
ed368546 DJ |
1604 | if (tags == TAGS_DEFAULT) { |
1605 | if (transport->remote->fetch_tags == 2) | |
1606 | tags = TAGS_SET; | |
1607 | if (transport->remote->fetch_tags == -1) | |
1608 | tags = TAGS_UNSET; | |
1609 | } | |
b888d61c | 1610 | |
b888d61c | 1611 | /* if not appending, truncate FETCH_HEAD */ |
887952b8 | 1612 | if (!append && write_fetch_head) { |
5b87d8d3 MH |
1613 | retcode = truncate_fetch_head(); |
1614 | if (retcode) | |
1615 | goto cleanup; | |
d6617c7c | 1616 | } |
b888d61c | 1617 | |
e70a3030 JT |
1618 | if (rs->nr) { |
1619 | int i; | |
1620 | ||
39835409 | 1621 | refspec_ref_prefixes(rs, &transport_ls_refs_options.ref_prefixes); |
e70a3030 JT |
1622 | |
1623 | /* | |
1624 | * We can avoid listing refs if all of them are exact | |
1625 | * OIDs | |
1626 | */ | |
1627 | must_list_refs = 0; | |
1628 | for (i = 0; i < rs->nr; i++) { | |
1629 | if (!rs->items[i].exact_sha1) { | |
1630 | must_list_refs = 1; | |
1631 | break; | |
1632 | } | |
1633 | } | |
49ca2fba JK |
1634 | } else { |
1635 | struct branch *branch = branch_get(NULL); | |
1636 | ||
1637 | if (transport->remote->fetch.nr) | |
1638 | refspec_ref_prefixes(&transport->remote->fetch, | |
1639 | &transport_ls_refs_options.ref_prefixes); | |
1640 | if (branch_has_merge_config(branch) && | |
1641 | !strcmp(branch->remote_name, transport->remote->name)) { | |
1642 | int i; | |
1643 | for (i = 0; i < branch->merge_nr; i++) { | |
1644 | strvec_push(&transport_ls_refs_options.ref_prefixes, | |
1645 | branch->merge[i]->src); | |
1646 | } | |
1647 | } | |
1648 | } | |
b888d61c | 1649 | |
e70a3030 JT |
1650 | if (tags == TAGS_SET || tags == TAGS_DEFAULT) { |
1651 | must_list_refs = 1; | |
39835409 JT |
1652 | if (transport_ls_refs_options.ref_prefixes.nr) |
1653 | strvec_push(&transport_ls_refs_options.ref_prefixes, | |
1654 | "refs/tags/"); | |
b888d61c DB |
1655 | } |
1656 | ||
5fc31180 JS |
1657 | if (must_list_refs) { |
1658 | trace2_region_enter("fetch", "remote_refs", the_repository); | |
39835409 JT |
1659 | remote_refs = transport_get_remote_refs(transport, |
1660 | &transport_ls_refs_options); | |
5fc31180 JS |
1661 | trace2_region_leave("fetch", "remote_refs", the_repository); |
1662 | } else | |
e70a3030 JT |
1663 | remote_refs = NULL; |
1664 | ||
f36d4f83 | 1665 | transport_ls_refs_options_release(&transport_ls_refs_options); |
6d1700d5 BW |
1666 | |
1667 | ref_map = get_ref_map(transport->remote, remote_refs, rs, | |
1668 | tags, &autotags); | |
8ee5d731 | 1669 | if (!update_head_ok) |
12d47e3b | 1670 | check_not_current_branch(ref_map); |
b888d61c | 1671 | |
2983cec0 PS |
1672 | retcode = open_fetch_head(&fetch_head); |
1673 | if (retcode) | |
1674 | goto cleanup; | |
1675 | ||
b3a80466 PS |
1676 | if (atomic_fetch) { |
1677 | transaction = ref_transaction_begin(&err); | |
1678 | if (!transaction) { | |
1679 | retcode = error("%s", err.buf); | |
1680 | goto cleanup; | |
1681 | } | |
1682 | } | |
1683 | ||
41fa7d2e SP |
1684 | if (tags == TAGS_DEFAULT && autotags) |
1685 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); | |
ed43de6e | 1686 | if (prune) { |
0838bf47 MH |
1687 | /* |
1688 | * We only prune based on refspecs specified | |
1689 | * explicitly (via command line or configuration); we | |
1690 | * don't care whether --tags was specified. | |
1691 | */ | |
65a1301f | 1692 | if (rs->nr) { |
583bc419 | 1693 | retcode = prune_refs(rs, transaction, ref_map, transport->url); |
e8c1e6c7 | 1694 | } else { |
c9e04d90 | 1695 | retcode = prune_refs(&transport->remote->fetch, |
583bc419 | 1696 | transaction, ref_map, |
c9e04d90 | 1697 | transport->url); |
e8c1e6c7 | 1698 | } |
c9e04d90 TG |
1699 | if (retcode != 0) |
1700 | retcode = 1; | |
ed43de6e | 1701 | } |
2983cec0 | 1702 | |
b2463fc3 | 1703 | if (fetch_and_consume_refs(transport, transaction, ref_map, &fetch_head)) { |
10a6cc88 TM |
1704 | retcode = 1; |
1705 | goto cleanup; | |
1706 | } | |
24bc1a12 | 1707 | |
efbade06 PS |
1708 | /* |
1709 | * If neither --no-tags nor --tags was specified, do automated tag | |
1710 | * following. | |
1711 | */ | |
1712 | if (tags == TAGS_DEFAULT && autotags) { | |
1713 | struct ref *tags_ref_map = NULL, **tail = &tags_ref_map; | |
1714 | ||
b3a80466 | 1715 | find_non_local_tags(remote_refs, transaction, &tags_ref_map, &tail); |
62091b4c PS |
1716 | if (tags_ref_map) { |
1717 | /* | |
1718 | * If backfilling of tags fails then we want to tell | |
1719 | * the user so, but we have to continue regardless to | |
1720 | * populate upstream information of the references we | |
b3a80466 PS |
1721 | * have already fetched above. The exception though is |
1722 | * when `--atomic` is passed: in that case we'll abort | |
1723 | * the transaction and don't commit anything. | |
62091b4c | 1724 | */ |
b3a80466 | 1725 | if (backfill_tags(transport, transaction, tags_ref_map, |
b2463fc3 | 1726 | &fetch_head)) |
62091b4c PS |
1727 | retcode = 1; |
1728 | } | |
efbade06 PS |
1729 | |
1730 | free_refs(tags_ref_map); | |
1731 | } | |
1732 | ||
b3a80466 PS |
1733 | if (transaction) { |
1734 | if (retcode) | |
1735 | goto cleanup; | |
1736 | ||
1737 | retcode = ref_transaction_commit(transaction, &err); | |
1738 | if (retcode) { | |
1739 | error("%s", err.buf); | |
1740 | ref_transaction_free(transaction); | |
1741 | transaction = NULL; | |
1742 | goto cleanup; | |
1743 | } | |
1744 | } | |
1745 | ||
2983cec0 PS |
1746 | commit_fetch_head(&fetch_head); |
1747 | ||
24bc1a12 CB |
1748 | if (set_upstream) { |
1749 | struct branch *branch = branch_get("HEAD"); | |
1750 | struct ref *rm; | |
1751 | struct ref *source_ref = NULL; | |
1752 | ||
1753 | /* | |
1754 | * We're setting the upstream configuration for the | |
15beaaa3 | 1755 | * current branch. The relevant upstream is the |
24bc1a12 CB |
1756 | * fetched branch that is meant to be merged with the |
1757 | * current one, i.e. the one fetched to FETCH_HEAD. | |
1758 | * | |
1759 | * When there are several such branches, consider the | |
1760 | * request ambiguous and err on the safe side by doing | |
1761 | * nothing and just emit a warning. | |
1762 | */ | |
1763 | for (rm = ref_map; rm; rm = rm->next) { | |
1764 | if (!rm->peer_ref) { | |
1765 | if (source_ref) { | |
391c7e40 | 1766 | warning(_("multiple branches detected, incompatible with --set-upstream")); |
efbade06 | 1767 | goto cleanup; |
24bc1a12 CB |
1768 | } else { |
1769 | source_ref = rm; | |
1770 | } | |
1771 | } | |
1772 | } | |
1773 | if (source_ref) { | |
17baeaf8 ÆAB |
1774 | if (!branch) { |
1775 | const char *shortname = source_ref->name; | |
1776 | skip_prefix(shortname, "refs/heads/", &shortname); | |
1777 | ||
1778 | warning(_("could not set upstream of HEAD to '%s' from '%s' when " | |
1779 | "it does not point to any branch."), | |
1780 | shortname, transport->remote->name); | |
efbade06 | 1781 | goto cleanup; |
17baeaf8 ÆAB |
1782 | } |
1783 | ||
24bc1a12 CB |
1784 | if (!strcmp(source_ref->name, "HEAD") || |
1785 | starts_with(source_ref->name, "refs/heads/")) | |
1786 | install_branch_config(0, | |
1787 | branch->name, | |
1788 | transport->remote->name, | |
1789 | source_ref->name); | |
1790 | else if (starts_with(source_ref->name, "refs/remotes/")) | |
1791 | warning(_("not setting upstream for a remote remote-tracking branch")); | |
1792 | else if (starts_with(source_ref->name, "refs/tags/")) | |
1793 | warning(_("not setting upstream for a remote tag")); | |
1794 | else | |
1795 | warning(_("unknown branch type")); | |
1796 | } else { | |
66996bea AK |
1797 | warning(_("no source branch found;\n" |
1798 | "you need to specify exactly one branch with the --set-upstream option")); | |
24bc1a12 CB |
1799 | } |
1800 | } | |
b888d61c | 1801 | |
8bc1f39f | 1802 | cleanup: |
b3a80466 PS |
1803 | if (retcode && transaction) { |
1804 | ref_transaction_abort(transaction, &err); | |
1805 | error("%s", err.buf); | |
b888d61c DB |
1806 | } |
1807 | ||
2983cec0 | 1808 | close_fetch_head(&fetch_head); |
b3a80466 | 1809 | strbuf_release(&err); |
efbade06 | 1810 | free_refs(ref_map); |
5b87d8d3 | 1811 | return retcode; |
b888d61c DB |
1812 | } |
1813 | ||
9c4a036b BG |
1814 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
1815 | { | |
1816 | struct string_list *list = priv; | |
7cc91a2f | 1817 | if (!remote->skip_default_update) |
1d2f80fa | 1818 | string_list_append(list, remote->name); |
9c4a036b BG |
1819 | return 0; |
1820 | } | |
1821 | ||
1822 | struct remote_group_data { | |
1823 | const char *name; | |
1824 | struct string_list *list; | |
1825 | }; | |
1826 | ||
1827 | static int get_remote_group(const char *key, const char *value, void *priv) | |
1828 | { | |
1829 | struct remote_group_data *g = priv; | |
1830 | ||
bc598c32 | 1831 | if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) { |
9c4a036b | 1832 | /* split list by white space */ |
9c4a036b | 1833 | while (*value) { |
5f65499f MH |
1834 | size_t wordlen = strcspn(value, " \t\n"); |
1835 | ||
e286542d | 1836 | if (wordlen >= 1) |
b7410f61 | 1837 | string_list_append_nodup(g->list, |
e286542d MH |
1838 | xstrndup(value, wordlen)); |
1839 | value += wordlen + (value[wordlen] != '\0'); | |
9c4a036b BG |
1840 | } |
1841 | } | |
1842 | ||
1843 | return 0; | |
1844 | } | |
1845 | ||
1846 | static int add_remote_or_group(const char *name, struct string_list *list) | |
1847 | { | |
1848 | int prev_nr = list->nr; | |
66dbfd55 GV |
1849 | struct remote_group_data g; |
1850 | g.name = name; g.list = list; | |
9c4a036b BG |
1851 | |
1852 | git_config(get_remote_group, &g); | |
1853 | if (list->nr == prev_nr) { | |
674468b3 | 1854 | struct remote *remote = remote_get(name); |
e459b073 | 1855 | if (!remote_is_configured(remote, 0)) |
9c4a036b | 1856 | return 0; |
1d2f80fa | 1857 | string_list_append(list, remote->name); |
9c4a036b BG |
1858 | } |
1859 | return 1; | |
1860 | } | |
1861 | ||
22f9b7f3 | 1862 | static void add_options_to_argv(struct strvec *argv) |
9c4a036b | 1863 | { |
28a15401 | 1864 | if (dry_run) |
22f9b7f3 | 1865 | strvec_push(argv, "--dry-run"); |
90765fa3 | 1866 | if (prune != -1) |
22f9b7f3 | 1867 | strvec_push(argv, prune ? "--prune" : "--no-prune"); |
97716d21 | 1868 | if (prune_tags != -1) |
22f9b7f3 | 1869 | strvec_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags"); |
bba5322a | 1870 | if (update_head_ok) |
22f9b7f3 | 1871 | strvec_push(argv, "--update-head-ok"); |
bba5322a | 1872 | if (force) |
22f9b7f3 | 1873 | strvec_push(argv, "--force"); |
bba5322a | 1874 | if (keep) |
22f9b7f3 | 1875 | strvec_push(argv, "--keep"); |
be254a0e | 1876 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
22f9b7f3 | 1877 | strvec_push(argv, "--recurse-submodules"); |
8f0700dd | 1878 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
22f9b7f3 | 1879 | strvec_push(argv, "--recurse-submodules=on-demand"); |
85566460 | 1880 | if (tags == TAGS_SET) |
22f9b7f3 | 1881 | strvec_push(argv, "--tags"); |
85566460 | 1882 | else if (tags == TAGS_UNSET) |
22f9b7f3 | 1883 | strvec_push(argv, "--no-tags"); |
9c4a036b | 1884 | if (verbosity >= 2) |
22f9b7f3 | 1885 | strvec_push(argv, "-v"); |
9c4a036b | 1886 | if (verbosity >= 1) |
22f9b7f3 | 1887 | strvec_push(argv, "-v"); |
9c4a036b | 1888 | else if (verbosity < 0) |
22f9b7f3 | 1889 | strvec_push(argv, "-q"); |
4e735c13 | 1890 | if (family == TRANSPORT_FAMILY_IPV4) |
6854689e | 1891 | strvec_push(argv, "--ipv4"); |
4e735c13 | 1892 | else if (family == TRANSPORT_FAMILY_IPV6) |
6854689e | 1893 | strvec_push(argv, "--ipv6"); |
15184ae9 EW |
1894 | if (!write_fetch_head) |
1895 | strvec_push(argv, "--no-write-fetch-head"); | |
7dce19d3 JL |
1896 | } |
1897 | ||
d54dea77 JS |
1898 | /* Fetch multiple remotes in parallel */ |
1899 | ||
1900 | struct parallel_fetch_state { | |
1901 | const char **argv; | |
1902 | struct string_list *remotes; | |
1903 | int next, result; | |
1904 | }; | |
1905 | ||
a5c76b36 JK |
1906 | static int fetch_next_remote(struct child_process *cp, |
1907 | struct strbuf *out UNUSED, | |
d54dea77 JS |
1908 | void *cb, void **task_cb) |
1909 | { | |
1910 | struct parallel_fetch_state *state = cb; | |
1911 | char *remote; | |
1912 | ||
1913 | if (state->next < 0 || state->next >= state->remotes->nr) | |
1914 | return 0; | |
1915 | ||
1916 | remote = state->remotes->items[state->next++].string; | |
1917 | *task_cb = remote; | |
1918 | ||
22f9b7f3 JK |
1919 | strvec_pushv(&cp->args, state->argv); |
1920 | strvec_push(&cp->args, remote); | |
d54dea77 JS |
1921 | cp->git_cmd = 1; |
1922 | ||
1923 | if (verbosity >= 0) | |
1924 | printf(_("Fetching %s\n"), remote); | |
1925 | ||
1926 | return 1; | |
1927 | } | |
1928 | ||
a5c76b36 JK |
1929 | static int fetch_failed_to_start(struct strbuf *out UNUSED, |
1930 | void *cb, void *task_cb) | |
d54dea77 JS |
1931 | { |
1932 | struct parallel_fetch_state *state = cb; | |
1933 | const char *remote = task_cb; | |
1934 | ||
66996bea | 1935 | state->result = error(_("could not fetch %s"), remote); |
d54dea77 JS |
1936 | |
1937 | return 0; | |
1938 | } | |
1939 | ||
1940 | static int fetch_finished(int result, struct strbuf *out, | |
1941 | void *cb, void *task_cb) | |
1942 | { | |
1943 | struct parallel_fetch_state *state = cb; | |
1944 | const char *remote = task_cb; | |
1945 | ||
1946 | if (result) { | |
1947 | strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"), | |
1948 | remote, result); | |
1949 | state->result = -1; | |
1950 | } | |
1951 | ||
1952 | return 0; | |
1953 | } | |
1954 | ||
1955 | static int fetch_multiple(struct string_list *list, int max_children) | |
7dce19d3 JL |
1956 | { |
1957 | int i, result = 0; | |
22f9b7f3 | 1958 | struct strvec argv = STRVEC_INIT; |
9c4a036b | 1959 | |
887952b8 | 1960 | if (!append && write_fetch_head) { |
e6cc5104 JH |
1961 | int errcode = truncate_fetch_head(); |
1962 | if (errcode) | |
1963 | return errcode; | |
1964 | } | |
1965 | ||
22f9b7f3 | 1966 | strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc", |
f6d8942b | 1967 | "--no-write-commit-graph", NULL); |
85556d4e JK |
1968 | add_options_to_argv(&argv); |
1969 | ||
d54dea77 | 1970 | if (max_children != 1 && list->nr != 1) { |
d70a9eb6 | 1971 | struct parallel_fetch_state state = { argv.v, list, 0, 0 }; |
36d69bf7 ÆAB |
1972 | const struct run_process_parallel_opts opts = { |
1973 | .tr2_category = "fetch", | |
1974 | .tr2_label = "parallel/fetch", | |
1975 | ||
1976 | .processes = max_children, | |
1977 | ||
1978 | .get_next_task = &fetch_next_remote, | |
1979 | .start_failure = &fetch_failed_to_start, | |
1980 | .task_finished = &fetch_finished, | |
1981 | .data = &state, | |
1982 | }; | |
d54dea77 | 1983 | |
22f9b7f3 | 1984 | strvec_push(&argv, "--end-of-options"); |
7dd5762d | 1985 | |
36d69bf7 | 1986 | run_processes_parallel(&opts); |
7dd5762d | 1987 | result = state.result; |
d54dea77 JS |
1988 | } else |
1989 | for (i = 0; i < list->nr; i++) { | |
1990 | const char *name = list->items[i].string; | |
ddbb47fd RS |
1991 | struct child_process cmd = CHILD_PROCESS_INIT; |
1992 | ||
1993 | strvec_pushv(&cmd.args, argv.v); | |
1994 | strvec_push(&cmd.args, name); | |
d54dea77 JS |
1995 | if (verbosity >= 0) |
1996 | printf(_("Fetching %s\n"), name); | |
ddbb47fd RS |
1997 | cmd.git_cmd = 1; |
1998 | if (run_command(&cmd)) { | |
66996bea | 1999 | error(_("could not fetch %s"), name); |
d54dea77 JS |
2000 | result = 1; |
2001 | } | |
9c4a036b | 2002 | } |
9c4a036b | 2003 | |
22f9b7f3 | 2004 | strvec_clear(&argv); |
d54dea77 | 2005 | return !!result; |
9c4a036b BG |
2006 | } |
2007 | ||
aa57b871 JH |
2008 | /* |
2009 | * Fetching from the promisor remote should use the given filter-spec | |
2010 | * or inherit the default filter-spec from the config. | |
2011 | */ | |
2012 | static inline void fetch_one_setup_partial(struct remote *remote) | |
2013 | { | |
2014 | /* | |
2015 | * Explicit --no-filter argument overrides everything, regardless | |
2016 | * of any prior partial clones and fetches. | |
2017 | */ | |
2018 | if (filter_options.no_filter) | |
2019 | return; | |
2020 | ||
2021 | /* | |
2022 | * If no prior partial clone/fetch and the current fetch DID NOT | |
2023 | * request a partial-fetch, do a normal fetch. | |
2024 | */ | |
a5183d76 | 2025 | if (!repo_has_promisor_remote(the_repository) && !filter_options.choice) |
aa57b871 JH |
2026 | return; |
2027 | ||
2028 | /* | |
5e461393 CC |
2029 | * If this is a partial-fetch request, we enable partial on |
2030 | * this repo if not already enabled and remember the given | |
2031 | * filter-spec as the default for subsequent fetches to this | |
23547c40 | 2032 | * remote if there is currently no default filter-spec. |
aa57b871 | 2033 | */ |
5e461393 | 2034 | if (filter_options.choice) { |
aa57b871 JH |
2035 | partial_clone_register(remote->name, &filter_options); |
2036 | return; | |
2037 | } | |
2038 | ||
aa57b871 JH |
2039 | /* |
2040 | * Do a partial-fetch from the promisor remote using either the | |
2041 | * explicitly given filter-spec or inherit the filter-spec from | |
2042 | * the config. | |
2043 | */ | |
2044 | if (!filter_options.choice) | |
fa3d1b63 | 2045 | partial_clone_get_default_filter_spec(&filter_options, remote->name); |
aa57b871 JH |
2046 | return; |
2047 | } | |
2048 | ||
2b713c27 JT |
2049 | static int fetch_one(struct remote *remote, int argc, const char **argv, |
2050 | int prune_tags_ok, int use_stdin_refspecs) | |
b888d61c | 2051 | { |
d7c8e307 BW |
2052 | struct refspec rs = REFSPEC_INIT_FETCH; |
2053 | int i; | |
7b7f39ea | 2054 | int exit_code; |
6317972c ÆAB |
2055 | int maybe_prune_tags; |
2056 | int remote_via_config = remote_is_configured(remote, 0); | |
b888d61c | 2057 | |
fa685bdf | 2058 | if (!remote) |
66996bea AK |
2059 | die(_("no remote repository specified; please specify either a URL or a\n" |
2060 | "remote name from which new revisions should be fetched")); | |
fa685bdf | 2061 | |
508ea882 | 2062 | gtransport = prepare_transport(remote, 1); |
737c5a9c MS |
2063 | |
2064 | if (prune < 0) { | |
2065 | /* no command line request */ | |
07118832 ÆAB |
2066 | if (0 <= remote->prune) |
2067 | prune = remote->prune; | |
737c5a9c MS |
2068 | else if (0 <= fetch_prune_config) |
2069 | prune = fetch_prune_config; | |
2070 | else | |
2071 | prune = PRUNE_BY_DEFAULT; | |
2072 | } | |
2073 | ||
97716d21 ÆAB |
2074 | if (prune_tags < 0) { |
2075 | /* no command line request */ | |
2076 | if (0 <= remote->prune_tags) | |
2077 | prune_tags = remote->prune_tags; | |
2078 | else if (0 <= fetch_prune_tags_config) | |
2079 | prune_tags = fetch_prune_tags_config; | |
2080 | else | |
2081 | prune_tags = PRUNE_TAGS_BY_DEFAULT; | |
2082 | } | |
2083 | ||
6317972c ÆAB |
2084 | maybe_prune_tags = prune_tags_ok && prune_tags; |
2085 | if (maybe_prune_tags && remote_via_config) | |
95303500 | 2086 | refspec_append(&remote->fetch, TAG_REFSPEC); |
97716d21 | 2087 | |
d7c8e307 BW |
2088 | if (maybe_prune_tags && (argc || !remote_via_config)) |
2089 | refspec_append(&rs, TAG_REFSPEC); | |
6317972c | 2090 | |
d7c8e307 BW |
2091 | for (i = 0; i < argc; i++) { |
2092 | if (!strcmp(argv[i], "tag")) { | |
d7c8e307 BW |
2093 | i++; |
2094 | if (i >= argc) | |
66996bea | 2095 | die(_("you need to specify a tag name")); |
d7c8e307 | 2096 | |
1af8b8c0 RS |
2097 | refspec_appendf(&rs, "refs/tags/%s:refs/tags/%s", |
2098 | argv[i], argv[i]); | |
d7c8e307 BW |
2099 | } else { |
2100 | refspec_append(&rs, argv[i]); | |
b888d61c | 2101 | } |
b888d61c DB |
2102 | } |
2103 | ||
2b713c27 JT |
2104 | if (use_stdin_refspecs) { |
2105 | struct strbuf line = STRBUF_INIT; | |
2106 | while (strbuf_getline_lf(&line, stdin) != EOF) | |
2107 | refspec_append(&rs, line.buf); | |
2108 | strbuf_release(&line); | |
2109 | } | |
2110 | ||
5e3548ef BW |
2111 | if (server_options.nr) |
2112 | gtransport->server_options = &server_options; | |
2113 | ||
57b235a4 | 2114 | sigchain_push_common(unlock_pack_on_signal); |
58d4d7f1 | 2115 | atexit(unlock_pack_atexit); |
14358894 | 2116 | sigchain_push(SIGPIPE, SIG_IGN); |
65a1301f | 2117 | exit_code = do_fetch(gtransport, &rs); |
14358894 | 2118 | sigchain_pop(SIGPIPE); |
d7c8e307 | 2119 | refspec_clear(&rs); |
af234459 JH |
2120 | transport_disconnect(gtransport); |
2121 | gtransport = NULL; | |
7b7f39ea | 2122 | return exit_code; |
b888d61c | 2123 | } |
9c4a036b BG |
2124 | |
2125 | int cmd_fetch(int argc, const char **argv, const char *prefix) | |
2126 | { | |
2127 | int i; | |
7f0cc04f | 2128 | const char *bundle_uri; |
b7410f61 | 2129 | struct string_list list = STRING_LIST_INIT_DUP; |
a1743343 | 2130 | struct remote *remote = NULL; |
9c4a036b | 2131 | int result = 0; |
c1a7902f | 2132 | int prune_tags_ok = 1; |
9c4a036b | 2133 | |
bbc30f99 JK |
2134 | packet_trace_identity("fetch"); |
2135 | ||
9c4a036b BG |
2136 | /* Record the command line for the reflog */ |
2137 | strbuf_addstr(&default_rla, "fetch"); | |
46da295a JS |
2138 | for (i = 1; i < argc; i++) { |
2139 | /* This handles non-URLs gracefully */ | |
2140 | char *anon = transport_anonymize_url(argv[i]); | |
2141 | ||
2142 | strbuf_addf(&default_rla, " %s", anon); | |
2143 | free(anon); | |
2144 | } | |
9c4a036b | 2145 | |
737c5a9c | 2146 | git_config(git_fetch_config, NULL); |
059fda19 JS |
2147 | if (the_repository->gitdir) { |
2148 | prepare_repo_settings(the_repository); | |
2149 | the_repository->settings.command_requires_full_index = 0; | |
2150 | } | |
737c5a9c | 2151 | |
9c4a036b BG |
2152 | argc = parse_options(argc, argv, prefix, |
2153 | builtin_fetch_options, builtin_fetch_usage, 0); | |
386c076a GC |
2154 | |
2155 | if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT) | |
2156 | recurse_submodules = recurse_submodules_cli; | |
2157 | ||
2158 | if (negotiate_only) { | |
2159 | switch (recurse_submodules_cli) { | |
2160 | case RECURSE_SUBMODULES_OFF: | |
2161 | case RECURSE_SUBMODULES_DEFAULT: | |
2162 | /* | |
2163 | * --negotiate-only should never recurse into | |
2164 | * submodules. Skip it by setting recurse_submodules to | |
2165 | * RECURSE_SUBMODULES_OFF. | |
2166 | */ | |
2167 | recurse_submodules = RECURSE_SUBMODULES_OFF; | |
2168 | break; | |
2169 | ||
2170 | default: | |
de4eaae6 JH |
2171 | die(_("options '%s' and '%s' cannot be used together"), |
2172 | "--negotiate-only", "--recurse-submodules"); | |
386c076a GC |
2173 | } |
2174 | } | |
2175 | ||
e5b94213 JT |
2176 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) { |
2177 | int *sfjc = submodule_fetch_jobs_config == -1 | |
2178 | ? &submodule_fetch_jobs_config : NULL; | |
2179 | int *rs = recurse_submodules == RECURSE_SUBMODULES_DEFAULT | |
2180 | ? &recurse_submodules : NULL; | |
2181 | ||
2182 | fetch_config_from_gitmodules(sfjc, rs); | |
2183 | } | |
9c4a036b | 2184 | |
eff40457 | 2185 | if (negotiate_only && !negotiation_tip.nr) |
2826ffad | 2186 | die(_("--negotiate-only needs one or more --negotiation-tip=*")); |
eff40457 | 2187 | |
cccf74e2 NTND |
2188 | if (deepen_relative) { |
2189 | if (deepen_relative < 0) | |
66996bea | 2190 | die(_("negative depth in --deepen is not supported")); |
cccf74e2 | 2191 | if (depth) |
43ea635c | 2192 | die(_("options '%s' and '%s' cannot be used together"), "--deepen", "--depth"); |
cccf74e2 NTND |
2193 | depth = xstrfmt("%d", deepen_relative); |
2194 | } | |
4dcb167f NTND |
2195 | if (unshallow) { |
2196 | if (depth) | |
43ea635c | 2197 | die(_("options '%s' and '%s' cannot be used together"), "--depth", "--unshallow"); |
c8813487 | 2198 | else if (!is_repository_shallow(the_repository)) |
4dcb167f | 2199 | die(_("--unshallow on a complete repository does not make sense")); |
2805bb59 JK |
2200 | else |
2201 | depth = xstrfmt("%d", INFINITE_DEPTH); | |
4dcb167f NTND |
2202 | } |
2203 | ||
5594bcad NTND |
2204 | /* no need to be strict, transport_set_option() will validate it again */ |
2205 | if (depth && atoi(depth) < 1) | |
2206 | die(_("depth %s is not a positive number"), depth); | |
a45a2600 | 2207 | if (depth || deepen_since || deepen_not.nr) |
508ea882 | 2208 | deepen = 1; |
5594bcad | 2209 | |
887952b8 JH |
2210 | /* FETCH_HEAD never gets updated in --dry-run mode */ |
2211 | if (dry_run) | |
2212 | write_fetch_head = 0; | |
2213 | ||
c39952b9 MA |
2214 | if (!max_jobs) |
2215 | max_jobs = online_cpus(); | |
2216 | ||
7f0cc04f DS |
2217 | if (!git_config_get_string_tmp("fetch.bundleuri", &bundle_uri) && |
2218 | fetch_bundle_uri(the_repository, bundle_uri, NULL)) | |
2219 | warning(_("failed to fetch bundles from '%s'"), bundle_uri); | |
2220 | ||
9c4a036b BG |
2221 | if (all) { |
2222 | if (argc == 1) | |
bd4a51fc | 2223 | die(_("fetch --all does not take a repository argument")); |
9c4a036b | 2224 | else if (argc > 1) |
bd4a51fc | 2225 | die(_("fetch --all does not make sense with refspecs")); |
9c4a036b | 2226 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
0353c688 JH |
2227 | |
2228 | /* do not do fetch_multiple() of one */ | |
2229 | if (list.nr == 1) | |
2230 | remote = remote_get(list.items[0].string); | |
9c4a036b BG |
2231 | } else if (argc == 0) { |
2232 | /* No arguments -- use default remote */ | |
2233 | remote = remote_get(NULL); | |
16679e37 BG |
2234 | } else if (multiple) { |
2235 | /* All arguments are assumed to be remotes or groups */ | |
2236 | for (i = 0; i < argc; i++) | |
2237 | if (!add_remote_or_group(argv[i], &list)) | |
66996bea AK |
2238 | die(_("no such remote or remote group: %s"), |
2239 | argv[i]); | |
9c4a036b BG |
2240 | } else { |
2241 | /* Single remote or group */ | |
2242 | (void) add_remote_or_group(argv[0], &list); | |
2243 | if (list.nr > 1) { | |
2244 | /* More than one remote */ | |
2245 | if (argc > 1) | |
66996bea | 2246 | die(_("fetching a group and specifying refspecs does not make sense")); |
9c4a036b BG |
2247 | } else { |
2248 | /* Zero or one remotes */ | |
2249 | remote = remote_get(argv[0]); | |
c1a7902f | 2250 | prune_tags_ok = (argc == 1); |
a1743343 JT |
2251 | argc--; |
2252 | argv++; | |
9c4a036b BG |
2253 | } |
2254 | } | |
06a668cb | 2255 | string_list_remove_duplicates(&list, 0); |
9c4a036b | 2256 | |
9c1e657a JT |
2257 | if (negotiate_only) { |
2258 | struct oidset acked_commits = OIDSET_INIT; | |
2259 | struct oidset_iter iter; | |
2260 | const struct object_id *oid; | |
2261 | ||
2262 | if (!remote) | |
2263 | die(_("must supply remote when using --negotiate-only")); | |
2264 | gtransport = prepare_transport(remote, 1); | |
2265 | if (gtransport->smart_options) { | |
2266 | gtransport->smart_options->acked_commits = &acked_commits; | |
2267 | } else { | |
66996bea | 2268 | warning(_("protocol does not support --negotiate-only, exiting")); |
bec587d4 GC |
2269 | result = 1; |
2270 | goto cleanup; | |
9c1e657a JT |
2271 | } |
2272 | if (server_options.nr) | |
2273 | gtransport->server_options = &server_options; | |
2274 | result = transport_fetch_refs(gtransport, NULL); | |
2275 | ||
2276 | oidset_iter_init(&acked_commits, &iter); | |
2277 | while ((oid = oidset_iter_next(&iter))) | |
2278 | printf("%s\n", oid_to_hex(oid)); | |
2279 | oidset_clear(&acked_commits); | |
2280 | } else if (remote) { | |
a5183d76 | 2281 | if (filter_options.choice || repo_has_promisor_remote(the_repository)) |
aa57b871 | 2282 | fetch_one_setup_partial(remote); |
2b713c27 | 2283 | result = fetch_one(remote, argc, argv, prune_tags_ok, stdin_refspecs); |
acb0c572 | 2284 | } else { |
d54dea77 JS |
2285 | int max_children = max_jobs; |
2286 | ||
acb0c572 | 2287 | if (filter_options.choice) |
e0137875 CC |
2288 | die(_("--filter can only be used with the remote " |
2289 | "configured in extensions.partialclone")); | |
d54dea77 | 2290 | |
c7b190da PS |
2291 | if (atomic_fetch) |
2292 | die(_("--atomic can only be used when fetching " | |
2293 | "from one remote")); | |
2294 | ||
2b713c27 JT |
2295 | if (stdin_refspecs) |
2296 | die(_("--stdin can only be used when fetching " | |
2297 | "from one remote")); | |
2298 | ||
d54dea77 JS |
2299 | if (max_children < 0) |
2300 | max_children = fetch_parallel_config; | |
2301 | ||
aa57b871 | 2302 | /* TODO should this also die if we have a previous partial-clone? */ |
d54dea77 | 2303 | result = fetch_multiple(&list, max_children); |
acb0c572 | 2304 | } |
a1743343 | 2305 | |
0353c688 JH |
2306 | |
2307 | /* | |
2308 | * This is only needed after fetch_one(), which does not fetch | |
2309 | * submodules by itself. | |
2310 | * | |
2311 | * When we fetch from multiple remotes, fetch_multiple() has | |
2312 | * already updated submodules to grab commits necessary for | |
2313 | * the fetched history from each remote, so there is no need | |
2314 | * to fetch submodules from here. | |
2315 | */ | |
2316 | if (!result && remote && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { | |
22f9b7f3 | 2317 | struct strvec options = STRVEC_INIT; |
d54dea77 JS |
2318 | int max_children = max_jobs; |
2319 | ||
2320 | if (max_children < 0) | |
2321 | max_children = submodule_fetch_jobs_config; | |
2322 | if (max_children < 0) | |
2323 | max_children = fetch_parallel_config; | |
85556d4e JK |
2324 | |
2325 | add_options_to_argv(&options); | |
b90d9f76 GC |
2326 | result = fetch_submodules(the_repository, |
2327 | &options, | |
2328 | submodule_prefix, | |
2329 | recurse_submodules, | |
2330 | recurse_submodules_default, | |
2331 | verbosity < 0, | |
2332 | max_children); | |
22f9b7f3 | 2333 | strvec_clear(&options); |
7dce19d3 JL |
2334 | } |
2335 | ||
135a12bc GC |
2336 | /* |
2337 | * Skip irrelevant tasks because we know objects were not | |
2338 | * fetched. | |
2339 | * | |
2340 | * NEEDSWORK: as a future optimization, we can return early | |
2341 | * whenever objects were not fetched e.g. if we already have all | |
2342 | * of them. | |
2343 | */ | |
2344 | if (negotiate_only) | |
2345 | goto cleanup; | |
9c4a036b | 2346 | |
50f26bd0 | 2347 | prepare_repo_settings(the_repository); |
c14e6e79 JS |
2348 | if (fetch_write_commit_graph > 0 || |
2349 | (fetch_write_commit_graph < 0 && | |
2350 | the_repository->settings.fetch_write_commit_graph)) { | |
5a535094 | 2351 | int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT; |
50f26bd0 DS |
2352 | |
2353 | if (progress) | |
5a535094 | 2354 | commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS; |
50f26bd0 | 2355 | |
0bd52e27 | 2356 | write_commit_graph_reachable(the_repository->objects->odb, |
50f26bd0 | 2357 | commit_graph_flags, |
63020f17 | 2358 | NULL); |
50f26bd0 DS |
2359 | } |
2360 | ||
7390f05a RC |
2361 | if (enable_auto_gc) { |
2362 | if (refetch) { | |
2363 | /* | |
2364 | * Hint auto-maintenance strongly to encourage repacking, | |
2365 | * but respect config settings disabling it. | |
2366 | */ | |
2367 | int opt_val; | |
2368 | if (git_config_get_int("gc.autopacklimit", &opt_val)) | |
2369 | opt_val = -1; | |
2370 | if (opt_val != 0) | |
2371 | git_config_push_parameter("gc.autoPackLimit=1"); | |
2372 | ||
2373 | if (git_config_get_int("maintenance.incremental-repack.auto", &opt_val)) | |
2374 | opt_val = -1; | |
2375 | if (opt_val != 0) | |
2376 | git_config_push_parameter("maintenance.incremental-repack.auto=-1"); | |
2377 | } | |
a95ce124 | 2378 | run_auto_maintenance(verbosity < 0); |
7390f05a | 2379 | } |
131b8fcb | 2380 | |
bec587d4 GC |
2381 | cleanup: |
2382 | string_list_clear(&list, 0); | |
9c4a036b BG |
2383 | return result; |
2384 | } |