fetch: convert prune_refs 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
0ad4a5ff 701static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
e6f63712
CMN
702{
703 int i;
704 int find_src = !query->src;
705
706 if (find_src && !query->dst)
707 error("query_refspecs_multiple: need either src or dst");
708
709 for (i = 0; i < ref_count; i++) {
0ad4a5ff 710 struct refspec_item *refspec = &refs[i];
e6f63712
CMN
711 const char *key = find_src ? refspec->dst : refspec->src;
712 const char *value = find_src ? refspec->src : refspec->dst;
713 const char *needle = find_src ? query->dst : query->src;
714 char **result = find_src ? &query->src : &query->dst;
715
716 if (!refspec->dst)
717 continue;
718 if (refspec->pattern) {
719 if (match_name_with_pattern(key, needle, value, result))
720 string_list_append_nodup(results, *result);
721 } else if (!strcmp(needle, key)) {
722 string_list_append(results, value);
723 }
724 }
725}
726
0ad4a5ff 727int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query)
72ff8943
DB
728{
729 int i;
c500352e 730 int find_src = !query->src;
049bff8f
MH
731 const char *needle = find_src ? query->dst : query->src;
732 char **result = find_src ? &query->src : &query->dst;
72ff8943 733
c500352e
CMN
734 if (find_src && !query->dst)
735 return error("query_refspecs: need either src or dst");
b42f6927 736
c500352e 737 for (i = 0; i < ref_count; i++) {
0ad4a5ff 738 struct refspec_item *refspec = &refs[i];
c500352e
CMN
739 const char *key = find_src ? refspec->dst : refspec->src;
740 const char *value = find_src ? refspec->src : refspec->dst;
b42f6927 741
c500352e 742 if (!refspec->dst)
5d46c9d4 743 continue;
c500352e 744 if (refspec->pattern) {
e928213f 745 if (match_name_with_pattern(key, needle, value, result)) {
c500352e 746 query->force = refspec->force;
5d46c9d4
DB
747 return 0;
748 }
b42f6927
JS
749 } else if (!strcmp(needle, key)) {
750 *result = xstrdup(value);
c500352e 751 query->force = refspec->force;
b42f6927 752 return 0;
5d46c9d4
DB
753 }
754 }
5d46c9d4
DB
755 return -1;
756}
757
0ad4a5ff 758char *apply_refspecs(struct refspec_item *refspecs, int nr_refspec,
c500352e
CMN
759 const char *name)
760{
0ad4a5ff 761 struct refspec_item query;
c500352e 762
0ad4a5ff 763 memset(&query, 0, sizeof(struct refspec_item));
c500352e
CMN
764 query.src = (char *)name;
765
766 if (query_refspecs(refspecs, nr_refspec, &query))
767 return NULL;
768
769 return query.dst;
770}
771
0ad4a5ff 772int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
c500352e 773{
e5349abf 774 return query_refspecs(remote->fetch.items, remote->fetch.nr, refspec);
c500352e
CMN
775}
776
8009768e
RS
777static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
778 const char *name)
779{
780 size_t len = strlen(name);
50a6c8ef 781 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
8009768e
RS
782 memcpy(ref->name, prefix, prefixlen);
783 memcpy(ref->name + prefixlen, name, len);
784 return ref;
785}
786
59c69c0c 787struct ref *alloc_ref(const char *name)
dfd255dd 788{
59c69c0c 789 return alloc_ref_with_prefix("", 0, name);
737922aa
KK
790}
791
59a57757 792struct ref *copy_ref(const struct ref *ref)
d71ab174 793{
7b3db095
JS
794 struct ref *cpy;
795 size_t len;
796 if (!ref)
797 return NULL;
50a6c8ef
JK
798 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
799 cpy = xmalloc(len);
800 memcpy(cpy, ref, len);
7b3db095 801 cpy->next = NULL;
8c53f071
JK
802 cpy->symref = xstrdup_or_null(ref->symref);
803 cpy->remote_status = xstrdup_or_null(ref->remote_status);
7b3db095
JS
804 cpy->peer_ref = copy_ref(ref->peer_ref);
805 return cpy;
d71ab174
DB
806}
807
4577370e
DB
808struct ref *copy_ref_list(const struct ref *ref)
809{
810 struct ref *ret = NULL;
811 struct ref **tail = &ret;
812 while (ref) {
813 *tail = copy_ref(ref);
814 ref = ref->next;
815 tail = &((*tail)->next);
816 }
817 return ret;
818}
819
697d7f5d 820static void free_ref(struct ref *ref)
be885d96
DB
821{
822 if (!ref)
823 return;
7b3db095 824 free_ref(ref->peer_ref);
be885d96
DB
825 free(ref->remote_status);
826 free(ref->symref);
827 free(ref);
828}
829
dfd255dd
DB
830void free_refs(struct ref *ref)
831{
832 struct ref *next;
833 while (ref) {
834 next = ref->next;
be885d96 835 free_ref(ref);
dfd255dd
DB
836 ref = next;
837 }
838}
839
ed81c76b
JK
840int ref_compare_name(const void *va, const void *vb)
841{
842 const struct ref *a = va, *b = vb;
843 return strcmp(a->name, b->name);
844}
845
846static void *ref_list_get_next(const void *a)
847{
848 return ((const struct ref *)a)->next;
849}
850
851static void ref_list_set_next(void *a, void *next)
852{
853 ((struct ref *)a)->next = next;
854}
855
856void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
857{
858 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
859}
860
ca02465b
JH
861int count_refspec_match(const char *pattern,
862 struct ref *refs,
863 struct ref **matched_ref)
6b62816c
DB
864{
865 int patlen = strlen(pattern);
866 struct ref *matched_weak = NULL;
867 struct ref *matched = NULL;
868 int weak_match = 0;
869 int match = 0;
870
871 for (weak_match = match = 0; refs; refs = refs->next) {
872 char *name = refs->name;
873 int namelen = strlen(name);
6b62816c 874
54457fe5 875 if (!refname_match(pattern, name))
6b62816c
DB
876 continue;
877
878 /* A match is "weak" if it is with refs outside
879 * heads or tags, and did not specify the pattern
880 * in full (e.g. "refs/remotes/origin/master") or at
881 * least from the toplevel (e.g. "remotes/origin/master");
882 * otherwise "git push $URL master" would result in
883 * ambiguity between remotes/origin/master and heads/master
884 * at the remote site.
885 */
886 if (namelen != patlen &&
887 patlen != namelen - 5 &&
59556548
CC
888 !starts_with(name, "refs/heads/") &&
889 !starts_with(name, "refs/tags/")) {
6b62816c
DB
890 /* We want to catch the case where only weak
891 * matches are found and there are multiple
892 * matches, and where more than one strong
893 * matches are found, as ambiguous. One
894 * strong match with zero or more weak matches
895 * are acceptable as a unique match.
896 */
897 matched_weak = refs;
898 weak_match++;
899 }
900 else {
901 matched = refs;
902 match++;
903 }
904 }
905 if (!matched) {
471fd3fe
JK
906 if (matched_ref)
907 *matched_ref = matched_weak;
6b62816c
DB
908 return weak_match;
909 }
910 else {
471fd3fe
JK
911 if (matched_ref)
912 *matched_ref = matched;
6b62816c
DB
913 return match;
914 }
915}
916
1d735267 917static void tail_link_ref(struct ref *ref, struct ref ***tail)
6b62816c
DB
918{
919 **tail = ref;
1d735267
DB
920 while (ref->next)
921 ref = ref->next;
6b62816c 922 *tail = &ref->next;
6b62816c
DB
923}
924
67655246
FC
925static struct ref *alloc_delete_ref(void)
926{
927 struct ref *ref = alloc_ref("(delete)");
f4e54d02 928 oidclr(&ref->new_oid);
67655246
FC
929 return ref;
930}
931
471fd3fe
JK
932static int try_explicit_object_name(const char *name,
933 struct ref **match)
6b62816c 934{
fcd30b13 935 struct object_id oid;
6b62816c 936
471fd3fe
JK
937 if (!*name) {
938 if (match)
939 *match = alloc_delete_ref();
940 return 0;
941 }
942
e82caf38 943 if (get_oid(name, &oid))
471fd3fe
JK
944 return -1;
945
946 if (match) {
947 *match = alloc_ref(name);
fcd30b13 948 oidcpy(&(*match)->new_oid, &oid);
471fd3fe
JK
949 }
950 return 0;
6b62816c
DB
951}
952
1d735267 953static struct ref *make_linked_ref(const char *name, struct ref ***tail)
6b62816c 954{
59c69c0c 955 struct ref *ret = alloc_ref(name);
1d735267
DB
956 tail_link_ref(ret, tail);
957 return ret;
163f0ee5 958}
8558fd9e 959
f8aae120
JK
960static char *guess_ref(const char *name, struct ref *peer)
961{
962 struct strbuf buf = STRBUF_INIT;
f8aae120 963
7695d118 964 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
744c040b 965 NULL, NULL);
f8aae120
JK
966 if (!r)
967 return NULL;
968
59556548 969 if (starts_with(r, "refs/heads/"))
f8aae120 970 strbuf_addstr(&buf, "refs/heads/");
59556548 971 else if (starts_with(r, "refs/tags/"))
f8aae120
JK
972 strbuf_addstr(&buf, "refs/tags/");
973 else
974 return NULL;
975
976 strbuf_addstr(&buf, name);
977 return strbuf_detach(&buf, NULL);
978}
979
f7ade3d3 980static int match_explicit_lhs(struct ref *src,
0ad4a5ff 981 struct refspec_item *rs,
f7ade3d3
JK
982 struct ref **match,
983 int *allocated_match)
984{
985 switch (count_refspec_match(rs->src, src, match)) {
986 case 1:
471fd3fe
JK
987 if (allocated_match)
988 *allocated_match = 0;
f7ade3d3
JK
989 return 0;
990 case 0:
991 /* The source could be in the get_sha1() format
992 * not a reference name. :refs/other is a
993 * way to delete 'other' ref at the remote end.
994 */
471fd3fe 995 if (try_explicit_object_name(rs->src, match) < 0)
f7ade3d3 996 return error("src refspec %s does not match any.", rs->src);
471fd3fe
JK
997 if (allocated_match)
998 *allocated_match = 1;
f7ade3d3
JK
999 return 0;
1000 default:
1001 return error("src refspec %s matches more than one.", rs->src);
1002 }
1003}
1004
54a8ad92
JH
1005static int match_explicit(struct ref *src, struct ref *dst,
1006 struct ref ***dst_tail,
0ad4a5ff 1007 struct refspec_item *rs)
6b62816c 1008{
54a8ad92 1009 struct ref *matched_src, *matched_dst;
f7ade3d3 1010 int allocated_src;
8558fd9e 1011
54a8ad92 1012 const char *dst_value = rs->dst;
f8aae120 1013 char *dst_guess;
6b62816c 1014
a83619d6 1015 if (rs->pattern || rs->matching)
9a7bbd1d 1016 return 0;
8558fd9e 1017
54a8ad92 1018 matched_src = matched_dst = NULL;
f7ade3d3
JK
1019 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1020 return -1;
3c8b7df1 1021
4491e62a 1022 if (!dst_value) {
9f0ea7e8
DB
1023 int flag;
1024
7695d118
RS
1025 dst_value = resolve_ref_unsafe(matched_src->name,
1026 RESOLVE_REF_READING,
744c040b 1027 NULL, &flag);
9f0ea7e8
DB
1028 if (!dst_value ||
1029 ((flag & REF_ISSYMREF) &&
59556548 1030 !starts_with(dst_value, "refs/heads/")))
9f0ea7e8
DB
1031 die("%s cannot be resolved to branch.",
1032 matched_src->name);
4491e62a 1033 }
3c8b7df1 1034
54a8ad92
JH
1035 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1036 case 1:
1037 break;
1038 case 0:
50e19a83 1039 if (starts_with(dst_value, "refs/"))
1d735267 1040 matched_dst = make_linked_ref(dst_value, dst_tail);
f4e54d02 1041 else if (is_null_oid(&matched_src->new_oid))
5742c82b
JK
1042 error("unable to delete '%s': remote ref does not exist",
1043 dst_value);
3dc7ea91 1044 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
f8aae120 1045 matched_dst = make_linked_ref(dst_guess, dst_tail);
3dc7ea91
JS
1046 free(dst_guess);
1047 } else
f8aae120
JK
1048 error("unable to push to unqualified destination: %s\n"
1049 "The destination refspec neither matches an "
1050 "existing ref on the remote nor\n"
1051 "begins with refs/, and we are unable to "
1052 "guess a prefix based on the source ref.",
1053 dst_value);
54a8ad92
JH
1054 break;
1055 default:
3c8b7df1 1056 matched_dst = NULL;
54a8ad92
JH
1057 error("dst refspec %s matches more than one.",
1058 dst_value);
1059 break;
1060 }
9a7bbd1d
JK
1061 if (!matched_dst)
1062 return -1;
1063 if (matched_dst->peer_ref)
1064 return error("dst ref %s receives from more than one src.",
54a8ad92 1065 matched_dst->name);
54a8ad92 1066 else {
f7ade3d3
JK
1067 matched_dst->peer_ref = allocated_src ?
1068 matched_src :
1069 copy_ref(matched_src);
54a8ad92 1070 matched_dst->force = rs->force;
6b62816c 1071 }
9a7bbd1d 1072 return 0;
54a8ad92
JH
1073}
1074
1075static int match_explicit_refs(struct ref *src, struct ref *dst,
0ad4a5ff 1076 struct ref ***dst_tail, struct refspec_item *rs,
54a8ad92
JH
1077 int rs_nr)
1078{
1079 int i, errs;
1080 for (i = errs = 0; i < rs_nr; i++)
9a7bbd1d
JK
1081 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1082 return errs;
6b62816c
DB
1083}
1084
0ad4a5ff
BW
1085static char *get_ref_match(const struct refspec_item *rs, int rs_nr, const struct ref *ref,
1086 int send_mirror, int direction, const struct refspec_item **ret_pat)
8558fd9e 1087{
0ad4a5ff 1088 const struct refspec_item *pat;
db70a04c 1089 char *name;
8558fd9e 1090 int i;
a83619d6 1091 int matching_refs = -1;
8558fd9e 1092 for (i = 0; i < rs_nr; i++) {
a83619d6
PB
1093 if (rs[i].matching &&
1094 (matching_refs == -1 || rs[i].force)) {
1095 matching_refs = i;
1096 continue;
1097 }
1098
db70a04c
FC
1099 if (rs[i].pattern) {
1100 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
6ddba5e2
FC
1101 int match;
1102 if (direction == FROM_SRC)
1103 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1104 else
1105 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1106 if (match) {
db70a04c
FC
1107 matching_refs = i;
1108 break;
1109 }
1110 }
8558fd9e 1111 }
db70a04c 1112 if (matching_refs == -1)
a83619d6 1113 return NULL;
db70a04c
FC
1114
1115 pat = rs + matching_refs;
1116 if (pat->matching) {
1117 /*
1118 * "matching refs"; traditionally we pushed everything
1119 * including refs outside refs/heads/ hierarchy, but
1120 * that does not make much sense these days.
1121 */
59556548 1122 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
db70a04c
FC
1123 return NULL;
1124 name = xstrdup(ref->name);
1125 }
1126 if (ret_pat)
1127 *ret_pat = pat;
1128 return name;
8558fd9e
DB
1129}
1130
6d2bf96e
CB
1131static struct ref **tail_ref(struct ref **head)
1132{
1133 struct ref **tail = head;
1134 while (*tail)
1135 tail = &((*tail)->next);
1136 return tail;
1137}
1138
c2aba155
JH
1139struct tips {
1140 struct commit **tip;
1141 int nr, alloc;
1142};
1143
fcd30b13 1144static void add_to_tips(struct tips *tips, const struct object_id *oid)
c2aba155
JH
1145{
1146 struct commit *commit;
1147
fcd30b13 1148 if (is_null_oid(oid))
c2aba155 1149 return;
bc83266a 1150 commit = lookup_commit_reference_gently(oid, 1);
c2aba155
JH
1151 if (!commit || (commit->object.flags & TMP_MARK))
1152 return;
1153 commit->object.flags |= TMP_MARK;
1154 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1155 tips->tip[tips->nr++] = commit;
1156}
1157
1158static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1159{
1160 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1161 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1162 struct string_list_item *item;
1163 struct ref *ref;
1164 struct tips sent_tips;
1165
1166 /*
1167 * Collect everything we know they would have at the end of
1168 * this push, and collect all tags they have.
1169 */
1170 memset(&sent_tips, 0, sizeof(sent_tips));
1171 for (ref = *dst; ref; ref = ref->next) {
1172 if (ref->peer_ref &&
f4e54d02 1173 !is_null_oid(&ref->peer_ref->new_oid))
fcd30b13 1174 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
c2aba155 1175 else
fcd30b13 1176 add_to_tips(&sent_tips, &ref->old_oid);
59556548 1177 if (starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1178 string_list_append(&dst_tag, ref->name);
1179 }
1180 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1181
3383e199 1182 string_list_sort(&dst_tag);
c2aba155
JH
1183
1184 /* Collect tags they do not have. */
1185 for (ref = src; ref; ref = ref->next) {
59556548 1186 if (!starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1187 continue; /* not a tag */
1188 if (string_list_has_string(&dst_tag, ref->name))
1189 continue; /* they already have it */
abef9020 1190 if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
c2aba155
JH
1191 continue; /* be conservative */
1192 item = string_list_append(&src_tag, ref->name);
1193 item->util = ref;
1194 }
1195 string_list_clear(&dst_tag, 0);
1196
1197 /*
1198 * At this point, src_tag lists tags that are missing from
1199 * dst, and sent_tips lists the tips we are pushing or those
1200 * that we know they already have. An element in the src_tag
1201 * that is an ancestor of any of the sent_tips needs to be
1202 * sent to the other side.
1203 */
1204 if (sent_tips.nr) {
1205 for_each_string_list_item(item, &src_tag) {
1206 struct ref *ref = item->util;
1207 struct ref *dst_ref;
1208 struct commit *commit;
1209
f4e54d02 1210 if (is_null_oid(&ref->new_oid))
c2aba155 1211 continue;
bc83266a 1212 commit = lookup_commit_reference_gently(&ref->new_oid,
1213 1);
c2aba155
JH
1214 if (!commit)
1215 /* not pushing a commit, which is not an error */
1216 continue;
1217
1218 /*
1219 * Is this tag, which they do not have, reachable from
1220 * any of the commits we are sending?
1221 */
1222 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1223 continue;
1224
1225 /* Add it in */
1226 dst_ref = make_linked_ref(ref->name, dst_tail);
f4e54d02 1227 oidcpy(&dst_ref->new_oid, &ref->new_oid);
c2aba155
JH
1228 dst_ref->peer_ref = copy_ref(ref);
1229 }
1230 }
1231 string_list_clear(&src_tag, 0);
1232 free(sent_tips.tip);
1233}
1234
47a59185
JH
1235struct ref *find_ref_by_name(const struct ref *list, const char *name)
1236{
1237 for ( ; list; list = list->next)
1238 if (!strcmp(list->name, name))
1239 return (struct ref *)list;
1240 return NULL;
1241}
1242
f1bd15ab
BC
1243static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1244{
1245 for ( ; ref; ref = ref->next)
1246 string_list_append_nodup(ref_index, ref->name)->util = ref;
1247
3383e199 1248 string_list_sort(ref_index);
f1bd15ab
BC
1249}
1250
ba928c13
JK
1251/*
1252 * Given only the set of local refs, sanity-check the set of push
1253 * refspecs. We can't catch all errors that match_push_refs would,
1254 * but we can catch some errors early before even talking to the
1255 * remote side.
1256 */
1257int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1258{
0460f472 1259 struct refspec refspec = REFSPEC_INIT_PUSH;
ba928c13
JK
1260 int ret = 0;
1261 int i;
1262
0460f472
BW
1263 refspec_appendn(&refspec, refspec_names, nr_refspec);
1264
1265 for (i = 0; i < refspec.nr; i++) {
1266 struct refspec_item *rs = &refspec.items[i];
ba928c13
JK
1267
1268 if (rs->pattern || rs->matching)
1269 continue;
1270
1271 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1272 }
1273
0460f472 1274 refspec_clear(&refspec);
ba928c13
JK
1275 return ret;
1276}
1277
54a8ad92 1278/*
29753cdd
JH
1279 * Given the set of refs the local repository has, the set of refs the
1280 * remote repository has, and the refspec used for push, determine
1281 * what remote refs we will update and with what value by setting
1282 * peer_ref (which object is being pushed) and force (if the push is
1283 * forced) in elements of "dst". The function may add new elements to
1284 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
54a8ad92 1285 */
29753cdd
JH
1286int match_push_refs(struct ref *src, struct ref **dst,
1287 int nr_refspec, const char **refspec, int flags)
6b62816c 1288{
8ca69370 1289 struct refspec rs = REFSPEC_INIT_PUSH;
28b9d6e5
AW
1290 int send_all = flags & MATCH_REFS_ALL;
1291 int send_mirror = flags & MATCH_REFS_MIRROR;
6ddba5e2 1292 int send_prune = flags & MATCH_REFS_PRUNE;
5f48cb95 1293 int errs;
2af202be 1294 static const char *default_refspec[] = { ":", NULL };
b1d8b1f3 1295 struct ref *ref, **dst_tail = tail_ref(dst);
f1bd15ab 1296 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
6b62816c 1297
a83619d6
PB
1298 if (!nr_refspec) {
1299 nr_refspec = 1;
1300 refspec = default_refspec;
1301 }
8ca69370
BW
1302 refspec_appendn(&rs, refspec, nr_refspec);
1303 errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);
6b62816c
DB
1304
1305 /* pick the remainder */
b1d8b1f3 1306 for (ref = src; ref; ref = ref->next) {
f1bd15ab 1307 struct string_list_item *dst_item;
6b62816c 1308 struct ref *dst_peer;
0ad4a5ff 1309 const struct refspec_item *pat = NULL;
6e66bf3c 1310 char *dst_name;
db70a04c 1311
8ca69370 1312 dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat);
db70a04c 1313 if (!dst_name)
a83619d6
PB
1314 continue;
1315
f1bd15ab
BC
1316 if (!dst_ref_index.nr)
1317 prepare_ref_index(&dst_ref_index, *dst);
1318
1319 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1320 dst_peer = dst_item ? dst_item->util : NULL;
a83619d6
PB
1321 if (dst_peer) {
1322 if (dst_peer->peer_ref)
1323 /* We're already sending something to this ref. */
1324 goto free_name;
a83619d6
PB
1325 } else {
1326 if (pat->matching && !(send_all || send_mirror))
1327 /*
1328 * Remote doesn't have it, and we have no
1329 * explicit pattern, and we don't have
01689909 1330 * --all or --mirror.
a83619d6
PB
1331 */
1332 goto free_name;
28b9d6e5 1333
6b62816c 1334 /* Create a new one and link it */
6d2bf96e 1335 dst_peer = make_linked_ref(dst_name, &dst_tail);
f4e54d02 1336 oidcpy(&dst_peer->new_oid, &ref->new_oid);
f1bd15ab
BC
1337 string_list_insert(&dst_ref_index,
1338 dst_peer->name)->util = dst_peer;
6b62816c 1339 }
b1d8b1f3 1340 dst_peer->peer_ref = copy_ref(ref);
a83619d6 1341 dst_peer->force = pat->force;
6e66bf3c
AR
1342 free_name:
1343 free(dst_name);
6b62816c 1344 }
c2aba155 1345
f1bd15ab
BC
1346 string_list_clear(&dst_ref_index, 0);
1347
c2aba155
JH
1348 if (flags & MATCH_REFS_FOLLOW_TAGS)
1349 add_missing_tags(src, dst, &dst_tail);
1350
6ddba5e2 1351 if (send_prune) {
f1bd15ab 1352 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
6ddba5e2
FC
1353 /* check for missing refs on the remote */
1354 for (ref = *dst; ref; ref = ref->next) {
1355 char *src_name;
1356
1357 if (ref->peer_ref)
1358 /* We're already sending something to this ref. */
1359 continue;
1360
8ca69370 1361 src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL);
6ddba5e2 1362 if (src_name) {
f1bd15ab
BC
1363 if (!src_ref_index.nr)
1364 prepare_ref_index(&src_ref_index, src);
1365 if (!string_list_has_string(&src_ref_index,
1366 src_name))
6ddba5e2
FC
1367 ref->peer_ref = alloc_delete_ref();
1368 free(src_name);
1369 }
1370 }
f1bd15ab 1371 string_list_clear(&src_ref_index, 0);
6ddba5e2 1372 }
8ca69370
BW
1373
1374 refspec_clear(&rs);
1375
5f48cb95
JS
1376 if (errs)
1377 return -1;
6b62816c
DB
1378 return 0;
1379}
cf818348 1380
20e8b465 1381void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
631b5ef2 1382 int force_update)
20e8b465
TRC
1383{
1384 struct ref *ref;
1385
1386 for (ref = remote_refs; ref; ref = ref->next) {
8c5f6f71 1387 int force_ref_update = ref->force || force_update;
631b5ef2 1388 int reject_reason = 0;
8c5f6f71 1389
20e8b465 1390 if (ref->peer_ref)
f4e54d02 1391 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
20e8b465
TRC
1392 else if (!send_mirror)
1393 continue;
1394
f4e54d02 1395 ref->deletion = is_null_oid(&ref->new_oid);
20e8b465 1396 if (!ref->deletion &&
f4e54d02 1397 !oidcmp(&ref->old_oid, &ref->new_oid)) {
20e8b465
TRC
1398 ref->status = REF_STATUS_UPTODATE;
1399 continue;
1400 }
1401
a272b289 1402 /*
b2e93f88
AW
1403 * If the remote ref has moved and is now different
1404 * from what we expect, reject any push.
631b5ef2
JH
1405 *
1406 * It also is an error if the user told us to check
1407 * with the remote-tracking branch to find the value
1408 * to expect, but we did not have such a tracking
1409 * branch.
1410 */
1411 if (ref->expect_old_sha1) {
64ac39af 1412 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
631b5ef2 1413 reject_reason = REF_STATUS_REJECT_STALE;
b2e93f88
AW
1414 else
1415 /* If the ref isn't stale then force the update. */
1416 force_ref_update = 1;
631b5ef2
JH
1417 }
1418
1419 /*
b2e93f88
AW
1420 * If the update isn't already rejected then check
1421 * the usual "must fast-forward" rules.
631b5ef2 1422 *
256b9d70
JH
1423 * Decide whether an individual refspec A:B can be
1424 * pushed. The push will succeed if any of the
1425 * following are true:
20e8b465 1426 *
a272b289 1427 * (1) the remote reference B does not exist
20e8b465 1428 *
a272b289
CR
1429 * (2) the remote reference B is being removed (i.e.,
1430 * pushing :B where no source is specified)
20e8b465 1431 *
256b9d70
JH
1432 * (3) the destination is not under refs/tags/, and
1433 * if the old and new value is a commit, the new
1434 * is a descendant of the old.
20e8b465 1435 *
a272b289
CR
1436 * (4) it is forced using the +A:B notation, or by
1437 * passing the --force argument
20e8b465
TRC
1438 */
1439
b2e93f88 1440 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
59556548 1441 if (starts_with(ref->name, "refs/tags/"))
631b5ef2 1442 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
f4e54d02 1443 else if (!has_object_file(&ref->old_oid))
631b5ef2 1444 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
bc83266a 1445 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1446 !lookup_commit_reference_gently(&ref->new_oid, 1))
631b5ef2 1447 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
6f3d57b6 1448 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
631b5ef2 1449 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
20e8b465 1450 }
631b5ef2
JH
1451
1452 /*
1453 * "--force" will defeat any rejection implemented
1454 * by the rules above.
1455 */
1456 if (!force_ref_update)
1457 ref->status = reject_reason;
1458 else if (reject_reason)
1459 ref->forced_update = 1;
20e8b465
TRC
1460 }
1461}
1462
05e73682
JH
1463static void set_merge(struct branch *ret)
1464{
9e3751d4 1465 struct remote *remote;
05e73682 1466 char *ref;
fcd30b13 1467 struct object_id oid;
05e73682
JH
1468 int i;
1469
ee2499fe
JK
1470 if (!ret)
1471 return; /* no branch */
1472 if (ret->merge)
1473 return; /* already run */
1474 if (!ret->remote_name || !ret->merge_nr) {
1475 /*
1476 * no merge config; let's make sure we don't confuse callers
1477 * with a non-zero merge_nr but a NULL merge
1478 */
1479 ret->merge_nr = 0;
1480 return;
1481 }
1482
9e3751d4
JK
1483 remote = remote_get(ret->remote_name);
1484
05e73682
JH
1485 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1486 for (i = 0; i < ret->merge_nr; i++) {
1487 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1488 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
9e3751d4 1489 if (!remote_find_tracking(remote, ret->merge[i]) ||
05e73682
JH
1490 strcmp(ret->remote_name, "."))
1491 continue;
1492 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
cca5fa64 1493 &oid, &ref) == 1)
05e73682
JH
1494 ret->merge[i]->dst = ref;
1495 else
1496 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1497 }
1498}
1499
cf818348
DB
1500struct branch *branch_get(const char *name)
1501{
1502 struct branch *ret;
1503
1504 read_config();
1505 if (!name || !*name || !strcmp(name, "HEAD"))
1506 ret = current_branch;
1507 else
1508 ret = make_branch(name, 0);
ee2499fe 1509 set_merge(ret);
cf818348
DB
1510 return ret;
1511}
1512
1513int branch_has_merge_config(struct branch *branch)
1514{
1515 return branch && !!branch->merge;
1516}
1517
85682c19
SP
1518int branch_merge_matches(struct branch *branch,
1519 int i,
1520 const char *refname)
cf818348 1521{
85682c19 1522 if (!branch || i < 0 || i >= branch->merge_nr)
cf818348 1523 return 0;
54457fe5 1524 return refname_match(branch->merge[i]->src, refname);
cf818348 1525}
d71ab174 1526
060e7766 1527__attribute__((format (printf,2,3)))
3a429d0a
JK
1528static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1529{
1530 if (err) {
1531 va_list ap;
1532 va_start(ap, fmt);
1533 strbuf_vaddf(err, fmt, ap);
1534 va_end(ap);
1535 }
1536 return NULL;
1537}
1538
1539const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1540{
1541 if (!branch)
1542 return error_buf(err, _("HEAD does not point to a branch"));
1ca41a19
JK
1543
1544 if (!branch->merge || !branch->merge[0]) {
1545 /*
1546 * no merge config; is it because the user didn't define any,
1547 * or because it is not a real branch, and get_branch
1548 * auto-vivified it?
1549 */
3a429d0a
JK
1550 if (!ref_exists(branch->refname))
1551 return error_buf(err, _("no such branch: '%s'"),
1552 branch->name);
1ca41a19
JK
1553 return error_buf(err,
1554 _("no upstream configured for branch '%s'"),
1555 branch->name);
1556 }
1557
1558 if (!branch->merge[0]->dst)
3a429d0a
JK
1559 return error_buf(err,
1560 _("upstream branch '%s' not stored as a remote-tracking branch"),
1561 branch->merge[0]->src);
3a429d0a 1562
a9f9f8cc
JK
1563 return branch->merge[0]->dst;
1564}
1565
e291c75a
JK
1566static const char *tracking_for_push_dest(struct remote *remote,
1567 const char *refname,
1568 struct strbuf *err)
1569{
1570 char *ret;
1571
e5349abf 1572 ret = apply_refspecs(remote->fetch.items, remote->fetch.nr, refname);
e291c75a
JK
1573 if (!ret)
1574 return error_buf(err,
1575 _("push destination '%s' on remote '%s' has no local tracking branch"),
1576 refname, remote->name);
1577 return ret;
1578}
1579
1580static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1581{
1582 struct remote *remote;
1583
e291c75a
JK
1584 remote = remote_get(pushremote_for_branch(branch, NULL));
1585 if (!remote)
1586 return error_buf(err,
1587 _("branch '%s' has no remote for pushing"),
1588 branch->name);
1589
6bdb304b 1590 if (remote->push.nr) {
e291c75a
JK
1591 char *dst;
1592 const char *ret;
1593
6bdb304b 1594 dst = apply_refspecs(remote->push.items, remote->push.nr,
e291c75a
JK
1595 branch->refname);
1596 if (!dst)
1597 return error_buf(err,
1598 _("push refspecs for '%s' do not include '%s'"),
1599 remote->name, branch->name);
1600
1601 ret = tracking_for_push_dest(remote, dst, err);
1602 free(dst);
1603 return ret;
1604 }
1605
1606 if (remote->mirror)
1607 return tracking_for_push_dest(remote, branch->refname, err);
1608
1609 switch (push_default) {
1610 case PUSH_DEFAULT_NOTHING:
1611 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1612
1613 case PUSH_DEFAULT_MATCHING:
1614 case PUSH_DEFAULT_CURRENT:
1615 return tracking_for_push_dest(remote, branch->refname, err);
1616
1617 case PUSH_DEFAULT_UPSTREAM:
1618 return branch_get_upstream(branch, err);
1619
1620 case PUSH_DEFAULT_UNSPECIFIED:
1621 case PUSH_DEFAULT_SIMPLE:
1622 {
1623 const char *up, *cur;
1624
1625 up = branch_get_upstream(branch, err);
1626 if (!up)
1627 return NULL;
1628 cur = tracking_for_push_dest(remote, branch->refname, err);
1629 if (!cur)
1630 return NULL;
1631 if (strcmp(cur, up))
1632 return error_buf(err,
1633 _("cannot resolve 'simple' push to a single destination"));
1634 return cur;
1635 }
1636 }
1637
1638 die("BUG: unhandled push situation");
1639}
1640
1641const char *branch_get_push(struct branch *branch, struct strbuf *err)
1642{
b10731f4
KM
1643 if (!branch)
1644 return error_buf(err, _("HEAD does not point to a branch"));
1645
e291c75a
JK
1646 if (!branch->push_tracking_ref)
1647 branch->push_tracking_ref = branch_get_push_1(branch, err);
1648 return branch->push_tracking_ref;
1649}
1650
f8fb971e
JH
1651static int ignore_symref_update(const char *refname)
1652{
f8fb971e
JH
1653 int flag;
1654
744c040b 1655 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
f8fb971e
JH
1656 return 0; /* non-existing refs are OK */
1657 return (flag & REF_ISSYMREF);
1658}
1659
f166db26
MH
1660/*
1661 * Create and return a list of (struct ref) consisting of copies of
1662 * each remote_ref that matches refspec. refspec must be a pattern.
1663 * Fill in the copies' peer_ref to describe the local tracking refs to
1664 * which they map. Omit any references that would map to an existing
1665 * local symbolic ref.
1666 */
4577370e 1667static struct ref *get_expanded_map(const struct ref *remote_refs,
0ad4a5ff 1668 const struct refspec_item *refspec)
d71ab174 1669{
4577370e 1670 const struct ref *ref;
d71ab174
DB
1671 struct ref *ret = NULL;
1672 struct ref **tail = &ret;
1673
d71ab174 1674 for (ref = remote_refs; ref; ref = ref->next) {
e31a17f7
MH
1675 char *expn_name = NULL;
1676
d71ab174
DB
1677 if (strchr(ref->name, '^'))
1678 continue; /* a dereference item */
e928213f 1679 if (match_name_with_pattern(refspec->src, ref->name,
f8fb971e
JH
1680 refspec->dst, &expn_name) &&
1681 !ignore_symref_update(expn_name)) {
d71ab174 1682 struct ref *cpy = copy_ref(ref);
d71ab174 1683
e928213f 1684 cpy->peer_ref = alloc_ref(expn_name);
d71ab174
DB
1685 if (refspec->force)
1686 cpy->peer_ref->force = 1;
1687 *tail = cpy;
1688 tail = &cpy->next;
1689 }
e31a17f7 1690 free(expn_name);
d71ab174
DB
1691 }
1692
1693 return ret;
1694}
1695
4577370e 1696static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
d71ab174 1697{
4577370e 1698 const struct ref *ref;
d71ab174 1699 for (ref = refs; ref; ref = ref->next) {
54457fe5 1700 if (refname_match(name, ref->name))
d71ab174
DB
1701 return ref;
1702 }
1703 return NULL;
1704}
1705
4577370e 1706struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
d71ab174 1707{
4577370e 1708 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
d71ab174
DB
1709
1710 if (!ref)
9ad7c5ae 1711 return NULL;
d71ab174
DB
1712
1713 return copy_ref(ref);
1714}
1715
1716static struct ref *get_local_ref(const char *name)
1717{
3eb96997 1718 if (!name || name[0] == '\0')
d71ab174
DB
1719 return NULL;
1720
59556548 1721 if (starts_with(name, "refs/"))
59c69c0c 1722 return alloc_ref(name);
d71ab174 1723
59556548
CC
1724 if (starts_with(name, "heads/") ||
1725 starts_with(name, "tags/") ||
1726 starts_with(name, "remotes/"))
8009768e 1727 return alloc_ref_with_prefix("refs/", 5, name);
d71ab174 1728
8009768e 1729 return alloc_ref_with_prefix("refs/heads/", 11, name);
d71ab174
DB
1730}
1731
4577370e 1732int get_fetch_map(const struct ref *remote_refs,
0ad4a5ff 1733 const struct refspec_item *refspec,
9ad7c5ae
JH
1734 struct ref ***tail,
1735 int missing_ok)
d71ab174 1736{
ef00d150 1737 struct ref *ref_map, **rmp;
d71ab174
DB
1738
1739 if (refspec->pattern) {
1740 ref_map = get_expanded_map(remote_refs, refspec);
1741 } else {
9ad7c5ae
JH
1742 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1743
6e7b66ee
JH
1744 if (refspec->exact_sha1) {
1745 ref_map = alloc_ref(name);
f4e54d02 1746 get_oid_hex(name, &ref_map->old_oid);
6e7b66ee
JH
1747 } else {
1748 ref_map = get_remote_ref(remote_refs, name);
1749 }
9ad7c5ae
JH
1750 if (!missing_ok && !ref_map)
1751 die("Couldn't find remote ref %s", name);
1752 if (ref_map) {
1753 ref_map->peer_ref = get_local_ref(refspec->dst);
1754 if (ref_map->peer_ref && refspec->force)
1755 ref_map->peer_ref->force = 1;
1756 }
d71ab174
DB
1757 }
1758
ef00d150
DB
1759 for (rmp = &ref_map; *rmp; ) {
1760 if ((*rmp)->peer_ref) {
59556548 1761 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
5c08c1f2 1762 check_refname_format((*rmp)->peer_ref->name, 0)) {
ef00d150
DB
1763 struct ref *ignore = *rmp;
1764 error("* Ignoring funny ref '%s' locally",
1765 (*rmp)->peer_ref->name);
1766 *rmp = (*rmp)->next;
1767 free(ignore->peer_ref);
1768 free(ignore);
1769 continue;
1770 }
1771 }
1772 rmp = &((*rmp)->next);
d71ab174
DB
1773 }
1774
8f70a765
AR
1775 if (ref_map)
1776 tail_link_ref(ref_map, tail);
d71ab174
DB
1777
1778 return 0;
1779}
be885d96
DB
1780
1781int resolve_remote_symref(struct ref *ref, struct ref *list)
1782{
1783 if (!ref->symref)
1784 return 0;
1785 for (; list; list = list->next)
1786 if (!strcmp(ref->symref, list->name)) {
f4e54d02 1787 oidcpy(&ref->old_oid, &list->old_oid);
be885d96
DB
1788 return 0;
1789 }
1790 return 1;
1791}
6d21bf96 1792
ec8452d5
JS
1793static void unmark_and_free(struct commit_list *list, unsigned int mark)
1794{
1795 while (list) {
e510ab89
RS
1796 struct commit *commit = pop_commit(&list);
1797 commit->object.flags &= ~mark;
ec8452d5
JS
1798 }
1799}
1800
6f3d57b6 1801int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
ec8452d5
JS
1802{
1803 struct object *o;
f3bbe630 1804 struct commit *old_commit, *new_commit;
ec8452d5
JS
1805 struct commit_list *list, *used;
1806 int found = 0;
1807
75e5c0dc 1808 /*
f3bbe630
BW
1809 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1810 * old_commit. Otherwise we require --force.
ec8452d5 1811 */
c251c83d 1812 o = deref_tag(parse_object(old_oid), NULL, 0);
ec8452d5
JS
1813 if (!o || o->type != OBJ_COMMIT)
1814 return 0;
f3bbe630 1815 old_commit = (struct commit *) o;
ec8452d5 1816
c251c83d 1817 o = deref_tag(parse_object(new_oid), NULL, 0);
ec8452d5
JS
1818 if (!o || o->type != OBJ_COMMIT)
1819 return 0;
f3bbe630 1820 new_commit = (struct commit *) o;
ec8452d5 1821
f3bbe630 1822 if (parse_commit(new_commit) < 0)
ec8452d5
JS
1823 return 0;
1824
1825 used = list = NULL;
f3bbe630 1826 commit_list_insert(new_commit, &list);
ec8452d5 1827 while (list) {
f3bbe630
BW
1828 new_commit = pop_most_recent_commit(&list, TMP_MARK);
1829 commit_list_insert(new_commit, &used);
1830 if (new_commit == old_commit) {
ec8452d5
JS
1831 found = 1;
1832 break;
1833 }
1834 }
1835 unmark_and_free(list, TMP_MARK);
1836 unmark_and_free(used, TMP_MARK);
1837 return found;
1838}
1839
6d21bf96 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;
bc83266a 1875 theirs = lookup_commit_reference(&oid);
6d21bf96 1876 if (!theirs)
f2e08739 1877 return -1;
6d21bf96 1878
34c290a6 1879 if (read_ref(branch->refname, &oid))
f2e08739 1880 return -1;
bc83266a 1881 ours = lookup_commit_reference(&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
JH
1902
1903 init_revisions(&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");
f4e54d02 2049 if (r && !oidcmp(&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/") &&
f4e54d02 2057 !oidcmp(&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;
0ad4a5ff 2071 struct refspec_item *refs;
ed43de6e 2072 int ref_count;
f2ef6075
JS
2073};
2074
455ade65
MH
2075static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2076 int flags, void *cb_data)
f2ef6075
JS
2077{
2078 struct stale_heads_info *info = cb_data;
e6f63712 2079 struct string_list matches = STRING_LIST_INIT_DUP;
0ad4a5ff 2080 struct refspec_item query;
e6f63712 2081 int i, stale = 1;
0ad4a5ff 2082 memset(&query, 0, sizeof(struct refspec_item));
ed43de6e
CMN
2083 query.dst = (char *)refname;
2084
e6f63712
CMN
2085 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2086 if (matches.nr == 0)
2087 goto clean_exit; /* No matches */
ed43de6e
CMN
2088
2089 /*
2090 * If we did find a suitable refspec and it's not a symref and
2091 * it's not in the list of refs that currently exist in that
e6f63712
CMN
2092 * remote, we consider it to be stale. In order to deal with
2093 * overlapping refspecs, we need to go over all of the
2094 * matching refs.
ed43de6e 2095 */
e6f63712
CMN
2096 if (flags & REF_ISSYMREF)
2097 goto clean_exit;
2098
2099 for (i = 0; stale && i < matches.nr; i++)
2100 if (string_list_has_string(info->ref_names, matches.items[i].string))
2101 stale = 0;
2102
2103 if (stale) {
ed43de6e 2104 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
f4e54d02 2105 oidcpy(&ref->new_oid, oid);
f2ef6075 2106 }
ed43de6e 2107
e6f63712
CMN
2108clean_exit:
2109 string_list_clear(&matches, 0);
f2ef6075
JS
2110 return 0;
2111}
2112
0ad4a5ff 2113struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
f2ef6075
JS
2114{
2115 struct ref *ref, *stale_refs = NULL;
183113a5 2116 struct string_list ref_names = STRING_LIST_INIT_NODUP;
f2ef6075 2117 struct stale_heads_info info;
2b2a5be3 2118
f2ef6075
JS
2119 info.ref_names = &ref_names;
2120 info.stale_refs_tail = &stale_refs;
ed43de6e
CMN
2121 info.refs = refs;
2122 info.ref_count = ref_count;
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}