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