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