Merge tag 'v2.14.1'
[git/raj.git] / remote.c
blob60d004392109f1e39f0bf34578e195cdf3af1639
1 #include "cache.h"
2 #include "config.h"
3 #include "remote.h"
4 #include "refs.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "dir.h"
9 #include "tag.h"
10 #include "string-list.h"
11 #include "mergesort.h"
12 #include "argv-array.h"
14 enum map_direction { FROM_SRC, FROM_DST };
16 static struct refspec s_tag_refspec = {
21 "refs/tags/*",
22 "refs/tags/*"
25 const struct refspec *tag_refspec = &s_tag_refspec;
27 struct counted_string {
28 size_t len;
29 const char *s;
31 struct rewrite {
32 const char *base;
33 size_t baselen;
34 struct counted_string *instead_of;
35 int instead_of_nr;
36 int instead_of_alloc;
38 struct rewrites {
39 struct rewrite **rewrite;
40 int rewrite_alloc;
41 int rewrite_nr;
44 static struct remote **remotes;
45 static int remotes_alloc;
46 static int remotes_nr;
47 static struct hashmap remotes_hash;
49 static struct branch **branches;
50 static int branches_alloc;
51 static int branches_nr;
53 static struct branch *current_branch;
54 static const char *pushremote_name;
56 static struct rewrites rewrites;
57 static struct rewrites rewrites_push;
59 static int valid_remote(const struct remote *remote)
61 return (!!remote->url) || (!!remote->foreign_vcs);
64 static const char *alias_url(const char *url, struct rewrites *r)
66 int i, j;
67 struct counted_string *longest;
68 int longest_i;
70 longest = NULL;
71 longest_i = -1;
72 for (i = 0; i < r->rewrite_nr; i++) {
73 if (!r->rewrite[i])
74 continue;
75 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
76 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
77 (!longest ||
78 longest->len < r->rewrite[i]->instead_of[j].len)) {
79 longest = &(r->rewrite[i]->instead_of[j]);
80 longest_i = i;
84 if (!longest)
85 return url;
87 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
90 static void add_push_refspec(struct remote *remote, const char *ref)
92 ALLOC_GROW(remote->push_refspec,
93 remote->push_refspec_nr + 1,
94 remote->push_refspec_alloc);
95 remote->push_refspec[remote->push_refspec_nr++] = ref;
98 static void add_fetch_refspec(struct remote *remote, const char *ref)
100 ALLOC_GROW(remote->fetch_refspec,
101 remote->fetch_refspec_nr + 1,
102 remote->fetch_refspec_alloc);
103 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
106 static void add_url(struct remote *remote, const char *url)
108 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
109 remote->url[remote->url_nr++] = url;
112 static void add_pushurl(struct remote *remote, const char *pushurl)
114 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
115 remote->pushurl[remote->pushurl_nr++] = pushurl;
118 static void add_pushurl_alias(struct remote *remote, const char *url)
120 const char *pushurl = alias_url(url, &rewrites_push);
121 if (pushurl != url)
122 add_pushurl(remote, pushurl);
125 static void add_url_alias(struct remote *remote, const char *url)
127 add_url(remote, alias_url(url, &rewrites));
128 add_pushurl_alias(remote, url);
131 struct remotes_hash_key {
132 const char *str;
133 int len;
136 static int remotes_hash_cmp(const void *unused_cmp_data,
137 const struct remote *a,
138 const struct remote *b,
139 const struct remotes_hash_key *key)
141 if (key)
142 return strncmp(a->name, key->str, key->len) || a->name[key->len];
143 else
144 return strcmp(a->name, b->name);
147 static inline void init_remotes_hash(void)
149 if (!remotes_hash.cmpfn)
150 hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, NULL, 0);
153 static struct remote *make_remote(const char *name, int len)
155 struct remote *ret, *replaced;
156 struct remotes_hash_key lookup;
157 struct hashmap_entry lookup_entry;
159 if (!len)
160 len = strlen(name);
162 init_remotes_hash();
163 lookup.str = name;
164 lookup.len = len;
165 hashmap_entry_init(&lookup_entry, memhash(name, len));
167 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
168 return ret;
170 ret = xcalloc(1, sizeof(struct remote));
171 ret->prune = -1; /* unspecified */
172 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
173 remotes[remotes_nr++] = ret;
174 ret->name = xstrndup(name, len);
176 hashmap_entry_init(ret, lookup_entry.hash);
177 replaced = hashmap_put(&remotes_hash, ret);
178 assert(replaced == NULL); /* no previous entry overwritten */
179 return ret;
182 static void add_merge(struct branch *branch, const char *name)
184 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
185 branch->merge_alloc);
186 branch->merge_name[branch->merge_nr++] = name;
189 static struct branch *make_branch(const char *name, int len)
191 struct branch *ret;
192 int i;
194 for (i = 0; i < branches_nr; i++) {
195 if (len ? (!strncmp(name, branches[i]->name, len) &&
196 !branches[i]->name[len]) :
197 !strcmp(name, branches[i]->name))
198 return branches[i];
201 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
202 ret = xcalloc(1, sizeof(struct branch));
203 branches[branches_nr++] = ret;
204 if (len)
205 ret->name = xstrndup(name, len);
206 else
207 ret->name = xstrdup(name);
208 ret->refname = xstrfmt("refs/heads/%s", ret->name);
210 return ret;
213 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
215 struct rewrite *ret;
216 int i;
218 for (i = 0; i < r->rewrite_nr; i++) {
219 if (len
220 ? (len == r->rewrite[i]->baselen &&
221 !strncmp(base, r->rewrite[i]->base, len))
222 : !strcmp(base, r->rewrite[i]->base))
223 return r->rewrite[i];
226 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
227 ret = xcalloc(1, sizeof(struct rewrite));
228 r->rewrite[r->rewrite_nr++] = ret;
229 if (len) {
230 ret->base = xstrndup(base, len);
231 ret->baselen = len;
233 else {
234 ret->base = xstrdup(base);
235 ret->baselen = strlen(base);
237 return ret;
240 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
242 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
243 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
244 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
245 rewrite->instead_of_nr++;
248 static const char *skip_spaces(const char *s)
250 while (isspace(*s))
251 s++;
252 return s;
255 static void read_remotes_file(struct remote *remote)
257 struct strbuf buf = STRBUF_INIT;
258 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
260 if (!f)
261 return;
262 remote->configured_in_repo = 1;
263 remote->origin = REMOTE_REMOTES;
264 while (strbuf_getline(&buf, f) != EOF) {
265 const char *v;
267 strbuf_rtrim(&buf);
269 if (skip_prefix(buf.buf, "URL:", &v))
270 add_url_alias(remote, xstrdup(skip_spaces(v)));
271 else if (skip_prefix(buf.buf, "Push:", &v))
272 add_push_refspec(remote, xstrdup(skip_spaces(v)));
273 else if (skip_prefix(buf.buf, "Pull:", &v))
274 add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
276 strbuf_release(&buf);
277 fclose(f);
280 static void read_branches_file(struct remote *remote)
282 char *frag;
283 struct strbuf buf = STRBUF_INIT;
284 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
286 if (!f)
287 return;
289 strbuf_getline_lf(&buf, f);
290 fclose(f);
291 strbuf_trim(&buf);
292 if (!buf.len) {
293 strbuf_release(&buf);
294 return;
297 remote->configured_in_repo = 1;
298 remote->origin = REMOTE_BRANCHES;
301 * The branches file would have URL and optionally
302 * #branch specified. The "master" (or specified) branch is
303 * fetched and stored in the local branch matching the
304 * remote name.
306 frag = strchr(buf.buf, '#');
307 if (frag)
308 *(frag++) = '\0';
309 else
310 frag = "master";
312 add_url_alias(remote, strbuf_detach(&buf, NULL));
313 add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
314 frag, remote->name));
317 * Cogito compatible push: push current HEAD to remote #branch
318 * (master if missing)
320 add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
321 remote->fetch_tags = 1; /* always auto-follow */
324 static int handle_config(const char *key, const char *value, void *cb)
326 const char *name;
327 int namelen;
328 const char *subkey;
329 struct remote *remote;
330 struct branch *branch;
331 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
332 if (!name)
333 return 0;
334 branch = make_branch(name, namelen);
335 if (!strcmp(subkey, "remote")) {
336 return git_config_string(&branch->remote_name, key, value);
337 } else if (!strcmp(subkey, "pushremote")) {
338 return git_config_string(&branch->pushremote_name, key, value);
339 } else if (!strcmp(subkey, "merge")) {
340 if (!value)
341 return config_error_nonbool(key);
342 add_merge(branch, xstrdup(value));
344 return 0;
346 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
347 struct rewrite *rewrite;
348 if (!name)
349 return 0;
350 if (!strcmp(subkey, "insteadof")) {
351 rewrite = make_rewrite(&rewrites, name, namelen);
352 if (!value)
353 return config_error_nonbool(key);
354 add_instead_of(rewrite, xstrdup(value));
355 } else if (!strcmp(subkey, "pushinsteadof")) {
356 rewrite = make_rewrite(&rewrites_push, name, namelen);
357 if (!value)
358 return config_error_nonbool(key);
359 add_instead_of(rewrite, xstrdup(value));
363 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
364 return 0;
366 /* Handle remote.* variables */
367 if (!name && !strcmp(subkey, "pushdefault"))
368 return git_config_string(&pushremote_name, key, value);
370 if (!name)
371 return 0;
372 /* Handle remote.<name>.* variables */
373 if (*name == '/') {
374 warning("Config remote shorthand cannot begin with '/': %s",
375 name);
376 return 0;
378 remote = make_remote(name, namelen);
379 remote->origin = REMOTE_CONFIG;
380 if (current_config_scope() == CONFIG_SCOPE_REPO)
381 remote->configured_in_repo = 1;
382 if (!strcmp(subkey, "mirror"))
383 remote->mirror = git_config_bool(key, value);
384 else if (!strcmp(subkey, "skipdefaultupdate"))
385 remote->skip_default_update = git_config_bool(key, value);
386 else if (!strcmp(subkey, "skipfetchall"))
387 remote->skip_default_update = git_config_bool(key, value);
388 else if (!strcmp(subkey, "prune"))
389 remote->prune = git_config_bool(key, value);
390 else if (!strcmp(subkey, "url")) {
391 const char *v;
392 if (git_config_string(&v, key, value))
393 return -1;
394 add_url(remote, v);
395 } else if (!strcmp(subkey, "pushurl")) {
396 const char *v;
397 if (git_config_string(&v, key, value))
398 return -1;
399 add_pushurl(remote, v);
400 } else if (!strcmp(subkey, "push")) {
401 const char *v;
402 if (git_config_string(&v, key, value))
403 return -1;
404 add_push_refspec(remote, v);
405 } else if (!strcmp(subkey, "fetch")) {
406 const char *v;
407 if (git_config_string(&v, key, value))
408 return -1;
409 add_fetch_refspec(remote, v);
410 } else if (!strcmp(subkey, "receivepack")) {
411 const char *v;
412 if (git_config_string(&v, key, value))
413 return -1;
414 if (!remote->receivepack)
415 remote->receivepack = v;
416 else
417 error("more than one receivepack given, using the first");
418 } else if (!strcmp(subkey, "uploadpack")) {
419 const char *v;
420 if (git_config_string(&v, key, value))
421 return -1;
422 if (!remote->uploadpack)
423 remote->uploadpack = v;
424 else
425 error("more than one uploadpack given, using the first");
426 } else if (!strcmp(subkey, "tagopt")) {
427 if (!strcmp(value, "--no-tags"))
428 remote->fetch_tags = -1;
429 else if (!strcmp(value, "--tags"))
430 remote->fetch_tags = 2;
431 } else if (!strcmp(subkey, "proxy")) {
432 return git_config_string((const char **)&remote->http_proxy,
433 key, value);
434 } else if (!strcmp(subkey, "proxyauthmethod")) {
435 return git_config_string((const char **)&remote->http_proxy_authmethod,
436 key, value);
437 } else if (!strcmp(subkey, "vcs")) {
438 return git_config_string(&remote->foreign_vcs, key, value);
440 return 0;
443 static void alias_all_urls(void)
445 int i, j;
446 for (i = 0; i < remotes_nr; i++) {
447 int add_pushurl_aliases;
448 if (!remotes[i])
449 continue;
450 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
451 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
453 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
454 for (j = 0; j < remotes[i]->url_nr; j++) {
455 if (add_pushurl_aliases)
456 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
457 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
462 static void read_config(void)
464 static int loaded;
465 struct object_id oid;
466 int flag;
468 if (loaded)
469 return;
470 loaded = 1;
472 current_branch = NULL;
473 if (startup_info->have_repository) {
474 const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
475 if (head_ref && (flag & REF_ISSYMREF) &&
476 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
477 current_branch = make_branch(head_ref, 0);
480 git_config(handle_config, NULL);
481 alias_all_urls();
484 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
486 int i;
487 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
489 for (i = 0; i < nr_refspec; i++) {
490 size_t llen;
491 int is_glob;
492 const char *lhs, *rhs;
493 int flags;
495 is_glob = 0;
497 lhs = refspec[i];
498 if (*lhs == '+') {
499 rs[i].force = 1;
500 lhs++;
503 rhs = strrchr(lhs, ':');
506 * Before going on, special case ":" (or "+:") as a refspec
507 * for pushing matching refs.
509 if (!fetch && rhs == lhs && rhs[1] == '\0') {
510 rs[i].matching = 1;
511 continue;
514 if (rhs) {
515 size_t rlen = strlen(++rhs);
516 is_glob = (1 <= rlen && strchr(rhs, '*'));
517 rs[i].dst = xstrndup(rhs, rlen);
520 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
521 if (1 <= llen && memchr(lhs, '*', llen)) {
522 if ((rhs && !is_glob) || (!rhs && fetch))
523 goto invalid;
524 is_glob = 1;
525 } else if (rhs && is_glob) {
526 goto invalid;
529 rs[i].pattern = is_glob;
530 rs[i].src = xstrndup(lhs, llen);
531 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
533 if (fetch) {
534 struct object_id unused;
536 /* LHS */
537 if (!*rs[i].src)
538 ; /* empty is ok; it means "HEAD" */
539 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
540 rs[i].exact_sha1 = 1; /* ok */
541 else if (!check_refname_format(rs[i].src, flags))
542 ; /* valid looking ref is ok */
543 else
544 goto invalid;
545 /* RHS */
546 if (!rs[i].dst)
547 ; /* missing is ok; it is the same as empty */
548 else if (!*rs[i].dst)
549 ; /* empty is ok; it means "do not store" */
550 else if (!check_refname_format(rs[i].dst, flags))
551 ; /* valid looking ref is ok */
552 else
553 goto invalid;
554 } else {
556 * LHS
557 * - empty is allowed; it means delete.
558 * - when wildcarded, it must be a valid looking ref.
559 * - otherwise, it must be an extended SHA-1, but
560 * there is no existing way to validate this.
562 if (!*rs[i].src)
563 ; /* empty is ok */
564 else if (is_glob) {
565 if (check_refname_format(rs[i].src, flags))
566 goto invalid;
568 else
569 ; /* anything goes, for now */
571 * RHS
572 * - missing is allowed, but LHS then must be a
573 * valid looking ref.
574 * - empty is not allowed.
575 * - otherwise it must be a valid looking ref.
577 if (!rs[i].dst) {
578 if (check_refname_format(rs[i].src, flags))
579 goto invalid;
580 } else if (!*rs[i].dst) {
581 goto invalid;
582 } else {
583 if (check_refname_format(rs[i].dst, flags))
584 goto invalid;
588 return rs;
590 invalid:
591 if (verify) {
593 * nr_refspec must be greater than zero and i must be valid
594 * since it is only possible to reach this point from within
595 * the for loop above.
597 free_refspec(i+1, rs);
598 return NULL;
600 die("Invalid refspec '%s'", refspec[i]);
603 int valid_fetch_refspec(const char *fetch_refspec_str)
605 struct refspec *refspec;
607 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
608 free_refspec(1, refspec);
609 return !!refspec;
612 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
614 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
617 struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
619 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
622 void free_refspec(int nr_refspec, struct refspec *refspec)
624 int i;
626 if (!refspec)
627 return;
629 for (i = 0; i < nr_refspec; i++) {
630 free(refspec[i].src);
631 free(refspec[i].dst);
633 free(refspec);
636 static int valid_remote_nick(const char *name)
638 if (!name[0] || is_dot_or_dotdot(name))
639 return 0;
641 /* remote nicknames cannot contain slashes */
642 while (*name)
643 if (is_dir_sep(*name++))
644 return 0;
645 return 1;
648 const char *remote_for_branch(struct branch *branch, int *explicit)
650 if (branch && branch->remote_name) {
651 if (explicit)
652 *explicit = 1;
653 return branch->remote_name;
655 if (explicit)
656 *explicit = 0;
657 return "origin";
660 const char *pushremote_for_branch(struct branch *branch, int *explicit)
662 if (branch && branch->pushremote_name) {
663 if (explicit)
664 *explicit = 1;
665 return branch->pushremote_name;
667 if (pushremote_name) {
668 if (explicit)
669 *explicit = 1;
670 return pushremote_name;
672 return remote_for_branch(branch, explicit);
675 static struct remote *remote_get_1(const char *name,
676 const char *(*get_default)(struct branch *, int *))
678 struct remote *ret;
679 int name_given = 0;
681 read_config();
683 if (name)
684 name_given = 1;
685 else
686 name = get_default(current_branch, &name_given);
688 ret = make_remote(name, 0);
689 if (valid_remote_nick(name) && have_git_dir()) {
690 if (!valid_remote(ret))
691 read_remotes_file(ret);
692 if (!valid_remote(ret))
693 read_branches_file(ret);
695 if (name_given && !valid_remote(ret))
696 add_url_alias(ret, name);
697 if (!valid_remote(ret))
698 return NULL;
699 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
700 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
701 return ret;
704 struct remote *remote_get(const char *name)
706 return remote_get_1(name, remote_for_branch);
709 struct remote *pushremote_get(const char *name)
711 return remote_get_1(name, pushremote_for_branch);
714 int remote_is_configured(struct remote *remote, int in_repo)
716 if (!remote)
717 return 0;
718 if (in_repo)
719 return remote->configured_in_repo;
720 return !!remote->origin;
723 int for_each_remote(each_remote_fn fn, void *priv)
725 int i, result = 0;
726 read_config();
727 for (i = 0; i < remotes_nr && !result; i++) {
728 struct remote *r = remotes[i];
729 if (!r)
730 continue;
731 if (!r->fetch)
732 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
733 r->fetch_refspec);
734 if (!r->push)
735 r->push = parse_push_refspec(r->push_refspec_nr,
736 r->push_refspec);
737 result = fn(r, priv);
739 return result;
742 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
744 if (strcmp(ref1->name, ref2->name)) {
745 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
746 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
747 die(_("Cannot fetch both %s and %s to %s"),
748 ref1->name, ref2->name, ref2->peer_ref->name);
749 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
750 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
751 warning(_("%s usually tracks %s, not %s"),
752 ref2->peer_ref->name, ref2->name, ref1->name);
753 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
754 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
755 die(_("%s tracks both %s and %s"),
756 ref2->peer_ref->name, ref1->name, ref2->name);
757 } else {
759 * This last possibility doesn't occur because
760 * FETCH_HEAD_IGNORE entries always appear at
761 * the end of the list.
763 die(_("Internal error"));
766 free(ref2->peer_ref);
767 free(ref2);
770 struct ref *ref_remove_duplicates(struct ref *ref_map)
772 struct string_list refs = STRING_LIST_INIT_NODUP;
773 struct ref *retval = NULL;
774 struct ref **p = &retval;
776 while (ref_map) {
777 struct ref *ref = ref_map;
779 ref_map = ref_map->next;
780 ref->next = NULL;
782 if (!ref->peer_ref) {
783 *p = ref;
784 p = &ref->next;
785 } else {
786 struct string_list_item *item =
787 string_list_insert(&refs, ref->peer_ref->name);
789 if (item->util) {
790 /* Entry already existed */
791 handle_duplicate((struct ref *)item->util, ref);
792 } else {
793 *p = ref;
794 p = &ref->next;
795 item->util = ref;
800 string_list_clear(&refs, 0);
801 return retval;
804 int remote_has_url(struct remote *remote, const char *url)
806 int i;
807 for (i = 0; i < remote->url_nr; i++) {
808 if (!strcmp(remote->url[i], url))
809 return 1;
811 return 0;
814 static int match_name_with_pattern(const char *key, const char *name,
815 const char *value, char **result)
817 const char *kstar = strchr(key, '*');
818 size_t klen;
819 size_t ksuffixlen;
820 size_t namelen;
821 int ret;
822 if (!kstar)
823 die("Key '%s' of pattern had no '*'", key);
824 klen = kstar - key;
825 ksuffixlen = strlen(kstar + 1);
826 namelen = strlen(name);
827 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
828 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
829 if (ret && value) {
830 struct strbuf sb = STRBUF_INIT;
831 const char *vstar = strchr(value, '*');
832 if (!vstar)
833 die("Value '%s' of pattern has no '*'", value);
834 strbuf_add(&sb, value, vstar - value);
835 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
836 strbuf_addstr(&sb, vstar + 1);
837 *result = strbuf_detach(&sb, NULL);
839 return ret;
842 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
844 int i;
845 int find_src = !query->src;
847 if (find_src && !query->dst)
848 error("query_refspecs_multiple: need either src or dst");
850 for (i = 0; i < ref_count; i++) {
851 struct refspec *refspec = &refs[i];
852 const char *key = find_src ? refspec->dst : refspec->src;
853 const char *value = find_src ? refspec->src : refspec->dst;
854 const char *needle = find_src ? query->dst : query->src;
855 char **result = find_src ? &query->src : &query->dst;
857 if (!refspec->dst)
858 continue;
859 if (refspec->pattern) {
860 if (match_name_with_pattern(key, needle, value, result))
861 string_list_append_nodup(results, *result);
862 } else if (!strcmp(needle, key)) {
863 string_list_append(results, value);
868 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
870 int i;
871 int find_src = !query->src;
872 const char *needle = find_src ? query->dst : query->src;
873 char **result = find_src ? &query->src : &query->dst;
875 if (find_src && !query->dst)
876 return error("query_refspecs: need either src or dst");
878 for (i = 0; i < ref_count; i++) {
879 struct refspec *refspec = &refs[i];
880 const char *key = find_src ? refspec->dst : refspec->src;
881 const char *value = find_src ? refspec->src : refspec->dst;
883 if (!refspec->dst)
884 continue;
885 if (refspec->pattern) {
886 if (match_name_with_pattern(key, needle, value, result)) {
887 query->force = refspec->force;
888 return 0;
890 } else if (!strcmp(needle, key)) {
891 *result = xstrdup(value);
892 query->force = refspec->force;
893 return 0;
896 return -1;
899 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
900 const char *name)
902 struct refspec query;
904 memset(&query, 0, sizeof(struct refspec));
905 query.src = (char *)name;
907 if (query_refspecs(refspecs, nr_refspec, &query))
908 return NULL;
910 return query.dst;
913 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
915 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
918 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
919 const char *name)
921 size_t len = strlen(name);
922 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
923 memcpy(ref->name, prefix, prefixlen);
924 memcpy(ref->name + prefixlen, name, len);
925 return ref;
928 struct ref *alloc_ref(const char *name)
930 return alloc_ref_with_prefix("", 0, name);
933 struct ref *copy_ref(const struct ref *ref)
935 struct ref *cpy;
936 size_t len;
937 if (!ref)
938 return NULL;
939 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
940 cpy = xmalloc(len);
941 memcpy(cpy, ref, len);
942 cpy->next = NULL;
943 cpy->symref = xstrdup_or_null(ref->symref);
944 cpy->remote_status = xstrdup_or_null(ref->remote_status);
945 cpy->peer_ref = copy_ref(ref->peer_ref);
946 return cpy;
949 struct ref *copy_ref_list(const struct ref *ref)
951 struct ref *ret = NULL;
952 struct ref **tail = &ret;
953 while (ref) {
954 *tail = copy_ref(ref);
955 ref = ref->next;
956 tail = &((*tail)->next);
958 return ret;
961 static void free_ref(struct ref *ref)
963 if (!ref)
964 return;
965 free_ref(ref->peer_ref);
966 free(ref->remote_status);
967 free(ref->symref);
968 free(ref);
971 void free_refs(struct ref *ref)
973 struct ref *next;
974 while (ref) {
975 next = ref->next;
976 free_ref(ref);
977 ref = next;
981 int ref_compare_name(const void *va, const void *vb)
983 const struct ref *a = va, *b = vb;
984 return strcmp(a->name, b->name);
987 static void *ref_list_get_next(const void *a)
989 return ((const struct ref *)a)->next;
992 static void ref_list_set_next(void *a, void *next)
994 ((struct ref *)a)->next = next;
997 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
999 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1002 int count_refspec_match(const char *pattern,
1003 struct ref *refs,
1004 struct ref **matched_ref)
1006 int patlen = strlen(pattern);
1007 struct ref *matched_weak = NULL;
1008 struct ref *matched = NULL;
1009 int weak_match = 0;
1010 int match = 0;
1012 for (weak_match = match = 0; refs; refs = refs->next) {
1013 char *name = refs->name;
1014 int namelen = strlen(name);
1016 if (!refname_match(pattern, name))
1017 continue;
1019 /* A match is "weak" if it is with refs outside
1020 * heads or tags, and did not specify the pattern
1021 * in full (e.g. "refs/remotes/origin/master") or at
1022 * least from the toplevel (e.g. "remotes/origin/master");
1023 * otherwise "git push $URL master" would result in
1024 * ambiguity between remotes/origin/master and heads/master
1025 * at the remote site.
1027 if (namelen != patlen &&
1028 patlen != namelen - 5 &&
1029 !starts_with(name, "refs/heads/") &&
1030 !starts_with(name, "refs/tags/")) {
1031 /* We want to catch the case where only weak
1032 * matches are found and there are multiple
1033 * matches, and where more than one strong
1034 * matches are found, as ambiguous. One
1035 * strong match with zero or more weak matches
1036 * are acceptable as a unique match.
1038 matched_weak = refs;
1039 weak_match++;
1041 else {
1042 matched = refs;
1043 match++;
1046 if (!matched) {
1047 if (matched_ref)
1048 *matched_ref = matched_weak;
1049 return weak_match;
1051 else {
1052 if (matched_ref)
1053 *matched_ref = matched;
1054 return match;
1058 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1060 **tail = ref;
1061 while (ref->next)
1062 ref = ref->next;
1063 *tail = &ref->next;
1066 static struct ref *alloc_delete_ref(void)
1068 struct ref *ref = alloc_ref("(delete)");
1069 oidclr(&ref->new_oid);
1070 return ref;
1073 static int try_explicit_object_name(const char *name,
1074 struct ref **match)
1076 struct object_id oid;
1078 if (!*name) {
1079 if (match)
1080 *match = alloc_delete_ref();
1081 return 0;
1084 if (get_sha1(name, oid.hash))
1085 return -1;
1087 if (match) {
1088 *match = alloc_ref(name);
1089 oidcpy(&(*match)->new_oid, &oid);
1091 return 0;
1094 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1096 struct ref *ret = alloc_ref(name);
1097 tail_link_ref(ret, tail);
1098 return ret;
1101 static char *guess_ref(const char *name, struct ref *peer)
1103 struct strbuf buf = STRBUF_INIT;
1104 struct object_id oid;
1106 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1107 oid.hash, NULL);
1108 if (!r)
1109 return NULL;
1111 if (starts_with(r, "refs/heads/"))
1112 strbuf_addstr(&buf, "refs/heads/");
1113 else if (starts_with(r, "refs/tags/"))
1114 strbuf_addstr(&buf, "refs/tags/");
1115 else
1116 return NULL;
1118 strbuf_addstr(&buf, name);
1119 return strbuf_detach(&buf, NULL);
1122 static int match_explicit_lhs(struct ref *src,
1123 struct refspec *rs,
1124 struct ref **match,
1125 int *allocated_match)
1127 switch (count_refspec_match(rs->src, src, match)) {
1128 case 1:
1129 if (allocated_match)
1130 *allocated_match = 0;
1131 return 0;
1132 case 0:
1133 /* The source could be in the get_sha1() format
1134 * not a reference name. :refs/other is a
1135 * way to delete 'other' ref at the remote end.
1137 if (try_explicit_object_name(rs->src, match) < 0)
1138 return error("src refspec %s does not match any.", rs->src);
1139 if (allocated_match)
1140 *allocated_match = 1;
1141 return 0;
1142 default:
1143 return error("src refspec %s matches more than one.", rs->src);
1147 static int match_explicit(struct ref *src, struct ref *dst,
1148 struct ref ***dst_tail,
1149 struct refspec *rs)
1151 struct ref *matched_src, *matched_dst;
1152 int allocated_src;
1154 const char *dst_value = rs->dst;
1155 char *dst_guess;
1157 if (rs->pattern || rs->matching)
1158 return 0;
1160 matched_src = matched_dst = NULL;
1161 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1162 return -1;
1164 if (!dst_value) {
1165 struct object_id oid;
1166 int flag;
1168 dst_value = resolve_ref_unsafe(matched_src->name,
1169 RESOLVE_REF_READING,
1170 oid.hash, &flag);
1171 if (!dst_value ||
1172 ((flag & REF_ISSYMREF) &&
1173 !starts_with(dst_value, "refs/heads/")))
1174 die("%s cannot be resolved to branch.",
1175 matched_src->name);
1178 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1179 case 1:
1180 break;
1181 case 0:
1182 if (starts_with(dst_value, "refs/"))
1183 matched_dst = make_linked_ref(dst_value, dst_tail);
1184 else if (is_null_oid(&matched_src->new_oid))
1185 error("unable to delete '%s': remote ref does not exist",
1186 dst_value);
1187 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1188 matched_dst = make_linked_ref(dst_guess, dst_tail);
1189 free(dst_guess);
1190 } else
1191 error("unable to push to unqualified destination: %s\n"
1192 "The destination refspec neither matches an "
1193 "existing ref on the remote nor\n"
1194 "begins with refs/, and we are unable to "
1195 "guess a prefix based on the source ref.",
1196 dst_value);
1197 break;
1198 default:
1199 matched_dst = NULL;
1200 error("dst refspec %s matches more than one.",
1201 dst_value);
1202 break;
1204 if (!matched_dst)
1205 return -1;
1206 if (matched_dst->peer_ref)
1207 return error("dst ref %s receives from more than one src.",
1208 matched_dst->name);
1209 else {
1210 matched_dst->peer_ref = allocated_src ?
1211 matched_src :
1212 copy_ref(matched_src);
1213 matched_dst->force = rs->force;
1215 return 0;
1218 static int match_explicit_refs(struct ref *src, struct ref *dst,
1219 struct ref ***dst_tail, struct refspec *rs,
1220 int rs_nr)
1222 int i, errs;
1223 for (i = errs = 0; i < rs_nr; i++)
1224 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1225 return errs;
1228 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1229 int send_mirror, int direction, const struct refspec **ret_pat)
1231 const struct refspec *pat;
1232 char *name;
1233 int i;
1234 int matching_refs = -1;
1235 for (i = 0; i < rs_nr; i++) {
1236 if (rs[i].matching &&
1237 (matching_refs == -1 || rs[i].force)) {
1238 matching_refs = i;
1239 continue;
1242 if (rs[i].pattern) {
1243 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1244 int match;
1245 if (direction == FROM_SRC)
1246 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1247 else
1248 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1249 if (match) {
1250 matching_refs = i;
1251 break;
1255 if (matching_refs == -1)
1256 return NULL;
1258 pat = rs + matching_refs;
1259 if (pat->matching) {
1261 * "matching refs"; traditionally we pushed everything
1262 * including refs outside refs/heads/ hierarchy, but
1263 * that does not make much sense these days.
1265 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1266 return NULL;
1267 name = xstrdup(ref->name);
1269 if (ret_pat)
1270 *ret_pat = pat;
1271 return name;
1274 static struct ref **tail_ref(struct ref **head)
1276 struct ref **tail = head;
1277 while (*tail)
1278 tail = &((*tail)->next);
1279 return tail;
1282 struct tips {
1283 struct commit **tip;
1284 int nr, alloc;
1287 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1289 struct commit *commit;
1291 if (is_null_oid(oid))
1292 return;
1293 commit = lookup_commit_reference_gently(oid, 1);
1294 if (!commit || (commit->object.flags & TMP_MARK))
1295 return;
1296 commit->object.flags |= TMP_MARK;
1297 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1298 tips->tip[tips->nr++] = commit;
1301 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1303 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1304 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1305 struct string_list_item *item;
1306 struct ref *ref;
1307 struct tips sent_tips;
1310 * Collect everything we know they would have at the end of
1311 * this push, and collect all tags they have.
1313 memset(&sent_tips, 0, sizeof(sent_tips));
1314 for (ref = *dst; ref; ref = ref->next) {
1315 if (ref->peer_ref &&
1316 !is_null_oid(&ref->peer_ref->new_oid))
1317 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1318 else
1319 add_to_tips(&sent_tips, &ref->old_oid);
1320 if (starts_with(ref->name, "refs/tags/"))
1321 string_list_append(&dst_tag, ref->name);
1323 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1325 string_list_sort(&dst_tag);
1327 /* Collect tags they do not have. */
1328 for (ref = src; ref; ref = ref->next) {
1329 if (!starts_with(ref->name, "refs/tags/"))
1330 continue; /* not a tag */
1331 if (string_list_has_string(&dst_tag, ref->name))
1332 continue; /* they already have it */
1333 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1334 continue; /* be conservative */
1335 item = string_list_append(&src_tag, ref->name);
1336 item->util = ref;
1338 string_list_clear(&dst_tag, 0);
1341 * At this point, src_tag lists tags that are missing from
1342 * dst, and sent_tips lists the tips we are pushing or those
1343 * that we know they already have. An element in the src_tag
1344 * that is an ancestor of any of the sent_tips needs to be
1345 * sent to the other side.
1347 if (sent_tips.nr) {
1348 for_each_string_list_item(item, &src_tag) {
1349 struct ref *ref = item->util;
1350 struct ref *dst_ref;
1351 struct commit *commit;
1353 if (is_null_oid(&ref->new_oid))
1354 continue;
1355 commit = lookup_commit_reference_gently(&ref->new_oid,
1357 if (!commit)
1358 /* not pushing a commit, which is not an error */
1359 continue;
1362 * Is this tag, which they do not have, reachable from
1363 * any of the commits we are sending?
1365 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1366 continue;
1368 /* Add it in */
1369 dst_ref = make_linked_ref(ref->name, dst_tail);
1370 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1371 dst_ref->peer_ref = copy_ref(ref);
1374 string_list_clear(&src_tag, 0);
1375 free(sent_tips.tip);
1378 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1380 for ( ; list; list = list->next)
1381 if (!strcmp(list->name, name))
1382 return (struct ref *)list;
1383 return NULL;
1386 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1388 for ( ; ref; ref = ref->next)
1389 string_list_append_nodup(ref_index, ref->name)->util = ref;
1391 string_list_sort(ref_index);
1395 * Given only the set of local refs, sanity-check the set of push
1396 * refspecs. We can't catch all errors that match_push_refs would,
1397 * but we can catch some errors early before even talking to the
1398 * remote side.
1400 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1402 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1403 int ret = 0;
1404 int i;
1406 for (i = 0; i < nr_refspec; i++) {
1407 struct refspec *rs = refspec + i;
1409 if (rs->pattern || rs->matching)
1410 continue;
1412 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1415 free_refspec(nr_refspec, refspec);
1416 return ret;
1420 * Given the set of refs the local repository has, the set of refs the
1421 * remote repository has, and the refspec used for push, determine
1422 * what remote refs we will update and with what value by setting
1423 * peer_ref (which object is being pushed) and force (if the push is
1424 * forced) in elements of "dst". The function may add new elements to
1425 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1427 int match_push_refs(struct ref *src, struct ref **dst,
1428 int nr_refspec, const char **refspec, int flags)
1430 struct refspec *rs;
1431 int send_all = flags & MATCH_REFS_ALL;
1432 int send_mirror = flags & MATCH_REFS_MIRROR;
1433 int send_prune = flags & MATCH_REFS_PRUNE;
1434 int errs;
1435 static const char *default_refspec[] = { ":", NULL };
1436 struct ref *ref, **dst_tail = tail_ref(dst);
1437 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1439 if (!nr_refspec) {
1440 nr_refspec = 1;
1441 refspec = default_refspec;
1443 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1444 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1446 /* pick the remainder */
1447 for (ref = src; ref; ref = ref->next) {
1448 struct string_list_item *dst_item;
1449 struct ref *dst_peer;
1450 const struct refspec *pat = NULL;
1451 char *dst_name;
1453 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1454 if (!dst_name)
1455 continue;
1457 if (!dst_ref_index.nr)
1458 prepare_ref_index(&dst_ref_index, *dst);
1460 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1461 dst_peer = dst_item ? dst_item->util : NULL;
1462 if (dst_peer) {
1463 if (dst_peer->peer_ref)
1464 /* We're already sending something to this ref. */
1465 goto free_name;
1466 } else {
1467 if (pat->matching && !(send_all || send_mirror))
1469 * Remote doesn't have it, and we have no
1470 * explicit pattern, and we don't have
1471 * --all or --mirror.
1473 goto free_name;
1475 /* Create a new one and link it */
1476 dst_peer = make_linked_ref(dst_name, &dst_tail);
1477 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1478 string_list_insert(&dst_ref_index,
1479 dst_peer->name)->util = dst_peer;
1481 dst_peer->peer_ref = copy_ref(ref);
1482 dst_peer->force = pat->force;
1483 free_name:
1484 free(dst_name);
1487 string_list_clear(&dst_ref_index, 0);
1489 if (flags & MATCH_REFS_FOLLOW_TAGS)
1490 add_missing_tags(src, dst, &dst_tail);
1492 if (send_prune) {
1493 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1494 /* check for missing refs on the remote */
1495 for (ref = *dst; ref; ref = ref->next) {
1496 char *src_name;
1498 if (ref->peer_ref)
1499 /* We're already sending something to this ref. */
1500 continue;
1502 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1503 if (src_name) {
1504 if (!src_ref_index.nr)
1505 prepare_ref_index(&src_ref_index, src);
1506 if (!string_list_has_string(&src_ref_index,
1507 src_name))
1508 ref->peer_ref = alloc_delete_ref();
1509 free(src_name);
1512 string_list_clear(&src_ref_index, 0);
1514 if (errs)
1515 return -1;
1516 return 0;
1519 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1520 int force_update)
1522 struct ref *ref;
1524 for (ref = remote_refs; ref; ref = ref->next) {
1525 int force_ref_update = ref->force || force_update;
1526 int reject_reason = 0;
1528 if (ref->peer_ref)
1529 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1530 else if (!send_mirror)
1531 continue;
1533 ref->deletion = is_null_oid(&ref->new_oid);
1534 if (!ref->deletion &&
1535 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1536 ref->status = REF_STATUS_UPTODATE;
1537 continue;
1541 * If the remote ref has moved and is now different
1542 * from what we expect, reject any push.
1544 * It also is an error if the user told us to check
1545 * with the remote-tracking branch to find the value
1546 * to expect, but we did not have such a tracking
1547 * branch.
1549 if (ref->expect_old_sha1) {
1550 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1551 reject_reason = REF_STATUS_REJECT_STALE;
1552 else
1553 /* If the ref isn't stale then force the update. */
1554 force_ref_update = 1;
1558 * If the update isn't already rejected then check
1559 * the usual "must fast-forward" rules.
1561 * Decide whether an individual refspec A:B can be
1562 * pushed. The push will succeed if any of the
1563 * following are true:
1565 * (1) the remote reference B does not exist
1567 * (2) the remote reference B is being removed (i.e.,
1568 * pushing :B where no source is specified)
1570 * (3) the destination is not under refs/tags/, and
1571 * if the old and new value is a commit, the new
1572 * is a descendant of the old.
1574 * (4) it is forced using the +A:B notation, or by
1575 * passing the --force argument
1578 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1579 if (starts_with(ref->name, "refs/tags/"))
1580 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1581 else if (!has_object_file(&ref->old_oid))
1582 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1583 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1584 !lookup_commit_reference_gently(&ref->new_oid, 1))
1585 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1586 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1587 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1591 * "--force" will defeat any rejection implemented
1592 * by the rules above.
1594 if (!force_ref_update)
1595 ref->status = reject_reason;
1596 else if (reject_reason)
1597 ref->forced_update = 1;
1601 static void set_merge(struct branch *ret)
1603 struct remote *remote;
1604 char *ref;
1605 struct object_id oid;
1606 int i;
1608 if (!ret)
1609 return; /* no branch */
1610 if (ret->merge)
1611 return; /* already run */
1612 if (!ret->remote_name || !ret->merge_nr) {
1614 * no merge config; let's make sure we don't confuse callers
1615 * with a non-zero merge_nr but a NULL merge
1617 ret->merge_nr = 0;
1618 return;
1621 remote = remote_get(ret->remote_name);
1623 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1624 for (i = 0; i < ret->merge_nr; i++) {
1625 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1626 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1627 if (!remote_find_tracking(remote, ret->merge[i]) ||
1628 strcmp(ret->remote_name, "."))
1629 continue;
1630 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1631 oid.hash, &ref) == 1)
1632 ret->merge[i]->dst = ref;
1633 else
1634 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1638 struct branch *branch_get(const char *name)
1640 struct branch *ret;
1642 read_config();
1643 if (!name || !*name || !strcmp(name, "HEAD"))
1644 ret = current_branch;
1645 else
1646 ret = make_branch(name, 0);
1647 set_merge(ret);
1648 return ret;
1651 int branch_has_merge_config(struct branch *branch)
1653 return branch && !!branch->merge;
1656 int branch_merge_matches(struct branch *branch,
1657 int i,
1658 const char *refname)
1660 if (!branch || i < 0 || i >= branch->merge_nr)
1661 return 0;
1662 return refname_match(branch->merge[i]->src, refname);
1665 __attribute__((format (printf,2,3)))
1666 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1668 if (err) {
1669 va_list ap;
1670 va_start(ap, fmt);
1671 strbuf_vaddf(err, fmt, ap);
1672 va_end(ap);
1674 return NULL;
1677 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1679 if (!branch)
1680 return error_buf(err, _("HEAD does not point to a branch"));
1682 if (!branch->merge || !branch->merge[0]) {
1684 * no merge config; is it because the user didn't define any,
1685 * or because it is not a real branch, and get_branch
1686 * auto-vivified it?
1688 if (!ref_exists(branch->refname))
1689 return error_buf(err, _("no such branch: '%s'"),
1690 branch->name);
1691 return error_buf(err,
1692 _("no upstream configured for branch '%s'"),
1693 branch->name);
1696 if (!branch->merge[0]->dst)
1697 return error_buf(err,
1698 _("upstream branch '%s' not stored as a remote-tracking branch"),
1699 branch->merge[0]->src);
1701 return branch->merge[0]->dst;
1704 static const char *tracking_for_push_dest(struct remote *remote,
1705 const char *refname,
1706 struct strbuf *err)
1708 char *ret;
1710 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1711 if (!ret)
1712 return error_buf(err,
1713 _("push destination '%s' on remote '%s' has no local tracking branch"),
1714 refname, remote->name);
1715 return ret;
1718 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1720 struct remote *remote;
1722 remote = remote_get(pushremote_for_branch(branch, NULL));
1723 if (!remote)
1724 return error_buf(err,
1725 _("branch '%s' has no remote for pushing"),
1726 branch->name);
1728 if (remote->push_refspec_nr) {
1729 char *dst;
1730 const char *ret;
1732 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1733 branch->refname);
1734 if (!dst)
1735 return error_buf(err,
1736 _("push refspecs for '%s' do not include '%s'"),
1737 remote->name, branch->name);
1739 ret = tracking_for_push_dest(remote, dst, err);
1740 free(dst);
1741 return ret;
1744 if (remote->mirror)
1745 return tracking_for_push_dest(remote, branch->refname, err);
1747 switch (push_default) {
1748 case PUSH_DEFAULT_NOTHING:
1749 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1751 case PUSH_DEFAULT_MATCHING:
1752 case PUSH_DEFAULT_CURRENT:
1753 return tracking_for_push_dest(remote, branch->refname, err);
1755 case PUSH_DEFAULT_UPSTREAM:
1756 return branch_get_upstream(branch, err);
1758 case PUSH_DEFAULT_UNSPECIFIED:
1759 case PUSH_DEFAULT_SIMPLE:
1761 const char *up, *cur;
1763 up = branch_get_upstream(branch, err);
1764 if (!up)
1765 return NULL;
1766 cur = tracking_for_push_dest(remote, branch->refname, err);
1767 if (!cur)
1768 return NULL;
1769 if (strcmp(cur, up))
1770 return error_buf(err,
1771 _("cannot resolve 'simple' push to a single destination"));
1772 return cur;
1776 die("BUG: unhandled push situation");
1779 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1781 if (!branch)
1782 return error_buf(err, _("HEAD does not point to a branch"));
1784 if (!branch->push_tracking_ref)
1785 branch->push_tracking_ref = branch_get_push_1(branch, err);
1786 return branch->push_tracking_ref;
1789 static int ignore_symref_update(const char *refname)
1791 struct object_id oid;
1792 int flag;
1794 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1795 return 0; /* non-existing refs are OK */
1796 return (flag & REF_ISSYMREF);
1800 * Create and return a list of (struct ref) consisting of copies of
1801 * each remote_ref that matches refspec. refspec must be a pattern.
1802 * Fill in the copies' peer_ref to describe the local tracking refs to
1803 * which they map. Omit any references that would map to an existing
1804 * local symbolic ref.
1806 static struct ref *get_expanded_map(const struct ref *remote_refs,
1807 const struct refspec *refspec)
1809 const struct ref *ref;
1810 struct ref *ret = NULL;
1811 struct ref **tail = &ret;
1813 for (ref = remote_refs; ref; ref = ref->next) {
1814 char *expn_name = NULL;
1816 if (strchr(ref->name, '^'))
1817 continue; /* a dereference item */
1818 if (match_name_with_pattern(refspec->src, ref->name,
1819 refspec->dst, &expn_name) &&
1820 !ignore_symref_update(expn_name)) {
1821 struct ref *cpy = copy_ref(ref);
1823 cpy->peer_ref = alloc_ref(expn_name);
1824 if (refspec->force)
1825 cpy->peer_ref->force = 1;
1826 *tail = cpy;
1827 tail = &cpy->next;
1829 free(expn_name);
1832 return ret;
1835 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1837 const struct ref *ref;
1838 for (ref = refs; ref; ref = ref->next) {
1839 if (refname_match(name, ref->name))
1840 return ref;
1842 return NULL;
1845 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1847 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1849 if (!ref)
1850 return NULL;
1852 return copy_ref(ref);
1855 static struct ref *get_local_ref(const char *name)
1857 if (!name || name[0] == '\0')
1858 return NULL;
1860 if (starts_with(name, "refs/"))
1861 return alloc_ref(name);
1863 if (starts_with(name, "heads/") ||
1864 starts_with(name, "tags/") ||
1865 starts_with(name, "remotes/"))
1866 return alloc_ref_with_prefix("refs/", 5, name);
1868 return alloc_ref_with_prefix("refs/heads/", 11, name);
1871 int get_fetch_map(const struct ref *remote_refs,
1872 const struct refspec *refspec,
1873 struct ref ***tail,
1874 int missing_ok)
1876 struct ref *ref_map, **rmp;
1878 if (refspec->pattern) {
1879 ref_map = get_expanded_map(remote_refs, refspec);
1880 } else {
1881 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1883 if (refspec->exact_sha1) {
1884 ref_map = alloc_ref(name);
1885 get_oid_hex(name, &ref_map->old_oid);
1886 } else {
1887 ref_map = get_remote_ref(remote_refs, name);
1889 if (!missing_ok && !ref_map)
1890 die("Couldn't find remote ref %s", name);
1891 if (ref_map) {
1892 ref_map->peer_ref = get_local_ref(refspec->dst);
1893 if (ref_map->peer_ref && refspec->force)
1894 ref_map->peer_ref->force = 1;
1898 for (rmp = &ref_map; *rmp; ) {
1899 if ((*rmp)->peer_ref) {
1900 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1901 check_refname_format((*rmp)->peer_ref->name, 0)) {
1902 struct ref *ignore = *rmp;
1903 error("* Ignoring funny ref '%s' locally",
1904 (*rmp)->peer_ref->name);
1905 *rmp = (*rmp)->next;
1906 free(ignore->peer_ref);
1907 free(ignore);
1908 continue;
1911 rmp = &((*rmp)->next);
1914 if (ref_map)
1915 tail_link_ref(ref_map, tail);
1917 return 0;
1920 int resolve_remote_symref(struct ref *ref, struct ref *list)
1922 if (!ref->symref)
1923 return 0;
1924 for (; list; list = list->next)
1925 if (!strcmp(ref->symref, list->name)) {
1926 oidcpy(&ref->old_oid, &list->old_oid);
1927 return 0;
1929 return 1;
1932 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1934 while (list) {
1935 struct commit *commit = pop_commit(&list);
1936 commit->object.flags &= ~mark;
1940 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1942 struct object *o;
1943 struct commit *old, *new;
1944 struct commit_list *list, *used;
1945 int found = 0;
1948 * Both new and old must be commit-ish and new is descendant of
1949 * old. Otherwise we require --force.
1951 o = deref_tag(parse_object(old_oid), NULL, 0);
1952 if (!o || o->type != OBJ_COMMIT)
1953 return 0;
1954 old = (struct commit *) o;
1956 o = deref_tag(parse_object(new_oid), NULL, 0);
1957 if (!o || o->type != OBJ_COMMIT)
1958 return 0;
1959 new = (struct commit *) o;
1961 if (parse_commit(new) < 0)
1962 return 0;
1964 used = list = NULL;
1965 commit_list_insert(new, &list);
1966 while (list) {
1967 new = pop_most_recent_commit(&list, TMP_MARK);
1968 commit_list_insert(new, &used);
1969 if (new == old) {
1970 found = 1;
1971 break;
1974 unmark_and_free(list, TMP_MARK);
1975 unmark_and_free(used, TMP_MARK);
1976 return found;
1980 * Compare a branch with its upstream, and save their differences (number
1981 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1982 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1983 * is not itself NULL.
1985 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1986 * upstream defined, or ref does not exist), 0 otherwise.
1988 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1989 const char **upstream_name)
1991 struct object_id oid;
1992 struct commit *ours, *theirs;
1993 struct rev_info revs;
1994 const char *base;
1995 struct argv_array argv = ARGV_ARRAY_INIT;
1997 /* Cannot stat unless we are marked to build on top of somebody else. */
1998 base = branch_get_upstream(branch, NULL);
1999 if (upstream_name)
2000 *upstream_name = base;
2001 if (!base)
2002 return -1;
2004 /* Cannot stat if what we used to build on no longer exists */
2005 if (read_ref(base, oid.hash))
2006 return -1;
2007 theirs = lookup_commit_reference(&oid);
2008 if (!theirs)
2009 return -1;
2011 if (read_ref(branch->refname, oid.hash))
2012 return -1;
2013 ours = lookup_commit_reference(&oid);
2014 if (!ours)
2015 return -1;
2017 /* are we the same? */
2018 if (theirs == ours) {
2019 *num_theirs = *num_ours = 0;
2020 return 0;
2023 /* Run "rev-list --left-right ours...theirs" internally... */
2024 argv_array_push(&argv, ""); /* ignored */
2025 argv_array_push(&argv, "--left-right");
2026 argv_array_pushf(&argv, "%s...%s",
2027 oid_to_hex(&ours->object.oid),
2028 oid_to_hex(&theirs->object.oid));
2029 argv_array_push(&argv, "--");
2031 init_revisions(&revs, NULL);
2032 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2033 if (prepare_revision_walk(&revs))
2034 die("revision walk setup failed");
2036 /* ... and count the commits on each side. */
2037 *num_ours = 0;
2038 *num_theirs = 0;
2039 while (1) {
2040 struct commit *c = get_revision(&revs);
2041 if (!c)
2042 break;
2043 if (c->object.flags & SYMMETRIC_LEFT)
2044 (*num_ours)++;
2045 else
2046 (*num_theirs)++;
2049 /* clear object flags smudged by the above traversal */
2050 clear_commit_marks(ours, ALL_REV_FLAGS);
2051 clear_commit_marks(theirs, ALL_REV_FLAGS);
2053 argv_array_clear(&argv);
2054 return 0;
2058 * Return true when there is anything to report, otherwise false.
2060 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2062 int ours, theirs;
2063 const char *full_base;
2064 char *base;
2065 int upstream_is_gone = 0;
2067 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2068 if (!full_base)
2069 return 0;
2070 upstream_is_gone = 1;
2073 base = shorten_unambiguous_ref(full_base, 0);
2074 if (upstream_is_gone) {
2075 strbuf_addf(sb,
2076 _("Your branch is based on '%s', but the upstream is gone.\n"),
2077 base);
2078 if (advice_status_hints)
2079 strbuf_addstr(sb,
2080 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2081 } else if (!ours && !theirs) {
2082 strbuf_addf(sb,
2083 _("Your branch is up-to-date with '%s'.\n"),
2084 base);
2085 } else if (!theirs) {
2086 strbuf_addf(sb,
2087 Q_("Your branch is ahead of '%s' by %d commit.\n",
2088 "Your branch is ahead of '%s' by %d commits.\n",
2089 ours),
2090 base, ours);
2091 if (advice_status_hints)
2092 strbuf_addstr(sb,
2093 _(" (use \"git push\" to publish your local commits)\n"));
2094 } else if (!ours) {
2095 strbuf_addf(sb,
2096 Q_("Your branch is behind '%s' by %d commit, "
2097 "and can be fast-forwarded.\n",
2098 "Your branch is behind '%s' by %d commits, "
2099 "and can be fast-forwarded.\n",
2100 theirs),
2101 base, theirs);
2102 if (advice_status_hints)
2103 strbuf_addstr(sb,
2104 _(" (use \"git pull\" to update your local branch)\n"));
2105 } else {
2106 strbuf_addf(sb,
2107 Q_("Your branch and '%s' have diverged,\n"
2108 "and have %d and %d different commit each, "
2109 "respectively.\n",
2110 "Your branch and '%s' have diverged,\n"
2111 "and have %d and %d different commits each, "
2112 "respectively.\n",
2113 ours + theirs),
2114 base, ours, theirs);
2115 if (advice_status_hints)
2116 strbuf_addstr(sb,
2117 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2119 free(base);
2120 return 1;
2123 static int one_local_ref(const char *refname, const struct object_id *oid,
2124 int flag, void *cb_data)
2126 struct ref ***local_tail = cb_data;
2127 struct ref *ref;
2129 /* we already know it starts with refs/ to get here */
2130 if (check_refname_format(refname + 5, 0))
2131 return 0;
2133 ref = alloc_ref(refname);
2134 oidcpy(&ref->new_oid, oid);
2135 **local_tail = ref;
2136 *local_tail = &ref->next;
2137 return 0;
2140 struct ref *get_local_heads(void)
2142 struct ref *local_refs = NULL, **local_tail = &local_refs;
2144 for_each_ref(one_local_ref, &local_tail);
2145 return local_refs;
2148 struct ref *guess_remote_head(const struct ref *head,
2149 const struct ref *refs,
2150 int all)
2152 const struct ref *r;
2153 struct ref *list = NULL;
2154 struct ref **tail = &list;
2156 if (!head)
2157 return NULL;
2160 * Some transports support directly peeking at
2161 * where HEAD points; if that is the case, then
2162 * we don't have to guess.
2164 if (head->symref)
2165 return copy_ref(find_ref_by_name(refs, head->symref));
2167 /* If refs/heads/master could be right, it is. */
2168 if (!all) {
2169 r = find_ref_by_name(refs, "refs/heads/master");
2170 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2171 return copy_ref(r);
2174 /* Look for another ref that points there */
2175 for (r = refs; r; r = r->next) {
2176 if (r != head &&
2177 starts_with(r->name, "refs/heads/") &&
2178 !oidcmp(&r->old_oid, &head->old_oid)) {
2179 *tail = copy_ref(r);
2180 tail = &((*tail)->next);
2181 if (!all)
2182 break;
2186 return list;
2189 struct stale_heads_info {
2190 struct string_list *ref_names;
2191 struct ref **stale_refs_tail;
2192 struct refspec *refs;
2193 int ref_count;
2196 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2197 int flags, void *cb_data)
2199 struct stale_heads_info *info = cb_data;
2200 struct string_list matches = STRING_LIST_INIT_DUP;
2201 struct refspec query;
2202 int i, stale = 1;
2203 memset(&query, 0, sizeof(struct refspec));
2204 query.dst = (char *)refname;
2206 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2207 if (matches.nr == 0)
2208 goto clean_exit; /* No matches */
2211 * If we did find a suitable refspec and it's not a symref and
2212 * it's not in the list of refs that currently exist in that
2213 * remote, we consider it to be stale. In order to deal with
2214 * overlapping refspecs, we need to go over all of the
2215 * matching refs.
2217 if (flags & REF_ISSYMREF)
2218 goto clean_exit;
2220 for (i = 0; stale && i < matches.nr; i++)
2221 if (string_list_has_string(info->ref_names, matches.items[i].string))
2222 stale = 0;
2224 if (stale) {
2225 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2226 oidcpy(&ref->new_oid, oid);
2229 clean_exit:
2230 string_list_clear(&matches, 0);
2231 return 0;
2234 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2236 struct ref *ref, *stale_refs = NULL;
2237 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2238 struct stale_heads_info info;
2240 info.ref_names = &ref_names;
2241 info.stale_refs_tail = &stale_refs;
2242 info.refs = refs;
2243 info.ref_count = ref_count;
2244 for (ref = fetch_map; ref; ref = ref->next)
2245 string_list_append(&ref_names, ref->name);
2246 string_list_sort(&ref_names);
2247 for_each_ref(get_stale_heads_cb, &info);
2248 string_list_clear(&ref_names, 0);
2249 return stale_refs;
2253 * Compare-and-swap
2255 static void clear_cas_option(struct push_cas_option *cas)
2257 int i;
2259 for (i = 0; i < cas->nr; i++)
2260 free(cas->entry[i].refname);
2261 free(cas->entry);
2262 memset(cas, 0, sizeof(*cas));
2265 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2266 const char *refname,
2267 size_t refnamelen)
2269 struct push_cas *entry;
2270 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2271 entry = &cas->entry[cas->nr++];
2272 memset(entry, 0, sizeof(*entry));
2273 entry->refname = xmemdupz(refname, refnamelen);
2274 return entry;
2277 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2279 const char *colon;
2280 struct push_cas *entry;
2282 if (unset) {
2283 /* "--no-<option>" */
2284 clear_cas_option(cas);
2285 return 0;
2288 if (!arg) {
2289 /* just "--<option>" */
2290 cas->use_tracking_for_rest = 1;
2291 return 0;
2294 /* "--<option>=refname" or "--<option>=refname:value" */
2295 colon = strchrnul(arg, ':');
2296 entry = add_cas_entry(cas, arg, colon - arg);
2297 if (!*colon)
2298 entry->use_tracking = 1;
2299 else if (!colon[1])
2300 hashclr(entry->expect);
2301 else if (get_sha1(colon + 1, entry->expect))
2302 return error("cannot parse expected object name '%s'", colon + 1);
2303 return 0;
2306 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2308 return parse_push_cas_option(opt->value, arg, unset);
2311 int is_empty_cas(const struct push_cas_option *cas)
2313 return !cas->use_tracking_for_rest && !cas->nr;
2317 * Look at remote.fetch refspec and see if we have a remote
2318 * tracking branch for the refname there. Fill its current
2319 * value in sha1[].
2320 * If we cannot do so, return negative to signal an error.
2322 static int remote_tracking(struct remote *remote, const char *refname,
2323 struct object_id *oid)
2325 char *dst;
2327 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2328 if (!dst)
2329 return -1; /* no tracking ref for refname at remote */
2330 if (read_ref(dst, oid->hash))
2331 return -1; /* we know what the tracking ref is but we cannot read it */
2332 return 0;
2335 static void apply_cas(struct push_cas_option *cas,
2336 struct remote *remote,
2337 struct ref *ref)
2339 int i;
2341 /* Find an explicit --<option>=<name>[:<value>] entry */
2342 for (i = 0; i < cas->nr; i++) {
2343 struct push_cas *entry = &cas->entry[i];
2344 if (!refname_match(entry->refname, ref->name))
2345 continue;
2346 ref->expect_old_sha1 = 1;
2347 if (!entry->use_tracking)
2348 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2349 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2350 oidclr(&ref->old_oid_expect);
2351 return;
2354 /* Are we using "--<option>" to cover all? */
2355 if (!cas->use_tracking_for_rest)
2356 return;
2358 ref->expect_old_sha1 = 1;
2359 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2360 oidclr(&ref->old_oid_expect);
2363 void apply_push_cas(struct push_cas_option *cas,
2364 struct remote *remote,
2365 struct ref *remote_refs)
2367 struct ref *ref;
2368 for (ref = remote_refs; ref; ref = ref->next)
2369 apply_cas(cas, remote, ref);