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