commit.c: use clear_commit_marks_many() in in_merge_bases_many()
[git/git.git] / remote.c
CommitLineData
5751f490
DB
1#include "cache.h"
2#include "remote.h"
3#include "refs.h"
6d21bf96
JH
4#include "commit.h"
5#include "diff.h"
6#include "revision.h"
8ca12c0d 7#include "dir.h"
ec8452d5 8#include "tag.h"
73cf0822 9#include "string-list.h"
ed81c76b 10#include "mergesort.h"
5751f490 11
6ddba5e2
FC
12enum map_direction { FROM_SRC, FROM_DST };
13
e0aaa29f
DB
14static struct refspec s_tag_refspec = {
15 0,
16 1,
b84c343c 17 0,
08fbdb30
DB
18 "refs/tags/*",
19 "refs/tags/*"
e0aaa29f
DB
20};
21
22const struct refspec *tag_refspec = &s_tag_refspec;
23
844112ca
JH
24struct counted_string {
25 size_t len;
26 const char *s;
27};
55029ae4
DB
28struct rewrite {
29 const char *base;
844112ca
JH
30 size_t baselen;
31 struct counted_string *instead_of;
55029ae4
DB
32 int instead_of_nr;
33 int instead_of_alloc;
34};
d071d942
JT
35struct rewrites {
36 struct rewrite **rewrite;
37 int rewrite_alloc;
38 int rewrite_nr;
39};
55029ae4 40
5751f490 41static struct remote **remotes;
2d31347b
DB
42static int remotes_alloc;
43static int remotes_nr;
5751f490 44
cf818348 45static struct branch **branches;
2d31347b
DB
46static int branches_alloc;
47static int branches_nr;
cf818348
DB
48
49static struct branch *current_branch;
50static const char *default_remote_name;
fa685bdf 51static int explicit_default_remote_name;
cf818348 52
d071d942 53static struct rewrites rewrites;
1c2eafb8 54static struct rewrites rewrites_push;
55029ae4 55
5751f490
DB
56#define BUF_SIZE (2048)
57static char buffer[BUF_SIZE];
58
0a4da29d
DB
59static int valid_remote(const struct remote *remote)
60{
c578f51d 61 return (!!remote->url) || (!!remote->foreign_vcs);
0a4da29d
DB
62}
63
d071d942 64static const char *alias_url(const char *url, struct rewrites *r)
55029ae4
DB
65{
66 int i, j;
844112ca
JH
67 char *ret;
68 struct counted_string *longest;
69 int longest_i;
70
71 longest = NULL;
72 longest_i = -1;
d071d942
JT
73 for (i = 0; i < r->rewrite_nr; i++) {
74 if (!r->rewrite[i])
55029ae4 75 continue;
d071d942
JT
76 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
77 if (!prefixcmp(url, r->rewrite[i]->instead_of[j].s) &&
844112ca 78 (!longest ||
d071d942
JT
79 longest->len < r->rewrite[i]->instead_of[j].len)) {
80 longest = &(r->rewrite[i]->instead_of[j]);
844112ca 81 longest_i = i;
55029ae4
DB
82 }
83 }
84 }
844112ca
JH
85 if (!longest)
86 return url;
87
d071d942 88 ret = xmalloc(r->rewrite[longest_i]->baselen +
844112ca 89 (strlen(url) - longest->len) + 1);
d071d942
JT
90 strcpy(ret, r->rewrite[longest_i]->base);
91 strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
844112ca 92 return ret;
55029ae4
DB
93}
94
5751f490
DB
95static void add_push_refspec(struct remote *remote, const char *ref)
96{
2d31347b
DB
97 ALLOC_GROW(remote->push_refspec,
98 remote->push_refspec_nr + 1,
99 remote->push_refspec_alloc);
100 remote->push_refspec[remote->push_refspec_nr++] = ref;
5751f490
DB
101}
102
5d46c9d4
DB
103static void add_fetch_refspec(struct remote *remote, const char *ref)
104{
2d31347b
DB
105 ALLOC_GROW(remote->fetch_refspec,
106 remote->fetch_refspec_nr + 1,
107 remote->fetch_refspec_alloc);
108 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
5d46c9d4
DB
109}
110
28b91f8a 111static void add_url(struct remote *remote, const char *url)
5751f490 112{
2d31347b
DB
113 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
114 remote->url[remote->url_nr++] = url;
5751f490
DB
115}
116
20346234
MG
117static void add_pushurl(struct remote *remote, const char *pushurl)
118{
119 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
120 remote->pushurl[remote->pushurl_nr++] = pushurl;
121}
122
1c2eafb8
JT
123static void add_pushurl_alias(struct remote *remote, const char *url)
124{
125 const char *pushurl = alias_url(url, &rewrites_push);
126 if (pushurl != url)
127 add_pushurl(remote, pushurl);
128}
129
130static void add_url_alias(struct remote *remote, const char *url)
131{
132 add_url(remote, alias_url(url, &rewrites));
133 add_pushurl_alias(remote, url);
134}
135
5751f490
DB
136static struct remote *make_remote(const char *name, int len)
137{
2d31347b
DB
138 struct remote *ret;
139 int i;
5751f490 140
2d31347b
DB
141 for (i = 0; i < remotes_nr; i++) {
142 if (len ? (!strncmp(name, remotes[i]->name, len) &&
143 !remotes[i]->name[len]) :
144 !strcmp(name, remotes[i]->name))
145 return remotes[i];
5751f490
DB
146 }
147
2d31347b
DB
148 ret = xcalloc(1, sizeof(struct remote));
149 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
150 remotes[remotes_nr++] = ret;
5751f490 151 if (len)
2d31347b 152 ret->name = xstrndup(name, len);
5751f490 153 else
2d31347b
DB
154 ret->name = xstrdup(name);
155 return ret;
5751f490
DB
156}
157
cf818348
DB
158static void add_merge(struct branch *branch, const char *name)
159{
2d31347b
DB
160 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
161 branch->merge_alloc);
162 branch->merge_name[branch->merge_nr++] = name;
cf818348
DB
163}
164
165static struct branch *make_branch(const char *name, int len)
166{
2d31347b
DB
167 struct branch *ret;
168 int i;
cf818348
DB
169 char *refname;
170
2d31347b
DB
171 for (i = 0; i < branches_nr; i++) {
172 if (len ? (!strncmp(name, branches[i]->name, len) &&
173 !branches[i]->name[len]) :
174 !strcmp(name, branches[i]->name))
175 return branches[i];
cf818348
DB
176 }
177
2d31347b
DB
178 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
179 ret = xcalloc(1, sizeof(struct branch));
180 branches[branches_nr++] = ret;
cf818348 181 if (len)
2d31347b 182 ret->name = xstrndup(name, len);
cf818348 183 else
2d31347b 184 ret->name = xstrdup(name);
e8eec71d 185 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
cf818348 186 strcpy(refname, "refs/heads/");
2d31347b
DB
187 strcpy(refname + strlen("refs/heads/"), ret->name);
188 ret->refname = refname;
cf818348 189
2d31347b 190 return ret;
cf818348
DB
191}
192
d071d942 193static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
55029ae4
DB
194{
195 struct rewrite *ret;
196 int i;
197
d071d942 198 for (i = 0; i < r->rewrite_nr; i++) {
844112ca 199 if (len
d071d942
JT
200 ? (len == r->rewrite[i]->baselen &&
201 !strncmp(base, r->rewrite[i]->base, len))
202 : !strcmp(base, r->rewrite[i]->base))
203 return r->rewrite[i];
55029ae4
DB
204 }
205
d071d942 206 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
55029ae4 207 ret = xcalloc(1, sizeof(struct rewrite));
d071d942 208 r->rewrite[r->rewrite_nr++] = ret;
844112ca 209 if (len) {
55029ae4 210 ret->base = xstrndup(base, len);
844112ca
JH
211 ret->baselen = len;
212 }
213 else {
55029ae4 214 ret->base = xstrdup(base);
844112ca
JH
215 ret->baselen = strlen(base);
216 }
55029ae4
DB
217 return ret;
218}
219
220static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
221{
222 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
844112ca
JH
223 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
224 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
225 rewrite->instead_of_nr++;
55029ae4
DB
226}
227
5751f490
DB
228static void read_remotes_file(struct remote *remote)
229{
230 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
231
232 if (!f)
233 return;
89cf4c70 234 remote->origin = REMOTE_REMOTES;
5751f490
DB
235 while (fgets(buffer, BUF_SIZE, f)) {
236 int value_list;
237 char *s, *p;
238
239 if (!prefixcmp(buffer, "URL:")) {
240 value_list = 0;
241 s = buffer + 4;
242 } else if (!prefixcmp(buffer, "Push:")) {
243 value_list = 1;
244 s = buffer + 5;
5d46c9d4
DB
245 } else if (!prefixcmp(buffer, "Pull:")) {
246 value_list = 2;
247 s = buffer + 5;
5751f490
DB
248 } else
249 continue;
250
251 while (isspace(*s))
252 s++;
253 if (!*s)
254 continue;
255
256 p = s + strlen(s);
257 while (isspace(p[-1]))
258 *--p = 0;
259
260 switch (value_list) {
261 case 0:
55029ae4 262 add_url_alias(remote, xstrdup(s));
5751f490
DB
263 break;
264 case 1:
265 add_push_refspec(remote, xstrdup(s));
266 break;
5d46c9d4
DB
267 case 2:
268 add_fetch_refspec(remote, xstrdup(s));
269 break;
5751f490
DB
270 }
271 }
272 fclose(f);
273}
274
275static void read_branches_file(struct remote *remote)
276{
277 const char *slash = strchr(remote->name, '/');
cf818348 278 char *frag;
f285a2d7 279 struct strbuf branch = STRBUF_INIT;
5751f490
DB
280 int n = slash ? slash - remote->name : 1000;
281 FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
282 char *s, *p;
283 int len;
284
285 if (!f)
286 return;
287 s = fgets(buffer, BUF_SIZE, f);
288 fclose(f);
289 if (!s)
290 return;
291 while (isspace(*s))
292 s++;
293 if (!*s)
294 return;
89cf4c70 295 remote->origin = REMOTE_BRANCHES;
5751f490
DB
296 p = s + strlen(s);
297 while (isspace(p[-1]))
298 *--p = 0;
299 len = p - s;
300 if (slash)
301 len += strlen(slash);
302 p = xmalloc(len + 1);
303 strcpy(p, s);
304 if (slash)
305 strcat(p, slash);
472fa4cd
DB
306
307 /*
308 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
309 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
310 * the partial URL obtained from the branches file plus
311 * "/netdev-2.6" and does not store it in any tracking ref.
312 * #branch specifier in the file is ignored.
313 *
314 * Otherwise, the branches file would have URL and optionally
315 * #branch specified. The "master" (or specified) branch is
316 * fetched and stored in the local branch of the same name.
317 */
cf818348
DB
318 frag = strchr(p, '#');
319 if (frag) {
320 *(frag++) = '\0';
472fa4cd
DB
321 strbuf_addf(&branch, "refs/heads/%s", frag);
322 } else
323 strbuf_addstr(&branch, "refs/heads/master");
324 if (!slash) {
325 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
cf818348 326 } else {
472fa4cd
DB
327 strbuf_reset(&branch);
328 strbuf_addstr(&branch, "HEAD:");
cf818348 329 }
55029ae4 330 add_url_alias(remote, p);
2af202be 331 add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
18afe101
MK
332 /*
333 * Cogito compatible push: push current HEAD to remote #branch
334 * (master if missing)
335 */
336 strbuf_init(&branch, 0);
337 strbuf_addstr(&branch, "HEAD");
338 if (frag)
339 strbuf_addf(&branch, ":refs/heads/%s", frag);
340 else
341 strbuf_addstr(&branch, ":refs/heads/master");
2af202be 342 add_push_refspec(remote, strbuf_detach(&branch, NULL));
d71ab174 343 remote->fetch_tags = 1; /* always auto-follow */
5751f490
DB
344}
345
ef90d6d4 346static int handle_config(const char *key, const char *value, void *cb)
5751f490
DB
347{
348 const char *name;
349 const char *subkey;
350 struct remote *remote;
cf818348
DB
351 struct branch *branch;
352 if (!prefixcmp(key, "branch.")) {
353 name = key + 7;
354 subkey = strrchr(name, '.');
cf818348
DB
355 if (!subkey)
356 return 0;
896c0535 357 branch = make_branch(name, subkey - name);
cf818348 358 if (!strcmp(subkey, ".remote")) {
d2370cc2
JH
359 if (!value)
360 return config_error_nonbool(key);
cf818348 361 branch->remote_name = xstrdup(value);
fa685bdf 362 if (branch == current_branch) {
cf818348 363 default_remote_name = branch->remote_name;
fa685bdf
DB
364 explicit_default_remote_name = 1;
365 }
d2370cc2
JH
366 } else if (!strcmp(subkey, ".merge")) {
367 if (!value)
368 return config_error_nonbool(key);
cf818348 369 add_merge(branch, xstrdup(value));
d2370cc2 370 }
cf818348 371 return 0;
5751f490 372 }
55029ae4
DB
373 if (!prefixcmp(key, "url.")) {
374 struct rewrite *rewrite;
60e3aba9 375 name = key + 4;
55029ae4
DB
376 subkey = strrchr(name, '.');
377 if (!subkey)
378 return 0;
55029ae4 379 if (!strcmp(subkey, ".insteadof")) {
1c2eafb8
JT
380 rewrite = make_rewrite(&rewrites, name, subkey - name);
381 if (!value)
382 return config_error_nonbool(key);
383 add_instead_of(rewrite, xstrdup(value));
384 } else if (!strcmp(subkey, ".pushinsteadof")) {
385 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
55029ae4
DB
386 if (!value)
387 return config_error_nonbool(key);
388 add_instead_of(rewrite, xstrdup(value));
389 }
390 }
5751f490
DB
391 if (prefixcmp(key, "remote."))
392 return 0;
393 name = key + 7;
c82efafc
BC
394 if (*name == '/') {
395 warning("Config remote shorthand cannot begin with '/': %s",
396 name);
397 return 0;
398 }
5751f490
DB
399 subkey = strrchr(name, '.');
400 if (!subkey)
cd294bc3 401 return 0;
5751f490 402 remote = make_remote(name, subkey - name);
89cf4c70 403 remote->origin = REMOTE_CONFIG;
84bb2dfd
PB
404 if (!strcmp(subkey, ".mirror"))
405 remote->mirror = git_config_bool(key, value);
406 else if (!strcmp(subkey, ".skipdefaultupdate"))
407 remote->skip_default_update = git_config_bool(key, value);
7cc91a2f
BG
408 else if (!strcmp(subkey, ".skipfetchall"))
409 remote->skip_default_update = git_config_bool(key, value);
84bb2dfd
PB
410 else if (!strcmp(subkey, ".url")) {
411 const char *v;
412 if (git_config_string(&v, key, value))
413 return -1;
414 add_url(remote, v);
20346234
MG
415 } else if (!strcmp(subkey, ".pushurl")) {
416 const char *v;
417 if (git_config_string(&v, key, value))
418 return -1;
419 add_pushurl(remote, v);
5751f490 420 } else if (!strcmp(subkey, ".push")) {
84bb2dfd
PB
421 const char *v;
422 if (git_config_string(&v, key, value))
423 return -1;
424 add_push_refspec(remote, v);
5d46c9d4 425 } else if (!strcmp(subkey, ".fetch")) {
84bb2dfd
PB
426 const char *v;
427 if (git_config_string(&v, key, value))
428 return -1;
429 add_fetch_refspec(remote, v);
5751f490 430 } else if (!strcmp(subkey, ".receivepack")) {
84bb2dfd
PB
431 const char *v;
432 if (git_config_string(&v, key, value))
433 return -1;
5751f490 434 if (!remote->receivepack)
84bb2dfd 435 remote->receivepack = v;
5751f490
DB
436 else
437 error("more than one receivepack given, using the first");
0012ba21 438 } else if (!strcmp(subkey, ".uploadpack")) {
84bb2dfd
PB
439 const char *v;
440 if (git_config_string(&v, key, value))
441 return -1;
0012ba21 442 if (!remote->uploadpack)
84bb2dfd 443 remote->uploadpack = v;
0012ba21
DB
444 else
445 error("more than one uploadpack given, using the first");
d71ab174
DB
446 } else if (!strcmp(subkey, ".tagopt")) {
447 if (!strcmp(value, "--no-tags"))
448 remote->fetch_tags = -1;
944163a4
ST
449 else if (!strcmp(value, "--tags"))
450 remote->fetch_tags = 2;
14c98218 451 } else if (!strcmp(subkey, ".proxy")) {
84bb2dfd
PB
452 return git_config_string((const char **)&remote->http_proxy,
453 key, value);
c578f51d
DB
454 } else if (!strcmp(subkey, ".vcs")) {
455 return git_config_string(&remote->foreign_vcs, key, value);
84bb2dfd 456 }
5751f490
DB
457 return 0;
458}
459
55029ae4
DB
460static void alias_all_urls(void)
461{
462 int i, j;
463 for (i = 0; i < remotes_nr; i++) {
1c2eafb8 464 int add_pushurl_aliases;
55029ae4
DB
465 if (!remotes[i])
466 continue;
20346234 467 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
d071d942 468 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
20346234 469 }
1c2eafb8
JT
470 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
471 for (j = 0; j < remotes[i]->url_nr; j++) {
472 if (add_pushurl_aliases)
473 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
474 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
475 }
55029ae4
DB
476 }
477}
478
5751f490
DB
479static void read_config(void)
480{
481 unsigned char sha1[20];
482 const char *head_ref;
483 int flag;
2543d9b6 484 if (default_remote_name) /* did this already */
5751f490
DB
485 return;
486 default_remote_name = xstrdup("origin");
487 current_branch = NULL;
8cad4744 488 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
5751f490
DB
489 if (head_ref && (flag & REF_ISSYMREF) &&
490 !prefixcmp(head_ref, "refs/heads/")) {
cf818348
DB
491 current_branch =
492 make_branch(head_ref + strlen("refs/heads/"), 0);
5751f490 493 }
ef90d6d4 494 git_config(handle_config, NULL);
55029ae4 495 alias_all_urls();
5751f490
DB
496}
497
2cb1f36d
BC
498/*
499 * This function frees a refspec array.
500 * Warning: code paths should be checked to ensure that the src
501 * and dst pointers are always freeable pointers as well
502 * as the refspec pointer itself.
503 */
697d7f5d 504static void free_refspecs(struct refspec *refspec, int nr_refspec)
2cb1f36d
BC
505{
506 int i;
507
508 if (!refspec)
509 return;
510
511 for (i = 0; i < nr_refspec; i++) {
512 free(refspec[i].src);
513 free(refspec[i].dst);
514 }
515 free(refspec);
516}
517
24b6177e 518static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
6b62816c
DB
519{
520 int i;
521 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
46220ca1 522
6b62816c 523 for (i = 0; i < nr_refspec; i++) {
47c6ef1c 524 size_t llen;
46220ca1
JH
525 int is_glob;
526 const char *lhs, *rhs;
8d9c5010 527 int flags;
46220ca1 528
8e76bf3f 529 is_glob = 0;
46220ca1
JH
530
531 lhs = refspec[i];
532 if (*lhs == '+') {
6b62816c 533 rs[i].force = 1;
46220ca1 534 lhs++;
6b62816c 535 }
46220ca1
JH
536
537 rhs = strrchr(lhs, ':');
a83619d6
PB
538
539 /*
540 * Before going on, special case ":" (or "+:") as a refspec
541 * for matching refs.
542 */
543 if (!fetch && rhs == lhs && rhs[1] == '\0') {
544 rs[i].matching = 1;
545 continue;
546 }
547
46220ca1 548 if (rhs) {
47c6ef1c 549 size_t rlen = strlen(++rhs);
abd2bde7 550 is_glob = (1 <= rlen && strchr(rhs, '*'));
08fbdb30 551 rs[i].dst = xstrndup(rhs, rlen);
6b62816c 552 }
ef00d150 553
46220ca1 554 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
abd2bde7 555 if (1 <= llen && memchr(lhs, '*', llen)) {
7d19da46
JH
556 if ((rhs && !is_glob) || (!rhs && fetch))
557 goto invalid;
558 is_glob = 1;
7d19da46
JH
559 } else if (rhs && is_glob) {
560 goto invalid;
ef00d150 561 }
7d19da46 562
46220ca1
JH
563 rs[i].pattern = is_glob;
564 rs[i].src = xstrndup(lhs, llen);
8d9c5010 565 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
46220ca1
JH
566
567 if (fetch) {
568 /*
569 * LHS
570 * - empty is allowed; it means HEAD.
571 * - otherwise it must be a valid looking ref.
572 */
573 if (!*rs[i].src)
574 ; /* empty is ok */
8d9c5010
MH
575 else if (check_refname_format(rs[i].src, flags))
576 goto invalid;
46220ca1
JH
577 /*
578 * RHS
7d19da46 579 * - missing is ok, and is same as empty.
46220ca1
JH
580 * - empty is ok; it means not to store.
581 * - otherwise it must be a valid looking ref.
582 */
8d9c5010 583 if (!rs[i].dst)
46220ca1 584 ; /* ok */
8d9c5010 585 else if (!*rs[i].dst)
46220ca1 586 ; /* ok */
8d9c5010
MH
587 else if (check_refname_format(rs[i].dst, flags))
588 goto invalid;
46220ca1
JH
589 } else {
590 /*
591 * LHS
592 * - empty is allowed; it means delete.
593 * - when wildcarded, it must be a valid looking ref.
594 * - otherwise, it must be an extended SHA-1, but
595 * there is no existing way to validate this.
596 */
597 if (!*rs[i].src)
598 ; /* empty is ok */
599 else if (is_glob) {
8d9c5010 600 if (check_refname_format(rs[i].src, flags))
46220ca1
JH
601 goto invalid;
602 }
603 else
604 ; /* anything goes, for now */
605 /*
606 * RHS
607 * - missing is allowed, but LHS then must be a
608 * valid looking ref.
609 * - empty is not allowed.
610 * - otherwise it must be a valid looking ref.
611 */
612 if (!rs[i].dst) {
8d9c5010 613 if (check_refname_format(rs[i].src, flags))
46220ca1
JH
614 goto invalid;
615 } else if (!*rs[i].dst) {
616 goto invalid;
617 } else {
8d9c5010 618 if (check_refname_format(rs[i].dst, flags))
46220ca1
JH
619 goto invalid;
620 }
ef00d150 621 }
6b62816c
DB
622 }
623 return rs;
46220ca1
JH
624
625 invalid:
24b6177e 626 if (verify) {
2cb1f36d
BC
627 /*
628 * nr_refspec must be greater than zero and i must be valid
629 * since it is only possible to reach this point from within
630 * the for loop above.
631 */
632 free_refspecs(rs, i+1);
24b6177e
JF
633 return NULL;
634 }
46220ca1
JH
635 die("Invalid refspec '%s'", refspec[i]);
636}
637
24b6177e
JF
638int valid_fetch_refspec(const char *fetch_refspec_str)
639{
24b6177e
JF
640 struct refspec *refspec;
641
66dbfd55 642 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
2cb1f36d 643 free_refspecs(refspec, 1);
24b6177e
JF
644 return !!refspec;
645}
646
46220ca1
JH
647struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
648{
24b6177e 649 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
46220ca1
JH
650}
651
697d7f5d 652static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
46220ca1 653{
24b6177e 654 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
6b62816c
DB
655}
656
72ff8943
DB
657void free_refspec(int nr_refspec, struct refspec *refspec)
658{
659 int i;
660 for (i = 0; i < nr_refspec; i++) {
661 free(refspec[i].src);
662 free(refspec[i].dst);
663 }
664 free(refspec);
665}
666
df93e33c
DB
667static int valid_remote_nick(const char *name)
668{
8ca12c0d 669 if (!name[0] || is_dot_or_dotdot(name))
df93e33c
DB
670 return 0;
671 return !strchr(name, '/'); /* no slash */
672}
673
5751f490
DB
674struct remote *remote_get(const char *name)
675{
676 struct remote *ret;
fa685bdf 677 int name_given = 0;
5751f490
DB
678
679 read_config();
fa685bdf
DB
680 if (name)
681 name_given = 1;
682 else {
5751f490 683 name = default_remote_name;
fa685bdf
DB
684 name_given = explicit_default_remote_name;
685 }
9326d494 686
5751f490 687 ret = make_remote(name, 0);
df93e33c 688 if (valid_remote_nick(name)) {
0a4da29d 689 if (!valid_remote(ret))
5751f490 690 read_remotes_file(ret);
0a4da29d 691 if (!valid_remote(ret))
5751f490
DB
692 read_branches_file(ret);
693 }
0a4da29d 694 if (name_given && !valid_remote(ret))
55029ae4 695 add_url_alias(ret, name);
0a4da29d 696 if (!valid_remote(ret))
5751f490 697 return NULL;
46220ca1
JH
698 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
699 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
5751f490
DB
700 return ret;
701}
6b62816c 702
9a23ba33
FAG
703int remote_is_configured(const char *name)
704{
705 int i;
706 read_config();
707
708 for (i = 0; i < remotes_nr; i++)
709 if (!strcmp(name, remotes[i]->name))
710 return 1;
711 return 0;
712}
713
b42f6927
JS
714int for_each_remote(each_remote_fn fn, void *priv)
715{
716 int i, result = 0;
717 read_config();
2d31347b 718 for (i = 0; i < remotes_nr && !result; i++) {
b42f6927
JS
719 struct remote *r = remotes[i];
720 if (!r)
721 continue;
722 if (!r->fetch)
46220ca1
JH
723 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
724 r->fetch_refspec);
b42f6927 725 if (!r->push)
46220ca1
JH
726 r->push = parse_push_refspec(r->push_refspec_nr,
727 r->push_refspec);
b42f6927
JS
728 result = fn(r, priv);
729 }
730 return result;
731}
732
2467a4fa
DB
733void ref_remove_duplicates(struct ref *ref_map)
734{
183113a5 735 struct string_list refs = STRING_LIST_INIT_NODUP;
73cf0822
JP
736 struct string_list_item *item = NULL;
737 struct ref *prev = NULL, *next = NULL;
738 for (; ref_map; prev = ref_map, ref_map = next) {
739 next = ref_map->next;
2467a4fa
DB
740 if (!ref_map->peer_ref)
741 continue;
73cf0822 742
e8c8b713 743 item = string_list_lookup(&refs, ref_map->peer_ref->name);
73cf0822
JP
744 if (item) {
745 if (strcmp(((struct ref *)item->util)->name,
746 ref_map->name))
747 die("%s tracks both %s and %s",
748 ref_map->peer_ref->name,
749 ((struct ref *)item->util)->name,
750 ref_map->name);
751 prev->next = ref_map->next;
752 free(ref_map->peer_ref);
753 free(ref_map);
95c96d48
JP
754 ref_map = prev; /* skip this; we freed it */
755 continue;
2467a4fa 756 }
73cf0822 757
78a395d3 758 item = string_list_insert(&refs, ref_map->peer_ref->name);
73cf0822 759 item->util = ref_map;
2467a4fa 760 }
73cf0822 761 string_list_clear(&refs, 0);
2467a4fa
DB
762}
763
28b91f8a 764int remote_has_url(struct remote *remote, const char *url)
5d46c9d4
DB
765{
766 int i;
28b91f8a
SP
767 for (i = 0; i < remote->url_nr; i++) {
768 if (!strcmp(remote->url[i], url))
5d46c9d4
DB
769 return 1;
770 }
771 return 0;
772}
773
e928213f
DB
774static int match_name_with_pattern(const char *key, const char *name,
775 const char *value, char **result)
a3c84239 776{
08fbdb30
DB
777 const char *kstar = strchr(key, '*');
778 size_t klen;
abd2bde7
DB
779 size_t ksuffixlen;
780 size_t namelen;
08fbdb30
DB
781 int ret;
782 if (!kstar)
783 die("Key '%s' of pattern had no '*'", key);
784 klen = kstar - key;
abd2bde7
DB
785 ksuffixlen = strlen(kstar + 1);
786 namelen = strlen(name);
787 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
788 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
e928213f 789 if (ret && value) {
08fbdb30
DB
790 const char *vstar = strchr(value, '*');
791 size_t vlen;
abd2bde7 792 size_t vsuffixlen;
08fbdb30
DB
793 if (!vstar)
794 die("Value '%s' of pattern has no '*'", value);
795 vlen = vstar - value;
abd2bde7
DB
796 vsuffixlen = strlen(vstar + 1);
797 *result = xmalloc(vlen + vsuffixlen +
e928213f 798 strlen(name) -
abd2bde7
DB
799 klen - ksuffixlen + 1);
800 strncpy(*result, value, vlen);
801 strncpy(*result + vlen,
802 name + klen, namelen - klen - ksuffixlen);
803 strcpy(*result + vlen + namelen - klen - ksuffixlen,
804 vstar + 1);
e928213f 805 }
a3c84239
DB
806 return ret;
807}
808
c500352e 809static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
72ff8943
DB
810{
811 int i;
c500352e 812 int find_src = !query->src;
72ff8943 813
c500352e
CMN
814 if (find_src && !query->dst)
815 return error("query_refspecs: need either src or dst");
b42f6927 816
c500352e
CMN
817 for (i = 0; i < ref_count; i++) {
818 struct refspec *refspec = &refs[i];
819 const char *key = find_src ? refspec->dst : refspec->src;
820 const char *value = find_src ? refspec->src : refspec->dst;
821 const char *needle = find_src ? query->dst : query->src;
822 char **result = find_src ? &query->src : &query->dst;
b42f6927 823
c500352e 824 if (!refspec->dst)
5d46c9d4 825 continue;
c500352e 826 if (refspec->pattern) {
e928213f 827 if (match_name_with_pattern(key, needle, value, result)) {
c500352e 828 query->force = refspec->force;
5d46c9d4
DB
829 return 0;
830 }
b42f6927
JS
831 } else if (!strcmp(needle, key)) {
832 *result = xstrdup(value);
c500352e 833 query->force = refspec->force;
b42f6927 834 return 0;
5d46c9d4
DB
835 }
836 }
5d46c9d4
DB
837 return -1;
838}
839
c500352e
CMN
840char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
841 const char *name)
842{
843 struct refspec query;
844
845 memset(&query, 0, sizeof(struct refspec));
846 query.src = (char *)name;
847
848 if (query_refspecs(refspecs, nr_refspec, &query))
849 return NULL;
850
851 return query.dst;
852}
853
854int remote_find_tracking(struct remote *remote, struct refspec *refspec)
855{
856 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
857}
858
8009768e
RS
859static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
860 const char *name)
861{
862 size_t len = strlen(name);
863 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
864 memcpy(ref->name, prefix, prefixlen);
865 memcpy(ref->name + prefixlen, name, len);
866 return ref;
867}
868
59c69c0c 869struct ref *alloc_ref(const char *name)
dfd255dd 870{
59c69c0c 871 return alloc_ref_with_prefix("", 0, name);
737922aa
KK
872}
873
59a57757 874struct ref *copy_ref(const struct ref *ref)
d71ab174 875{
7b3db095
JS
876 struct ref *cpy;
877 size_t len;
878 if (!ref)
879 return NULL;
880 len = strlen(ref->name);
881 cpy = xmalloc(sizeof(struct ref) + len + 1);
882 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
883 cpy->next = NULL;
884 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
885 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
886 cpy->peer_ref = copy_ref(ref->peer_ref);
887 return cpy;
d71ab174
DB
888}
889
4577370e
DB
890struct ref *copy_ref_list(const struct ref *ref)
891{
892 struct ref *ret = NULL;
893 struct ref **tail = &ret;
894 while (ref) {
895 *tail = copy_ref(ref);
896 ref = ref->next;
897 tail = &((*tail)->next);
898 }
899 return ret;
900}
901
697d7f5d 902static void free_ref(struct ref *ref)
be885d96
DB
903{
904 if (!ref)
905 return;
7b3db095 906 free_ref(ref->peer_ref);
be885d96
DB
907 free(ref->remote_status);
908 free(ref->symref);
909 free(ref);
910}
911
dfd255dd
DB
912void free_refs(struct ref *ref)
913{
914 struct ref *next;
915 while (ref) {
916 next = ref->next;
be885d96 917 free_ref(ref);
dfd255dd
DB
918 ref = next;
919 }
920}
921
ed81c76b
JK
922int ref_compare_name(const void *va, const void *vb)
923{
924 const struct ref *a = va, *b = vb;
925 return strcmp(a->name, b->name);
926}
927
928static void *ref_list_get_next(const void *a)
929{
930 return ((const struct ref *)a)->next;
931}
932
933static void ref_list_set_next(void *a, void *next)
934{
935 ((struct ref *)a)->next = next;
936}
937
938void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
939{
940 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
941}
942
6b62816c
DB
943static int count_refspec_match(const char *pattern,
944 struct ref *refs,
945 struct ref **matched_ref)
946{
947 int patlen = strlen(pattern);
948 struct ref *matched_weak = NULL;
949 struct ref *matched = NULL;
950 int weak_match = 0;
951 int match = 0;
952
953 for (weak_match = match = 0; refs; refs = refs->next) {
954 char *name = refs->name;
955 int namelen = strlen(name);
6b62816c 956
ae36bdcf 957 if (!refname_match(pattern, name, ref_rev_parse_rules))
6b62816c
DB
958 continue;
959
960 /* A match is "weak" if it is with refs outside
961 * heads or tags, and did not specify the pattern
962 * in full (e.g. "refs/remotes/origin/master") or at
963 * least from the toplevel (e.g. "remotes/origin/master");
964 * otherwise "git push $URL master" would result in
965 * ambiguity between remotes/origin/master and heads/master
966 * at the remote site.
967 */
968 if (namelen != patlen &&
969 patlen != namelen - 5 &&
970 prefixcmp(name, "refs/heads/") &&
971 prefixcmp(name, "refs/tags/")) {
972 /* We want to catch the case where only weak
973 * matches are found and there are multiple
974 * matches, and where more than one strong
975 * matches are found, as ambiguous. One
976 * strong match with zero or more weak matches
977 * are acceptable as a unique match.
978 */
979 matched_weak = refs;
980 weak_match++;
981 }
982 else {
983 matched = refs;
984 match++;
985 }
986 }
987 if (!matched) {
988 *matched_ref = matched_weak;
989 return weak_match;
990 }
991 else {
992 *matched_ref = matched;
993 return match;
994 }
995}
996
1d735267 997static void tail_link_ref(struct ref *ref, struct ref ***tail)
6b62816c
DB
998{
999 **tail = ref;
1d735267
DB
1000 while (ref->next)
1001 ref = ref->next;
6b62816c 1002 *tail = &ref->next;
6b62816c
DB
1003}
1004
67655246
FC
1005static struct ref *alloc_delete_ref(void)
1006{
1007 struct ref *ref = alloc_ref("(delete)");
1008 hashclr(ref->new_sha1);
1009 return ref;
1010}
1011
6b62816c
DB
1012static struct ref *try_explicit_object_name(const char *name)
1013{
1014 unsigned char sha1[20];
1015 struct ref *ref;
6b62816c 1016
67655246
FC
1017 if (!*name)
1018 return alloc_delete_ref();
6b62816c
DB
1019 if (get_sha1(name, sha1))
1020 return NULL;
59c69c0c 1021 ref = alloc_ref(name);
6b62816c
DB
1022 hashcpy(ref->new_sha1, sha1);
1023 return ref;
1024}
1025
1d735267 1026static struct ref *make_linked_ref(const char *name, struct ref ***tail)
6b62816c 1027{
59c69c0c 1028 struct ref *ret = alloc_ref(name);
1d735267
DB
1029 tail_link_ref(ret, tail);
1030 return ret;
163f0ee5 1031}
8558fd9e 1032
f8aae120
JK
1033static char *guess_ref(const char *name, struct ref *peer)
1034{
1035 struct strbuf buf = STRBUF_INIT;
1036 unsigned char sha1[20];
1037
8cad4744 1038 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
f8aae120
JK
1039 if (!r)
1040 return NULL;
1041
1042 if (!prefixcmp(r, "refs/heads/"))
1043 strbuf_addstr(&buf, "refs/heads/");
1044 else if (!prefixcmp(r, "refs/tags/"))
1045 strbuf_addstr(&buf, "refs/tags/");
1046 else
1047 return NULL;
1048
1049 strbuf_addstr(&buf, name);
1050 return strbuf_detach(&buf, NULL);
1051}
1052
54a8ad92
JH
1053static int match_explicit(struct ref *src, struct ref *dst,
1054 struct ref ***dst_tail,
9a7bbd1d 1055 struct refspec *rs)
6b62816c 1056{
54a8ad92 1057 struct ref *matched_src, *matched_dst;
cdf690e5 1058 int copy_src;
8558fd9e 1059
54a8ad92 1060 const char *dst_value = rs->dst;
f8aae120 1061 char *dst_guess;
6b62816c 1062
a83619d6 1063 if (rs->pattern || rs->matching)
9a7bbd1d 1064 return 0;
8558fd9e 1065
54a8ad92
JH
1066 matched_src = matched_dst = NULL;
1067 switch (count_refspec_match(rs->src, src, &matched_src)) {
1068 case 1:
cdf690e5 1069 copy_src = 1;
54a8ad92
JH
1070 break;
1071 case 0:
1072 /* The source could be in the get_sha1() format
1073 * not a reference name. :refs/other is a
1074 * way to delete 'other' ref at the remote end.
1075 */
1076 matched_src = try_explicit_object_name(rs->src);
7dfee372 1077 if (!matched_src)
9a7bbd1d 1078 return error("src refspec %s does not match any.", rs->src);
cdf690e5 1079 copy_src = 0;
54a8ad92
JH
1080 break;
1081 default:
9a7bbd1d 1082 return error("src refspec %s matches more than one.", rs->src);
54a8ad92 1083 }
3c8b7df1 1084
4491e62a 1085 if (!dst_value) {
9f0ea7e8
DB
1086 unsigned char sha1[20];
1087 int flag;
1088
8cad4744 1089 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
9f0ea7e8
DB
1090 if (!dst_value ||
1091 ((flag & REF_ISSYMREF) &&
1092 prefixcmp(dst_value, "refs/heads/")))
1093 die("%s cannot be resolved to branch.",
1094 matched_src->name);
4491e62a 1095 }
3c8b7df1 1096
54a8ad92
JH
1097 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1098 case 1:
1099 break;
1100 case 0:
163f0ee5 1101 if (!memcmp(dst_value, "refs/", 5))
1d735267 1102 matched_dst = make_linked_ref(dst_value, dst_tail);
5742c82b
JK
1103 else if (is_null_sha1(matched_src->new_sha1))
1104 error("unable to delete '%s': remote ref does not exist",
1105 dst_value);
eeefa7c9 1106 else if ((dst_guess = guess_ref(dst_value, matched_src)))
f8aae120 1107 matched_dst = make_linked_ref(dst_guess, dst_tail);
3c8b7df1 1108 else
f8aae120
JK
1109 error("unable to push to unqualified destination: %s\n"
1110 "The destination refspec neither matches an "
1111 "existing ref on the remote nor\n"
1112 "begins with refs/, and we are unable to "
1113 "guess a prefix based on the source ref.",
1114 dst_value);
54a8ad92
JH
1115 break;
1116 default:
3c8b7df1 1117 matched_dst = NULL;
54a8ad92
JH
1118 error("dst refspec %s matches more than one.",
1119 dst_value);
1120 break;
1121 }
9a7bbd1d
JK
1122 if (!matched_dst)
1123 return -1;
1124 if (matched_dst->peer_ref)
1125 return error("dst ref %s receives from more than one src.",
54a8ad92 1126 matched_dst->name);
54a8ad92 1127 else {
cdf690e5 1128 matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
54a8ad92 1129 matched_dst->force = rs->force;
6b62816c 1130 }
9a7bbd1d 1131 return 0;
54a8ad92
JH
1132}
1133
1134static int match_explicit_refs(struct ref *src, struct ref *dst,
1135 struct ref ***dst_tail, struct refspec *rs,
1136 int rs_nr)
1137{
1138 int i, errs;
1139 for (i = errs = 0; i < rs_nr; i++)
9a7bbd1d
JK
1140 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1141 return errs;
6b62816c
DB
1142}
1143
db70a04c 1144static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
6ddba5e2 1145 int send_mirror, int direction, const struct refspec **ret_pat)
8558fd9e 1146{
db70a04c
FC
1147 const struct refspec *pat;
1148 char *name;
8558fd9e 1149 int i;
a83619d6 1150 int matching_refs = -1;
8558fd9e 1151 for (i = 0; i < rs_nr; i++) {
a83619d6
PB
1152 if (rs[i].matching &&
1153 (matching_refs == -1 || rs[i].force)) {
1154 matching_refs = i;
1155 continue;
1156 }
1157
db70a04c
FC
1158 if (rs[i].pattern) {
1159 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
6ddba5e2
FC
1160 int match;
1161 if (direction == FROM_SRC)
1162 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1163 else
1164 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1165 if (match) {
db70a04c
FC
1166 matching_refs = i;
1167 break;
1168 }
1169 }
8558fd9e 1170 }
db70a04c 1171 if (matching_refs == -1)
a83619d6 1172 return NULL;
db70a04c
FC
1173
1174 pat = rs + matching_refs;
1175 if (pat->matching) {
1176 /*
1177 * "matching refs"; traditionally we pushed everything
1178 * including refs outside refs/heads/ hierarchy, but
1179 * that does not make much sense these days.
1180 */
1181 if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
1182 return NULL;
1183 name = xstrdup(ref->name);
1184 }
1185 if (ret_pat)
1186 *ret_pat = pat;
1187 return name;
8558fd9e
DB
1188}
1189
6d2bf96e
CB
1190static struct ref **tail_ref(struct ref **head)
1191{
1192 struct ref **tail = head;
1193 while (*tail)
1194 tail = &((*tail)->next);
1195 return tail;
1196}
1197
54a8ad92 1198/*
29753cdd
JH
1199 * Given the set of refs the local repository has, the set of refs the
1200 * remote repository has, and the refspec used for push, determine
1201 * what remote refs we will update and with what value by setting
1202 * peer_ref (which object is being pushed) and force (if the push is
1203 * forced) in elements of "dst". The function may add new elements to
1204 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
54a8ad92 1205 */
29753cdd
JH
1206int match_push_refs(struct ref *src, struct ref **dst,
1207 int nr_refspec, const char **refspec, int flags)
6b62816c 1208{
a83619d6 1209 struct refspec *rs;
28b9d6e5
AW
1210 int send_all = flags & MATCH_REFS_ALL;
1211 int send_mirror = flags & MATCH_REFS_MIRROR;
6ddba5e2 1212 int send_prune = flags & MATCH_REFS_PRUNE;
5f48cb95 1213 int errs;
2af202be 1214 static const char *default_refspec[] = { ":", NULL };
b1d8b1f3 1215 struct ref *ref, **dst_tail = tail_ref(dst);
6b62816c 1216
a83619d6
PB
1217 if (!nr_refspec) {
1218 nr_refspec = 1;
1219 refspec = default_refspec;
1220 }
1221 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
6d2bf96e 1222 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
6b62816c
DB
1223
1224 /* pick the remainder */
b1d8b1f3 1225 for (ref = src; ref; ref = ref->next) {
6b62816c 1226 struct ref *dst_peer;
6e66bf3c
AR
1227 const struct refspec *pat = NULL;
1228 char *dst_name;
db70a04c 1229
b1d8b1f3 1230 if (ref->peer_ref)
6b62816c 1231 continue;
a83619d6 1232
6ddba5e2 1233 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
db70a04c 1234 if (!dst_name)
a83619d6
PB
1235 continue;
1236
6d2bf96e 1237 dst_peer = find_ref_by_name(*dst, dst_name);
a83619d6
PB
1238 if (dst_peer) {
1239 if (dst_peer->peer_ref)
1240 /* We're already sending something to this ref. */
1241 goto free_name;
a83619d6
PB
1242 } else {
1243 if (pat->matching && !(send_all || send_mirror))
1244 /*
1245 * Remote doesn't have it, and we have no
1246 * explicit pattern, and we don't have
1247 * --all nor --mirror.
1248 */
1249 goto free_name;
28b9d6e5 1250
6b62816c 1251 /* Create a new one and link it */
6d2bf96e 1252 dst_peer = make_linked_ref(dst_name, &dst_tail);
b1d8b1f3 1253 hashcpy(dst_peer->new_sha1, ref->new_sha1);
6b62816c 1254 }
b1d8b1f3 1255 dst_peer->peer_ref = copy_ref(ref);
a83619d6 1256 dst_peer->force = pat->force;
6e66bf3c
AR
1257 free_name:
1258 free(dst_name);
6b62816c 1259 }
6ddba5e2
FC
1260 if (send_prune) {
1261 /* check for missing refs on the remote */
1262 for (ref = *dst; ref; ref = ref->next) {
1263 char *src_name;
1264
1265 if (ref->peer_ref)
1266 /* We're already sending something to this ref. */
1267 continue;
1268
1269 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1270 if (src_name) {
1271 if (!find_ref_by_name(src, src_name))
1272 ref->peer_ref = alloc_delete_ref();
1273 free(src_name);
1274 }
1275 }
1276 }
5f48cb95
JS
1277 if (errs)
1278 return -1;
6b62816c
DB
1279 return 0;
1280}
cf818348 1281
20e8b465
TRC
1282void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1283 int force_update)
1284{
1285 struct ref *ref;
1286
1287 for (ref = remote_refs; ref; ref = ref->next) {
1288 if (ref->peer_ref)
1289 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1290 else if (!send_mirror)
1291 continue;
1292
1293 ref->deletion = is_null_sha1(ref->new_sha1);
1294 if (!ref->deletion &&
1295 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1296 ref->status = REF_STATUS_UPTODATE;
1297 continue;
1298 }
1299
1300 /* This part determines what can overwrite what.
1301 * The rules are:
1302 *
1303 * (0) you can always use --force or +A:B notation to
1304 * selectively force individual ref pairs.
1305 *
1306 * (1) if the old thing does not exist, it is OK.
1307 *
1308 * (2) if you do not have the old thing, you are not allowed
1309 * to overwrite it; you would not know what you are losing
1310 * otherwise.
1311 *
1312 * (3) if both new and old are commit-ish, and new is a
1313 * descendant of old, it is OK.
1314 *
1315 * (4) regardless of all of the above, removing :B is
1316 * always allowed.
1317 */
1318
1319 ref->nonfastforward =
1320 !ref->deletion &&
1321 !is_null_sha1(ref->old_sha1) &&
1322 (!has_sha1_file(ref->old_sha1)
1323 || !ref_newer(ref->new_sha1, ref->old_sha1));
1324
1325 if (ref->nonfastforward && !ref->force && !force_update) {
1326 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
1327 continue;
1328 }
1329 }
1330}
1331
cf818348
DB
1332struct branch *branch_get(const char *name)
1333{
1334 struct branch *ret;
1335
1336 read_config();
1337 if (!name || !*name || !strcmp(name, "HEAD"))
1338 ret = current_branch;
1339 else
1340 ret = make_branch(name, 0);
1341 if (ret && ret->remote_name) {
1342 ret->remote = remote_get(ret->remote_name);
1343 if (ret->merge_nr) {
1344 int i;
1345 ret->merge = xcalloc(sizeof(*ret->merge),
1346 ret->merge_nr);
1347 for (i = 0; i < ret->merge_nr; i++) {
1348 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1349 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
5e6e2b48
MG
1350 if (remote_find_tracking(ret->remote, ret->merge[i])
1351 && !strcmp(ret->remote_name, "."))
1352 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
cf818348
DB
1353 }
1354 }
1355 }
1356 return ret;
1357}
1358
1359int branch_has_merge_config(struct branch *branch)
1360{
1361 return branch && !!branch->merge;
1362}
1363
85682c19
SP
1364int branch_merge_matches(struct branch *branch,
1365 int i,
1366 const char *refname)
cf818348 1367{
85682c19 1368 if (!branch || i < 0 || i >= branch->merge_nr)
cf818348 1369 return 0;
605b4978 1370 return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
cf818348 1371}
d71ab174 1372
f8fb971e
JH
1373static int ignore_symref_update(const char *refname)
1374{
1375 unsigned char sha1[20];
1376 int flag;
1377
1378 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1379 return 0; /* non-existing refs are OK */
1380 return (flag & REF_ISSYMREF);
1381}
1382
4577370e 1383static struct ref *get_expanded_map(const struct ref *remote_refs,
d71ab174
DB
1384 const struct refspec *refspec)
1385{
4577370e 1386 const struct ref *ref;
d71ab174
DB
1387 struct ref *ret = NULL;
1388 struct ref **tail = &ret;
1389
e928213f 1390 char *expn_name;
d71ab174
DB
1391
1392 for (ref = remote_refs; ref; ref = ref->next) {
1393 if (strchr(ref->name, '^'))
1394 continue; /* a dereference item */
e928213f 1395 if (match_name_with_pattern(refspec->src, ref->name,
f8fb971e
JH
1396 refspec->dst, &expn_name) &&
1397 !ignore_symref_update(expn_name)) {
d71ab174 1398 struct ref *cpy = copy_ref(ref);
d71ab174 1399
e928213f
DB
1400 cpy->peer_ref = alloc_ref(expn_name);
1401 free(expn_name);
d71ab174
DB
1402 if (refspec->force)
1403 cpy->peer_ref->force = 1;
1404 *tail = cpy;
1405 tail = &cpy->next;
1406 }
1407 }
1408
1409 return ret;
1410}
1411
4577370e 1412static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
d71ab174 1413{
4577370e 1414 const struct ref *ref;
d71ab174 1415 for (ref = refs; ref; ref = ref->next) {
605b4978 1416 if (refname_match(name, ref->name, ref_fetch_rules))
d71ab174
DB
1417 return ref;
1418 }
1419 return NULL;
1420}
1421
4577370e 1422struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
d71ab174 1423{
4577370e 1424 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
d71ab174
DB
1425
1426 if (!ref)
9ad7c5ae 1427 return NULL;
d71ab174
DB
1428
1429 return copy_ref(ref);
1430}
1431
1432static struct ref *get_local_ref(const char *name)
1433{
3eb96997 1434 if (!name || name[0] == '\0')
d71ab174
DB
1435 return NULL;
1436
59c69c0c
RS
1437 if (!prefixcmp(name, "refs/"))
1438 return alloc_ref(name);
d71ab174
DB
1439
1440 if (!prefixcmp(name, "heads/") ||
1441 !prefixcmp(name, "tags/") ||
8009768e
RS
1442 !prefixcmp(name, "remotes/"))
1443 return alloc_ref_with_prefix("refs/", 5, name);
d71ab174 1444
8009768e 1445 return alloc_ref_with_prefix("refs/heads/", 11, name);
d71ab174
DB
1446}
1447
4577370e 1448int get_fetch_map(const struct ref *remote_refs,
d71ab174 1449 const struct refspec *refspec,
9ad7c5ae
JH
1450 struct ref ***tail,
1451 int missing_ok)
d71ab174 1452{
ef00d150 1453 struct ref *ref_map, **rmp;
d71ab174
DB
1454
1455 if (refspec->pattern) {
1456 ref_map = get_expanded_map(remote_refs, refspec);
1457 } else {
9ad7c5ae
JH
1458 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1459
1460 ref_map = get_remote_ref(remote_refs, name);
1461 if (!missing_ok && !ref_map)
1462 die("Couldn't find remote ref %s", name);
1463 if (ref_map) {
1464 ref_map->peer_ref = get_local_ref(refspec->dst);
1465 if (ref_map->peer_ref && refspec->force)
1466 ref_map->peer_ref->force = 1;
1467 }
d71ab174
DB
1468 }
1469
ef00d150
DB
1470 for (rmp = &ref_map; *rmp; ) {
1471 if ((*rmp)->peer_ref) {
5c08c1f2
JH
1472 if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
1473 check_refname_format((*rmp)->peer_ref->name, 0)) {
ef00d150
DB
1474 struct ref *ignore = *rmp;
1475 error("* Ignoring funny ref '%s' locally",
1476 (*rmp)->peer_ref->name);
1477 *rmp = (*rmp)->next;
1478 free(ignore->peer_ref);
1479 free(ignore);
1480 continue;
1481 }
1482 }
1483 rmp = &((*rmp)->next);
d71ab174
DB
1484 }
1485
8f70a765
AR
1486 if (ref_map)
1487 tail_link_ref(ref_map, tail);
d71ab174
DB
1488
1489 return 0;
1490}
be885d96
DB
1491
1492int resolve_remote_symref(struct ref *ref, struct ref *list)
1493{
1494 if (!ref->symref)
1495 return 0;
1496 for (; list; list = list->next)
1497 if (!strcmp(ref->symref, list->name)) {
1498 hashcpy(ref->old_sha1, list->old_sha1);
1499 return 0;
1500 }
1501 return 1;
1502}
6d21bf96 1503
ec8452d5
JS
1504static void unmark_and_free(struct commit_list *list, unsigned int mark)
1505{
1506 while (list) {
1507 struct commit_list *temp = list;
1508 temp->item->object.flags &= ~mark;
1509 list = temp->next;
1510 free(temp);
1511 }
1512}
1513
1514int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1515{
1516 struct object *o;
1517 struct commit *old, *new;
1518 struct commit_list *list, *used;
1519 int found = 0;
1520
1521 /* Both new and old must be commit-ish and new is descendant of
1522 * old. Otherwise we require --force.
1523 */
1524 o = deref_tag(parse_object(old_sha1), NULL, 0);
1525 if (!o || o->type != OBJ_COMMIT)
1526 return 0;
1527 old = (struct commit *) o;
1528
1529 o = deref_tag(parse_object(new_sha1), NULL, 0);
1530 if (!o || o->type != OBJ_COMMIT)
1531 return 0;
1532 new = (struct commit *) o;
1533
1534 if (parse_commit(new) < 0)
1535 return 0;
1536
1537 used = list = NULL;
1538 commit_list_insert(new, &list);
1539 while (list) {
1540 new = pop_most_recent_commit(&list, TMP_MARK);
1541 commit_list_insert(new, &used);
1542 if (new == old) {
1543 found = 1;
1544 break;
1545 }
1546 }
1547 unmark_and_free(list, TMP_MARK);
1548 unmark_and_free(used, TMP_MARK);
1549 return found;
1550}
1551
6d21bf96
JH
1552/*
1553 * Return true if there is anything to report, otherwise false.
1554 */
1555int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1556{
1557 unsigned char sha1[20];
1558 struct commit *ours, *theirs;
1559 char symmetric[84];
1560 struct rev_info revs;
1561 const char *rev_argv[10], *base;
1562 int rev_argc;
1563
1564 /*
1565 * Nothing to report unless we are marked to build on top of
1566 * somebody else.
1567 */
1568 if (!branch ||
1569 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1570 return 0;
1571
1572 /*
1573 * If what we used to build on no longer exists, there is
1574 * nothing to report.
1575 */
1576 base = branch->merge[0]->dst;
c6893323 1577 if (read_ref(base, sha1))
6d21bf96 1578 return 0;
57ffc5f8 1579 theirs = lookup_commit_reference(sha1);
6d21bf96
JH
1580 if (!theirs)
1581 return 0;
1582
c6893323 1583 if (read_ref(branch->refname, sha1))
6d21bf96 1584 return 0;
57ffc5f8 1585 ours = lookup_commit_reference(sha1);
6d21bf96
JH
1586 if (!ours)
1587 return 0;
1588
1589 /* are we the same? */
1590 if (theirs == ours)
1591 return 0;
1592
8fbf879e 1593 /* Run "rev-list --left-right ours...theirs" internally... */
6d21bf96
JH
1594 rev_argc = 0;
1595 rev_argv[rev_argc++] = NULL;
1596 rev_argv[rev_argc++] = "--left-right";
1597 rev_argv[rev_argc++] = symmetric;
1598 rev_argv[rev_argc++] = "--";
1599 rev_argv[rev_argc] = NULL;
1600
1601 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1602 strcpy(symmetric + 40, "...");
1603 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1604
1605 init_revisions(&revs, NULL);
1606 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1607 prepare_revision_walk(&revs);
1608
1609 /* ... and count the commits on each side. */
1610 *num_ours = 0;
1611 *num_theirs = 0;
1612 while (1) {
1613 struct commit *c = get_revision(&revs);
1614 if (!c)
1615 break;
1616 if (c->object.flags & SYMMETRIC_LEFT)
1617 (*num_ours)++;
1618 else
1619 (*num_theirs)++;
1620 }
c0234b2e
JH
1621
1622 /* clear object flags smudged by the above traversal */
1623 clear_commit_marks(ours, ALL_REV_FLAGS);
1624 clear_commit_marks(theirs, ALL_REV_FLAGS);
6d21bf96
JH
1625 return 1;
1626}
1627
1628/*
1629 * Return true when there is anything to report, otherwise false.
1630 */
1631int format_tracking_info(struct branch *branch, struct strbuf *sb)
1632{
1633 int num_ours, num_theirs;
4de53ce0 1634 const char *base;
6d21bf96
JH
1635
1636 if (!stat_tracking_info(branch, &num_ours, &num_theirs))
1637 return 0;
1638
1639 base = branch->merge[0]->dst;
45972ffb 1640 base = shorten_unambiguous_ref(base, 0);
c190ced6 1641 if (!num_theirs) {
8a5b7494
JX
1642 strbuf_addf(sb,
1643 Q_("Your branch is ahead of '%s' by %d commit.\n",
1644 "Your branch is ahead of '%s' by %d commits.\n",
1645 num_ours),
1646 base, num_ours);
491e3075
JK
1647 if (advice_status_hints)
1648 strbuf_addf(sb,
1649 _(" (use \"git push\" to publish your local commits)\n"));
c190ced6 1650 } else if (!num_ours) {
8a5b7494
JX
1651 strbuf_addf(sb,
1652 Q_("Your branch is behind '%s' by %d commit, "
1653 "and can be fast-forwarded.\n",
1654 "Your branch is behind '%s' by %d commits, "
1655 "and can be fast-forwarded.\n",
1656 num_theirs),
1657 base, num_theirs);
491e3075
JK
1658 if (advice_status_hints)
1659 strbuf_addf(sb,
1660 _(" (use \"git pull\" to update your local branch)\n"));
c190ced6 1661 } else {
8a5b7494
JX
1662 strbuf_addf(sb,
1663 Q_("Your branch and '%s' have diverged,\n"
1664 "and have %d and %d different commit each, "
1665 "respectively.\n",
1666 "Your branch and '%s' have diverged,\n"
1667 "and have %d and %d different commits each, "
1668 "respectively.\n",
1669 num_theirs),
1670 base, num_ours, num_theirs);
491e3075
JK
1671 if (advice_status_hints)
1672 strbuf_addf(sb,
1673 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
c190ced6 1674 }
6d21bf96
JH
1675 return 1;
1676}
454e2025
JS
1677
1678static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1679{
1680 struct ref ***local_tail = cb_data;
1681 struct ref *ref;
1682 int len;
1683
1684 /* we already know it starts with refs/ to get here */
8d9c5010 1685 if (check_refname_format(refname + 5, 0))
454e2025
JS
1686 return 0;
1687
1688 len = strlen(refname) + 1;
1689 ref = xcalloc(1, sizeof(*ref) + len);
1690 hashcpy(ref->new_sha1, sha1);
1691 memcpy(ref->name, refname, len);
1692 **local_tail = ref;
1693 *local_tail = &ref->next;
1694 return 0;
1695}
1696
1697struct ref *get_local_heads(void)
1698{
55f0566f 1699 struct ref *local_refs = NULL, **local_tail = &local_refs;
454e2025
JS
1700 for_each_ref(one_local_ref, &local_tail);
1701 return local_refs;
1702}
8ef51733 1703
4229f1fa
JS
1704struct ref *guess_remote_head(const struct ref *head,
1705 const struct ref *refs,
1706 int all)
8ef51733 1707{
8ef51733 1708 const struct ref *r;
4229f1fa
JS
1709 struct ref *list = NULL;
1710 struct ref **tail = &list;
8ef51733 1711
6cb4e6cc 1712 if (!head)
8ef51733
JS
1713 return NULL;
1714
fbb074c2
JK
1715 /*
1716 * Some transports support directly peeking at
1717 * where HEAD points; if that is the case, then
1718 * we don't have to guess.
1719 */
1720 if (head->symref)
1721 return copy_ref(find_ref_by_name(refs, head->symref));
1722
8ef51733 1723 /* If refs/heads/master could be right, it is. */
4229f1fa
JS
1724 if (!all) {
1725 r = find_ref_by_name(refs, "refs/heads/master");
1726 if (r && !hashcmp(r->old_sha1, head->old_sha1))
1727 return copy_ref(r);
1728 }
8ef51733
JS
1729
1730 /* Look for another ref that points there */
4229f1fa 1731 for (r = refs; r; r = r->next) {
61adfd30
JK
1732 if (r != head &&
1733 !prefixcmp(r->name, "refs/heads/") &&
1734 !hashcmp(r->old_sha1, head->old_sha1)) {
4229f1fa
JS
1735 *tail = copy_ref(r);
1736 tail = &((*tail)->next);
1737 if (!all)
1738 break;
1739 }
1740 }
8ef51733 1741
4229f1fa 1742 return list;
8ef51733 1743}
f2ef6075
JS
1744
1745struct stale_heads_info {
f2ef6075
JS
1746 struct string_list *ref_names;
1747 struct ref **stale_refs_tail;
ed43de6e
CMN
1748 struct refspec *refs;
1749 int ref_count;
f2ef6075
JS
1750};
1751
1752static int get_stale_heads_cb(const char *refname,
1753 const unsigned char *sha1, int flags, void *cb_data)
1754{
1755 struct stale_heads_info *info = cb_data;
ed43de6e
CMN
1756 struct refspec query;
1757 memset(&query, 0, sizeof(struct refspec));
1758 query.dst = (char *)refname;
1759
1760 if (query_refspecs(info->refs, info->ref_count, &query))
1761 return 0; /* No matches */
1762
1763 /*
1764 * If we did find a suitable refspec and it's not a symref and
1765 * it's not in the list of refs that currently exist in that
1766 * remote we consider it to be stale.
1767 */
1768 if (!((flags & REF_ISSYMREF) ||
1769 string_list_has_string(info->ref_names, query.src))) {
1770 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1771 hashcpy(ref->new_sha1, sha1);
f2ef6075 1772 }
ed43de6e
CMN
1773
1774 free(query.src);
f2ef6075
JS
1775 return 0;
1776}
1777
ed43de6e 1778struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
f2ef6075
JS
1779{
1780 struct ref *ref, *stale_refs = NULL;
183113a5 1781 struct string_list ref_names = STRING_LIST_INIT_NODUP;
f2ef6075 1782 struct stale_heads_info info;
f2ef6075
JS
1783 info.ref_names = &ref_names;
1784 info.stale_refs_tail = &stale_refs;
ed43de6e
CMN
1785 info.refs = refs;
1786 info.ref_count = ref_count;
f2ef6075 1787 for (ref = fetch_map; ref; ref = ref->next)
1d2f80fa 1788 string_list_append(&ref_names, ref->name);
f2ef6075
JS
1789 sort_string_list(&ref_names);
1790 for_each_ref(get_stale_heads_cb, &info);
1791 string_list_clear(&ref_names, 0);
1792 return stale_refs;
1793}