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