]> git.ipfire.org Git - thirdparty/git.git/blame - remote.c
push: add reflog check for "--force-if-includes"
[thirdparty/git.git] / remote.c
CommitLineData
5751f490 1#include "cache.h"
b2141fc1 2#include "config.h"
5751f490
DB
3#include "remote.h"
4#include "refs.h"
ec0cb496 5#include "refspec.h"
cbd53a21 6#include "object-store.h"
6d21bf96
JH
7#include "commit.h"
8#include "diff.h"
9#include "revision.h"
8ca12c0d 10#include "dir.h"
ec8452d5 11#include "tag.h"
73cf0822 12#include "string-list.h"
ed81c76b 13#include "mergesort.h"
dbbcd44f 14#include "strvec.h"
64043556 15#include "commit-reach.h"
dd8dd300 16#include "advice.h"
5751f490 17
6ddba5e2
FC
18enum map_direction { FROM_SRC, FROM_DST };
19
844112ca
JH
20struct counted_string {
21 size_t len;
22 const char *s;
23};
55029ae4
DB
24struct rewrite {
25 const char *base;
844112ca
JH
26 size_t baselen;
27 struct counted_string *instead_of;
55029ae4
DB
28 int instead_of_nr;
29 int instead_of_alloc;
30};
d071d942
JT
31struct rewrites {
32 struct rewrite **rewrite;
33 int rewrite_alloc;
34 int rewrite_nr;
35};
55029ae4 36
5751f490 37static struct remote **remotes;
2d31347b
DB
38static int remotes_alloc;
39static int remotes_nr;
d0da003d 40static struct hashmap remotes_hash;
5751f490 41
cf818348 42static struct branch **branches;
2d31347b
DB
43static int branches_alloc;
44static int branches_nr;
cf818348
DB
45
46static struct branch *current_branch;
f24f715e 47static const char *pushremote_name;
cf818348 48
d071d942 49static struct rewrites rewrites;
1c2eafb8 50static struct rewrites rewrites_push;
55029ae4 51
0a4da29d
DB
52static int valid_remote(const struct remote *remote)
53{
c578f51d 54 return (!!remote->url) || (!!remote->foreign_vcs);
0a4da29d
DB
55}
56
d071d942 57static const char *alias_url(const char *url, struct rewrites *r)
55029ae4
DB
58{
59 int i, j;
844112ca
JH
60 struct counted_string *longest;
61 int longest_i;
62
63 longest = NULL;
64 longest_i = -1;
d071d942
JT
65 for (i = 0; i < r->rewrite_nr; i++) {
66 if (!r->rewrite[i])
55029ae4 67 continue;
d071d942 68 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
59556548 69 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
844112ca 70 (!longest ||
d071d942
JT
71 longest->len < r->rewrite[i]->instead_of[j].len)) {
72 longest = &(r->rewrite[i]->instead_of[j]);
844112ca 73 longest_i = i;
55029ae4
DB
74 }
75 }
76 }
844112ca
JH
77 if (!longest)
78 return url;
79
75faa45a 80 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
55029ae4
DB
81}
82
28b91f8a 83static void add_url(struct remote *remote, const char *url)
5751f490 84{
2d31347b
DB
85 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
86 remote->url[remote->url_nr++] = url;
5751f490
DB
87}
88
20346234
MG
89static void add_pushurl(struct remote *remote, const char *pushurl)
90{
91 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
92 remote->pushurl[remote->pushurl_nr++] = pushurl;
93}
94
1c2eafb8
JT
95static void add_pushurl_alias(struct remote *remote, const char *url)
96{
97 const char *pushurl = alias_url(url, &rewrites_push);
98 if (pushurl != url)
99 add_pushurl(remote, pushurl);
100}
101
102static void add_url_alias(struct remote *remote, const char *url)
103{
104 add_url(remote, alias_url(url, &rewrites));
105 add_pushurl_alias(remote, url);
106}
107
d0da003d
PR
108struct remotes_hash_key {
109 const char *str;
110 int len;
111};
112
7663cdc8 113static int remotes_hash_cmp(const void *unused_cmp_data,
939af16e
EW
114 const struct hashmap_entry *eptr,
115 const struct hashmap_entry *entry_or_key,
45dcb35f 116 const void *keydata)
d0da003d 117{
939af16e 118 const struct remote *a, *b;
45dcb35f
SB
119 const struct remotes_hash_key *key = keydata;
120
939af16e
EW
121 a = container_of(eptr, const struct remote, ent);
122 b = container_of(entry_or_key, const struct remote, ent);
123
d0da003d
PR
124 if (key)
125 return strncmp(a->name, key->str, key->len) || a->name[key->len];
126 else
127 return strcmp(a->name, b->name);
128}
129
130static inline void init_remotes_hash(void)
131{
132 if (!remotes_hash.cmpfn)
45dcb35f 133 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
d0da003d
PR
134}
135
5751f490
DB
136static struct remote *make_remote(const char *name, int len)
137{
d0da003d
PR
138 struct remote *ret, *replaced;
139 struct remotes_hash_key lookup;
f23a4651 140 struct hashmap_entry lookup_entry, *e;
5751f490 141
d0da003d
PR
142 if (!len)
143 len = strlen(name);
144
145 init_remotes_hash();
146 lookup.str = name;
147 lookup.len = len;
148 hashmap_entry_init(&lookup_entry, memhash(name, len));
149
f23a4651
EW
150 e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
151 if (e)
152 return container_of(e, struct remote, ent);
5751f490 153
2d31347b 154 ret = xcalloc(1, sizeof(struct remote));
737c5a9c 155 ret->prune = -1; /* unspecified */
97716d21 156 ret->prune_tags = -1; /* unspecified */
6bdb304b
BW
157 ret->name = xstrndup(name, len);
158 refspec_init(&ret->push, REFSPEC_PUSH);
e5349abf 159 refspec_init(&ret->fetch, REFSPEC_FETCH);
6bdb304b 160
2d31347b
DB
161 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
162 remotes[remotes_nr++] = ret;
d0da003d 163
d22245a2 164 hashmap_entry_init(&ret->ent, lookup_entry.hash);
404ab78e 165 replaced = hashmap_put_entry(&remotes_hash, ret, ent);
d0da003d 166 assert(replaced == NULL); /* no previous entry overwritten */
2d31347b 167 return ret;
5751f490
DB
168}
169
cf818348
DB
170static void add_merge(struct branch *branch, const char *name)
171{
2d31347b
DB
172 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
173 branch->merge_alloc);
174 branch->merge_name[branch->merge_nr++] = name;
cf818348
DB
175}
176
021ba32a 177static struct branch *make_branch(const char *name, size_t len)
cf818348 178{
2d31347b
DB
179 struct branch *ret;
180 int i;
cf818348 181
2d31347b 182 for (i = 0; i < branches_nr; i++) {
021ba32a
JK
183 if (!strncmp(name, branches[i]->name, len) &&
184 !branches[i]->name[len])
2d31347b 185 return branches[i];
cf818348
DB
186 }
187
2d31347b
DB
188 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189 ret = xcalloc(1, sizeof(struct branch));
190 branches[branches_nr++] = ret;
021ba32a 191 ret->name = xstrndup(name, len);
fa3f60b7 192 ret->refname = xstrfmt("refs/heads/%s", ret->name);
cf818348 193
2d31347b 194 return ret;
cf818348
DB
195}
196
021ba32a
JK
197static struct rewrite *make_rewrite(struct rewrites *r,
198 const char *base, size_t len)
55029ae4
DB
199{
200 struct rewrite *ret;
201 int i;
202
d071d942 203 for (i = 0; i < r->rewrite_nr; i++) {
021ba32a
JK
204 if (len == r->rewrite[i]->baselen &&
205 !strncmp(base, r->rewrite[i]->base, len))
d071d942 206 return r->rewrite[i];
55029ae4
DB
207 }
208
d071d942 209 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
55029ae4 210 ret = xcalloc(1, sizeof(struct rewrite));
d071d942 211 r->rewrite[r->rewrite_nr++] = ret;
021ba32a
JK
212 ret->base = xstrndup(base, len);
213 ret->baselen = len;
55029ae4
DB
214 return ret;
215}
216
217static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
218{
219 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
844112ca
JH
220 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
221 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
222 rewrite->instead_of_nr++;
55029ae4
DB
223}
224
0e265a92
JK
225static const char *skip_spaces(const char *s)
226{
227 while (isspace(*s))
228 s++;
229 return s;
230}
231
5751f490
DB
232static void read_remotes_file(struct remote *remote)
233{
0e265a92 234 struct strbuf buf = STRBUF_INIT;
e9d983f1 235 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
5751f490
DB
236
237 if (!f)
238 return;
e459b073 239 remote->configured_in_repo = 1;
89cf4c70 240 remote->origin = REMOTE_REMOTES;
18814d0e 241 while (strbuf_getline(&buf, f) != EOF) {
0e265a92 242 const char *v;
5751f490 243
0e265a92 244 strbuf_rtrim(&buf);
5751f490 245
0e265a92
JK
246 if (skip_prefix(buf.buf, "URL:", &v))
247 add_url_alias(remote, xstrdup(skip_spaces(v)));
248 else if (skip_prefix(buf.buf, "Push:", &v))
6bdb304b 249 refspec_append(&remote->push, skip_spaces(v));
0e265a92 250 else if (skip_prefix(buf.buf, "Pull:", &v))
e5349abf 251 refspec_append(&remote->fetch, skip_spaces(v));
5751f490 252 }
0e265a92 253 strbuf_release(&buf);
5751f490
DB
254 fclose(f);
255}
256
257static void read_branches_file(struct remote *remote)
258{
cf818348 259 char *frag;
f28e3ab2 260 struct strbuf buf = STRBUF_INIT;
e9d983f1 261 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
5751f490
DB
262
263 if (!f)
264 return;
f28e3ab2 265
8f309aeb 266 strbuf_getline_lf(&buf, f);
0fb19906 267 fclose(f);
f28e3ab2
JK
268 strbuf_trim(&buf);
269 if (!buf.len) {
270 strbuf_release(&buf);
5751f490 271 return;
f28e3ab2
JK
272 }
273
e459b073 274 remote->configured_in_repo = 1;
89cf4c70 275 remote->origin = REMOTE_BRANCHES;
472fa4cd
DB
276
277 /*
55cfde25 278 * The branches file would have URL and optionally
a471214b 279 * #branch specified. The default (or specified) branch is
f28e3ab2
JK
280 * fetched and stored in the local branch matching the
281 * remote name.
472fa4cd 282 */
f28e3ab2
JK
283 frag = strchr(buf.buf, '#');
284 if (frag)
cf818348 285 *(frag++) = '\0';
f28e3ab2 286 else
a471214b 287 frag = (char *)git_default_branch_name();
f28e3ab2
JK
288
289 add_url_alias(remote, strbuf_detach(&buf, NULL));
1af8b8c0
RS
290 refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
291 frag, remote->name);
55cfde25 292
18afe101
MK
293 /*
294 * Cogito compatible push: push current HEAD to remote #branch
295 * (master if missing)
296 */
1af8b8c0 297 refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
d71ab174 298 remote->fetch_tags = 1; /* always auto-follow */
5751f490
DB
299}
300
ef90d6d4 301static int handle_config(const char *key, const char *value, void *cb)
5751f490
DB
302{
303 const char *name;
f5914f4b 304 size_t namelen;
5751f490
DB
305 const char *subkey;
306 struct remote *remote;
cf818348 307 struct branch *branch;
bc60f8a7
TG
308 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
309 if (!name)
cf818348 310 return 0;
bc60f8a7
TG
311 branch = make_branch(name, namelen);
312 if (!strcmp(subkey, "remote")) {
e41bf352 313 return git_config_string(&branch->remote_name, key, value);
bc60f8a7 314 } else if (!strcmp(subkey, "pushremote")) {
da66b274 315 return git_config_string(&branch->pushremote_name, key, value);
bc60f8a7 316 } else if (!strcmp(subkey, "merge")) {
d2370cc2
JH
317 if (!value)
318 return config_error_nonbool(key);
cf818348 319 add_merge(branch, xstrdup(value));
d2370cc2 320 }
cf818348 321 return 0;
5751f490 322 }
bc60f8a7 323 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
55029ae4 324 struct rewrite *rewrite;
bc60f8a7 325 if (!name)
55029ae4 326 return 0;
bc60f8a7 327 if (!strcmp(subkey, "insteadof")) {
1c2eafb8
JT
328 if (!value)
329 return config_error_nonbool(key);
54e8c112 330 rewrite = make_rewrite(&rewrites, name, namelen);
1c2eafb8 331 add_instead_of(rewrite, xstrdup(value));
bc60f8a7 332 } else if (!strcmp(subkey, "pushinsteadof")) {
55029ae4
DB
333 if (!value)
334 return config_error_nonbool(key);
54e8c112 335 rewrite = make_rewrite(&rewrites_push, name, namelen);
55029ae4
DB
336 add_instead_of(rewrite, xstrdup(value));
337 }
338 }
224c2171 339
bc60f8a7 340 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
5751f490 341 return 0;
224c2171
RR
342
343 /* Handle remote.* variables */
bc60f8a7 344 if (!name && !strcmp(subkey, "pushdefault"))
224c2171
RR
345 return git_config_string(&pushremote_name, key, value);
346
bc60f8a7
TG
347 if (!name)
348 return 0;
224c2171 349 /* Handle remote.<name>.* variables */
c82efafc 350 if (*name == '/') {
0b9c3afd 351 warning(_("config remote shorthand cannot begin with '/': %s"),
c82efafc
BC
352 name);
353 return 0;
354 }
bc60f8a7 355 remote = make_remote(name, namelen);
89cf4c70 356 remote->origin = REMOTE_CONFIG;
6dc905d9
MR
357 if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
358 current_config_scope() == CONFIG_SCOPE_WORKTREE)
e459b073 359 remote->configured_in_repo = 1;
bc60f8a7 360 if (!strcmp(subkey, "mirror"))
84bb2dfd 361 remote->mirror = git_config_bool(key, value);
bc60f8a7 362 else if (!strcmp(subkey, "skipdefaultupdate"))
84bb2dfd 363 remote->skip_default_update = git_config_bool(key, value);
bc60f8a7 364 else if (!strcmp(subkey, "skipfetchall"))
7cc91a2f 365 remote->skip_default_update = git_config_bool(key, value);
bc60f8a7 366 else if (!strcmp(subkey, "prune"))
737c5a9c 367 remote->prune = git_config_bool(key, value);
97716d21
ÆAB
368 else if (!strcmp(subkey, "prunetags"))
369 remote->prune_tags = git_config_bool(key, value);
bc60f8a7 370 else if (!strcmp(subkey, "url")) {
84bb2dfd
PB
371 const char *v;
372 if (git_config_string(&v, key, value))
373 return -1;
374 add_url(remote, v);
bc60f8a7 375 } else if (!strcmp(subkey, "pushurl")) {
20346234
MG
376 const char *v;
377 if (git_config_string(&v, key, value))
378 return -1;
379 add_pushurl(remote, v);
bc60f8a7 380 } else if (!strcmp(subkey, "push")) {
84bb2dfd
PB
381 const char *v;
382 if (git_config_string(&v, key, value))
383 return -1;
6bdb304b
BW
384 refspec_append(&remote->push, v);
385 free((char *)v);
bc60f8a7 386 } else if (!strcmp(subkey, "fetch")) {
84bb2dfd
PB
387 const char *v;
388 if (git_config_string(&v, key, value))
389 return -1;
e5349abf
BW
390 refspec_append(&remote->fetch, v);
391 free((char *)v);
bc60f8a7 392 } else if (!strcmp(subkey, "receivepack")) {
84bb2dfd
PB
393 const char *v;
394 if (git_config_string(&v, key, value))
395 return -1;
5751f490 396 if (!remote->receivepack)
84bb2dfd 397 remote->receivepack = v;
5751f490 398 else
0b9c3afd 399 error(_("more than one receivepack given, using the first"));
bc60f8a7 400 } else if (!strcmp(subkey, "uploadpack")) {
84bb2dfd
PB
401 const char *v;
402 if (git_config_string(&v, key, value))
403 return -1;
0012ba21 404 if (!remote->uploadpack)
84bb2dfd 405 remote->uploadpack = v;
0012ba21 406 else
0b9c3afd 407 error(_("more than one uploadpack given, using the first"));
bc60f8a7 408 } else if (!strcmp(subkey, "tagopt")) {
d71ab174
DB
409 if (!strcmp(value, "--no-tags"))
410 remote->fetch_tags = -1;
944163a4
ST
411 else if (!strcmp(value, "--tags"))
412 remote->fetch_tags = 2;
bc60f8a7 413 } else if (!strcmp(subkey, "proxy")) {
84bb2dfd
PB
414 return git_config_string((const char **)&remote->http_proxy,
415 key, value);
bc60f8a7 416 } else if (!strcmp(subkey, "proxyauthmethod")) {
ef976395
KF
417 return git_config_string((const char **)&remote->http_proxy_authmethod,
418 key, value);
bc60f8a7 419 } else if (!strcmp(subkey, "vcs")) {
c578f51d 420 return git_config_string(&remote->foreign_vcs, key, value);
84bb2dfd 421 }
5751f490
DB
422 return 0;
423}
424
55029ae4
DB
425static void alias_all_urls(void)
426{
427 int i, j;
428 for (i = 0; i < remotes_nr; i++) {
1c2eafb8 429 int add_pushurl_aliases;
55029ae4
DB
430 if (!remotes[i])
431 continue;
20346234 432 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
d071d942 433 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
20346234 434 }
1c2eafb8
JT
435 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
436 for (j = 0; j < remotes[i]->url_nr; j++) {
437 if (add_pushurl_aliases)
438 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
439 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
440 }
55029ae4
DB
441 }
442}
443
5751f490
DB
444static void read_config(void)
445{
e41bf352 446 static int loaded;
5751f490 447 int flag;
e41bf352
JK
448
449 if (loaded)
5751f490 450 return;
e41bf352
JK
451 loaded = 1;
452
5751f490 453 current_branch = NULL;
f2f12d16 454 if (startup_info->have_repository) {
744c040b 455 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
f2f12d16
JK
456 if (head_ref && (flag & REF_ISSYMREF) &&
457 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
021ba32a 458 current_branch = make_branch(head_ref, strlen(head_ref));
f2f12d16 459 }
5751f490 460 }
ef90d6d4 461 git_config(handle_config, NULL);
55029ae4 462 alias_all_urls();
5751f490
DB
463}
464
df93e33c
DB
465static int valid_remote_nick(const char *name)
466{
8ca12c0d 467 if (!name[0] || is_dot_or_dotdot(name))
df93e33c 468 return 0;
d9244ecf
JS
469
470 /* remote nicknames cannot contain slashes */
471 while (*name)
472 if (is_dir_sep(*name++))
473 return 0;
474 return 1;
df93e33c
DB
475}
476
f052154d
JK
477const char *remote_for_branch(struct branch *branch, int *explicit)
478{
479 if (branch && branch->remote_name) {
480 if (explicit)
481 *explicit = 1;
482 return branch->remote_name;
483 }
484 if (explicit)
485 *explicit = 0;
486 return "origin";
487}
488
da66b274
JK
489const char *pushremote_for_branch(struct branch *branch, int *explicit)
490{
491 if (branch && branch->pushremote_name) {
492 if (explicit)
493 *explicit = 1;
494 return branch->pushremote_name;
495 }
496 if (pushremote_name) {
497 if (explicit)
498 *explicit = 1;
499 return pushremote_name;
500 }
501 return remote_for_branch(branch, explicit);
502}
503
af8ccd8a 504const char *remote_ref_for_branch(struct branch *branch, int for_push)
9700fae5
W
505{
506 if (branch) {
507 if (!for_push) {
508 if (branch->merge_nr) {
9700fae5
W
509 return branch->merge_name[0];
510 }
511 } else {
512 const char *dst, *remote_name =
513 pushremote_for_branch(branch, NULL);
514 struct remote *remote = remote_get(remote_name);
515
6bdb304b 516 if (remote && remote->push.nr &&
d000414e 517 (dst = apply_refspecs(&remote->push,
9700fae5 518 branch->refname))) {
9700fae5
W
519 return dst;
520 }
521 }
522 }
af8ccd8a 523 return NULL;
9700fae5
W
524}
525
da66b274
JK
526static struct remote *remote_get_1(const char *name,
527 const char *(*get_default)(struct branch *, int *))
5751f490
DB
528{
529 struct remote *ret;
fa685bdf 530 int name_given = 0;
5751f490 531
8770e6fb
JK
532 read_config();
533
fa685bdf
DB
534 if (name)
535 name_given = 1;
da66b274
JK
536 else
537 name = get_default(current_branch, &name_given);
9326d494 538
5751f490 539 ret = make_remote(name, 0);
4539c218 540 if (valid_remote_nick(name) && have_git_dir()) {
0a4da29d 541 if (!valid_remote(ret))
5751f490 542 read_remotes_file(ret);
0a4da29d 543 if (!valid_remote(ret))
5751f490
DB
544 read_branches_file(ret);
545 }
0a4da29d 546 if (name_given && !valid_remote(ret))
55029ae4 547 add_url_alias(ret, name);
0a4da29d 548 if (!valid_remote(ret))
5751f490
DB
549 return NULL;
550 return ret;
551}
6b62816c 552
f24f715e
RR
553struct remote *remote_get(const char *name)
554{
da66b274 555 return remote_get_1(name, remote_for_branch);
f24f715e
RR
556}
557
558struct remote *pushremote_get(const char *name)
559{
da66b274 560 return remote_get_1(name, pushremote_for_branch);
f24f715e
RR
561}
562
e459b073 563int remote_is_configured(struct remote *remote, int in_repo)
9a23ba33 564{
e459b073
JS
565 if (!remote)
566 return 0;
567 if (in_repo)
568 return remote->configured_in_repo;
569 return !!remote->origin;
9a23ba33
FAG
570}
571
b42f6927
JS
572int for_each_remote(each_remote_fn fn, void *priv)
573{
574 int i, result = 0;
575 read_config();
2d31347b 576 for (i = 0; i < remotes_nr && !result; i++) {
b42f6927
JS
577 struct remote *r = remotes[i];
578 if (!r)
579 continue;
b42f6927
JS
580 result = fn(r, priv);
581 }
582 return result;
583}
584
df02ebda
MH
585static void handle_duplicate(struct ref *ref1, struct ref *ref2)
586{
f096e6e8
MH
587 if (strcmp(ref1->name, ref2->name)) {
588 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
589 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
590 die(_("Cannot fetch both %s and %s to %s"),
591 ref1->name, ref2->name, ref2->peer_ref->name);
592 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
593 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
594 warning(_("%s usually tracks %s, not %s"),
595 ref2->peer_ref->name, ref2->name, ref1->name);
596 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
597 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
598 die(_("%s tracks both %s and %s"),
599 ref2->peer_ref->name, ref1->name, ref2->name);
600 } else {
601 /*
602 * This last possibility doesn't occur because
603 * FETCH_HEAD_IGNORE entries always appear at
604 * the end of the list.
605 */
92ca8680 606 BUG("Internal error");
f096e6e8
MH
607 }
608 }
df02ebda
MH
609 free(ref2->peer_ref);
610 free(ref2);
611}
612
b9afe665 613struct ref *ref_remove_duplicates(struct ref *ref_map)
2467a4fa 614{
183113a5 615 struct string_list refs = STRING_LIST_INIT_NODUP;
b9afe665
MH
616 struct ref *retval = NULL;
617 struct ref **p = &retval;
73cf0822 618
b9afe665
MH
619 while (ref_map) {
620 struct ref *ref = ref_map;
621
622 ref_map = ref_map->next;
623 ref->next = NULL;
73cf0822 624
b9afe665
MH
625 if (!ref->peer_ref) {
626 *p = ref;
627 p = &ref->next;
09ea1f8e 628 } else {
b9afe665
MH
629 struct string_list_item *item =
630 string_list_insert(&refs, ref->peer_ref->name);
631
632 if (item->util) {
633 /* Entry already existed */
df02ebda 634 handle_duplicate((struct ref *)item->util, ref);
b9afe665
MH
635 } else {
636 *p = ref;
637 p = &ref->next;
638 item->util = ref;
639 }
2467a4fa
DB
640 }
641 }
b9afe665 642
73cf0822 643 string_list_clear(&refs, 0);
b9afe665 644 return retval;
2467a4fa
DB
645}
646
28b91f8a 647int remote_has_url(struct remote *remote, const char *url)
5d46c9d4
DB
648{
649 int i;
28b91f8a
SP
650 for (i = 0; i < remote->url_nr; i++) {
651 if (!strcmp(remote->url[i], url))
5d46c9d4
DB
652 return 1;
653 }
654 return 0;
655}
656
e928213f
DB
657static int match_name_with_pattern(const char *key, const char *name,
658 const char *value, char **result)
a3c84239 659{
08fbdb30
DB
660 const char *kstar = strchr(key, '*');
661 size_t klen;
abd2bde7
DB
662 size_t ksuffixlen;
663 size_t namelen;
08fbdb30
DB
664 int ret;
665 if (!kstar)
0b9c3afd 666 die(_("key '%s' of pattern had no '*'"), key);
08fbdb30 667 klen = kstar - key;
abd2bde7
DB
668 ksuffixlen = strlen(kstar + 1);
669 namelen = strlen(name);
670 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
671 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
e928213f 672 if (ret && value) {
07bfa575 673 struct strbuf sb = STRBUF_INIT;
08fbdb30 674 const char *vstar = strchr(value, '*');
08fbdb30 675 if (!vstar)
0b9c3afd 676 die(_("value '%s' of pattern has no '*'"), value);
07bfa575
RS
677 strbuf_add(&sb, value, vstar - value);
678 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
679 strbuf_addstr(&sb, vstar + 1);
680 *result = strbuf_detach(&sb, NULL);
e928213f 681 }
a3c84239
DB
682 return ret;
683}
684
a2ac50cb
BW
685static void query_refspecs_multiple(struct refspec *rs,
686 struct refspec_item *query,
687 struct string_list *results)
e6f63712
CMN
688{
689 int i;
690 int find_src = !query->src;
691
692 if (find_src && !query->dst)
92ca8680 693 BUG("query_refspecs_multiple: need either src or dst");
e6f63712 694
a2ac50cb
BW
695 for (i = 0; i < rs->nr; i++) {
696 struct refspec_item *refspec = &rs->items[i];
e6f63712
CMN
697 const char *key = find_src ? refspec->dst : refspec->src;
698 const char *value = find_src ? refspec->src : refspec->dst;
699 const char *needle = find_src ? query->dst : query->src;
700 char **result = find_src ? &query->src : &query->dst;
701
702 if (!refspec->dst)
703 continue;
704 if (refspec->pattern) {
705 if (match_name_with_pattern(key, needle, value, result))
706 string_list_append_nodup(results, *result);
707 } else if (!strcmp(needle, key)) {
708 string_list_append(results, value);
709 }
710 }
711}
712
86baf825 713int query_refspecs(struct refspec *rs, struct refspec_item *query)
72ff8943
DB
714{
715 int i;
c500352e 716 int find_src = !query->src;
049bff8f
MH
717 const char *needle = find_src ? query->dst : query->src;
718 char **result = find_src ? &query->src : &query->dst;
72ff8943 719
c500352e 720 if (find_src && !query->dst)
92ca8680 721 BUG("query_refspecs: need either src or dst");
b42f6927 722
86baf825
BW
723 for (i = 0; i < rs->nr; i++) {
724 struct refspec_item *refspec = &rs->items[i];
c500352e
CMN
725 const char *key = find_src ? refspec->dst : refspec->src;
726 const char *value = find_src ? refspec->src : refspec->dst;
b42f6927 727
c500352e 728 if (!refspec->dst)
5d46c9d4 729 continue;
c500352e 730 if (refspec->pattern) {
e928213f 731 if (match_name_with_pattern(key, needle, value, result)) {
c500352e 732 query->force = refspec->force;
5d46c9d4
DB
733 return 0;
734 }
b42f6927
JS
735 } else if (!strcmp(needle, key)) {
736 *result = xstrdup(value);
c500352e 737 query->force = refspec->force;
b42f6927 738 return 0;
5d46c9d4
DB
739 }
740 }
5d46c9d4
DB
741 return -1;
742}
743
d000414e 744char *apply_refspecs(struct refspec *rs, const char *name)
c500352e 745{
0ad4a5ff 746 struct refspec_item query;
c500352e 747
0ad4a5ff 748 memset(&query, 0, sizeof(struct refspec_item));
c500352e
CMN
749 query.src = (char *)name;
750
86baf825 751 if (query_refspecs(rs, &query))
c500352e
CMN
752 return NULL;
753
754 return query.dst;
755}
756
0ad4a5ff 757int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
c500352e 758{
86baf825 759 return query_refspecs(&remote->fetch, refspec);
c500352e
CMN
760}
761
8009768e
RS
762static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
763 const char *name)
764{
765 size_t len = strlen(name);
50a6c8ef 766 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
8009768e
RS
767 memcpy(ref->name, prefix, prefixlen);
768 memcpy(ref->name + prefixlen, name, len);
769 return ref;
770}
771
59c69c0c 772struct ref *alloc_ref(const char *name)
dfd255dd 773{
59c69c0c 774 return alloc_ref_with_prefix("", 0, name);
737922aa
KK
775}
776
59a57757 777struct ref *copy_ref(const struct ref *ref)
d71ab174 778{
7b3db095
JS
779 struct ref *cpy;
780 size_t len;
781 if (!ref)
782 return NULL;
50a6c8ef
JK
783 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
784 cpy = xmalloc(len);
785 memcpy(cpy, ref, len);
7b3db095 786 cpy->next = NULL;
8c53f071
JK
787 cpy->symref = xstrdup_or_null(ref->symref);
788 cpy->remote_status = xstrdup_or_null(ref->remote_status);
7b3db095
JS
789 cpy->peer_ref = copy_ref(ref->peer_ref);
790 return cpy;
d71ab174
DB
791}
792
4577370e
DB
793struct ref *copy_ref_list(const struct ref *ref)
794{
795 struct ref *ret = NULL;
796 struct ref **tail = &ret;
797 while (ref) {
798 *tail = copy_ref(ref);
799 ref = ref->next;
800 tail = &((*tail)->next);
801 }
802 return ret;
803}
804
1027186f 805void free_one_ref(struct ref *ref)
be885d96
DB
806{
807 if (!ref)
808 return;
1027186f 809 free_one_ref(ref->peer_ref);
be885d96
DB
810 free(ref->remote_status);
811 free(ref->symref);
812 free(ref);
813}
814
dfd255dd
DB
815void free_refs(struct ref *ref)
816{
817 struct ref *next;
818 while (ref) {
819 next = ref->next;
1027186f 820 free_one_ref(ref);
dfd255dd
DB
821 ref = next;
822 }
823}
824
ed81c76b
JK
825int ref_compare_name(const void *va, const void *vb)
826{
827 const struct ref *a = va, *b = vb;
828 return strcmp(a->name, b->name);
829}
830
831static void *ref_list_get_next(const void *a)
832{
833 return ((const struct ref *)a)->next;
834}
835
836static void ref_list_set_next(void *a, void *next)
837{
838 ((struct ref *)a)->next = next;
839}
840
841void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
842{
843 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
844}
845
ca02465b
JH
846int count_refspec_match(const char *pattern,
847 struct ref *refs,
848 struct ref **matched_ref)
6b62816c
DB
849{
850 int patlen = strlen(pattern);
851 struct ref *matched_weak = NULL;
852 struct ref *matched = NULL;
853 int weak_match = 0;
854 int match = 0;
855
856 for (weak_match = match = 0; refs; refs = refs->next) {
857 char *name = refs->name;
858 int namelen = strlen(name);
6b62816c 859
54457fe5 860 if (!refname_match(pattern, name))
6b62816c
DB
861 continue;
862
863 /* A match is "weak" if it is with refs outside
864 * heads or tags, and did not specify the pattern
865 * in full (e.g. "refs/remotes/origin/master") or at
866 * least from the toplevel (e.g. "remotes/origin/master");
867 * otherwise "git push $URL master" would result in
868 * ambiguity between remotes/origin/master and heads/master
869 * at the remote site.
870 */
871 if (namelen != patlen &&
872 patlen != namelen - 5 &&
59556548
CC
873 !starts_with(name, "refs/heads/") &&
874 !starts_with(name, "refs/tags/")) {
6b62816c
DB
875 /* We want to catch the case where only weak
876 * matches are found and there are multiple
877 * matches, and where more than one strong
878 * matches are found, as ambiguous. One
879 * strong match with zero or more weak matches
880 * are acceptable as a unique match.
881 */
882 matched_weak = refs;
883 weak_match++;
884 }
885 else {
886 matched = refs;
887 match++;
888 }
889 }
890 if (!matched) {
471fd3fe
JK
891 if (matched_ref)
892 *matched_ref = matched_weak;
6b62816c
DB
893 return weak_match;
894 }
895 else {
471fd3fe
JK
896 if (matched_ref)
897 *matched_ref = matched;
6b62816c
DB
898 return match;
899 }
900}
901
1d735267 902static void tail_link_ref(struct ref *ref, struct ref ***tail)
6b62816c
DB
903{
904 **tail = ref;
1d735267
DB
905 while (ref->next)
906 ref = ref->next;
6b62816c 907 *tail = &ref->next;
6b62816c
DB
908}
909
67655246
FC
910static struct ref *alloc_delete_ref(void)
911{
912 struct ref *ref = alloc_ref("(delete)");
f4e54d02 913 oidclr(&ref->new_oid);
67655246
FC
914 return ref;
915}
916
471fd3fe
JK
917static int try_explicit_object_name(const char *name,
918 struct ref **match)
6b62816c 919{
fcd30b13 920 struct object_id oid;
6b62816c 921
471fd3fe
JK
922 if (!*name) {
923 if (match)
924 *match = alloc_delete_ref();
925 return 0;
926 }
927
e82caf38 928 if (get_oid(name, &oid))
471fd3fe
JK
929 return -1;
930
931 if (match) {
932 *match = alloc_ref(name);
fcd30b13 933 oidcpy(&(*match)->new_oid, &oid);
471fd3fe
JK
934 }
935 return 0;
6b62816c
DB
936}
937
1d735267 938static struct ref *make_linked_ref(const char *name, struct ref ***tail)
6b62816c 939{
59c69c0c 940 struct ref *ret = alloc_ref(name);
1d735267
DB
941 tail_link_ref(ret, tail);
942 return ret;
163f0ee5 943}
8558fd9e 944
f8aae120
JK
945static char *guess_ref(const char *name, struct ref *peer)
946{
947 struct strbuf buf = STRBUF_INIT;
f8aae120 948
7695d118 949 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
744c040b 950 NULL, NULL);
f8aae120
JK
951 if (!r)
952 return NULL;
953
cab53989 954 if (starts_with(r, "refs/heads/")) {
f8aae120 955 strbuf_addstr(&buf, "refs/heads/");
cab53989 956 } else if (starts_with(r, "refs/tags/")) {
f8aae120 957 strbuf_addstr(&buf, "refs/tags/");
cab53989 958 } else {
f8aae120 959 return NULL;
cab53989 960 }
f8aae120
JK
961
962 strbuf_addstr(&buf, name);
963 return strbuf_detach(&buf, NULL);
964}
965
f7ade3d3 966static int match_explicit_lhs(struct ref *src,
0ad4a5ff 967 struct refspec_item *rs,
f7ade3d3
JK
968 struct ref **match,
969 int *allocated_match)
970{
971 switch (count_refspec_match(rs->src, src, match)) {
972 case 1:
471fd3fe
JK
973 if (allocated_match)
974 *allocated_match = 0;
f7ade3d3
JK
975 return 0;
976 case 0:
977 /* The source could be in the get_sha1() format
978 * not a reference name. :refs/other is a
979 * way to delete 'other' ref at the remote end.
980 */
471fd3fe 981 if (try_explicit_object_name(rs->src, match) < 0)
0b9c3afd 982 return error(_("src refspec %s does not match any"), rs->src);
471fd3fe
JK
983 if (allocated_match)
984 *allocated_match = 1;
f7ade3d3
JK
985 return 0;
986 default:
0b9c3afd 987 return error(_("src refspec %s matches more than one"), rs->src);
f7ade3d3
JK
988 }
989}
990
04d17287
ÆAB
991static void show_push_unqualified_ref_name_error(const char *dst_value,
992 const char *matched_src_name)
993{
dd8dd300
ÆAB
994 struct object_id oid;
995 enum object_type type;
996
04d17287
ÆAB
997 /*
998 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
999 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1000 * the <src>.
1001 */
1002 error(_("The destination you provided is not a full refname (i.e.,\n"
1003 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1004 "\n"
1005 "- Looking for a ref that matches '%s' on the remote side.\n"
1006 "- Checking if the <src> being pushed ('%s')\n"
1007 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1008 " refs/{heads,tags}/ prefix on the remote side.\n"
1009 "\n"
1010 "Neither worked, so we gave up. You must fully qualify the ref."),
1011 dst_value, matched_src_name);
dd8dd300
ÆAB
1012
1013 if (!advice_push_unqualified_ref_name)
1014 return;
1015
1016 if (get_oid(matched_src_name, &oid))
1017 BUG("'%s' is not a valid object, "
1018 "match_explicit_lhs() should catch this!",
1019 matched_src_name);
1020 type = oid_object_info(the_repository, &oid, NULL);
1021 if (type == OBJ_COMMIT) {
1022 advise(_("The <src> part of the refspec is a commit object.\n"
1023 "Did you mean to create a new branch by pushing to\n"
1024 "'%s:refs/heads/%s'?"),
1025 matched_src_name, dst_value);
1026 } else if (type == OBJ_TAG) {
1027 advise(_("The <src> part of the refspec is a tag object.\n"
1028 "Did you mean to create a new tag by pushing to\n"
1029 "'%s:refs/tags/%s'?"),
1030 matched_src_name, dst_value);
1031 } else if (type == OBJ_TREE) {
1032 advise(_("The <src> part of the refspec is a tree object.\n"
1033 "Did you mean to tag a new tree by pushing to\n"
1034 "'%s:refs/tags/%s'?"),
1035 matched_src_name, dst_value);
1036 } else if (type == OBJ_BLOB) {
1037 advise(_("The <src> part of the refspec is a blob object.\n"
1038 "Did you mean to tag a new blob by pushing to\n"
1039 "'%s:refs/tags/%s'?"),
1040 matched_src_name, dst_value);
1041 } else {
1042 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1043 matched_src_name, type);
1044 }
04d17287
ÆAB
1045}
1046
54a8ad92
JH
1047static int match_explicit(struct ref *src, struct ref *dst,
1048 struct ref ***dst_tail,
0ad4a5ff 1049 struct refspec_item *rs)
6b62816c 1050{
54a8ad92 1051 struct ref *matched_src, *matched_dst;
f7ade3d3 1052 int allocated_src;
8558fd9e 1053
54a8ad92 1054 const char *dst_value = rs->dst;
f8aae120 1055 char *dst_guess;
6b62816c 1056
a83619d6 1057 if (rs->pattern || rs->matching)
9a7bbd1d 1058 return 0;
8558fd9e 1059
54a8ad92 1060 matched_src = matched_dst = NULL;
f7ade3d3
JK
1061 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1062 return -1;
3c8b7df1 1063
4491e62a 1064 if (!dst_value) {
9f0ea7e8
DB
1065 int flag;
1066
7695d118
RS
1067 dst_value = resolve_ref_unsafe(matched_src->name,
1068 RESOLVE_REF_READING,
744c040b 1069 NULL, &flag);
9f0ea7e8
DB
1070 if (!dst_value ||
1071 ((flag & REF_ISSYMREF) &&
59556548 1072 !starts_with(dst_value, "refs/heads/")))
0b9c3afd 1073 die(_("%s cannot be resolved to branch"),
9f0ea7e8 1074 matched_src->name);
4491e62a 1075 }
3c8b7df1 1076
54a8ad92
JH
1077 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1078 case 1:
1079 break;
1080 case 0:
cab53989 1081 if (starts_with(dst_value, "refs/")) {
1d735267 1082 matched_dst = make_linked_ref(dst_value, dst_tail);
cab53989 1083 } else if (is_null_oid(&matched_src->new_oid)) {
0b9c3afd 1084 error(_("unable to delete '%s': remote ref does not exist"),
5742c82b 1085 dst_value);
cab53989 1086 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
f8aae120 1087 matched_dst = make_linked_ref(dst_guess, dst_tail);
3dc7ea91 1088 free(dst_guess);
cab53989 1089 } else {
04d17287
ÆAB
1090 show_push_unqualified_ref_name_error(dst_value,
1091 matched_src->name);
cab53989 1092 }
54a8ad92
JH
1093 break;
1094 default:
3c8b7df1 1095 matched_dst = NULL;
0b9c3afd 1096 error(_("dst refspec %s matches more than one"),
54a8ad92
JH
1097 dst_value);
1098 break;
1099 }
9a7bbd1d
JK
1100 if (!matched_dst)
1101 return -1;
1102 if (matched_dst->peer_ref)
0b9c3afd
NTND
1103 return error(_("dst ref %s receives from more than one src"),
1104 matched_dst->name);
54a8ad92 1105 else {
f7ade3d3
JK
1106 matched_dst->peer_ref = allocated_src ?
1107 matched_src :
1108 copy_ref(matched_src);
54a8ad92 1109 matched_dst->force = rs->force;
6b62816c 1110 }
9a7bbd1d 1111 return 0;
54a8ad92
JH
1112}
1113
1114static int match_explicit_refs(struct ref *src, struct ref *dst,
9fa2e5e8 1115 struct ref ***dst_tail, struct refspec *rs)
54a8ad92
JH
1116{
1117 int i, errs;
9fa2e5e8
BW
1118 for (i = errs = 0; i < rs->nr; i++)
1119 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
9a7bbd1d 1120 return errs;
6b62816c
DB
1121}
1122
f3acb830
BW
1123static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1124 int send_mirror, int direction,
1125 const struct refspec_item **ret_pat)
8558fd9e 1126{
0ad4a5ff 1127 const struct refspec_item *pat;
db70a04c 1128 char *name;
8558fd9e 1129 int i;
a83619d6 1130 int matching_refs = -1;
f3acb830
BW
1131 for (i = 0; i < rs->nr; i++) {
1132 const struct refspec_item *item = &rs->items[i];
1133 if (item->matching &&
1134 (matching_refs == -1 || item->force)) {
a83619d6
PB
1135 matching_refs = i;
1136 continue;
1137 }
1138
f3acb830
BW
1139 if (item->pattern) {
1140 const char *dst_side = item->dst ? item->dst : item->src;
6ddba5e2
FC
1141 int match;
1142 if (direction == FROM_SRC)
f3acb830 1143 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
6ddba5e2 1144 else
f3acb830 1145 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
6ddba5e2 1146 if (match) {
db70a04c
FC
1147 matching_refs = i;
1148 break;
1149 }
1150 }
8558fd9e 1151 }
db70a04c 1152 if (matching_refs == -1)
a83619d6 1153 return NULL;
db70a04c 1154
f3acb830 1155 pat = &rs->items[matching_refs];
db70a04c
FC
1156 if (pat->matching) {
1157 /*
1158 * "matching refs"; traditionally we pushed everything
1159 * including refs outside refs/heads/ hierarchy, but
1160 * that does not make much sense these days.
1161 */
59556548 1162 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
db70a04c
FC
1163 return NULL;
1164 name = xstrdup(ref->name);
1165 }
1166 if (ret_pat)
1167 *ret_pat = pat;
1168 return name;
8558fd9e
DB
1169}
1170
6d2bf96e
CB
1171static struct ref **tail_ref(struct ref **head)
1172{
1173 struct ref **tail = head;
1174 while (*tail)
1175 tail = &((*tail)->next);
1176 return tail;
1177}
1178
c2aba155
JH
1179struct tips {
1180 struct commit **tip;
1181 int nr, alloc;
1182};
1183
fcd30b13 1184static void add_to_tips(struct tips *tips, const struct object_id *oid)
c2aba155
JH
1185{
1186 struct commit *commit;
1187
fcd30b13 1188 if (is_null_oid(oid))
c2aba155 1189 return;
21e1ee8f 1190 commit = lookup_commit_reference_gently(the_repository, oid, 1);
c2aba155
JH
1191 if (!commit || (commit->object.flags & TMP_MARK))
1192 return;
1193 commit->object.flags |= TMP_MARK;
1194 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1195 tips->tip[tips->nr++] = commit;
1196}
1197
1198static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1199{
1200 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1201 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1202 struct string_list_item *item;
1203 struct ref *ref;
1204 struct tips sent_tips;
1205
1206 /*
1207 * Collect everything we know they would have at the end of
1208 * this push, and collect all tags they have.
1209 */
1210 memset(&sent_tips, 0, sizeof(sent_tips));
1211 for (ref = *dst; ref; ref = ref->next) {
1212 if (ref->peer_ref &&
f4e54d02 1213 !is_null_oid(&ref->peer_ref->new_oid))
fcd30b13 1214 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
c2aba155 1215 else
fcd30b13 1216 add_to_tips(&sent_tips, &ref->old_oid);
59556548 1217 if (starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1218 string_list_append(&dst_tag, ref->name);
1219 }
1220 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1221
3383e199 1222 string_list_sort(&dst_tag);
c2aba155
JH
1223
1224 /* Collect tags they do not have. */
1225 for (ref = src; ref; ref = ref->next) {
59556548 1226 if (!starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1227 continue; /* not a tag */
1228 if (string_list_has_string(&dst_tag, ref->name))
1229 continue; /* they already have it */
0df8e965 1230 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
c2aba155
JH
1231 continue; /* be conservative */
1232 item = string_list_append(&src_tag, ref->name);
1233 item->util = ref;
1234 }
1235 string_list_clear(&dst_tag, 0);
1236
1237 /*
1238 * At this point, src_tag lists tags that are missing from
1239 * dst, and sent_tips lists the tips we are pushing or those
1240 * that we know they already have. An element in the src_tag
1241 * that is an ancestor of any of the sent_tips needs to be
1242 * sent to the other side.
1243 */
1244 if (sent_tips.nr) {
85daa01f
DS
1245 const int reachable_flag = 1;
1246 struct commit_list *found_commits;
1247 struct commit **src_commits;
1248 int nr_src_commits = 0, alloc_src_commits = 16;
1249 ALLOC_ARRAY(src_commits, alloc_src_commits);
1250
c2aba155
JH
1251 for_each_string_list_item(item, &src_tag) {
1252 struct ref *ref = item->util;
85daa01f
DS
1253 struct commit *commit;
1254
1255 if (is_null_oid(&ref->new_oid))
1256 continue;
1257 commit = lookup_commit_reference_gently(the_repository,
1258 &ref->new_oid,
1259 1);
1260 if (!commit)
1261 /* not pushing a commit, which is not an error */
1262 continue;
1263
1264 ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
1265 src_commits[nr_src_commits++] = commit;
1266 }
1267
1268 found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
1269 src_commits, nr_src_commits,
1270 reachable_flag);
1271
1272 for_each_string_list_item(item, &src_tag) {
c2aba155 1273 struct ref *dst_ref;
85daa01f 1274 struct ref *ref = item->util;
c2aba155
JH
1275 struct commit *commit;
1276
f4e54d02 1277 if (is_null_oid(&ref->new_oid))
c2aba155 1278 continue;
21e1ee8f
SB
1279 commit = lookup_commit_reference_gently(the_repository,
1280 &ref->new_oid,
bc83266a 1281 1);
c2aba155
JH
1282 if (!commit)
1283 /* not pushing a commit, which is not an error */
1284 continue;
1285
1286 /*
1287 * Is this tag, which they do not have, reachable from
1288 * any of the commits we are sending?
1289 */
85daa01f 1290 if (!(commit->object.flags & reachable_flag))
c2aba155
JH
1291 continue;
1292
1293 /* Add it in */
1294 dst_ref = make_linked_ref(ref->name, dst_tail);
f4e54d02 1295 oidcpy(&dst_ref->new_oid, &ref->new_oid);
c2aba155
JH
1296 dst_ref->peer_ref = copy_ref(ref);
1297 }
85daa01f
DS
1298
1299 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1300 free(src_commits);
1301 free_commit_list(found_commits);
c2aba155 1302 }
85daa01f 1303
c2aba155
JH
1304 string_list_clear(&src_tag, 0);
1305 free(sent_tips.tip);
1306}
1307
47a59185
JH
1308struct ref *find_ref_by_name(const struct ref *list, const char *name)
1309{
1310 for ( ; list; list = list->next)
1311 if (!strcmp(list->name, name))
1312 return (struct ref *)list;
1313 return NULL;
1314}
1315
f1bd15ab
BC
1316static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1317{
1318 for ( ; ref; ref = ref->next)
1319 string_list_append_nodup(ref_index, ref->name)->util = ref;
1320
3383e199 1321 string_list_sort(ref_index);
f1bd15ab
BC
1322}
1323
ba928c13
JK
1324/*
1325 * Given only the set of local refs, sanity-check the set of push
1326 * refspecs. We can't catch all errors that match_push_refs would,
1327 * but we can catch some errors early before even talking to the
1328 * remote side.
1329 */
afb1aed4 1330int check_push_refs(struct ref *src, struct refspec *rs)
ba928c13 1331{
ba928c13
JK
1332 int ret = 0;
1333 int i;
1334
afb1aed4
BW
1335 for (i = 0; i < rs->nr; i++) {
1336 struct refspec_item *item = &rs->items[i];
ba928c13 1337
afb1aed4 1338 if (item->pattern || item->matching)
ba928c13
JK
1339 continue;
1340
afb1aed4 1341 ret |= match_explicit_lhs(src, item, NULL, NULL);
ba928c13
JK
1342 }
1343
ba928c13
JK
1344 return ret;
1345}
1346
54a8ad92 1347/*
29753cdd
JH
1348 * Given the set of refs the local repository has, the set of refs the
1349 * remote repository has, and the refspec used for push, determine
1350 * what remote refs we will update and with what value by setting
1351 * peer_ref (which object is being pushed) and force (if the push is
1352 * forced) in elements of "dst". The function may add new elements to
1353 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
54a8ad92 1354 */
29753cdd 1355int match_push_refs(struct ref *src, struct ref **dst,
5c7ec846 1356 struct refspec *rs, int flags)
6b62816c 1357{
28b9d6e5
AW
1358 int send_all = flags & MATCH_REFS_ALL;
1359 int send_mirror = flags & MATCH_REFS_MIRROR;
6ddba5e2 1360 int send_prune = flags & MATCH_REFS_PRUNE;
5f48cb95 1361 int errs;
b1d8b1f3 1362 struct ref *ref, **dst_tail = tail_ref(dst);
f1bd15ab 1363 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
6b62816c 1364
5c7ec846
BW
1365 /* If no refspec is provided, use the default ":" */
1366 if (!rs->nr)
1367 refspec_append(rs, ":");
1368
1369 errs = match_explicit_refs(src, *dst, &dst_tail, rs);
6b62816c
DB
1370
1371 /* pick the remainder */
b1d8b1f3 1372 for (ref = src; ref; ref = ref->next) {
f1bd15ab 1373 struct string_list_item *dst_item;
6b62816c 1374 struct ref *dst_peer;
0ad4a5ff 1375 const struct refspec_item *pat = NULL;
6e66bf3c 1376 char *dst_name;
db70a04c 1377
5c7ec846 1378 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
db70a04c 1379 if (!dst_name)
a83619d6
PB
1380 continue;
1381
f1bd15ab
BC
1382 if (!dst_ref_index.nr)
1383 prepare_ref_index(&dst_ref_index, *dst);
1384
1385 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1386 dst_peer = dst_item ? dst_item->util : NULL;
a83619d6
PB
1387 if (dst_peer) {
1388 if (dst_peer->peer_ref)
1389 /* We're already sending something to this ref. */
1390 goto free_name;
a83619d6
PB
1391 } else {
1392 if (pat->matching && !(send_all || send_mirror))
1393 /*
1394 * Remote doesn't have it, and we have no
1395 * explicit pattern, and we don't have
01689909 1396 * --all or --mirror.
a83619d6
PB
1397 */
1398 goto free_name;
28b9d6e5 1399
6b62816c 1400 /* Create a new one and link it */
6d2bf96e 1401 dst_peer = make_linked_ref(dst_name, &dst_tail);
f4e54d02 1402 oidcpy(&dst_peer->new_oid, &ref->new_oid);
f1bd15ab
BC
1403 string_list_insert(&dst_ref_index,
1404 dst_peer->name)->util = dst_peer;
6b62816c 1405 }
b1d8b1f3 1406 dst_peer->peer_ref = copy_ref(ref);
a83619d6 1407 dst_peer->force = pat->force;
6e66bf3c
AR
1408 free_name:
1409 free(dst_name);
6b62816c 1410 }
c2aba155 1411
f1bd15ab
BC
1412 string_list_clear(&dst_ref_index, 0);
1413
c2aba155
JH
1414 if (flags & MATCH_REFS_FOLLOW_TAGS)
1415 add_missing_tags(src, dst, &dst_tail);
1416
6ddba5e2 1417 if (send_prune) {
f1bd15ab 1418 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
6ddba5e2
FC
1419 /* check for missing refs on the remote */
1420 for (ref = *dst; ref; ref = ref->next) {
1421 char *src_name;
1422
1423 if (ref->peer_ref)
1424 /* We're already sending something to this ref. */
1425 continue;
1426
5c7ec846 1427 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
6ddba5e2 1428 if (src_name) {
f1bd15ab
BC
1429 if (!src_ref_index.nr)
1430 prepare_ref_index(&src_ref_index, src);
1431 if (!string_list_has_string(&src_ref_index,
1432 src_name))
6ddba5e2
FC
1433 ref->peer_ref = alloc_delete_ref();
1434 free(src_name);
1435 }
1436 }
f1bd15ab 1437 string_list_clear(&src_ref_index, 0);
6ddba5e2 1438 }
8ca69370 1439
5f48cb95
JS
1440 if (errs)
1441 return -1;
6b62816c
DB
1442 return 0;
1443}
cf818348 1444
20e8b465 1445void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
631b5ef2 1446 int force_update)
20e8b465
TRC
1447{
1448 struct ref *ref;
1449
1450 for (ref = remote_refs; ref; ref = ref->next) {
8c5f6f71 1451 int force_ref_update = ref->force || force_update;
631b5ef2 1452 int reject_reason = 0;
8c5f6f71 1453
20e8b465 1454 if (ref->peer_ref)
f4e54d02 1455 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
20e8b465
TRC
1456 else if (!send_mirror)
1457 continue;
1458
f4e54d02 1459 ref->deletion = is_null_oid(&ref->new_oid);
20e8b465 1460 if (!ref->deletion &&
4a7e27e9 1461 oideq(&ref->old_oid, &ref->new_oid)) {
20e8b465
TRC
1462 ref->status = REF_STATUS_UPTODATE;
1463 continue;
1464 }
1465
a272b289 1466 /*
b2e93f88
AW
1467 * If the remote ref has moved and is now different
1468 * from what we expect, reject any push.
631b5ef2
JH
1469 *
1470 * It also is an error if the user told us to check
1471 * with the remote-tracking branch to find the value
1472 * to expect, but we did not have such a tracking
1473 * branch.
99a1f9ae
SK
1474 *
1475 * If the tip of the remote-tracking ref is unreachable
1476 * from any reflog entry of its local ref indicating a
1477 * possible update since checkout; reject the push.
631b5ef2
JH
1478 */
1479 if (ref->expect_old_sha1) {
9001dc2a 1480 if (!oideq(&ref->old_oid, &ref->old_oid_expect))
631b5ef2 1481 reject_reason = REF_STATUS_REJECT_STALE;
99a1f9ae
SK
1482 else if (ref->check_reachable && ref->unreachable)
1483 reject_reason =
1484 REF_STATUS_REJECT_REMOTE_UPDATED;
b2e93f88 1485 else
99a1f9ae
SK
1486 /*
1487 * If the ref isn't stale, and is reachable
1488 * from from one of the reflog entries of
1489 * the local branch, force the update.
1490 */
b2e93f88 1491 force_ref_update = 1;
631b5ef2
JH
1492 }
1493
1494 /*
b2e93f88
AW
1495 * If the update isn't already rejected then check
1496 * the usual "must fast-forward" rules.
631b5ef2 1497 *
256b9d70
JH
1498 * Decide whether an individual refspec A:B can be
1499 * pushed. The push will succeed if any of the
1500 * following are true:
20e8b465 1501 *
a272b289 1502 * (1) the remote reference B does not exist
20e8b465 1503 *
a272b289
CR
1504 * (2) the remote reference B is being removed (i.e.,
1505 * pushing :B where no source is specified)
20e8b465 1506 *
256b9d70
JH
1507 * (3) the destination is not under refs/tags/, and
1508 * if the old and new value is a commit, the new
1509 * is a descendant of the old.
20e8b465 1510 *
a272b289
CR
1511 * (4) it is forced using the +A:B notation, or by
1512 * passing the --force argument
20e8b465
TRC
1513 */
1514
b2e93f88 1515 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
59556548 1516 if (starts_with(ref->name, "refs/tags/"))
631b5ef2 1517 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
f4e54d02 1518 else if (!has_object_file(&ref->old_oid))
631b5ef2 1519 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
21e1ee8f
SB
1520 else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
1521 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
631b5ef2 1522 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
6f3d57b6 1523 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
631b5ef2 1524 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
20e8b465 1525 }
631b5ef2
JH
1526
1527 /*
1528 * "--force" will defeat any rejection implemented
1529 * by the rules above.
1530 */
1531 if (!force_ref_update)
1532 ref->status = reject_reason;
1533 else if (reject_reason)
1534 ref->forced_update = 1;
20e8b465
TRC
1535 }
1536}
1537
05e73682
JH
1538static void set_merge(struct branch *ret)
1539{
9e3751d4 1540 struct remote *remote;
05e73682 1541 char *ref;
fcd30b13 1542 struct object_id oid;
05e73682
JH
1543 int i;
1544
ee2499fe
JK
1545 if (!ret)
1546 return; /* no branch */
1547 if (ret->merge)
1548 return; /* already run */
1549 if (!ret->remote_name || !ret->merge_nr) {
1550 /*
1551 * no merge config; let's make sure we don't confuse callers
1552 * with a non-zero merge_nr but a NULL merge
1553 */
1554 ret->merge_nr = 0;
1555 return;
1556 }
1557
9e3751d4
JK
1558 remote = remote_get(ret->remote_name);
1559
05e73682
JH
1560 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1561 for (i = 0; i < ret->merge_nr; i++) {
1562 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1563 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
9e3751d4 1564 if (!remote_find_tracking(remote, ret->merge[i]) ||
05e73682
JH
1565 strcmp(ret->remote_name, "."))
1566 continue;
1567 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
f24c30e0 1568 &oid, &ref, 0) == 1)
05e73682
JH
1569 ret->merge[i]->dst = ref;
1570 else
1571 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1572 }
1573}
1574
cf818348
DB
1575struct branch *branch_get(const char *name)
1576{
1577 struct branch *ret;
1578
1579 read_config();
1580 if (!name || !*name || !strcmp(name, "HEAD"))
1581 ret = current_branch;
1582 else
021ba32a 1583 ret = make_branch(name, strlen(name));
ee2499fe 1584 set_merge(ret);
cf818348
DB
1585 return ret;
1586}
1587
1588int branch_has_merge_config(struct branch *branch)
1589{
1590 return branch && !!branch->merge;
1591}
1592
85682c19
SP
1593int branch_merge_matches(struct branch *branch,
1594 int i,
1595 const char *refname)
cf818348 1596{
85682c19 1597 if (!branch || i < 0 || i >= branch->merge_nr)
cf818348 1598 return 0;
54457fe5 1599 return refname_match(branch->merge[i]->src, refname);
cf818348 1600}
d71ab174 1601
060e7766 1602__attribute__((format (printf,2,3)))
3a429d0a
JK
1603static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1604{
1605 if (err) {
1606 va_list ap;
1607 va_start(ap, fmt);
1608 strbuf_vaddf(err, fmt, ap);
1609 va_end(ap);
1610 }
1611 return NULL;
1612}
1613
1614const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1615{
1616 if (!branch)
1617 return error_buf(err, _("HEAD does not point to a branch"));
1ca41a19
JK
1618
1619 if (!branch->merge || !branch->merge[0]) {
1620 /*
1621 * no merge config; is it because the user didn't define any,
1622 * or because it is not a real branch, and get_branch
1623 * auto-vivified it?
1624 */
3a429d0a
JK
1625 if (!ref_exists(branch->refname))
1626 return error_buf(err, _("no such branch: '%s'"),
1627 branch->name);
1ca41a19
JK
1628 return error_buf(err,
1629 _("no upstream configured for branch '%s'"),
1630 branch->name);
1631 }
1632
1633 if (!branch->merge[0]->dst)
3a429d0a
JK
1634 return error_buf(err,
1635 _("upstream branch '%s' not stored as a remote-tracking branch"),
1636 branch->merge[0]->src);
3a429d0a 1637
a9f9f8cc
JK
1638 return branch->merge[0]->dst;
1639}
1640
e291c75a
JK
1641static const char *tracking_for_push_dest(struct remote *remote,
1642 const char *refname,
1643 struct strbuf *err)
1644{
1645 char *ret;
1646
d000414e 1647 ret = apply_refspecs(&remote->fetch, refname);
e291c75a
JK
1648 if (!ret)
1649 return error_buf(err,
1650 _("push destination '%s' on remote '%s' has no local tracking branch"),
1651 refname, remote->name);
1652 return ret;
1653}
1654
1655static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1656{
1657 struct remote *remote;
1658
e291c75a
JK
1659 remote = remote_get(pushremote_for_branch(branch, NULL));
1660 if (!remote)
1661 return error_buf(err,
1662 _("branch '%s' has no remote for pushing"),
1663 branch->name);
1664
6bdb304b 1665 if (remote->push.nr) {
e291c75a
JK
1666 char *dst;
1667 const char *ret;
1668
d000414e 1669 dst = apply_refspecs(&remote->push, branch->refname);
e291c75a
JK
1670 if (!dst)
1671 return error_buf(err,
1672 _("push refspecs for '%s' do not include '%s'"),
1673 remote->name, branch->name);
1674
1675 ret = tracking_for_push_dest(remote, dst, err);
1676 free(dst);
1677 return ret;
1678 }
1679
1680 if (remote->mirror)
1681 return tracking_for_push_dest(remote, branch->refname, err);
1682
1683 switch (push_default) {
1684 case PUSH_DEFAULT_NOTHING:
1685 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1686
1687 case PUSH_DEFAULT_MATCHING:
1688 case PUSH_DEFAULT_CURRENT:
1689 return tracking_for_push_dest(remote, branch->refname, err);
1690
1691 case PUSH_DEFAULT_UPSTREAM:
1692 return branch_get_upstream(branch, err);
1693
1694 case PUSH_DEFAULT_UNSPECIFIED:
1695 case PUSH_DEFAULT_SIMPLE:
1696 {
1697 const char *up, *cur;
1698
1699 up = branch_get_upstream(branch, err);
1700 if (!up)
1701 return NULL;
1702 cur = tracking_for_push_dest(remote, branch->refname, err);
1703 if (!cur)
1704 return NULL;
1705 if (strcmp(cur, up))
1706 return error_buf(err,
1707 _("cannot resolve 'simple' push to a single destination"));
1708 return cur;
1709 }
1710 }
1711
033abf97 1712 BUG("unhandled push situation");
e291c75a
JK
1713}
1714
1715const char *branch_get_push(struct branch *branch, struct strbuf *err)
1716{
b10731f4
KM
1717 if (!branch)
1718 return error_buf(err, _("HEAD does not point to a branch"));
1719
e291c75a
JK
1720 if (!branch->push_tracking_ref)
1721 branch->push_tracking_ref = branch_get_push_1(branch, err);
1722 return branch->push_tracking_ref;
1723}
1724
f8fb971e
JH
1725static int ignore_symref_update(const char *refname)
1726{
f8fb971e
JH
1727 int flag;
1728
744c040b 1729 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
f8fb971e
JH
1730 return 0; /* non-existing refs are OK */
1731 return (flag & REF_ISSYMREF);
1732}
1733
f166db26
MH
1734/*
1735 * Create and return a list of (struct ref) consisting of copies of
1736 * each remote_ref that matches refspec. refspec must be a pattern.
1737 * Fill in the copies' peer_ref to describe the local tracking refs to
1738 * which they map. Omit any references that would map to an existing
1739 * local symbolic ref.
1740 */
4577370e 1741static struct ref *get_expanded_map(const struct ref *remote_refs,
0ad4a5ff 1742 const struct refspec_item *refspec)
d71ab174 1743{
4577370e 1744 const struct ref *ref;
d71ab174
DB
1745 struct ref *ret = NULL;
1746 struct ref **tail = &ret;
1747
d71ab174 1748 for (ref = remote_refs; ref; ref = ref->next) {
e31a17f7
MH
1749 char *expn_name = NULL;
1750
d71ab174
DB
1751 if (strchr(ref->name, '^'))
1752 continue; /* a dereference item */
e928213f 1753 if (match_name_with_pattern(refspec->src, ref->name,
f8fb971e
JH
1754 refspec->dst, &expn_name) &&
1755 !ignore_symref_update(expn_name)) {
d71ab174 1756 struct ref *cpy = copy_ref(ref);
d71ab174 1757
e928213f 1758 cpy->peer_ref = alloc_ref(expn_name);
d71ab174
DB
1759 if (refspec->force)
1760 cpy->peer_ref->force = 1;
1761 *tail = cpy;
1762 tail = &cpy->next;
1763 }
e31a17f7 1764 free(expn_name);
d71ab174
DB
1765 }
1766
1767 return ret;
1768}
1769
4577370e 1770static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
d71ab174 1771{
4577370e 1772 const struct ref *ref;
60650a48
JH
1773 const struct ref *best_match = NULL;
1774 int best_score = 0;
1775
d71ab174 1776 for (ref = refs; ref; ref = ref->next) {
60650a48
JH
1777 int score = refname_match(name, ref->name);
1778
1779 if (best_score < score) {
1780 best_match = ref;
1781 best_score = score;
1782 }
d71ab174 1783 }
60650a48 1784 return best_match;
d71ab174
DB
1785}
1786
4577370e 1787struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
d71ab174 1788{
4577370e 1789 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
d71ab174
DB
1790
1791 if (!ref)
9ad7c5ae 1792 return NULL;
d71ab174
DB
1793
1794 return copy_ref(ref);
1795}
1796
1797static struct ref *get_local_ref(const char *name)
1798{
3eb96997 1799 if (!name || name[0] == '\0')
d71ab174
DB
1800 return NULL;
1801
59556548 1802 if (starts_with(name, "refs/"))
59c69c0c 1803 return alloc_ref(name);
d71ab174 1804
59556548
CC
1805 if (starts_with(name, "heads/") ||
1806 starts_with(name, "tags/") ||
1807 starts_with(name, "remotes/"))
8009768e 1808 return alloc_ref_with_prefix("refs/", 5, name);
d71ab174 1809
8009768e 1810 return alloc_ref_with_prefix("refs/heads/", 11, name);
d71ab174
DB
1811}
1812
4577370e 1813int get_fetch_map(const struct ref *remote_refs,
0ad4a5ff 1814 const struct refspec_item *refspec,
9ad7c5ae
JH
1815 struct ref ***tail,
1816 int missing_ok)
d71ab174 1817{
ef00d150 1818 struct ref *ref_map, **rmp;
d71ab174
DB
1819
1820 if (refspec->pattern) {
1821 ref_map = get_expanded_map(remote_refs, refspec);
1822 } else {
9ad7c5ae
JH
1823 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1824
6e7b66ee
JH
1825 if (refspec->exact_sha1) {
1826 ref_map = alloc_ref(name);
f4e54d02 1827 get_oid_hex(name, &ref_map->old_oid);
73302051 1828 ref_map->exact_oid = 1;
6e7b66ee
JH
1829 } else {
1830 ref_map = get_remote_ref(remote_refs, name);
1831 }
9ad7c5ae 1832 if (!missing_ok && !ref_map)
0b9c3afd 1833 die(_("couldn't find remote ref %s"), name);
9ad7c5ae
JH
1834 if (ref_map) {
1835 ref_map->peer_ref = get_local_ref(refspec->dst);
1836 if (ref_map->peer_ref && refspec->force)
1837 ref_map->peer_ref->force = 1;
1838 }
d71ab174
DB
1839 }
1840
ef00d150
DB
1841 for (rmp = &ref_map; *rmp; ) {
1842 if ((*rmp)->peer_ref) {
59556548 1843 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
5c08c1f2 1844 check_refname_format((*rmp)->peer_ref->name, 0)) {
ef00d150 1845 struct ref *ignore = *rmp;
0b9c3afd 1846 error(_("* Ignoring funny ref '%s' locally"),
ef00d150
DB
1847 (*rmp)->peer_ref->name);
1848 *rmp = (*rmp)->next;
1849 free(ignore->peer_ref);
1850 free(ignore);
1851 continue;
1852 }
1853 }
1854 rmp = &((*rmp)->next);
d71ab174
DB
1855 }
1856
8f70a765
AR
1857 if (ref_map)
1858 tail_link_ref(ref_map, tail);
d71ab174
DB
1859
1860 return 0;
1861}
be885d96
DB
1862
1863int resolve_remote_symref(struct ref *ref, struct ref *list)
1864{
1865 if (!ref->symref)
1866 return 0;
1867 for (; list; list = list->next)
1868 if (!strcmp(ref->symref, list->name)) {
f4e54d02 1869 oidcpy(&ref->old_oid, &list->old_oid);
be885d96
DB
1870 return 0;
1871 }
1872 return 1;
1873}
6d21bf96
JH
1874
1875/*
c646d093 1876 * Compute the commit ahead/behind values for the pair branch_name, base.
d7d1b496
JH
1877 *
1878 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1879 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1880 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1881 * set to zero).
1882 *
c646d093
DR
1883 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1884 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1885 * commits are different.
6d21bf96 1886 */
c646d093
DR
1887
1888static int stat_branch_pair(const char *branch_name, const char *base,
1889 int *num_ours, int *num_theirs,
1890 enum ahead_behind_flags abf)
6d21bf96 1891{
fcd30b13 1892 struct object_id oid;
6d21bf96 1893 struct commit *ours, *theirs;
6d21bf96 1894 struct rev_info revs;
c972bf4c 1895 struct strvec argv = STRVEC_INIT;
6d21bf96 1896
f2e08739 1897 /* Cannot stat if what we used to build on no longer exists */
34c290a6 1898 if (read_ref(base, &oid))
f2e08739 1899 return -1;
2122f675 1900 theirs = lookup_commit_reference(the_repository, &oid);
6d21bf96 1901 if (!theirs)
f2e08739 1902 return -1;
6d21bf96 1903
c646d093 1904 if (read_ref(branch_name, &oid))
f2e08739 1905 return -1;
2122f675 1906 ours = lookup_commit_reference(the_repository, &oid);
6d21bf96 1907 if (!ours)
f2e08739 1908 return -1;
6d21bf96 1909
d7d1b496
JH
1910 *num_theirs = *num_ours = 0;
1911
6d21bf96 1912 /* are we the same? */
d7d1b496 1913 if (theirs == ours)
979cb245 1914 return 0;
d7d1b496
JH
1915 if (abf == AHEAD_BEHIND_QUICK)
1916 return 1;
fd9b544a 1917 if (abf != AHEAD_BEHIND_FULL)
c646d093 1918 BUG("stat_branch_pair: invalid abf '%d'", abf);
6d21bf96 1919
8fbf879e 1920 /* Run "rev-list --left-right ours...theirs" internally... */
c972bf4c
JK
1921 strvec_push(&argv, ""); /* ignored */
1922 strvec_push(&argv, "--left-right");
1923 strvec_pushf(&argv, "%s...%s",
f6d8942b
JK
1924 oid_to_hex(&ours->object.oid),
1925 oid_to_hex(&theirs->object.oid));
c972bf4c 1926 strvec_push(&argv, "--");
6d21bf96 1927
2abf3503 1928 repo_init_revisions(the_repository, &revs, NULL);
d70a9eb6 1929 setup_revisions(argv.nr, argv.v, &revs, NULL);
81c3ce3c 1930 if (prepare_revision_walk(&revs))
0b9c3afd 1931 die(_("revision walk setup failed"));
6d21bf96
JH
1932
1933 /* ... and count the commits on each side. */
6d21bf96
JH
1934 while (1) {
1935 struct commit *c = get_revision(&revs);
1936 if (!c)
1937 break;
1938 if (c->object.flags & SYMMETRIC_LEFT)
1939 (*num_ours)++;
1940 else
1941 (*num_theirs)++;
1942 }
c0234b2e
JH
1943
1944 /* clear object flags smudged by the above traversal */
1945 clear_commit_marks(ours, ALL_REV_FLAGS);
1946 clear_commit_marks(theirs, ALL_REV_FLAGS);
0b282cc4 1947
c972bf4c 1948 strvec_clear(&argv);
d7d1b496 1949 return 1;
6d21bf96
JH
1950}
1951
c646d093
DR
1952/*
1953 * Lookup the tracking branch for the given branch and if present, optionally
1954 * compute the commit ahead/behind values for the pair.
1955 *
1956 * If for_push is true, the tracking branch refers to the push branch,
1957 * otherwise it refers to the upstream branch.
1958 *
1959 * The name of the tracking branch (or NULL if it is not defined) is
1960 * returned via *tracking_name, if it is not itself NULL.
1961 *
1962 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1963 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1964 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1965 * set to zero).
1966 *
1967 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1968 * upstream defined, or ref does not exist). Returns 0 if the commits are
1969 * identical. Returns 1 if commits are different.
1970 */
1971int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1972 const char **tracking_name, int for_push,
1973 enum ahead_behind_flags abf)
1974{
1975 const char *base;
1976
1977 /* Cannot stat unless we are marked to build on top of somebody else. */
1978 base = for_push ? branch_get_push(branch, NULL) :
1979 branch_get_upstream(branch, NULL);
1980 if (tracking_name)
1981 *tracking_name = base;
1982 if (!base)
1983 return -1;
1984
1985 return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
1986}
1987
6d21bf96
JH
1988/*
1989 * Return true when there is anything to report, otherwise false.
1990 */
f39a757d
JH
1991int format_tracking_info(struct branch *branch, struct strbuf *sb,
1992 enum ahead_behind_flags abf)
6d21bf96 1993{
f39a757d 1994 int ours, theirs, sti;
979cb245 1995 const char *full_base;
2f50babe 1996 char *base;
f2e08739 1997 int upstream_is_gone = 0;
6d21bf96 1998
c646d093 1999 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
f39a757d 2000 if (sti < 0) {
979cb245
JK
2001 if (!full_base)
2002 return 0;
f2e08739 2003 upstream_is_gone = 1;
f2e08739 2004 }
6d21bf96 2005
979cb245 2006 base = shorten_unambiguous_ref(full_base, 0);
f2e08739
JX
2007 if (upstream_is_gone) {
2008 strbuf_addf(sb,
2009 _("Your branch is based on '%s', but the upstream is gone.\n"),
2010 base);
2011 if (advice_status_hints)
a22ae753 2012 strbuf_addstr(sb,
f2e08739 2013 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
f39a757d 2014 } else if (!sti) {
f223459b 2015 strbuf_addf(sb,
7560f547 2016 _("Your branch is up to date with '%s'.\n"),
f223459b 2017 base);
f39a757d
JH
2018 } else if (abf == AHEAD_BEHIND_QUICK) {
2019 strbuf_addf(sb,
2020 _("Your branch and '%s' refer to different commits.\n"),
2021 base);
2022 if (advice_status_hints)
2023 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
2024 "git status --ahead-behind");
f2e08739 2025 } else if (!theirs) {
8a5b7494
JX
2026 strbuf_addf(sb,
2027 Q_("Your branch is ahead of '%s' by %d commit.\n",
2028 "Your branch is ahead of '%s' by %d commits.\n",
f2e08739
JX
2029 ours),
2030 base, ours);
491e3075 2031 if (advice_status_hints)
a22ae753 2032 strbuf_addstr(sb,
491e3075 2033 _(" (use \"git push\" to publish your local commits)\n"));
f2e08739 2034 } else if (!ours) {
8a5b7494
JX
2035 strbuf_addf(sb,
2036 Q_("Your branch is behind '%s' by %d commit, "
2037 "and can be fast-forwarded.\n",
2038 "Your branch is behind '%s' by %d commits, "
2039 "and can be fast-forwarded.\n",
f2e08739
JX
2040 theirs),
2041 base, theirs);
491e3075 2042 if (advice_status_hints)
a22ae753 2043 strbuf_addstr(sb,
491e3075 2044 _(" (use \"git pull\" to update your local branch)\n"));
c190ced6 2045 } else {
8a5b7494
JX
2046 strbuf_addf(sb,
2047 Q_("Your branch and '%s' have diverged,\n"
2048 "and have %d and %d different commit each, "
2049 "respectively.\n",
2050 "Your branch and '%s' have diverged,\n"
2051 "and have %d and %d different commits each, "
2052 "respectively.\n",
f54bea44 2053 ours + theirs),
f2e08739 2054 base, ours, theirs);
491e3075 2055 if (advice_status_hints)
a22ae753 2056 strbuf_addstr(sb,
491e3075 2057 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
c190ced6 2058 }
2f50babe 2059 free(base);
6d21bf96
JH
2060 return 1;
2061}
454e2025 2062
455ade65
MH
2063static int one_local_ref(const char *refname, const struct object_id *oid,
2064 int flag, void *cb_data)
454e2025
JS
2065{
2066 struct ref ***local_tail = cb_data;
2067 struct ref *ref;
454e2025
JS
2068
2069 /* we already know it starts with refs/ to get here */
8d9c5010 2070 if (check_refname_format(refname + 5, 0))
454e2025
JS
2071 return 0;
2072
96ffc06f 2073 ref = alloc_ref(refname);
f4e54d02 2074 oidcpy(&ref->new_oid, oid);
454e2025
JS
2075 **local_tail = ref;
2076 *local_tail = &ref->next;
2077 return 0;
2078}
2079
2080struct ref *get_local_heads(void)
2081{
55f0566f 2082 struct ref *local_refs = NULL, **local_tail = &local_refs;
2b2a5be3 2083
454e2025
JS
2084 for_each_ref(one_local_ref, &local_tail);
2085 return local_refs;
2086}
8ef51733 2087
4229f1fa
JS
2088struct ref *guess_remote_head(const struct ref *head,
2089 const struct ref *refs,
2090 int all)
8ef51733 2091{
8ef51733 2092 const struct ref *r;
4229f1fa
JS
2093 struct ref *list = NULL;
2094 struct ref **tail = &list;
8ef51733 2095
6cb4e6cc 2096 if (!head)
8ef51733
JS
2097 return NULL;
2098
fbb074c2
JK
2099 /*
2100 * Some transports support directly peeking at
2101 * where HEAD points; if that is the case, then
2102 * we don't have to guess.
2103 */
2104 if (head->symref)
2105 return copy_ref(find_ref_by_name(refs, head->symref));
2106
a471214b 2107 /* If a remote branch exists with the default branch name, let's use it. */
4229f1fa 2108 if (!all) {
a471214b
JS
2109 char *ref = xstrfmt("refs/heads/%s", git_default_branch_name());
2110
2111 r = find_ref_by_name(refs, ref);
2112 free(ref);
2113 if (r && oideq(&r->old_oid, &head->old_oid))
2114 return copy_ref(r);
2115
2116 /* Fall back to the hard-coded historical default */
4229f1fa 2117 r = find_ref_by_name(refs, "refs/heads/master");
4a7e27e9 2118 if (r && oideq(&r->old_oid, &head->old_oid))
4229f1fa
JS
2119 return copy_ref(r);
2120 }
8ef51733
JS
2121
2122 /* Look for another ref that points there */
4229f1fa 2123 for (r = refs; r; r = r->next) {
61adfd30 2124 if (r != head &&
59556548 2125 starts_with(r->name, "refs/heads/") &&
4a7e27e9 2126 oideq(&r->old_oid, &head->old_oid)) {
4229f1fa
JS
2127 *tail = copy_ref(r);
2128 tail = &((*tail)->next);
2129 if (!all)
2130 break;
2131 }
2132 }
8ef51733 2133
4229f1fa 2134 return list;
8ef51733 2135}
f2ef6075
JS
2136
2137struct stale_heads_info {
f2ef6075
JS
2138 struct string_list *ref_names;
2139 struct ref **stale_refs_tail;
a2ac50cb 2140 struct refspec *rs;
f2ef6075
JS
2141};
2142
455ade65
MH
2143static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2144 int flags, void *cb_data)
f2ef6075
JS
2145{
2146 struct stale_heads_info *info = cb_data;
e6f63712 2147 struct string_list matches = STRING_LIST_INIT_DUP;
0ad4a5ff 2148 struct refspec_item query;
e6f63712 2149 int i, stale = 1;
0ad4a5ff 2150 memset(&query, 0, sizeof(struct refspec_item));
ed43de6e
CMN
2151 query.dst = (char *)refname;
2152
a2ac50cb 2153 query_refspecs_multiple(info->rs, &query, &matches);
e6f63712
CMN
2154 if (matches.nr == 0)
2155 goto clean_exit; /* No matches */
ed43de6e
CMN
2156
2157 /*
2158 * If we did find a suitable refspec and it's not a symref and
2159 * it's not in the list of refs that currently exist in that
e6f63712
CMN
2160 * remote, we consider it to be stale. In order to deal with
2161 * overlapping refspecs, we need to go over all of the
2162 * matching refs.
ed43de6e 2163 */
e6f63712
CMN
2164 if (flags & REF_ISSYMREF)
2165 goto clean_exit;
2166
2167 for (i = 0; stale && i < matches.nr; i++)
2168 if (string_list_has_string(info->ref_names, matches.items[i].string))
2169 stale = 0;
2170
2171 if (stale) {
ed43de6e 2172 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
f4e54d02 2173 oidcpy(&ref->new_oid, oid);
f2ef6075 2174 }
ed43de6e 2175
e6f63712
CMN
2176clean_exit:
2177 string_list_clear(&matches, 0);
f2ef6075
JS
2178 return 0;
2179}
2180
a2ac50cb 2181struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
f2ef6075
JS
2182{
2183 struct ref *ref, *stale_refs = NULL;
183113a5 2184 struct string_list ref_names = STRING_LIST_INIT_NODUP;
f2ef6075 2185 struct stale_heads_info info;
2b2a5be3 2186
f2ef6075
JS
2187 info.ref_names = &ref_names;
2188 info.stale_refs_tail = &stale_refs;
a2ac50cb 2189 info.rs = rs;
f2ef6075 2190 for (ref = fetch_map; ref; ref = ref->next)
1d2f80fa 2191 string_list_append(&ref_names, ref->name);
3383e199 2192 string_list_sort(&ref_names);
f2ef6075
JS
2193 for_each_ref(get_stale_heads_cb, &info);
2194 string_list_clear(&ref_names, 0);
2195 return stale_refs;
2196}
28f5d176
JH
2197
2198/*
2199 * Compare-and-swap
2200 */
a355b11d 2201static void clear_cas_option(struct push_cas_option *cas)
28f5d176
JH
2202{
2203 int i;
2204
2205 for (i = 0; i < cas->nr; i++)
2206 free(cas->entry[i].refname);
2207 free(cas->entry);
2208 memset(cas, 0, sizeof(*cas));
2209}
2210
2211static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2212 const char *refname,
2213 size_t refnamelen)
2214{
2215 struct push_cas *entry;
2216 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2217 entry = &cas->entry[cas->nr++];
2218 memset(entry, 0, sizeof(*entry));
2219 entry->refname = xmemdupz(refname, refnamelen);
2220 return entry;
2221}
2222
8668976b 2223static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
28f5d176
JH
2224{
2225 const char *colon;
2226 struct push_cas *entry;
2227
2228 if (unset) {
2229 /* "--no-<option>" */
2230 clear_cas_option(cas);
2231 return 0;
2232 }
2233
2234 if (!arg) {
2235 /* just "--<option>" */
2236 cas->use_tracking_for_rest = 1;
2237 return 0;
2238 }
2239
2240 /* "--<option>=refname" or "--<option>=refname:value" */
2241 colon = strchrnul(arg, ':');
2242 entry = add_cas_entry(cas, arg, colon - arg);
2243 if (!*colon)
2244 entry->use_tracking = 1;
eee98e74 2245 else if (!colon[1])
b8566f8f 2246 oidclr(&entry->expect);
2247 else if (get_oid(colon + 1, &entry->expect))
0b9c3afd
NTND
2248 return error(_("cannot parse expected object name '%s'"),
2249 colon + 1);
28f5d176
JH
2250 return 0;
2251}
2252
2253int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2254{
2255 return parse_push_cas_option(opt->value, arg, unset);
2256}
91048a95
JH
2257
2258int is_empty_cas(const struct push_cas_option *cas)
2259{
2260 return !cas->use_tracking_for_rest && !cas->nr;
2261}
2262
2263/*
2264 * Look at remote.fetch refspec and see if we have a remote
99a1f9ae
SK
2265 * tracking branch for the refname there. Fill the name of
2266 * the remote-tracking branch in *dst_refname, and the name
2267 * of the commit object at its tip in oid[].
91048a95
JH
2268 * If we cannot do so, return negative to signal an error.
2269 */
2270static int remote_tracking(struct remote *remote, const char *refname,
99a1f9ae 2271 struct object_id *oid, char **dst_refname)
91048a95
JH
2272{
2273 char *dst;
2274
d000414e 2275 dst = apply_refspecs(&remote->fetch, refname);
91048a95
JH
2276 if (!dst)
2277 return -1; /* no tracking ref for refname at remote */
34c290a6 2278 if (read_ref(dst, oid))
91048a95 2279 return -1; /* we know what the tracking ref is but we cannot read it */
99a1f9ae
SK
2280
2281 *dst_refname = dst;
91048a95
JH
2282 return 0;
2283}
2284
99a1f9ae
SK
2285/*
2286 * The struct "reflog_commit_array" and related helper functions
2287 * are used for collecting commits into an array during reflog
2288 * traversals in "check_and_collect_until()".
2289 */
2290struct reflog_commit_array {
2291 struct commit **item;
2292 size_t nr, alloc;
2293};
2294
2295#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
2296
2297/* Append a commit to the array. */
2298static void append_commit(struct reflog_commit_array *arr,
2299 struct commit *commit)
2300{
2301 ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
2302 arr->item[arr->nr++] = commit;
2303}
2304
2305/* Free and reset the array. */
2306static void free_commit_array(struct reflog_commit_array *arr)
2307{
2308 FREE_AND_NULL(arr->item);
2309 arr->nr = arr->alloc = 0;
2310}
2311
2312struct check_and_collect_until_cb_data {
2313 struct commit *remote_commit;
2314 struct reflog_commit_array *local_commits;
2315 timestamp_t remote_reflog_timestamp;
2316};
2317
2318/* Get the timestamp of the latest entry. */
2319static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
2320 const char *ident, timestamp_t timestamp,
2321 int tz, const char *message, void *cb_data)
2322{
2323 timestamp_t *ts = cb_data;
2324 *ts = timestamp;
2325 return 1;
2326}
2327
2328static int check_and_collect_until(struct object_id *o_oid,
2329 struct object_id *n_oid,
2330 const char *ident, timestamp_t timestamp,
2331 int tz, const char *message, void *cb_data)
2332{
2333 struct commit *commit;
2334 struct check_and_collect_until_cb_data *cb = cb_data;
2335
2336 /* An entry was found. */
2337 if (oideq(n_oid, &cb->remote_commit->object.oid))
2338 return 1;
2339
2340 if ((commit = lookup_commit_reference(the_repository, n_oid)))
2341 append_commit(cb->local_commits, commit);
2342
2343 /*
2344 * If the reflog entry timestamp is older than the remote ref's
2345 * latest reflog entry, there is no need to check or collect
2346 * entries older than this one.
2347 */
2348 if (timestamp < cb->remote_reflog_timestamp)
2349 return -1;
2350
2351 return 0;
2352}
2353
2354#define MERGE_BASES_BATCH_SIZE 8
2355
2356/*
2357 * Iterate through the reflog of the local ref to check if there is an entry
2358 * for the given remote-tracking ref; runs until the timestamp of an entry is
2359 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2360 * are that seen along the way are collected into an array to check if the
2361 * remote-tracking ref is reachable from any of them.
2362 */
2363static int is_reachable_in_reflog(const char *local, const struct ref *remote)
2364{
2365 timestamp_t date;
2366 struct commit *commit;
2367 struct commit **chunk;
2368 struct check_and_collect_until_cb_data cb;
2369 struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
2370 size_t size = 0;
2371 int ret = 0;
2372
2373 commit = lookup_commit_reference(the_repository, &remote->old_oid);
2374 if (!commit)
2375 goto cleanup_return;
2376
2377 /*
2378 * Get the timestamp from the latest entry
2379 * of the remote-tracking ref's reflog.
2380 */
2381 for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
2382
2383 cb.remote_commit = commit;
2384 cb.local_commits = &arr;
2385 cb.remote_reflog_timestamp = date;
2386 ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
2387
2388 /* We found an entry in the reflog. */
2389 if (ret > 0)
2390 goto cleanup_return;
2391
2392 /*
2393 * Check if the remote commit is reachable from any
2394 * of the commits in the collected array, in batches.
2395 */
2396 for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
2397 size = arr.item + arr.nr - chunk;
2398 if (MERGE_BASES_BATCH_SIZE < size)
2399 size = MERGE_BASES_BATCH_SIZE;
2400
2401 if ((ret = in_merge_bases_many(commit, size, chunk)))
2402 break;
2403 }
2404
2405cleanup_return:
2406 free_commit_array(&arr);
2407 return ret;
2408}
2409
2410/*
2411 * Check for reachability of a remote-tracking
2412 * ref in the reflog entries of its local ref.
2413 */
2414static void check_if_includes_upstream(struct ref *remote)
2415{
2416 struct ref *local = get_local_ref(remote->name);
2417 if (!local)
2418 return;
2419
2420 if (is_reachable_in_reflog(local->name, remote) <= 0)
2421 remote->unreachable = 1;
2422}
2423
91048a95
JH
2424static void apply_cas(struct push_cas_option *cas,
2425 struct remote *remote,
2426 struct ref *ref)
2427{
2428 int i;
2429
2430 /* Find an explicit --<option>=<name>[:<value>] entry */
2431 for (i = 0; i < cas->nr; i++) {
2432 struct push_cas *entry = &cas->entry[i];
54457fe5 2433 if (!refname_match(entry->refname, ref->name))
91048a95
JH
2434 continue;
2435 ref->expect_old_sha1 = 1;
2436 if (!entry->use_tracking)
b8566f8f 2437 oidcpy(&ref->old_oid_expect, &entry->expect);
99a1f9ae
SK
2438 else if (remote_tracking(remote, ref->name,
2439 &ref->old_oid_expect,
2440 &ref->tracking_ref))
64ac39af 2441 oidclr(&ref->old_oid_expect);
99a1f9ae
SK
2442 else
2443 ref->check_reachable = cas->use_force_if_includes;
91048a95
JH
2444 return;
2445 }
2446
2447 /* Are we using "--<option>" to cover all? */
2448 if (!cas->use_tracking_for_rest)
2449 return;
2450
2451 ref->expect_old_sha1 = 1;
99a1f9ae
SK
2452 if (remote_tracking(remote, ref->name,
2453 &ref->old_oid_expect,
2454 &ref->tracking_ref))
64ac39af 2455 oidclr(&ref->old_oid_expect);
99a1f9ae
SK
2456 else
2457 ref->check_reachable = cas->use_force_if_includes;
91048a95
JH
2458}
2459
2460void apply_push_cas(struct push_cas_option *cas,
2461 struct remote *remote,
2462 struct ref *remote_refs)
2463{
2464 struct ref *ref;
99a1f9ae 2465 for (ref = remote_refs; ref; ref = ref->next) {
91048a95 2466 apply_cas(cas, remote, ref);
99a1f9ae
SK
2467
2468 /*
2469 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2470 * mode, and if "--force-if-includes" was specified, run
2471 * the check.
2472 */
2473 if (ref->check_reachable)
2474 check_if_includes_upstream(ref);
2475 }
91048a95 2476}