]> git.ipfire.org Git - thirdparty/git.git/blame - remote.c
remote: convert match_push_refs to take a struct refspec
[thirdparty/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 527 if (remote && remote->push.nr &&
d000414e 528 (dst = apply_refspecs(&remote->push,
9700fae5
W
529 branch->refname))) {
530 if (explicit)
531 *explicit = 1;
532 return dst;
533 }
534 }
535 }
536 if (explicit)
537 *explicit = 0;
538 return "";
539}
540
da66b274
JK
541static struct remote *remote_get_1(const char *name,
542 const char *(*get_default)(struct branch *, int *))
5751f490
DB
543{
544 struct remote *ret;
fa685bdf 545 int name_given = 0;
5751f490 546
8770e6fb
JK
547 read_config();
548
fa685bdf
DB
549 if (name)
550 name_given = 1;
da66b274
JK
551 else
552 name = get_default(current_branch, &name_given);
9326d494 553
5751f490 554 ret = make_remote(name, 0);
4539c218 555 if (valid_remote_nick(name) && have_git_dir()) {
0a4da29d 556 if (!valid_remote(ret))
5751f490 557 read_remotes_file(ret);
0a4da29d 558 if (!valid_remote(ret))
5751f490
DB
559 read_branches_file(ret);
560 }
0a4da29d 561 if (name_given && !valid_remote(ret))
55029ae4 562 add_url_alias(ret, name);
0a4da29d 563 if (!valid_remote(ret))
5751f490
DB
564 return NULL;
565 return ret;
566}
6b62816c 567
f24f715e
RR
568struct remote *remote_get(const char *name)
569{
da66b274 570 return remote_get_1(name, remote_for_branch);
f24f715e
RR
571}
572
573struct remote *pushremote_get(const char *name)
574{
da66b274 575 return remote_get_1(name, pushremote_for_branch);
f24f715e
RR
576}
577
e459b073 578int remote_is_configured(struct remote *remote, int in_repo)
9a23ba33 579{
e459b073
JS
580 if (!remote)
581 return 0;
582 if (in_repo)
583 return remote->configured_in_repo;
584 return !!remote->origin;
9a23ba33
FAG
585}
586
b42f6927
JS
587int for_each_remote(each_remote_fn fn, void *priv)
588{
589 int i, result = 0;
590 read_config();
2d31347b 591 for (i = 0; i < remotes_nr && !result; i++) {
b42f6927
JS
592 struct remote *r = remotes[i];
593 if (!r)
594 continue;
b42f6927
JS
595 result = fn(r, priv);
596 }
597 return result;
598}
599
df02ebda
MH
600static void handle_duplicate(struct ref *ref1, struct ref *ref2)
601{
f096e6e8
MH
602 if (strcmp(ref1->name, ref2->name)) {
603 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
604 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
605 die(_("Cannot fetch both %s and %s to %s"),
606 ref1->name, ref2->name, ref2->peer_ref->name);
607 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
608 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
609 warning(_("%s usually tracks %s, not %s"),
610 ref2->peer_ref->name, ref2->name, ref1->name);
611 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
612 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
613 die(_("%s tracks both %s and %s"),
614 ref2->peer_ref->name, ref1->name, ref2->name);
615 } else {
616 /*
617 * This last possibility doesn't occur because
618 * FETCH_HEAD_IGNORE entries always appear at
619 * the end of the list.
620 */
621 die(_("Internal error"));
622 }
623 }
df02ebda
MH
624 free(ref2->peer_ref);
625 free(ref2);
626}
627
b9afe665 628struct ref *ref_remove_duplicates(struct ref *ref_map)
2467a4fa 629{
183113a5 630 struct string_list refs = STRING_LIST_INIT_NODUP;
b9afe665
MH
631 struct ref *retval = NULL;
632 struct ref **p = &retval;
73cf0822 633
b9afe665
MH
634 while (ref_map) {
635 struct ref *ref = ref_map;
636
637 ref_map = ref_map->next;
638 ref->next = NULL;
73cf0822 639
b9afe665
MH
640 if (!ref->peer_ref) {
641 *p = ref;
642 p = &ref->next;
09ea1f8e 643 } else {
b9afe665
MH
644 struct string_list_item *item =
645 string_list_insert(&refs, ref->peer_ref->name);
646
647 if (item->util) {
648 /* Entry already existed */
df02ebda 649 handle_duplicate((struct ref *)item->util, ref);
b9afe665
MH
650 } else {
651 *p = ref;
652 p = &ref->next;
653 item->util = ref;
654 }
2467a4fa
DB
655 }
656 }
b9afe665 657
73cf0822 658 string_list_clear(&refs, 0);
b9afe665 659 return retval;
2467a4fa
DB
660}
661
28b91f8a 662int remote_has_url(struct remote *remote, const char *url)
5d46c9d4
DB
663{
664 int i;
28b91f8a
SP
665 for (i = 0; i < remote->url_nr; i++) {
666 if (!strcmp(remote->url[i], url))
5d46c9d4
DB
667 return 1;
668 }
669 return 0;
670}
671
e928213f
DB
672static int match_name_with_pattern(const char *key, const char *name,
673 const char *value, char **result)
a3c84239 674{
08fbdb30
DB
675 const char *kstar = strchr(key, '*');
676 size_t klen;
abd2bde7
DB
677 size_t ksuffixlen;
678 size_t namelen;
08fbdb30
DB
679 int ret;
680 if (!kstar)
681 die("Key '%s' of pattern had no '*'", key);
682 klen = kstar - key;
abd2bde7
DB
683 ksuffixlen = strlen(kstar + 1);
684 namelen = strlen(name);
685 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
686 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
e928213f 687 if (ret && value) {
07bfa575 688 struct strbuf sb = STRBUF_INIT;
08fbdb30 689 const char *vstar = strchr(value, '*');
08fbdb30
DB
690 if (!vstar)
691 die("Value '%s' of pattern has no '*'", value);
07bfa575
RS
692 strbuf_add(&sb, value, vstar - value);
693 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
694 strbuf_addstr(&sb, vstar + 1);
695 *result = strbuf_detach(&sb, NULL);
e928213f 696 }
a3c84239
DB
697 return ret;
698}
699
a2ac50cb
BW
700static void query_refspecs_multiple(struct refspec *rs,
701 struct refspec_item *query,
702 struct string_list *results)
e6f63712
CMN
703{
704 int i;
705 int find_src = !query->src;
706
707 if (find_src && !query->dst)
708 error("query_refspecs_multiple: need either src or dst");
709
a2ac50cb
BW
710 for (i = 0; i < rs->nr; i++) {
711 struct refspec_item *refspec = &rs->items[i];
e6f63712
CMN
712 const char *key = find_src ? refspec->dst : refspec->src;
713 const char *value = find_src ? refspec->src : refspec->dst;
714 const char *needle = find_src ? query->dst : query->src;
715 char **result = find_src ? &query->src : &query->dst;
716
717 if (!refspec->dst)
718 continue;
719 if (refspec->pattern) {
720 if (match_name_with_pattern(key, needle, value, result))
721 string_list_append_nodup(results, *result);
722 } else if (!strcmp(needle, key)) {
723 string_list_append(results, value);
724 }
725 }
726}
727
86baf825 728int query_refspecs(struct refspec *rs, struct refspec_item *query)
72ff8943
DB
729{
730 int i;
c500352e 731 int find_src = !query->src;
049bff8f
MH
732 const char *needle = find_src ? query->dst : query->src;
733 char **result = find_src ? &query->src : &query->dst;
72ff8943 734
c500352e
CMN
735 if (find_src && !query->dst)
736 return error("query_refspecs: need either src or dst");
b42f6927 737
86baf825
BW
738 for (i = 0; i < rs->nr; i++) {
739 struct refspec_item *refspec = &rs->items[i];
c500352e
CMN
740 const char *key = find_src ? refspec->dst : refspec->src;
741 const char *value = find_src ? refspec->src : refspec->dst;
b42f6927 742
c500352e 743 if (!refspec->dst)
5d46c9d4 744 continue;
c500352e 745 if (refspec->pattern) {
e928213f 746 if (match_name_with_pattern(key, needle, value, result)) {
c500352e 747 query->force = refspec->force;
5d46c9d4
DB
748 return 0;
749 }
b42f6927
JS
750 } else if (!strcmp(needle, key)) {
751 *result = xstrdup(value);
c500352e 752 query->force = refspec->force;
b42f6927 753 return 0;
5d46c9d4
DB
754 }
755 }
5d46c9d4
DB
756 return -1;
757}
758
d000414e 759char *apply_refspecs(struct refspec *rs, const char *name)
c500352e 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
86baf825 766 if (query_refspecs(rs, &query))
c500352e
CMN
767 return NULL;
768
769 return query.dst;
770}
771
0ad4a5ff 772int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
c500352e 773{
86baf825 774 return query_refspecs(&remote->fetch, 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,
9fa2e5e8 1076 struct ref ***dst_tail, struct refspec *rs)
54a8ad92
JH
1077{
1078 int i, errs;
9fa2e5e8
BW
1079 for (i = errs = 0; i < rs->nr; i++)
1080 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
9a7bbd1d 1081 return errs;
6b62816c
DB
1082}
1083
f3acb830
BW
1084static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1085 int send_mirror, int direction,
1086 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;
f3acb830
BW
1092 for (i = 0; i < rs->nr; i++) {
1093 const struct refspec_item *item = &rs->items[i];
1094 if (item->matching &&
1095 (matching_refs == -1 || item->force)) {
a83619d6
PB
1096 matching_refs = i;
1097 continue;
1098 }
1099
f3acb830
BW
1100 if (item->pattern) {
1101 const char *dst_side = item->dst ? item->dst : item->src;
6ddba5e2
FC
1102 int match;
1103 if (direction == FROM_SRC)
f3acb830 1104 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
6ddba5e2 1105 else
f3acb830 1106 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
6ddba5e2 1107 if (match) {
db70a04c
FC
1108 matching_refs = i;
1109 break;
1110 }
1111 }
8558fd9e 1112 }
db70a04c 1113 if (matching_refs == -1)
a83619d6 1114 return NULL;
db70a04c 1115
f3acb830 1116 pat = &rs->items[matching_refs];
db70a04c
FC
1117 if (pat->matching) {
1118 /*
1119 * "matching refs"; traditionally we pushed everything
1120 * including refs outside refs/heads/ hierarchy, but
1121 * that does not make much sense these days.
1122 */
59556548 1123 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
db70a04c
FC
1124 return NULL;
1125 name = xstrdup(ref->name);
1126 }
1127 if (ret_pat)
1128 *ret_pat = pat;
1129 return name;
8558fd9e
DB
1130}
1131
6d2bf96e
CB
1132static struct ref **tail_ref(struct ref **head)
1133{
1134 struct ref **tail = head;
1135 while (*tail)
1136 tail = &((*tail)->next);
1137 return tail;
1138}
1139
c2aba155
JH
1140struct tips {
1141 struct commit **tip;
1142 int nr, alloc;
1143};
1144
fcd30b13 1145static void add_to_tips(struct tips *tips, const struct object_id *oid)
c2aba155
JH
1146{
1147 struct commit *commit;
1148
fcd30b13 1149 if (is_null_oid(oid))
c2aba155 1150 return;
bc83266a 1151 commit = lookup_commit_reference_gently(oid, 1);
c2aba155
JH
1152 if (!commit || (commit->object.flags & TMP_MARK))
1153 return;
1154 commit->object.flags |= TMP_MARK;
1155 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1156 tips->tip[tips->nr++] = commit;
1157}
1158
1159static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1160{
1161 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1162 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1163 struct string_list_item *item;
1164 struct ref *ref;
1165 struct tips sent_tips;
1166
1167 /*
1168 * Collect everything we know they would have at the end of
1169 * this push, and collect all tags they have.
1170 */
1171 memset(&sent_tips, 0, sizeof(sent_tips));
1172 for (ref = *dst; ref; ref = ref->next) {
1173 if (ref->peer_ref &&
f4e54d02 1174 !is_null_oid(&ref->peer_ref->new_oid))
fcd30b13 1175 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
c2aba155 1176 else
fcd30b13 1177 add_to_tips(&sent_tips, &ref->old_oid);
59556548 1178 if (starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1179 string_list_append(&dst_tag, ref->name);
1180 }
1181 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1182
3383e199 1183 string_list_sort(&dst_tag);
c2aba155
JH
1184
1185 /* Collect tags they do not have. */
1186 for (ref = src; ref; ref = ref->next) {
59556548 1187 if (!starts_with(ref->name, "refs/tags/"))
c2aba155
JH
1188 continue; /* not a tag */
1189 if (string_list_has_string(&dst_tag, ref->name))
1190 continue; /* they already have it */
abef9020 1191 if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
c2aba155
JH
1192 continue; /* be conservative */
1193 item = string_list_append(&src_tag, ref->name);
1194 item->util = ref;
1195 }
1196 string_list_clear(&dst_tag, 0);
1197
1198 /*
1199 * At this point, src_tag lists tags that are missing from
1200 * dst, and sent_tips lists the tips we are pushing or those
1201 * that we know they already have. An element in the src_tag
1202 * that is an ancestor of any of the sent_tips needs to be
1203 * sent to the other side.
1204 */
1205 if (sent_tips.nr) {
1206 for_each_string_list_item(item, &src_tag) {
1207 struct ref *ref = item->util;
1208 struct ref *dst_ref;
1209 struct commit *commit;
1210
f4e54d02 1211 if (is_null_oid(&ref->new_oid))
c2aba155 1212 continue;
bc83266a 1213 commit = lookup_commit_reference_gently(&ref->new_oid,
1214 1);
c2aba155
JH
1215 if (!commit)
1216 /* not pushing a commit, which is not an error */
1217 continue;
1218
1219 /*
1220 * Is this tag, which they do not have, reachable from
1221 * any of the commits we are sending?
1222 */
1223 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1224 continue;
1225
1226 /* Add it in */
1227 dst_ref = make_linked_ref(ref->name, dst_tail);
f4e54d02 1228 oidcpy(&dst_ref->new_oid, &ref->new_oid);
c2aba155
JH
1229 dst_ref->peer_ref = copy_ref(ref);
1230 }
1231 }
1232 string_list_clear(&src_tag, 0);
1233 free(sent_tips.tip);
1234}
1235
47a59185
JH
1236struct ref *find_ref_by_name(const struct ref *list, const char *name)
1237{
1238 for ( ; list; list = list->next)
1239 if (!strcmp(list->name, name))
1240 return (struct ref *)list;
1241 return NULL;
1242}
1243
f1bd15ab
BC
1244static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1245{
1246 for ( ; ref; ref = ref->next)
1247 string_list_append_nodup(ref_index, ref->name)->util = ref;
1248
3383e199 1249 string_list_sort(ref_index);
f1bd15ab
BC
1250}
1251
ba928c13
JK
1252/*
1253 * Given only the set of local refs, sanity-check the set of push
1254 * refspecs. We can't catch all errors that match_push_refs would,
1255 * but we can catch some errors early before even talking to the
1256 * remote side.
1257 */
1258int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1259{
0460f472 1260 struct refspec refspec = REFSPEC_INIT_PUSH;
ba928c13
JK
1261 int ret = 0;
1262 int i;
1263
0460f472
BW
1264 refspec_appendn(&refspec, refspec_names, nr_refspec);
1265
1266 for (i = 0; i < refspec.nr; i++) {
1267 struct refspec_item *rs = &refspec.items[i];
ba928c13
JK
1268
1269 if (rs->pattern || rs->matching)
1270 continue;
1271
1272 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1273 }
1274
0460f472 1275 refspec_clear(&refspec);
ba928c13
JK
1276 return ret;
1277}
1278
54a8ad92 1279/*
29753cdd
JH
1280 * Given the set of refs the local repository has, the set of refs the
1281 * remote repository has, and the refspec used for push, determine
1282 * what remote refs we will update and with what value by setting
1283 * peer_ref (which object is being pushed) and force (if the push is
1284 * forced) in elements of "dst". The function may add new elements to
1285 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
54a8ad92 1286 */
29753cdd 1287int match_push_refs(struct ref *src, struct ref **dst,
5c7ec846 1288 struct refspec *rs, int flags)
6b62816c 1289{
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;
b1d8b1f3 1294 struct ref *ref, **dst_tail = tail_ref(dst);
f1bd15ab 1295 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
6b62816c 1296
5c7ec846
BW
1297 /* If no refspec is provided, use the default ":" */
1298 if (!rs->nr)
1299 refspec_append(rs, ":");
1300
1301 errs = match_explicit_refs(src, *dst, &dst_tail, rs);
6b62816c
DB
1302
1303 /* pick the remainder */
b1d8b1f3 1304 for (ref = src; ref; ref = ref->next) {
f1bd15ab 1305 struct string_list_item *dst_item;
6b62816c 1306 struct ref *dst_peer;
0ad4a5ff 1307 const struct refspec_item *pat = NULL;
6e66bf3c 1308 char *dst_name;
db70a04c 1309
5c7ec846 1310 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
db70a04c 1311 if (!dst_name)
a83619d6
PB
1312 continue;
1313
f1bd15ab
BC
1314 if (!dst_ref_index.nr)
1315 prepare_ref_index(&dst_ref_index, *dst);
1316
1317 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1318 dst_peer = dst_item ? dst_item->util : NULL;
a83619d6
PB
1319 if (dst_peer) {
1320 if (dst_peer->peer_ref)
1321 /* We're already sending something to this ref. */
1322 goto free_name;
a83619d6
PB
1323 } else {
1324 if (pat->matching && !(send_all || send_mirror))
1325 /*
1326 * Remote doesn't have it, and we have no
1327 * explicit pattern, and we don't have
01689909 1328 * --all or --mirror.
a83619d6
PB
1329 */
1330 goto free_name;
28b9d6e5 1331
6b62816c 1332 /* Create a new one and link it */
6d2bf96e 1333 dst_peer = make_linked_ref(dst_name, &dst_tail);
f4e54d02 1334 oidcpy(&dst_peer->new_oid, &ref->new_oid);
f1bd15ab
BC
1335 string_list_insert(&dst_ref_index,
1336 dst_peer->name)->util = dst_peer;
6b62816c 1337 }
b1d8b1f3 1338 dst_peer->peer_ref = copy_ref(ref);
a83619d6 1339 dst_peer->force = pat->force;
6e66bf3c
AR
1340 free_name:
1341 free(dst_name);
6b62816c 1342 }
c2aba155 1343
f1bd15ab
BC
1344 string_list_clear(&dst_ref_index, 0);
1345
c2aba155
JH
1346 if (flags & MATCH_REFS_FOLLOW_TAGS)
1347 add_missing_tags(src, dst, &dst_tail);
1348
6ddba5e2 1349 if (send_prune) {
f1bd15ab 1350 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
6ddba5e2
FC
1351 /* check for missing refs on the remote */
1352 for (ref = *dst; ref; ref = ref->next) {
1353 char *src_name;
1354
1355 if (ref->peer_ref)
1356 /* We're already sending something to this ref. */
1357 continue;
1358
5c7ec846 1359 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
6ddba5e2 1360 if (src_name) {
f1bd15ab
BC
1361 if (!src_ref_index.nr)
1362 prepare_ref_index(&src_ref_index, src);
1363 if (!string_list_has_string(&src_ref_index,
1364 src_name))
6ddba5e2
FC
1365 ref->peer_ref = alloc_delete_ref();
1366 free(src_name);
1367 }
1368 }
f1bd15ab 1369 string_list_clear(&src_ref_index, 0);
6ddba5e2 1370 }
8ca69370 1371
5f48cb95
JS
1372 if (errs)
1373 return -1;
6b62816c
DB
1374 return 0;
1375}
cf818348 1376
20e8b465 1377void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
631b5ef2 1378 int force_update)
20e8b465
TRC
1379{
1380 struct ref *ref;
1381
1382 for (ref = remote_refs; ref; ref = ref->next) {
8c5f6f71 1383 int force_ref_update = ref->force || force_update;
631b5ef2 1384 int reject_reason = 0;
8c5f6f71 1385
20e8b465 1386 if (ref->peer_ref)
f4e54d02 1387 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
20e8b465
TRC
1388 else if (!send_mirror)
1389 continue;
1390
f4e54d02 1391 ref->deletion = is_null_oid(&ref->new_oid);
20e8b465 1392 if (!ref->deletion &&
f4e54d02 1393 !oidcmp(&ref->old_oid, &ref->new_oid)) {
20e8b465
TRC
1394 ref->status = REF_STATUS_UPTODATE;
1395 continue;
1396 }
1397
a272b289 1398 /*
b2e93f88
AW
1399 * If the remote ref has moved and is now different
1400 * from what we expect, reject any push.
631b5ef2
JH
1401 *
1402 * It also is an error if the user told us to check
1403 * with the remote-tracking branch to find the value
1404 * to expect, but we did not have such a tracking
1405 * branch.
1406 */
1407 if (ref->expect_old_sha1) {
64ac39af 1408 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
631b5ef2 1409 reject_reason = REF_STATUS_REJECT_STALE;
b2e93f88
AW
1410 else
1411 /* If the ref isn't stale then force the update. */
1412 force_ref_update = 1;
631b5ef2
JH
1413 }
1414
1415 /*
b2e93f88
AW
1416 * If the update isn't already rejected then check
1417 * the usual "must fast-forward" rules.
631b5ef2 1418 *
256b9d70
JH
1419 * Decide whether an individual refspec A:B can be
1420 * pushed. The push will succeed if any of the
1421 * following are true:
20e8b465 1422 *
a272b289 1423 * (1) the remote reference B does not exist
20e8b465 1424 *
a272b289
CR
1425 * (2) the remote reference B is being removed (i.e.,
1426 * pushing :B where no source is specified)
20e8b465 1427 *
256b9d70
JH
1428 * (3) the destination is not under refs/tags/, and
1429 * if the old and new value is a commit, the new
1430 * is a descendant of the old.
20e8b465 1431 *
a272b289
CR
1432 * (4) it is forced using the +A:B notation, or by
1433 * passing the --force argument
20e8b465
TRC
1434 */
1435
b2e93f88 1436 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
59556548 1437 if (starts_with(ref->name, "refs/tags/"))
631b5ef2 1438 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
f4e54d02 1439 else if (!has_object_file(&ref->old_oid))
631b5ef2 1440 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
bc83266a 1441 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1442 !lookup_commit_reference_gently(&ref->new_oid, 1))
631b5ef2 1443 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
6f3d57b6 1444 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
631b5ef2 1445 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
20e8b465 1446 }
631b5ef2
JH
1447
1448 /*
1449 * "--force" will defeat any rejection implemented
1450 * by the rules above.
1451 */
1452 if (!force_ref_update)
1453 ref->status = reject_reason;
1454 else if (reject_reason)
1455 ref->forced_update = 1;
20e8b465
TRC
1456 }
1457}
1458
05e73682
JH
1459static void set_merge(struct branch *ret)
1460{
9e3751d4 1461 struct remote *remote;
05e73682 1462 char *ref;
fcd30b13 1463 struct object_id oid;
05e73682
JH
1464 int i;
1465
ee2499fe
JK
1466 if (!ret)
1467 return; /* no branch */
1468 if (ret->merge)
1469 return; /* already run */
1470 if (!ret->remote_name || !ret->merge_nr) {
1471 /*
1472 * no merge config; let's make sure we don't confuse callers
1473 * with a non-zero merge_nr but a NULL merge
1474 */
1475 ret->merge_nr = 0;
1476 return;
1477 }
1478
9e3751d4
JK
1479 remote = remote_get(ret->remote_name);
1480
05e73682
JH
1481 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1482 for (i = 0; i < ret->merge_nr; i++) {
1483 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1484 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
9e3751d4 1485 if (!remote_find_tracking(remote, ret->merge[i]) ||
05e73682
JH
1486 strcmp(ret->remote_name, "."))
1487 continue;
1488 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
cca5fa64 1489 &oid, &ref) == 1)
05e73682
JH
1490 ret->merge[i]->dst = ref;
1491 else
1492 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1493 }
1494}
1495
cf818348
DB
1496struct branch *branch_get(const char *name)
1497{
1498 struct branch *ret;
1499
1500 read_config();
1501 if (!name || !*name || !strcmp(name, "HEAD"))
1502 ret = current_branch;
1503 else
1504 ret = make_branch(name, 0);
ee2499fe 1505 set_merge(ret);
cf818348
DB
1506 return ret;
1507}
1508
1509int branch_has_merge_config(struct branch *branch)
1510{
1511 return branch && !!branch->merge;
1512}
1513
85682c19
SP
1514int branch_merge_matches(struct branch *branch,
1515 int i,
1516 const char *refname)
cf818348 1517{
85682c19 1518 if (!branch || i < 0 || i >= branch->merge_nr)
cf818348 1519 return 0;
54457fe5 1520 return refname_match(branch->merge[i]->src, refname);
cf818348 1521}
d71ab174 1522
060e7766 1523__attribute__((format (printf,2,3)))
3a429d0a
JK
1524static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1525{
1526 if (err) {
1527 va_list ap;
1528 va_start(ap, fmt);
1529 strbuf_vaddf(err, fmt, ap);
1530 va_end(ap);
1531 }
1532 return NULL;
1533}
1534
1535const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1536{
1537 if (!branch)
1538 return error_buf(err, _("HEAD does not point to a branch"));
1ca41a19
JK
1539
1540 if (!branch->merge || !branch->merge[0]) {
1541 /*
1542 * no merge config; is it because the user didn't define any,
1543 * or because it is not a real branch, and get_branch
1544 * auto-vivified it?
1545 */
3a429d0a
JK
1546 if (!ref_exists(branch->refname))
1547 return error_buf(err, _("no such branch: '%s'"),
1548 branch->name);
1ca41a19
JK
1549 return error_buf(err,
1550 _("no upstream configured for branch '%s'"),
1551 branch->name);
1552 }
1553
1554 if (!branch->merge[0]->dst)
3a429d0a
JK
1555 return error_buf(err,
1556 _("upstream branch '%s' not stored as a remote-tracking branch"),
1557 branch->merge[0]->src);
3a429d0a 1558
a9f9f8cc
JK
1559 return branch->merge[0]->dst;
1560}
1561
e291c75a
JK
1562static const char *tracking_for_push_dest(struct remote *remote,
1563 const char *refname,
1564 struct strbuf *err)
1565{
1566 char *ret;
1567
d000414e 1568 ret = apply_refspecs(&remote->fetch, refname);
e291c75a
JK
1569 if (!ret)
1570 return error_buf(err,
1571 _("push destination '%s' on remote '%s' has no local tracking branch"),
1572 refname, remote->name);
1573 return ret;
1574}
1575
1576static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1577{
1578 struct remote *remote;
1579
e291c75a
JK
1580 remote = remote_get(pushremote_for_branch(branch, NULL));
1581 if (!remote)
1582 return error_buf(err,
1583 _("branch '%s' has no remote for pushing"),
1584 branch->name);
1585
6bdb304b 1586 if (remote->push.nr) {
e291c75a
JK
1587 char *dst;
1588 const char *ret;
1589
d000414e 1590 dst = apply_refspecs(&remote->push, branch->refname);
e291c75a
JK
1591 if (!dst)
1592 return error_buf(err,
1593 _("push refspecs for '%s' do not include '%s'"),
1594 remote->name, branch->name);
1595
1596 ret = tracking_for_push_dest(remote, dst, err);
1597 free(dst);
1598 return ret;
1599 }
1600
1601 if (remote->mirror)
1602 return tracking_for_push_dest(remote, branch->refname, err);
1603
1604 switch (push_default) {
1605 case PUSH_DEFAULT_NOTHING:
1606 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1607
1608 case PUSH_DEFAULT_MATCHING:
1609 case PUSH_DEFAULT_CURRENT:
1610 return tracking_for_push_dest(remote, branch->refname, err);
1611
1612 case PUSH_DEFAULT_UPSTREAM:
1613 return branch_get_upstream(branch, err);
1614
1615 case PUSH_DEFAULT_UNSPECIFIED:
1616 case PUSH_DEFAULT_SIMPLE:
1617 {
1618 const char *up, *cur;
1619
1620 up = branch_get_upstream(branch, err);
1621 if (!up)
1622 return NULL;
1623 cur = tracking_for_push_dest(remote, branch->refname, err);
1624 if (!cur)
1625 return NULL;
1626 if (strcmp(cur, up))
1627 return error_buf(err,
1628 _("cannot resolve 'simple' push to a single destination"));
1629 return cur;
1630 }
1631 }
1632
1633 die("BUG: unhandled push situation");
1634}
1635
1636const char *branch_get_push(struct branch *branch, struct strbuf *err)
1637{
b10731f4
KM
1638 if (!branch)
1639 return error_buf(err, _("HEAD does not point to a branch"));
1640
e291c75a
JK
1641 if (!branch->push_tracking_ref)
1642 branch->push_tracking_ref = branch_get_push_1(branch, err);
1643 return branch->push_tracking_ref;
1644}
1645
f8fb971e
JH
1646static int ignore_symref_update(const char *refname)
1647{
f8fb971e
JH
1648 int flag;
1649
744c040b 1650 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
f8fb971e
JH
1651 return 0; /* non-existing refs are OK */
1652 return (flag & REF_ISSYMREF);
1653}
1654
f166db26
MH
1655/*
1656 * Create and return a list of (struct ref) consisting of copies of
1657 * each remote_ref that matches refspec. refspec must be a pattern.
1658 * Fill in the copies' peer_ref to describe the local tracking refs to
1659 * which they map. Omit any references that would map to an existing
1660 * local symbolic ref.
1661 */
4577370e 1662static struct ref *get_expanded_map(const struct ref *remote_refs,
0ad4a5ff 1663 const struct refspec_item *refspec)
d71ab174 1664{
4577370e 1665 const struct ref *ref;
d71ab174
DB
1666 struct ref *ret = NULL;
1667 struct ref **tail = &ret;
1668
d71ab174 1669 for (ref = remote_refs; ref; ref = ref->next) {
e31a17f7
MH
1670 char *expn_name = NULL;
1671
d71ab174
DB
1672 if (strchr(ref->name, '^'))
1673 continue; /* a dereference item */
e928213f 1674 if (match_name_with_pattern(refspec->src, ref->name,
f8fb971e
JH
1675 refspec->dst, &expn_name) &&
1676 !ignore_symref_update(expn_name)) {
d71ab174 1677 struct ref *cpy = copy_ref(ref);
d71ab174 1678
e928213f 1679 cpy->peer_ref = alloc_ref(expn_name);
d71ab174
DB
1680 if (refspec->force)
1681 cpy->peer_ref->force = 1;
1682 *tail = cpy;
1683 tail = &cpy->next;
1684 }
e31a17f7 1685 free(expn_name);
d71ab174
DB
1686 }
1687
1688 return ret;
1689}
1690
4577370e 1691static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
d71ab174 1692{
4577370e 1693 const struct ref *ref;
d71ab174 1694 for (ref = refs; ref; ref = ref->next) {
54457fe5 1695 if (refname_match(name, ref->name))
d71ab174
DB
1696 return ref;
1697 }
1698 return NULL;
1699}
1700
4577370e 1701struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
d71ab174 1702{
4577370e 1703 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
d71ab174
DB
1704
1705 if (!ref)
9ad7c5ae 1706 return NULL;
d71ab174
DB
1707
1708 return copy_ref(ref);
1709}
1710
1711static struct ref *get_local_ref(const char *name)
1712{
3eb96997 1713 if (!name || name[0] == '\0')
d71ab174
DB
1714 return NULL;
1715
59556548 1716 if (starts_with(name, "refs/"))
59c69c0c 1717 return alloc_ref(name);
d71ab174 1718
59556548
CC
1719 if (starts_with(name, "heads/") ||
1720 starts_with(name, "tags/") ||
1721 starts_with(name, "remotes/"))
8009768e 1722 return alloc_ref_with_prefix("refs/", 5, name);
d71ab174 1723
8009768e 1724 return alloc_ref_with_prefix("refs/heads/", 11, name);
d71ab174
DB
1725}
1726
4577370e 1727int get_fetch_map(const struct ref *remote_refs,
0ad4a5ff 1728 const struct refspec_item *refspec,
9ad7c5ae
JH
1729 struct ref ***tail,
1730 int missing_ok)
d71ab174 1731{
ef00d150 1732 struct ref *ref_map, **rmp;
d71ab174
DB
1733
1734 if (refspec->pattern) {
1735 ref_map = get_expanded_map(remote_refs, refspec);
1736 } else {
9ad7c5ae
JH
1737 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1738
6e7b66ee
JH
1739 if (refspec->exact_sha1) {
1740 ref_map = alloc_ref(name);
f4e54d02 1741 get_oid_hex(name, &ref_map->old_oid);
6e7b66ee
JH
1742 } else {
1743 ref_map = get_remote_ref(remote_refs, name);
1744 }
9ad7c5ae
JH
1745 if (!missing_ok && !ref_map)
1746 die("Couldn't find remote ref %s", name);
1747 if (ref_map) {
1748 ref_map->peer_ref = get_local_ref(refspec->dst);
1749 if (ref_map->peer_ref && refspec->force)
1750 ref_map->peer_ref->force = 1;
1751 }
d71ab174
DB
1752 }
1753
ef00d150
DB
1754 for (rmp = &ref_map; *rmp; ) {
1755 if ((*rmp)->peer_ref) {
59556548 1756 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
5c08c1f2 1757 check_refname_format((*rmp)->peer_ref->name, 0)) {
ef00d150
DB
1758 struct ref *ignore = *rmp;
1759 error("* Ignoring funny ref '%s' locally",
1760 (*rmp)->peer_ref->name);
1761 *rmp = (*rmp)->next;
1762 free(ignore->peer_ref);
1763 free(ignore);
1764 continue;
1765 }
1766 }
1767 rmp = &((*rmp)->next);
d71ab174
DB
1768 }
1769
8f70a765
AR
1770 if (ref_map)
1771 tail_link_ref(ref_map, tail);
d71ab174
DB
1772
1773 return 0;
1774}
be885d96
DB
1775
1776int resolve_remote_symref(struct ref *ref, struct ref *list)
1777{
1778 if (!ref->symref)
1779 return 0;
1780 for (; list; list = list->next)
1781 if (!strcmp(ref->symref, list->name)) {
f4e54d02 1782 oidcpy(&ref->old_oid, &list->old_oid);
be885d96
DB
1783 return 0;
1784 }
1785 return 1;
1786}
6d21bf96 1787
ec8452d5
JS
1788static void unmark_and_free(struct commit_list *list, unsigned int mark)
1789{
1790 while (list) {
e510ab89
RS
1791 struct commit *commit = pop_commit(&list);
1792 commit->object.flags &= ~mark;
ec8452d5
JS
1793 }
1794}
1795
6f3d57b6 1796int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
ec8452d5
JS
1797{
1798 struct object *o;
f3bbe630 1799 struct commit *old_commit, *new_commit;
ec8452d5
JS
1800 struct commit_list *list, *used;
1801 int found = 0;
1802
75e5c0dc 1803 /*
f3bbe630
BW
1804 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1805 * old_commit. Otherwise we require --force.
ec8452d5 1806 */
c251c83d 1807 o = deref_tag(parse_object(old_oid), NULL, 0);
ec8452d5
JS
1808 if (!o || o->type != OBJ_COMMIT)
1809 return 0;
f3bbe630 1810 old_commit = (struct commit *) o;
ec8452d5 1811
c251c83d 1812 o = deref_tag(parse_object(new_oid), NULL, 0);
ec8452d5
JS
1813 if (!o || o->type != OBJ_COMMIT)
1814 return 0;
f3bbe630 1815 new_commit = (struct commit *) o;
ec8452d5 1816
f3bbe630 1817 if (parse_commit(new_commit) < 0)
ec8452d5
JS
1818 return 0;
1819
1820 used = list = NULL;
f3bbe630 1821 commit_list_insert(new_commit, &list);
ec8452d5 1822 while (list) {
f3bbe630
BW
1823 new_commit = pop_most_recent_commit(&list, TMP_MARK);
1824 commit_list_insert(new_commit, &used);
1825 if (new_commit == old_commit) {
ec8452d5
JS
1826 found = 1;
1827 break;
1828 }
1829 }
1830 unmark_and_free(list, TMP_MARK);
1831 unmark_and_free(used, TMP_MARK);
1832 return found;
1833}
1834
6d21bf96 1835/*
d7d1b496
JH
1836 * Lookup the upstream branch for the given branch and if present, optionally
1837 * compute the commit ahead/behind values for the pair.
1838 *
1839 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1840 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1841 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1842 * set to zero).
1843 *
1844 * The name of the upstream branch (or NULL if no upstream is defined) is
1845 * returned via *upstream_name, if it is not itself NULL.
f2e08739 1846 *
979cb245 1847 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
d7d1b496
JH
1848 * upstream defined, or ref does not exist). Returns 0 if the commits are
1849 * identical. Returns 1 if commits are different.
6d21bf96 1850 */
979cb245 1851int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
d7d1b496 1852 const char **upstream_name, enum ahead_behind_flags abf)
6d21bf96 1853{
fcd30b13 1854 struct object_id oid;
6d21bf96 1855 struct commit *ours, *theirs;
6d21bf96 1856 struct rev_info revs;
0b282cc4
JK
1857 const char *base;
1858 struct argv_array argv = ARGV_ARRAY_INIT;
6d21bf96 1859
f2e08739 1860 /* Cannot stat unless we are marked to build on top of somebody else. */
3a429d0a 1861 base = branch_get_upstream(branch, NULL);
979cb245
JK
1862 if (upstream_name)
1863 *upstream_name = base;
a9f9f8cc 1864 if (!base)
979cb245 1865 return -1;
6d21bf96 1866
f2e08739 1867 /* Cannot stat if what we used to build on no longer exists */
34c290a6 1868 if (read_ref(base, &oid))
f2e08739 1869 return -1;
bc83266a 1870 theirs = lookup_commit_reference(&oid);
6d21bf96 1871 if (!theirs)
f2e08739 1872 return -1;
6d21bf96 1873
34c290a6 1874 if (read_ref(branch->refname, &oid))
f2e08739 1875 return -1;
bc83266a 1876 ours = lookup_commit_reference(&oid);
6d21bf96 1877 if (!ours)
f2e08739 1878 return -1;
6d21bf96 1879
d7d1b496
JH
1880 *num_theirs = *num_ours = 0;
1881
6d21bf96 1882 /* are we the same? */
d7d1b496 1883 if (theirs == ours)
979cb245 1884 return 0;
d7d1b496
JH
1885 if (abf == AHEAD_BEHIND_QUICK)
1886 return 1;
fd9b544a
JH
1887 if (abf != AHEAD_BEHIND_FULL)
1888 BUG("stat_tracking_info: invalid abf '%d'", abf);
6d21bf96 1889
8fbf879e 1890 /* Run "rev-list --left-right ours...theirs" internally... */
0b282cc4
JK
1891 argv_array_push(&argv, ""); /* ignored */
1892 argv_array_push(&argv, "--left-right");
1893 argv_array_pushf(&argv, "%s...%s",
f2fd0760 1894 oid_to_hex(&ours->object.oid),
1895 oid_to_hex(&theirs->object.oid));
0b282cc4 1896 argv_array_push(&argv, "--");
6d21bf96
JH
1897
1898 init_revisions(&revs, NULL);
0b282cc4 1899 setup_revisions(argv.argc, argv.argv, &revs, NULL);
81c3ce3c
SB
1900 if (prepare_revision_walk(&revs))
1901 die("revision walk setup failed");
6d21bf96
JH
1902
1903 /* ... and count the commits on each side. */
6d21bf96
JH
1904 while (1) {
1905 struct commit *c = get_revision(&revs);
1906 if (!c)
1907 break;
1908 if (c->object.flags & SYMMETRIC_LEFT)
1909 (*num_ours)++;
1910 else
1911 (*num_theirs)++;
1912 }
c0234b2e
JH
1913
1914 /* clear object flags smudged by the above traversal */
1915 clear_commit_marks(ours, ALL_REV_FLAGS);
1916 clear_commit_marks(theirs, ALL_REV_FLAGS);
0b282cc4
JK
1917
1918 argv_array_clear(&argv);
d7d1b496 1919 return 1;
6d21bf96
JH
1920}
1921
1922/*
1923 * Return true when there is anything to report, otherwise false.
1924 */
f39a757d
JH
1925int format_tracking_info(struct branch *branch, struct strbuf *sb,
1926 enum ahead_behind_flags abf)
6d21bf96 1927{
f39a757d 1928 int ours, theirs, sti;
979cb245 1929 const char *full_base;
2f50babe 1930 char *base;
f2e08739 1931 int upstream_is_gone = 0;
6d21bf96 1932
f39a757d
JH
1933 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
1934 if (sti < 0) {
979cb245
JK
1935 if (!full_base)
1936 return 0;
f2e08739 1937 upstream_is_gone = 1;
f2e08739 1938 }
6d21bf96 1939
979cb245 1940 base = shorten_unambiguous_ref(full_base, 0);
f2e08739
JX
1941 if (upstream_is_gone) {
1942 strbuf_addf(sb,
1943 _("Your branch is based on '%s', but the upstream is gone.\n"),
1944 base);
1945 if (advice_status_hints)
a22ae753 1946 strbuf_addstr(sb,
f2e08739 1947 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
f39a757d 1948 } else if (!sti) {
f223459b 1949 strbuf_addf(sb,
7560f547 1950 _("Your branch is up to date with '%s'.\n"),
f223459b 1951 base);
f39a757d
JH
1952 } else if (abf == AHEAD_BEHIND_QUICK) {
1953 strbuf_addf(sb,
1954 _("Your branch and '%s' refer to different commits.\n"),
1955 base);
1956 if (advice_status_hints)
1957 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
1958 "git status --ahead-behind");
f2e08739 1959 } else if (!theirs) {
8a5b7494
JX
1960 strbuf_addf(sb,
1961 Q_("Your branch is ahead of '%s' by %d commit.\n",
1962 "Your branch is ahead of '%s' by %d commits.\n",
f2e08739
JX
1963 ours),
1964 base, ours);
491e3075 1965 if (advice_status_hints)
a22ae753 1966 strbuf_addstr(sb,
491e3075 1967 _(" (use \"git push\" to publish your local commits)\n"));
f2e08739 1968 } else if (!ours) {
8a5b7494
JX
1969 strbuf_addf(sb,
1970 Q_("Your branch is behind '%s' by %d commit, "
1971 "and can be fast-forwarded.\n",
1972 "Your branch is behind '%s' by %d commits, "
1973 "and can be fast-forwarded.\n",
f2e08739
JX
1974 theirs),
1975 base, theirs);
491e3075 1976 if (advice_status_hints)
a22ae753 1977 strbuf_addstr(sb,
491e3075 1978 _(" (use \"git pull\" to update your local branch)\n"));
c190ced6 1979 } else {
8a5b7494
JX
1980 strbuf_addf(sb,
1981 Q_("Your branch and '%s' have diverged,\n"
1982 "and have %d and %d different commit each, "
1983 "respectively.\n",
1984 "Your branch and '%s' have diverged,\n"
1985 "and have %d and %d different commits each, "
1986 "respectively.\n",
f54bea44 1987 ours + theirs),
f2e08739 1988 base, ours, theirs);
491e3075 1989 if (advice_status_hints)
a22ae753 1990 strbuf_addstr(sb,
491e3075 1991 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
c190ced6 1992 }
2f50babe 1993 free(base);
6d21bf96
JH
1994 return 1;
1995}
454e2025 1996
455ade65
MH
1997static int one_local_ref(const char *refname, const struct object_id *oid,
1998 int flag, void *cb_data)
454e2025
JS
1999{
2000 struct ref ***local_tail = cb_data;
2001 struct ref *ref;
454e2025
JS
2002
2003 /* we already know it starts with refs/ to get here */
8d9c5010 2004 if (check_refname_format(refname + 5, 0))
454e2025
JS
2005 return 0;
2006
96ffc06f 2007 ref = alloc_ref(refname);
f4e54d02 2008 oidcpy(&ref->new_oid, oid);
454e2025
JS
2009 **local_tail = ref;
2010 *local_tail = &ref->next;
2011 return 0;
2012}
2013
2014struct ref *get_local_heads(void)
2015{
55f0566f 2016 struct ref *local_refs = NULL, **local_tail = &local_refs;
2b2a5be3 2017
454e2025
JS
2018 for_each_ref(one_local_ref, &local_tail);
2019 return local_refs;
2020}
8ef51733 2021
4229f1fa
JS
2022struct ref *guess_remote_head(const struct ref *head,
2023 const struct ref *refs,
2024 int all)
8ef51733 2025{
8ef51733 2026 const struct ref *r;
4229f1fa
JS
2027 struct ref *list = NULL;
2028 struct ref **tail = &list;
8ef51733 2029
6cb4e6cc 2030 if (!head)
8ef51733
JS
2031 return NULL;
2032
fbb074c2
JK
2033 /*
2034 * Some transports support directly peeking at
2035 * where HEAD points; if that is the case, then
2036 * we don't have to guess.
2037 */
2038 if (head->symref)
2039 return copy_ref(find_ref_by_name(refs, head->symref));
2040
8ef51733 2041 /* If refs/heads/master could be right, it is. */
4229f1fa
JS
2042 if (!all) {
2043 r = find_ref_by_name(refs, "refs/heads/master");
f4e54d02 2044 if (r && !oidcmp(&r->old_oid, &head->old_oid))
4229f1fa
JS
2045 return copy_ref(r);
2046 }
8ef51733
JS
2047
2048 /* Look for another ref that points there */
4229f1fa 2049 for (r = refs; r; r = r->next) {
61adfd30 2050 if (r != head &&
59556548 2051 starts_with(r->name, "refs/heads/") &&
f4e54d02 2052 !oidcmp(&r->old_oid, &head->old_oid)) {
4229f1fa
JS
2053 *tail = copy_ref(r);
2054 tail = &((*tail)->next);
2055 if (!all)
2056 break;
2057 }
2058 }
8ef51733 2059
4229f1fa 2060 return list;
8ef51733 2061}
f2ef6075
JS
2062
2063struct stale_heads_info {
f2ef6075
JS
2064 struct string_list *ref_names;
2065 struct ref **stale_refs_tail;
a2ac50cb 2066 struct refspec *rs;
f2ef6075
JS
2067};
2068
455ade65
MH
2069static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2070 int flags, void *cb_data)
f2ef6075
JS
2071{
2072 struct stale_heads_info *info = cb_data;
e6f63712 2073 struct string_list matches = STRING_LIST_INIT_DUP;
0ad4a5ff 2074 struct refspec_item query;
e6f63712 2075 int i, stale = 1;
0ad4a5ff 2076 memset(&query, 0, sizeof(struct refspec_item));
ed43de6e
CMN
2077 query.dst = (char *)refname;
2078
a2ac50cb 2079 query_refspecs_multiple(info->rs, &query, &matches);
e6f63712
CMN
2080 if (matches.nr == 0)
2081 goto clean_exit; /* No matches */
ed43de6e
CMN
2082
2083 /*
2084 * If we did find a suitable refspec and it's not a symref and
2085 * it's not in the list of refs that currently exist in that
e6f63712
CMN
2086 * remote, we consider it to be stale. In order to deal with
2087 * overlapping refspecs, we need to go over all of the
2088 * matching refs.
ed43de6e 2089 */
e6f63712
CMN
2090 if (flags & REF_ISSYMREF)
2091 goto clean_exit;
2092
2093 for (i = 0; stale && i < matches.nr; i++)
2094 if (string_list_has_string(info->ref_names, matches.items[i].string))
2095 stale = 0;
2096
2097 if (stale) {
ed43de6e 2098 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
f4e54d02 2099 oidcpy(&ref->new_oid, oid);
f2ef6075 2100 }
ed43de6e 2101
e6f63712
CMN
2102clean_exit:
2103 string_list_clear(&matches, 0);
f2ef6075
JS
2104 return 0;
2105}
2106
a2ac50cb 2107struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
f2ef6075
JS
2108{
2109 struct ref *ref, *stale_refs = NULL;
183113a5 2110 struct string_list ref_names = STRING_LIST_INIT_NODUP;
f2ef6075 2111 struct stale_heads_info info;
2b2a5be3 2112
f2ef6075
JS
2113 info.ref_names = &ref_names;
2114 info.stale_refs_tail = &stale_refs;
a2ac50cb 2115 info.rs = rs;
f2ef6075 2116 for (ref = fetch_map; ref; ref = ref->next)
1d2f80fa 2117 string_list_append(&ref_names, ref->name);
3383e199 2118 string_list_sort(&ref_names);
f2ef6075
JS
2119 for_each_ref(get_stale_heads_cb, &info);
2120 string_list_clear(&ref_names, 0);
2121 return stale_refs;
2122}
28f5d176
JH
2123
2124/*
2125 * Compare-and-swap
2126 */
a355b11d 2127static void clear_cas_option(struct push_cas_option *cas)
28f5d176
JH
2128{
2129 int i;
2130
2131 for (i = 0; i < cas->nr; i++)
2132 free(cas->entry[i].refname);
2133 free(cas->entry);
2134 memset(cas, 0, sizeof(*cas));
2135}
2136
2137static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2138 const char *refname,
2139 size_t refnamelen)
2140{
2141 struct push_cas *entry;
2142 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2143 entry = &cas->entry[cas->nr++];
2144 memset(entry, 0, sizeof(*entry));
2145 entry->refname = xmemdupz(refname, refnamelen);
2146 return entry;
2147}
2148
8668976b 2149static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
28f5d176
JH
2150{
2151 const char *colon;
2152 struct push_cas *entry;
2153
2154 if (unset) {
2155 /* "--no-<option>" */
2156 clear_cas_option(cas);
2157 return 0;
2158 }
2159
2160 if (!arg) {
2161 /* just "--<option>" */
2162 cas->use_tracking_for_rest = 1;
2163 return 0;
2164 }
2165
2166 /* "--<option>=refname" or "--<option>=refname:value" */
2167 colon = strchrnul(arg, ':');
2168 entry = add_cas_entry(cas, arg, colon - arg);
2169 if (!*colon)
2170 entry->use_tracking = 1;
eee98e74 2171 else if (!colon[1])
b8566f8f 2172 oidclr(&entry->expect);
2173 else if (get_oid(colon + 1, &entry->expect))
28f5d176
JH
2174 return error("cannot parse expected object name '%s'", colon + 1);
2175 return 0;
2176}
2177
2178int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2179{
2180 return parse_push_cas_option(opt->value, arg, unset);
2181}
91048a95
JH
2182
2183int is_empty_cas(const struct push_cas_option *cas)
2184{
2185 return !cas->use_tracking_for_rest && !cas->nr;
2186}
2187
2188/*
2189 * Look at remote.fetch refspec and see if we have a remote
2190 * tracking branch for the refname there. Fill its current
2191 * value in sha1[].
2192 * If we cannot do so, return negative to signal an error.
2193 */
2194static int remote_tracking(struct remote *remote, const char *refname,
fcd30b13 2195 struct object_id *oid)
91048a95
JH
2196{
2197 char *dst;
2198
d000414e 2199 dst = apply_refspecs(&remote->fetch, refname);
91048a95
JH
2200 if (!dst)
2201 return -1; /* no tracking ref for refname at remote */
34c290a6 2202 if (read_ref(dst, oid))
91048a95
JH
2203 return -1; /* we know what the tracking ref is but we cannot read it */
2204 return 0;
2205}
2206
2207static void apply_cas(struct push_cas_option *cas,
2208 struct remote *remote,
2209 struct ref *ref)
2210{
2211 int i;
2212
2213 /* Find an explicit --<option>=<name>[:<value>] entry */
2214 for (i = 0; i < cas->nr; i++) {
2215 struct push_cas *entry = &cas->entry[i];
54457fe5 2216 if (!refname_match(entry->refname, ref->name))
91048a95
JH
2217 continue;
2218 ref->expect_old_sha1 = 1;
2219 if (!entry->use_tracking)
b8566f8f 2220 oidcpy(&ref->old_oid_expect, &entry->expect);
fcd30b13 2221 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
64ac39af 2222 oidclr(&ref->old_oid_expect);
91048a95
JH
2223 return;
2224 }
2225
2226 /* Are we using "--<option>" to cover all? */
2227 if (!cas->use_tracking_for_rest)
2228 return;
2229
2230 ref->expect_old_sha1 = 1;
fcd30b13 2231 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
64ac39af 2232 oidclr(&ref->old_oid_expect);
91048a95
JH
2233}
2234
2235void apply_push_cas(struct push_cas_option *cas,
2236 struct remote *remote,
2237 struct ref *remote_refs)
2238{
2239 struct ref *ref;
2240 for (ref = remote_refs; ref; ref = ref->next)
2241 apply_cas(cas, remote, ref);
2242}