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