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