config: don't implicitly use gitdir or commondir
[git.git] / remote.c
blob6ef03bb73066067fce9878e237c774da7c0ad14e
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 struct remote *a, const struct remote *b, const struct remotes_hash_key *key)
138 if (key)
139 return strncmp(a->name, key->str, key->len) || a->name[key->len];
140 else
141 return strcmp(a->name, b->name);
144 static inline void init_remotes_hash(void)
146 if (!remotes_hash.cmpfn)
147 hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0);
150 static struct remote *make_remote(const char *name, int len)
152 struct remote *ret, *replaced;
153 struct remotes_hash_key lookup;
154 struct hashmap_entry lookup_entry;
156 if (!len)
157 len = strlen(name);
159 init_remotes_hash();
160 lookup.str = name;
161 lookup.len = len;
162 hashmap_entry_init(&lookup_entry, memhash(name, len));
164 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
165 return ret;
167 ret = xcalloc(1, sizeof(struct remote));
168 ret->prune = -1; /* unspecified */
169 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
170 remotes[remotes_nr++] = ret;
171 ret->name = xstrndup(name, len);
173 hashmap_entry_init(ret, lookup_entry.hash);
174 replaced = hashmap_put(&remotes_hash, ret);
175 assert(replaced == NULL); /* no previous entry overwritten */
176 return ret;
179 static void add_merge(struct branch *branch, const char *name)
181 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
182 branch->merge_alloc);
183 branch->merge_name[branch->merge_nr++] = name;
186 static struct branch *make_branch(const char *name, int len)
188 struct branch *ret;
189 int i;
191 for (i = 0; i < branches_nr; i++) {
192 if (len ? (!strncmp(name, branches[i]->name, len) &&
193 !branches[i]->name[len]) :
194 !strcmp(name, branches[i]->name))
195 return branches[i];
198 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
199 ret = xcalloc(1, sizeof(struct branch));
200 branches[branches_nr++] = ret;
201 if (len)
202 ret->name = xstrndup(name, len);
203 else
204 ret->name = xstrdup(name);
205 ret->refname = xstrfmt("refs/heads/%s", ret->name);
207 return ret;
210 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
212 struct rewrite *ret;
213 int i;
215 for (i = 0; i < r->rewrite_nr; i++) {
216 if (len
217 ? (len == r->rewrite[i]->baselen &&
218 !strncmp(base, r->rewrite[i]->base, len))
219 : !strcmp(base, r->rewrite[i]->base))
220 return r->rewrite[i];
223 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
224 ret = xcalloc(1, sizeof(struct rewrite));
225 r->rewrite[r->rewrite_nr++] = ret;
226 if (len) {
227 ret->base = xstrndup(base, len);
228 ret->baselen = len;
230 else {
231 ret->base = xstrdup(base);
232 ret->baselen = strlen(base);
234 return ret;
237 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
239 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
240 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
241 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
242 rewrite->instead_of_nr++;
245 static const char *skip_spaces(const char *s)
247 while (isspace(*s))
248 s++;
249 return s;
252 static void read_remotes_file(struct remote *remote)
254 struct strbuf buf = STRBUF_INIT;
255 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
257 if (!f)
258 return;
259 remote->configured_in_repo = 1;
260 remote->origin = REMOTE_REMOTES;
261 while (strbuf_getline(&buf, f) != EOF) {
262 const char *v;
264 strbuf_rtrim(&buf);
266 if (skip_prefix(buf.buf, "URL:", &v))
267 add_url_alias(remote, xstrdup(skip_spaces(v)));
268 else if (skip_prefix(buf.buf, "Push:", &v))
269 add_push_refspec(remote, xstrdup(skip_spaces(v)));
270 else if (skip_prefix(buf.buf, "Pull:", &v))
271 add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
273 strbuf_release(&buf);
274 fclose(f);
277 static void read_branches_file(struct remote *remote)
279 char *frag;
280 struct strbuf buf = STRBUF_INIT;
281 FILE *f = fopen(git_path("branches/%s", remote->name), "r");
283 if (!f)
284 return;
286 strbuf_getline_lf(&buf, f);
287 fclose(f);
288 strbuf_trim(&buf);
289 if (!buf.len) {
290 strbuf_release(&buf);
291 return;
294 remote->configured_in_repo = 1;
295 remote->origin = REMOTE_BRANCHES;
298 * The branches file would have URL and optionally
299 * #branch specified. The "master" (or specified) branch is
300 * fetched and stored in the local branch matching the
301 * remote name.
303 frag = strchr(buf.buf, '#');
304 if (frag)
305 *(frag++) = '\0';
306 else
307 frag = "master";
309 add_url_alias(remote, strbuf_detach(&buf, NULL));
310 add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
311 frag, remote->name));
314 * Cogito compatible push: push current HEAD to remote #branch
315 * (master if missing)
317 add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
318 remote->fetch_tags = 1; /* always auto-follow */
321 static int handle_config(const char *key, const char *value, void *cb)
323 const char *name;
324 int namelen;
325 const char *subkey;
326 struct remote *remote;
327 struct branch *branch;
328 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
329 if (!name)
330 return 0;
331 branch = make_branch(name, namelen);
332 if (!strcmp(subkey, "remote")) {
333 return git_config_string(&branch->remote_name, key, value);
334 } else if (!strcmp(subkey, "pushremote")) {
335 return git_config_string(&branch->pushremote_name, key, value);
336 } else if (!strcmp(subkey, "merge")) {
337 if (!value)
338 return config_error_nonbool(key);
339 add_merge(branch, xstrdup(value));
341 return 0;
343 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
344 struct rewrite *rewrite;
345 if (!name)
346 return 0;
347 if (!strcmp(subkey, "insteadof")) {
348 rewrite = make_rewrite(&rewrites, name, namelen);
349 if (!value)
350 return config_error_nonbool(key);
351 add_instead_of(rewrite, xstrdup(value));
352 } else if (!strcmp(subkey, "pushinsteadof")) {
353 rewrite = make_rewrite(&rewrites_push, name, namelen);
354 if (!value)
355 return config_error_nonbool(key);
356 add_instead_of(rewrite, xstrdup(value));
360 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
361 return 0;
363 /* Handle remote.* variables */
364 if (!name && !strcmp(subkey, "pushdefault"))
365 return git_config_string(&pushremote_name, key, value);
367 if (!name)
368 return 0;
369 /* Handle remote.<name>.* variables */
370 if (*name == '/') {
371 warning("Config remote shorthand cannot begin with '/': %s",
372 name);
373 return 0;
375 remote = make_remote(name, namelen);
376 remote->origin = REMOTE_CONFIG;
377 if (current_config_scope() == CONFIG_SCOPE_REPO)
378 remote->configured_in_repo = 1;
379 if (!strcmp(subkey, "mirror"))
380 remote->mirror = git_config_bool(key, value);
381 else if (!strcmp(subkey, "skipdefaultupdate"))
382 remote->skip_default_update = git_config_bool(key, value);
383 else if (!strcmp(subkey, "skipfetchall"))
384 remote->skip_default_update = git_config_bool(key, value);
385 else if (!strcmp(subkey, "prune"))
386 remote->prune = git_config_bool(key, value);
387 else if (!strcmp(subkey, "url")) {
388 const char *v;
389 if (git_config_string(&v, key, value))
390 return -1;
391 add_url(remote, v);
392 } else if (!strcmp(subkey, "pushurl")) {
393 const char *v;
394 if (git_config_string(&v, key, value))
395 return -1;
396 add_pushurl(remote, v);
397 } else if (!strcmp(subkey, "push")) {
398 const char *v;
399 if (git_config_string(&v, key, value))
400 return -1;
401 add_push_refspec(remote, v);
402 } else if (!strcmp(subkey, "fetch")) {
403 const char *v;
404 if (git_config_string(&v, key, value))
405 return -1;
406 add_fetch_refspec(remote, v);
407 } else if (!strcmp(subkey, "receivepack")) {
408 const char *v;
409 if (git_config_string(&v, key, value))
410 return -1;
411 if (!remote->receivepack)
412 remote->receivepack = v;
413 else
414 error("more than one receivepack given, using the first");
415 } else if (!strcmp(subkey, "uploadpack")) {
416 const char *v;
417 if (git_config_string(&v, key, value))
418 return -1;
419 if (!remote->uploadpack)
420 remote->uploadpack = v;
421 else
422 error("more than one uploadpack given, using the first");
423 } else if (!strcmp(subkey, "tagopt")) {
424 if (!strcmp(value, "--no-tags"))
425 remote->fetch_tags = -1;
426 else if (!strcmp(value, "--tags"))
427 remote->fetch_tags = 2;
428 } else if (!strcmp(subkey, "proxy")) {
429 return git_config_string((const char **)&remote->http_proxy,
430 key, value);
431 } else if (!strcmp(subkey, "proxyauthmethod")) {
432 return git_config_string((const char **)&remote->http_proxy_authmethod,
433 key, value);
434 } else if (!strcmp(subkey, "vcs")) {
435 return git_config_string(&remote->foreign_vcs, key, value);
437 return 0;
440 static void alias_all_urls(void)
442 int i, j;
443 for (i = 0; i < remotes_nr; i++) {
444 int add_pushurl_aliases;
445 if (!remotes[i])
446 continue;
447 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
448 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
450 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
451 for (j = 0; j < remotes[i]->url_nr; j++) {
452 if (add_pushurl_aliases)
453 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
454 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
459 static void read_config(void)
461 static int loaded;
462 struct object_id oid;
463 int flag;
465 if (loaded)
466 return;
467 loaded = 1;
469 current_branch = NULL;
470 if (startup_info->have_repository) {
471 const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
472 if (head_ref && (flag & REF_ISSYMREF) &&
473 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
474 current_branch = make_branch(head_ref, 0);
477 git_config(handle_config, NULL);
478 alias_all_urls();
482 * This function frees a refspec array.
483 * Warning: code paths should be checked to ensure that the src
484 * and dst pointers are always freeable pointers as well
485 * as the refspec pointer itself.
487 static void free_refspecs(struct refspec *refspec, int nr_refspec)
489 int i;
491 if (!refspec)
492 return;
494 for (i = 0; i < nr_refspec; i++) {
495 free(refspec[i].src);
496 free(refspec[i].dst);
498 free(refspec);
501 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
503 int i;
504 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
506 for (i = 0; i < nr_refspec; i++) {
507 size_t llen;
508 int is_glob;
509 const char *lhs, *rhs;
510 int flags;
512 is_glob = 0;
514 lhs = refspec[i];
515 if (*lhs == '+') {
516 rs[i].force = 1;
517 lhs++;
520 rhs = strrchr(lhs, ':');
523 * Before going on, special case ":" (or "+:") as a refspec
524 * for pushing matching refs.
526 if (!fetch && rhs == lhs && rhs[1] == '\0') {
527 rs[i].matching = 1;
528 continue;
531 if (rhs) {
532 size_t rlen = strlen(++rhs);
533 is_glob = (1 <= rlen && strchr(rhs, '*'));
534 rs[i].dst = xstrndup(rhs, rlen);
537 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
538 if (1 <= llen && memchr(lhs, '*', llen)) {
539 if ((rhs && !is_glob) || (!rhs && fetch))
540 goto invalid;
541 is_glob = 1;
542 } else if (rhs && is_glob) {
543 goto invalid;
546 rs[i].pattern = is_glob;
547 rs[i].src = xstrndup(lhs, llen);
548 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
550 if (fetch) {
551 struct object_id unused;
553 /* LHS */
554 if (!*rs[i].src)
555 ; /* empty is ok; it means "HEAD" */
556 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
557 rs[i].exact_sha1 = 1; /* ok */
558 else if (!check_refname_format(rs[i].src, flags))
559 ; /* valid looking ref is ok */
560 else
561 goto invalid;
562 /* RHS */
563 if (!rs[i].dst)
564 ; /* missing is ok; it is the same as empty */
565 else if (!*rs[i].dst)
566 ; /* empty is ok; it means "do not store" */
567 else if (!check_refname_format(rs[i].dst, flags))
568 ; /* valid looking ref is ok */
569 else
570 goto invalid;
571 } else {
573 * LHS
574 * - empty is allowed; it means delete.
575 * - when wildcarded, it must be a valid looking ref.
576 * - otherwise, it must be an extended SHA-1, but
577 * there is no existing way to validate this.
579 if (!*rs[i].src)
580 ; /* empty is ok */
581 else if (is_glob) {
582 if (check_refname_format(rs[i].src, flags))
583 goto invalid;
585 else
586 ; /* anything goes, for now */
588 * RHS
589 * - missing is allowed, but LHS then must be a
590 * valid looking ref.
591 * - empty is not allowed.
592 * - otherwise it must be a valid looking ref.
594 if (!rs[i].dst) {
595 if (check_refname_format(rs[i].src, flags))
596 goto invalid;
597 } else if (!*rs[i].dst) {
598 goto invalid;
599 } else {
600 if (check_refname_format(rs[i].dst, flags))
601 goto invalid;
605 return rs;
607 invalid:
608 if (verify) {
610 * nr_refspec must be greater than zero and i must be valid
611 * since it is only possible to reach this point from within
612 * the for loop above.
614 free_refspecs(rs, i+1);
615 return NULL;
617 die("Invalid refspec '%s'", refspec[i]);
620 int valid_fetch_refspec(const char *fetch_refspec_str)
622 struct refspec *refspec;
624 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
625 free_refspecs(refspec, 1);
626 return !!refspec;
629 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
631 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
634 struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
636 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
639 void free_refspec(int nr_refspec, struct refspec *refspec)
641 int i;
642 for (i = 0; i < nr_refspec; i++) {
643 free(refspec[i].src);
644 free(refspec[i].dst);
646 free(refspec);
649 static int valid_remote_nick(const char *name)
651 if (!name[0] || is_dot_or_dotdot(name))
652 return 0;
653 return !strchr(name, '/'); /* no slash */
656 const char *remote_for_branch(struct branch *branch, int *explicit)
658 if (branch && branch->remote_name) {
659 if (explicit)
660 *explicit = 1;
661 return branch->remote_name;
663 if (explicit)
664 *explicit = 0;
665 return "origin";
668 const char *pushremote_for_branch(struct branch *branch, int *explicit)
670 if (branch && branch->pushremote_name) {
671 if (explicit)
672 *explicit = 1;
673 return branch->pushremote_name;
675 if (pushremote_name) {
676 if (explicit)
677 *explicit = 1;
678 return pushremote_name;
680 return remote_for_branch(branch, explicit);
683 static struct remote *remote_get_1(const char *name,
684 const char *(*get_default)(struct branch *, int *))
686 struct remote *ret;
687 int name_given = 0;
689 read_config();
691 if (name)
692 name_given = 1;
693 else
694 name = get_default(current_branch, &name_given);
696 ret = make_remote(name, 0);
697 if (valid_remote_nick(name) && have_git_dir()) {
698 if (!valid_remote(ret))
699 read_remotes_file(ret);
700 if (!valid_remote(ret))
701 read_branches_file(ret);
703 if (name_given && !valid_remote(ret))
704 add_url_alias(ret, name);
705 if (!valid_remote(ret))
706 return NULL;
707 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
708 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
709 return ret;
712 struct remote *remote_get(const char *name)
714 return remote_get_1(name, remote_for_branch);
717 struct remote *pushremote_get(const char *name)
719 return remote_get_1(name, pushremote_for_branch);
722 int remote_is_configured(struct remote *remote, int in_repo)
724 if (!remote)
725 return 0;
726 if (in_repo)
727 return remote->configured_in_repo;
728 return !!remote->origin;
731 int for_each_remote(each_remote_fn fn, void *priv)
733 int i, result = 0;
734 read_config();
735 for (i = 0; i < remotes_nr && !result; i++) {
736 struct remote *r = remotes[i];
737 if (!r)
738 continue;
739 if (!r->fetch)
740 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
741 r->fetch_refspec);
742 if (!r->push)
743 r->push = parse_push_refspec(r->push_refspec_nr,
744 r->push_refspec);
745 result = fn(r, priv);
747 return result;
750 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
752 if (strcmp(ref1->name, ref2->name)) {
753 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
754 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
755 die(_("Cannot fetch both %s and %s to %s"),
756 ref1->name, ref2->name, ref2->peer_ref->name);
757 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
758 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
759 warning(_("%s usually tracks %s, not %s"),
760 ref2->peer_ref->name, ref2->name, ref1->name);
761 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
762 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
763 die(_("%s tracks both %s and %s"),
764 ref2->peer_ref->name, ref1->name, ref2->name);
765 } else {
767 * This last possibility doesn't occur because
768 * FETCH_HEAD_IGNORE entries always appear at
769 * the end of the list.
771 die(_("Internal error"));
774 free(ref2->peer_ref);
775 free(ref2);
778 struct ref *ref_remove_duplicates(struct ref *ref_map)
780 struct string_list refs = STRING_LIST_INIT_NODUP;
781 struct ref *retval = NULL;
782 struct ref **p = &retval;
784 while (ref_map) {
785 struct ref *ref = ref_map;
787 ref_map = ref_map->next;
788 ref->next = NULL;
790 if (!ref->peer_ref) {
791 *p = ref;
792 p = &ref->next;
793 } else {
794 struct string_list_item *item =
795 string_list_insert(&refs, ref->peer_ref->name);
797 if (item->util) {
798 /* Entry already existed */
799 handle_duplicate((struct ref *)item->util, ref);
800 } else {
801 *p = ref;
802 p = &ref->next;
803 item->util = ref;
808 string_list_clear(&refs, 0);
809 return retval;
812 int remote_has_url(struct remote *remote, const char *url)
814 int i;
815 for (i = 0; i < remote->url_nr; i++) {
816 if (!strcmp(remote->url[i], url))
817 return 1;
819 return 0;
822 static int match_name_with_pattern(const char *key, const char *name,
823 const char *value, char **result)
825 const char *kstar = strchr(key, '*');
826 size_t klen;
827 size_t ksuffixlen;
828 size_t namelen;
829 int ret;
830 if (!kstar)
831 die("Key '%s' of pattern had no '*'", key);
832 klen = kstar - key;
833 ksuffixlen = strlen(kstar + 1);
834 namelen = strlen(name);
835 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
836 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
837 if (ret && value) {
838 struct strbuf sb = STRBUF_INIT;
839 const char *vstar = strchr(value, '*');
840 if (!vstar)
841 die("Value '%s' of pattern has no '*'", value);
842 strbuf_add(&sb, value, vstar - value);
843 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
844 strbuf_addstr(&sb, vstar + 1);
845 *result = strbuf_detach(&sb, NULL);
847 return ret;
850 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
852 int i;
853 int find_src = !query->src;
855 if (find_src && !query->dst)
856 error("query_refspecs_multiple: need either src or dst");
858 for (i = 0; i < ref_count; i++) {
859 struct refspec *refspec = &refs[i];
860 const char *key = find_src ? refspec->dst : refspec->src;
861 const char *value = find_src ? refspec->src : refspec->dst;
862 const char *needle = find_src ? query->dst : query->src;
863 char **result = find_src ? &query->src : &query->dst;
865 if (!refspec->dst)
866 continue;
867 if (refspec->pattern) {
868 if (match_name_with_pattern(key, needle, value, result))
869 string_list_append_nodup(results, *result);
870 } else if (!strcmp(needle, key)) {
871 string_list_append(results, value);
876 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
878 int i;
879 int find_src = !query->src;
880 const char *needle = find_src ? query->dst : query->src;
881 char **result = find_src ? &query->src : &query->dst;
883 if (find_src && !query->dst)
884 return error("query_refspecs: need either src or dst");
886 for (i = 0; i < ref_count; i++) {
887 struct refspec *refspec = &refs[i];
888 const char *key = find_src ? refspec->dst : refspec->src;
889 const char *value = find_src ? refspec->src : refspec->dst;
891 if (!refspec->dst)
892 continue;
893 if (refspec->pattern) {
894 if (match_name_with_pattern(key, needle, value, result)) {
895 query->force = refspec->force;
896 return 0;
898 } else if (!strcmp(needle, key)) {
899 *result = xstrdup(value);
900 query->force = refspec->force;
901 return 0;
904 return -1;
907 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
908 const char *name)
910 struct refspec query;
912 memset(&query, 0, sizeof(struct refspec));
913 query.src = (char *)name;
915 if (query_refspecs(refspecs, nr_refspec, &query))
916 return NULL;
918 return query.dst;
921 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
923 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
926 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
927 const char *name)
929 size_t len = strlen(name);
930 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
931 memcpy(ref->name, prefix, prefixlen);
932 memcpy(ref->name + prefixlen, name, len);
933 return ref;
936 struct ref *alloc_ref(const char *name)
938 return alloc_ref_with_prefix("", 0, name);
941 struct ref *copy_ref(const struct ref *ref)
943 struct ref *cpy;
944 size_t len;
945 if (!ref)
946 return NULL;
947 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
948 cpy = xmalloc(len);
949 memcpy(cpy, ref, len);
950 cpy->next = NULL;
951 cpy->symref = xstrdup_or_null(ref->symref);
952 cpy->remote_status = xstrdup_or_null(ref->remote_status);
953 cpy->peer_ref = copy_ref(ref->peer_ref);
954 return cpy;
957 struct ref *copy_ref_list(const struct ref *ref)
959 struct ref *ret = NULL;
960 struct ref **tail = &ret;
961 while (ref) {
962 *tail = copy_ref(ref);
963 ref = ref->next;
964 tail = &((*tail)->next);
966 return ret;
969 static void free_ref(struct ref *ref)
971 if (!ref)
972 return;
973 free_ref(ref->peer_ref);
974 free(ref->remote_status);
975 free(ref->symref);
976 free(ref);
979 void free_refs(struct ref *ref)
981 struct ref *next;
982 while (ref) {
983 next = ref->next;
984 free_ref(ref);
985 ref = next;
989 int ref_compare_name(const void *va, const void *vb)
991 const struct ref *a = va, *b = vb;
992 return strcmp(a->name, b->name);
995 static void *ref_list_get_next(const void *a)
997 return ((const struct ref *)a)->next;
1000 static void ref_list_set_next(void *a, void *next)
1002 ((struct ref *)a)->next = next;
1005 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
1007 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1010 int count_refspec_match(const char *pattern,
1011 struct ref *refs,
1012 struct ref **matched_ref)
1014 int patlen = strlen(pattern);
1015 struct ref *matched_weak = NULL;
1016 struct ref *matched = NULL;
1017 int weak_match = 0;
1018 int match = 0;
1020 for (weak_match = match = 0; refs; refs = refs->next) {
1021 char *name = refs->name;
1022 int namelen = strlen(name);
1024 if (!refname_match(pattern, name))
1025 continue;
1027 /* A match is "weak" if it is with refs outside
1028 * heads or tags, and did not specify the pattern
1029 * in full (e.g. "refs/remotes/origin/master") or at
1030 * least from the toplevel (e.g. "remotes/origin/master");
1031 * otherwise "git push $URL master" would result in
1032 * ambiguity between remotes/origin/master and heads/master
1033 * at the remote site.
1035 if (namelen != patlen &&
1036 patlen != namelen - 5 &&
1037 !starts_with(name, "refs/heads/") &&
1038 !starts_with(name, "refs/tags/")) {
1039 /* We want to catch the case where only weak
1040 * matches are found and there are multiple
1041 * matches, and where more than one strong
1042 * matches are found, as ambiguous. One
1043 * strong match with zero or more weak matches
1044 * are acceptable as a unique match.
1046 matched_weak = refs;
1047 weak_match++;
1049 else {
1050 matched = refs;
1051 match++;
1054 if (!matched) {
1055 if (matched_ref)
1056 *matched_ref = matched_weak;
1057 return weak_match;
1059 else {
1060 if (matched_ref)
1061 *matched_ref = matched;
1062 return match;
1066 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1068 **tail = ref;
1069 while (ref->next)
1070 ref = ref->next;
1071 *tail = &ref->next;
1074 static struct ref *alloc_delete_ref(void)
1076 struct ref *ref = alloc_ref("(delete)");
1077 oidclr(&ref->new_oid);
1078 return ref;
1081 static int try_explicit_object_name(const char *name,
1082 struct ref **match)
1084 struct object_id oid;
1086 if (!*name) {
1087 if (match)
1088 *match = alloc_delete_ref();
1089 return 0;
1092 if (get_sha1(name, oid.hash))
1093 return -1;
1095 if (match) {
1096 *match = alloc_ref(name);
1097 oidcpy(&(*match)->new_oid, &oid);
1099 return 0;
1102 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1104 struct ref *ret = alloc_ref(name);
1105 tail_link_ref(ret, tail);
1106 return ret;
1109 static char *guess_ref(const char *name, struct ref *peer)
1111 struct strbuf buf = STRBUF_INIT;
1112 struct object_id oid;
1114 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1115 oid.hash, NULL);
1116 if (!r)
1117 return NULL;
1119 if (starts_with(r, "refs/heads/"))
1120 strbuf_addstr(&buf, "refs/heads/");
1121 else if (starts_with(r, "refs/tags/"))
1122 strbuf_addstr(&buf, "refs/tags/");
1123 else
1124 return NULL;
1126 strbuf_addstr(&buf, name);
1127 return strbuf_detach(&buf, NULL);
1130 static int match_explicit_lhs(struct ref *src,
1131 struct refspec *rs,
1132 struct ref **match,
1133 int *allocated_match)
1135 switch (count_refspec_match(rs->src, src, match)) {
1136 case 1:
1137 if (allocated_match)
1138 *allocated_match = 0;
1139 return 0;
1140 case 0:
1141 /* The source could be in the get_sha1() format
1142 * not a reference name. :refs/other is a
1143 * way to delete 'other' ref at the remote end.
1145 if (try_explicit_object_name(rs->src, match) < 0)
1146 return error("src refspec %s does not match any.", rs->src);
1147 if (allocated_match)
1148 *allocated_match = 1;
1149 return 0;
1150 default:
1151 return error("src refspec %s matches more than one.", rs->src);
1155 static int match_explicit(struct ref *src, struct ref *dst,
1156 struct ref ***dst_tail,
1157 struct refspec *rs)
1159 struct ref *matched_src, *matched_dst;
1160 int allocated_src;
1162 const char *dst_value = rs->dst;
1163 char *dst_guess;
1165 if (rs->pattern || rs->matching)
1166 return 0;
1168 matched_src = matched_dst = NULL;
1169 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1170 return -1;
1172 if (!dst_value) {
1173 struct object_id oid;
1174 int flag;
1176 dst_value = resolve_ref_unsafe(matched_src->name,
1177 RESOLVE_REF_READING,
1178 oid.hash, &flag);
1179 if (!dst_value ||
1180 ((flag & REF_ISSYMREF) &&
1181 !starts_with(dst_value, "refs/heads/")))
1182 die("%s cannot be resolved to branch.",
1183 matched_src->name);
1186 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1187 case 1:
1188 break;
1189 case 0:
1190 if (starts_with(dst_value, "refs/"))
1191 matched_dst = make_linked_ref(dst_value, dst_tail);
1192 else if (is_null_oid(&matched_src->new_oid))
1193 error("unable to delete '%s': remote ref does not exist",
1194 dst_value);
1195 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1196 matched_dst = make_linked_ref(dst_guess, dst_tail);
1197 else
1198 error("unable to push to unqualified destination: %s\n"
1199 "The destination refspec neither matches an "
1200 "existing ref on the remote nor\n"
1201 "begins with refs/, and we are unable to "
1202 "guess a prefix based on the source ref.",
1203 dst_value);
1204 break;
1205 default:
1206 matched_dst = NULL;
1207 error("dst refspec %s matches more than one.",
1208 dst_value);
1209 break;
1211 if (!matched_dst)
1212 return -1;
1213 if (matched_dst->peer_ref)
1214 return error("dst ref %s receives from more than one src.",
1215 matched_dst->name);
1216 else {
1217 matched_dst->peer_ref = allocated_src ?
1218 matched_src :
1219 copy_ref(matched_src);
1220 matched_dst->force = rs->force;
1222 return 0;
1225 static int match_explicit_refs(struct ref *src, struct ref *dst,
1226 struct ref ***dst_tail, struct refspec *rs,
1227 int rs_nr)
1229 int i, errs;
1230 for (i = errs = 0; i < rs_nr; i++)
1231 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1232 return errs;
1235 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1236 int send_mirror, int direction, const struct refspec **ret_pat)
1238 const struct refspec *pat;
1239 char *name;
1240 int i;
1241 int matching_refs = -1;
1242 for (i = 0; i < rs_nr; i++) {
1243 if (rs[i].matching &&
1244 (matching_refs == -1 || rs[i].force)) {
1245 matching_refs = i;
1246 continue;
1249 if (rs[i].pattern) {
1250 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1251 int match;
1252 if (direction == FROM_SRC)
1253 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1254 else
1255 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1256 if (match) {
1257 matching_refs = i;
1258 break;
1262 if (matching_refs == -1)
1263 return NULL;
1265 pat = rs + matching_refs;
1266 if (pat->matching) {
1268 * "matching refs"; traditionally we pushed everything
1269 * including refs outside refs/heads/ hierarchy, but
1270 * that does not make much sense these days.
1272 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1273 return NULL;
1274 name = xstrdup(ref->name);
1276 if (ret_pat)
1277 *ret_pat = pat;
1278 return name;
1281 static struct ref **tail_ref(struct ref **head)
1283 struct ref **tail = head;
1284 while (*tail)
1285 tail = &((*tail)->next);
1286 return tail;
1289 struct tips {
1290 struct commit **tip;
1291 int nr, alloc;
1294 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1296 struct commit *commit;
1298 if (is_null_oid(oid))
1299 return;
1300 commit = lookup_commit_reference_gently(oid->hash, 1);
1301 if (!commit || (commit->object.flags & TMP_MARK))
1302 return;
1303 commit->object.flags |= TMP_MARK;
1304 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1305 tips->tip[tips->nr++] = commit;
1308 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1310 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1311 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1312 struct string_list_item *item;
1313 struct ref *ref;
1314 struct tips sent_tips;
1317 * Collect everything we know they would have at the end of
1318 * this push, and collect all tags they have.
1320 memset(&sent_tips, 0, sizeof(sent_tips));
1321 for (ref = *dst; ref; ref = ref->next) {
1322 if (ref->peer_ref &&
1323 !is_null_oid(&ref->peer_ref->new_oid))
1324 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1325 else
1326 add_to_tips(&sent_tips, &ref->old_oid);
1327 if (starts_with(ref->name, "refs/tags/"))
1328 string_list_append(&dst_tag, ref->name);
1330 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1332 string_list_sort(&dst_tag);
1334 /* Collect tags they do not have. */
1335 for (ref = src; ref; ref = ref->next) {
1336 if (!starts_with(ref->name, "refs/tags/"))
1337 continue; /* not a tag */
1338 if (string_list_has_string(&dst_tag, ref->name))
1339 continue; /* they already have it */
1340 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1341 continue; /* be conservative */
1342 item = string_list_append(&src_tag, ref->name);
1343 item->util = ref;
1345 string_list_clear(&dst_tag, 0);
1348 * At this point, src_tag lists tags that are missing from
1349 * dst, and sent_tips lists the tips we are pushing or those
1350 * that we know they already have. An element in the src_tag
1351 * that is an ancestor of any of the sent_tips needs to be
1352 * sent to the other side.
1354 if (sent_tips.nr) {
1355 for_each_string_list_item(item, &src_tag) {
1356 struct ref *ref = item->util;
1357 struct ref *dst_ref;
1358 struct commit *commit;
1360 if (is_null_oid(&ref->new_oid))
1361 continue;
1362 commit = lookup_commit_reference_gently(ref->new_oid.hash, 1);
1363 if (!commit)
1364 /* not pushing a commit, which is not an error */
1365 continue;
1368 * Is this tag, which they do not have, reachable from
1369 * any of the commits we are sending?
1371 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1372 continue;
1374 /* Add it in */
1375 dst_ref = make_linked_ref(ref->name, dst_tail);
1376 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1377 dst_ref->peer_ref = copy_ref(ref);
1380 string_list_clear(&src_tag, 0);
1381 free(sent_tips.tip);
1384 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1386 for ( ; list; list = list->next)
1387 if (!strcmp(list->name, name))
1388 return (struct ref *)list;
1389 return NULL;
1392 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1394 for ( ; ref; ref = ref->next)
1395 string_list_append_nodup(ref_index, ref->name)->util = ref;
1397 string_list_sort(ref_index);
1401 * Given only the set of local refs, sanity-check the set of push
1402 * refspecs. We can't catch all errors that match_push_refs would,
1403 * but we can catch some errors early before even talking to the
1404 * remote side.
1406 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1408 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1409 int ret = 0;
1410 int i;
1412 for (i = 0; i < nr_refspec; i++) {
1413 struct refspec *rs = refspec + i;
1415 if (rs->pattern || rs->matching)
1416 continue;
1418 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1421 free_refspec(nr_refspec, refspec);
1422 return ret;
1426 * Given the set of refs the local repository has, the set of refs the
1427 * remote repository has, and the refspec used for push, determine
1428 * what remote refs we will update and with what value by setting
1429 * peer_ref (which object is being pushed) and force (if the push is
1430 * forced) in elements of "dst". The function may add new elements to
1431 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1433 int match_push_refs(struct ref *src, struct ref **dst,
1434 int nr_refspec, const char **refspec, int flags)
1436 struct refspec *rs;
1437 int send_all = flags & MATCH_REFS_ALL;
1438 int send_mirror = flags & MATCH_REFS_MIRROR;
1439 int send_prune = flags & MATCH_REFS_PRUNE;
1440 int errs;
1441 static const char *default_refspec[] = { ":", NULL };
1442 struct ref *ref, **dst_tail = tail_ref(dst);
1443 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1445 if (!nr_refspec) {
1446 nr_refspec = 1;
1447 refspec = default_refspec;
1449 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1450 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1452 /* pick the remainder */
1453 for (ref = src; ref; ref = ref->next) {
1454 struct string_list_item *dst_item;
1455 struct ref *dst_peer;
1456 const struct refspec *pat = NULL;
1457 char *dst_name;
1459 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1460 if (!dst_name)
1461 continue;
1463 if (!dst_ref_index.nr)
1464 prepare_ref_index(&dst_ref_index, *dst);
1466 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1467 dst_peer = dst_item ? dst_item->util : NULL;
1468 if (dst_peer) {
1469 if (dst_peer->peer_ref)
1470 /* We're already sending something to this ref. */
1471 goto free_name;
1472 } else {
1473 if (pat->matching && !(send_all || send_mirror))
1475 * Remote doesn't have it, and we have no
1476 * explicit pattern, and we don't have
1477 * --all or --mirror.
1479 goto free_name;
1481 /* Create a new one and link it */
1482 dst_peer = make_linked_ref(dst_name, &dst_tail);
1483 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1484 string_list_insert(&dst_ref_index,
1485 dst_peer->name)->util = dst_peer;
1487 dst_peer->peer_ref = copy_ref(ref);
1488 dst_peer->force = pat->force;
1489 free_name:
1490 free(dst_name);
1493 string_list_clear(&dst_ref_index, 0);
1495 if (flags & MATCH_REFS_FOLLOW_TAGS)
1496 add_missing_tags(src, dst, &dst_tail);
1498 if (send_prune) {
1499 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1500 /* check for missing refs on the remote */
1501 for (ref = *dst; ref; ref = ref->next) {
1502 char *src_name;
1504 if (ref->peer_ref)
1505 /* We're already sending something to this ref. */
1506 continue;
1508 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1509 if (src_name) {
1510 if (!src_ref_index.nr)
1511 prepare_ref_index(&src_ref_index, src);
1512 if (!string_list_has_string(&src_ref_index,
1513 src_name))
1514 ref->peer_ref = alloc_delete_ref();
1515 free(src_name);
1518 string_list_clear(&src_ref_index, 0);
1520 if (errs)
1521 return -1;
1522 return 0;
1525 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1526 int force_update)
1528 struct ref *ref;
1530 for (ref = remote_refs; ref; ref = ref->next) {
1531 int force_ref_update = ref->force || force_update;
1532 int reject_reason = 0;
1534 if (ref->peer_ref)
1535 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1536 else if (!send_mirror)
1537 continue;
1539 ref->deletion = is_null_oid(&ref->new_oid);
1540 if (!ref->deletion &&
1541 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1542 ref->status = REF_STATUS_UPTODATE;
1543 continue;
1547 * If the remote ref has moved and is now different
1548 * from what we expect, reject any push.
1550 * It also is an error if the user told us to check
1551 * with the remote-tracking branch to find the value
1552 * to expect, but we did not have such a tracking
1553 * branch.
1555 if (ref->expect_old_sha1) {
1556 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1557 reject_reason = REF_STATUS_REJECT_STALE;
1558 else
1559 /* If the ref isn't stale then force the update. */
1560 force_ref_update = 1;
1564 * If the update isn't already rejected then check
1565 * the usual "must fast-forward" rules.
1567 * Decide whether an individual refspec A:B can be
1568 * pushed. The push will succeed if any of the
1569 * following are true:
1571 * (1) the remote reference B does not exist
1573 * (2) the remote reference B is being removed (i.e.,
1574 * pushing :B where no source is specified)
1576 * (3) the destination is not under refs/tags/, and
1577 * if the old and new value is a commit, the new
1578 * is a descendant of the old.
1580 * (4) it is forced using the +A:B notation, or by
1581 * passing the --force argument
1584 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1585 if (starts_with(ref->name, "refs/tags/"))
1586 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1587 else if (!has_object_file(&ref->old_oid))
1588 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1589 else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
1590 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
1591 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1592 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1593 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1597 * "--force" will defeat any rejection implemented
1598 * by the rules above.
1600 if (!force_ref_update)
1601 ref->status = reject_reason;
1602 else if (reject_reason)
1603 ref->forced_update = 1;
1607 static void set_merge(struct branch *ret)
1609 struct remote *remote;
1610 char *ref;
1611 struct object_id oid;
1612 int i;
1614 if (!ret)
1615 return; /* no branch */
1616 if (ret->merge)
1617 return; /* already run */
1618 if (!ret->remote_name || !ret->merge_nr) {
1620 * no merge config; let's make sure we don't confuse callers
1621 * with a non-zero merge_nr but a NULL merge
1623 ret->merge_nr = 0;
1624 return;
1627 remote = remote_get(ret->remote_name);
1629 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1630 for (i = 0; i < ret->merge_nr; i++) {
1631 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1632 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1633 if (!remote_find_tracking(remote, ret->merge[i]) ||
1634 strcmp(ret->remote_name, "."))
1635 continue;
1636 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1637 oid.hash, &ref) == 1)
1638 ret->merge[i]->dst = ref;
1639 else
1640 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1644 struct branch *branch_get(const char *name)
1646 struct branch *ret;
1648 read_config();
1649 if (!name || !*name || !strcmp(name, "HEAD"))
1650 ret = current_branch;
1651 else
1652 ret = make_branch(name, 0);
1653 set_merge(ret);
1654 return ret;
1657 int branch_has_merge_config(struct branch *branch)
1659 return branch && !!branch->merge;
1662 int branch_merge_matches(struct branch *branch,
1663 int i,
1664 const char *refname)
1666 if (!branch || i < 0 || i >= branch->merge_nr)
1667 return 0;
1668 return refname_match(branch->merge[i]->src, refname);
1671 __attribute__((format (printf,2,3)))
1672 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1674 if (err) {
1675 va_list ap;
1676 va_start(ap, fmt);
1677 strbuf_vaddf(err, fmt, ap);
1678 va_end(ap);
1680 return NULL;
1683 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1685 if (!branch)
1686 return error_buf(err, _("HEAD does not point to a branch"));
1688 if (!branch->merge || !branch->merge[0]) {
1690 * no merge config; is it because the user didn't define any,
1691 * or because it is not a real branch, and get_branch
1692 * auto-vivified it?
1694 if (!ref_exists(branch->refname))
1695 return error_buf(err, _("no such branch: '%s'"),
1696 branch->name);
1697 return error_buf(err,
1698 _("no upstream configured for branch '%s'"),
1699 branch->name);
1702 if (!branch->merge[0]->dst)
1703 return error_buf(err,
1704 _("upstream branch '%s' not stored as a remote-tracking branch"),
1705 branch->merge[0]->src);
1707 return branch->merge[0]->dst;
1710 static const char *tracking_for_push_dest(struct remote *remote,
1711 const char *refname,
1712 struct strbuf *err)
1714 char *ret;
1716 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1717 if (!ret)
1718 return error_buf(err,
1719 _("push destination '%s' on remote '%s' has no local tracking branch"),
1720 refname, remote->name);
1721 return ret;
1724 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1726 struct remote *remote;
1728 remote = remote_get(pushremote_for_branch(branch, NULL));
1729 if (!remote)
1730 return error_buf(err,
1731 _("branch '%s' has no remote for pushing"),
1732 branch->name);
1734 if (remote->push_refspec_nr) {
1735 char *dst;
1736 const char *ret;
1738 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1739 branch->refname);
1740 if (!dst)
1741 return error_buf(err,
1742 _("push refspecs for '%s' do not include '%s'"),
1743 remote->name, branch->name);
1745 ret = tracking_for_push_dest(remote, dst, err);
1746 free(dst);
1747 return ret;
1750 if (remote->mirror)
1751 return tracking_for_push_dest(remote, branch->refname, err);
1753 switch (push_default) {
1754 case PUSH_DEFAULT_NOTHING:
1755 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1757 case PUSH_DEFAULT_MATCHING:
1758 case PUSH_DEFAULT_CURRENT:
1759 return tracking_for_push_dest(remote, branch->refname, err);
1761 case PUSH_DEFAULT_UPSTREAM:
1762 return branch_get_upstream(branch, err);
1764 case PUSH_DEFAULT_UNSPECIFIED:
1765 case PUSH_DEFAULT_SIMPLE:
1767 const char *up, *cur;
1769 up = branch_get_upstream(branch, err);
1770 if (!up)
1771 return NULL;
1772 cur = tracking_for_push_dest(remote, branch->refname, err);
1773 if (!cur)
1774 return NULL;
1775 if (strcmp(cur, up))
1776 return error_buf(err,
1777 _("cannot resolve 'simple' push to a single destination"));
1778 return cur;
1782 die("BUG: unhandled push situation");
1785 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1787 if (!branch)
1788 return error_buf(err, _("HEAD does not point to a branch"));
1790 if (!branch->push_tracking_ref)
1791 branch->push_tracking_ref = branch_get_push_1(branch, err);
1792 return branch->push_tracking_ref;
1795 static int ignore_symref_update(const char *refname)
1797 struct object_id oid;
1798 int flag;
1800 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1801 return 0; /* non-existing refs are OK */
1802 return (flag & REF_ISSYMREF);
1806 * Create and return a list of (struct ref) consisting of copies of
1807 * each remote_ref that matches refspec. refspec must be a pattern.
1808 * Fill in the copies' peer_ref to describe the local tracking refs to
1809 * which they map. Omit any references that would map to an existing
1810 * local symbolic ref.
1812 static struct ref *get_expanded_map(const struct ref *remote_refs,
1813 const struct refspec *refspec)
1815 const struct ref *ref;
1816 struct ref *ret = NULL;
1817 struct ref **tail = &ret;
1819 for (ref = remote_refs; ref; ref = ref->next) {
1820 char *expn_name = NULL;
1822 if (strchr(ref->name, '^'))
1823 continue; /* a dereference item */
1824 if (match_name_with_pattern(refspec->src, ref->name,
1825 refspec->dst, &expn_name) &&
1826 !ignore_symref_update(expn_name)) {
1827 struct ref *cpy = copy_ref(ref);
1829 cpy->peer_ref = alloc_ref(expn_name);
1830 if (refspec->force)
1831 cpy->peer_ref->force = 1;
1832 *tail = cpy;
1833 tail = &cpy->next;
1835 free(expn_name);
1838 return ret;
1841 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1843 const struct ref *ref;
1844 for (ref = refs; ref; ref = ref->next) {
1845 if (refname_match(name, ref->name))
1846 return ref;
1848 return NULL;
1851 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1853 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1855 if (!ref)
1856 return NULL;
1858 return copy_ref(ref);
1861 static struct ref *get_local_ref(const char *name)
1863 if (!name || name[0] == '\0')
1864 return NULL;
1866 if (starts_with(name, "refs/"))
1867 return alloc_ref(name);
1869 if (starts_with(name, "heads/") ||
1870 starts_with(name, "tags/") ||
1871 starts_with(name, "remotes/"))
1872 return alloc_ref_with_prefix("refs/", 5, name);
1874 return alloc_ref_with_prefix("refs/heads/", 11, name);
1877 int get_fetch_map(const struct ref *remote_refs,
1878 const struct refspec *refspec,
1879 struct ref ***tail,
1880 int missing_ok)
1882 struct ref *ref_map, **rmp;
1884 if (refspec->pattern) {
1885 ref_map = get_expanded_map(remote_refs, refspec);
1886 } else {
1887 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1889 if (refspec->exact_sha1) {
1890 ref_map = alloc_ref(name);
1891 get_oid_hex(name, &ref_map->old_oid);
1892 } else {
1893 ref_map = get_remote_ref(remote_refs, name);
1895 if (!missing_ok && !ref_map)
1896 die("Couldn't find remote ref %s", name);
1897 if (ref_map) {
1898 ref_map->peer_ref = get_local_ref(refspec->dst);
1899 if (ref_map->peer_ref && refspec->force)
1900 ref_map->peer_ref->force = 1;
1904 for (rmp = &ref_map; *rmp; ) {
1905 if ((*rmp)->peer_ref) {
1906 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1907 check_refname_format((*rmp)->peer_ref->name, 0)) {
1908 struct ref *ignore = *rmp;
1909 error("* Ignoring funny ref '%s' locally",
1910 (*rmp)->peer_ref->name);
1911 *rmp = (*rmp)->next;
1912 free(ignore->peer_ref);
1913 free(ignore);
1914 continue;
1917 rmp = &((*rmp)->next);
1920 if (ref_map)
1921 tail_link_ref(ref_map, tail);
1923 return 0;
1926 int resolve_remote_symref(struct ref *ref, struct ref *list)
1928 if (!ref->symref)
1929 return 0;
1930 for (; list; list = list->next)
1931 if (!strcmp(ref->symref, list->name)) {
1932 oidcpy(&ref->old_oid, &list->old_oid);
1933 return 0;
1935 return 1;
1938 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1940 while (list) {
1941 struct commit *commit = pop_commit(&list);
1942 commit->object.flags &= ~mark;
1946 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1948 struct object *o;
1949 struct commit *old, *new;
1950 struct commit_list *list, *used;
1951 int found = 0;
1954 * Both new and old must be commit-ish and new is descendant of
1955 * old. Otherwise we require --force.
1957 o = deref_tag(parse_object(old_oid->hash), NULL, 0);
1958 if (!o || o->type != OBJ_COMMIT)
1959 return 0;
1960 old = (struct commit *) o;
1962 o = deref_tag(parse_object(new_oid->hash), NULL, 0);
1963 if (!o || o->type != OBJ_COMMIT)
1964 return 0;
1965 new = (struct commit *) o;
1967 if (parse_commit(new) < 0)
1968 return 0;
1970 used = list = NULL;
1971 commit_list_insert(new, &list);
1972 while (list) {
1973 new = pop_most_recent_commit(&list, TMP_MARK);
1974 commit_list_insert(new, &used);
1975 if (new == old) {
1976 found = 1;
1977 break;
1980 unmark_and_free(list, TMP_MARK);
1981 unmark_and_free(used, TMP_MARK);
1982 return found;
1986 * Compare a branch with its upstream, and save their differences (number
1987 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1988 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1989 * is not itself NULL.
1991 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1992 * upstream defined, or ref does not exist), 0 otherwise.
1994 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1995 const char **upstream_name)
1997 struct object_id oid;
1998 struct commit *ours, *theirs;
1999 struct rev_info revs;
2000 const char *base;
2001 struct argv_array argv = ARGV_ARRAY_INIT;
2003 /* Cannot stat unless we are marked to build on top of somebody else. */
2004 base = branch_get_upstream(branch, NULL);
2005 if (upstream_name)
2006 *upstream_name = base;
2007 if (!base)
2008 return -1;
2010 /* Cannot stat if what we used to build on no longer exists */
2011 if (read_ref(base, oid.hash))
2012 return -1;
2013 theirs = lookup_commit_reference(oid.hash);
2014 if (!theirs)
2015 return -1;
2017 if (read_ref(branch->refname, oid.hash))
2018 return -1;
2019 ours = lookup_commit_reference(oid.hash);
2020 if (!ours)
2021 return -1;
2023 /* are we the same? */
2024 if (theirs == ours) {
2025 *num_theirs = *num_ours = 0;
2026 return 0;
2029 /* Run "rev-list --left-right ours...theirs" internally... */
2030 argv_array_push(&argv, ""); /* ignored */
2031 argv_array_push(&argv, "--left-right");
2032 argv_array_pushf(&argv, "%s...%s",
2033 oid_to_hex(&ours->object.oid),
2034 oid_to_hex(&theirs->object.oid));
2035 argv_array_push(&argv, "--");
2037 init_revisions(&revs, NULL);
2038 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2039 if (prepare_revision_walk(&revs))
2040 die("revision walk setup failed");
2042 /* ... and count the commits on each side. */
2043 *num_ours = 0;
2044 *num_theirs = 0;
2045 while (1) {
2046 struct commit *c = get_revision(&revs);
2047 if (!c)
2048 break;
2049 if (c->object.flags & SYMMETRIC_LEFT)
2050 (*num_ours)++;
2051 else
2052 (*num_theirs)++;
2055 /* clear object flags smudged by the above traversal */
2056 clear_commit_marks(ours, ALL_REV_FLAGS);
2057 clear_commit_marks(theirs, ALL_REV_FLAGS);
2059 argv_array_clear(&argv);
2060 return 0;
2064 * Return true when there is anything to report, otherwise false.
2066 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2068 int ours, theirs;
2069 const char *full_base;
2070 char *base;
2071 int upstream_is_gone = 0;
2073 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2074 if (!full_base)
2075 return 0;
2076 upstream_is_gone = 1;
2079 base = shorten_unambiguous_ref(full_base, 0);
2080 if (upstream_is_gone) {
2081 strbuf_addf(sb,
2082 _("Your branch is based on '%s', but the upstream is gone.\n"),
2083 base);
2084 if (advice_status_hints)
2085 strbuf_addstr(sb,
2086 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2087 } else if (!ours && !theirs) {
2088 strbuf_addf(sb,
2089 _("Your branch is up-to-date with '%s'.\n"),
2090 base);
2091 } else if (!theirs) {
2092 strbuf_addf(sb,
2093 Q_("Your branch is ahead of '%s' by %d commit.\n",
2094 "Your branch is ahead of '%s' by %d commits.\n",
2095 ours),
2096 base, ours);
2097 if (advice_status_hints)
2098 strbuf_addstr(sb,
2099 _(" (use \"git push\" to publish your local commits)\n"));
2100 } else if (!ours) {
2101 strbuf_addf(sb,
2102 Q_("Your branch is behind '%s' by %d commit, "
2103 "and can be fast-forwarded.\n",
2104 "Your branch is behind '%s' by %d commits, "
2105 "and can be fast-forwarded.\n",
2106 theirs),
2107 base, theirs);
2108 if (advice_status_hints)
2109 strbuf_addstr(sb,
2110 _(" (use \"git pull\" to update your local branch)\n"));
2111 } else {
2112 strbuf_addf(sb,
2113 Q_("Your branch and '%s' have diverged,\n"
2114 "and have %d and %d different commit each, "
2115 "respectively.\n",
2116 "Your branch and '%s' have diverged,\n"
2117 "and have %d and %d different commits each, "
2118 "respectively.\n",
2119 ours + theirs),
2120 base, ours, theirs);
2121 if (advice_status_hints)
2122 strbuf_addstr(sb,
2123 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2125 free(base);
2126 return 1;
2129 static int one_local_ref(const char *refname, const struct object_id *oid,
2130 int flag, void *cb_data)
2132 struct ref ***local_tail = cb_data;
2133 struct ref *ref;
2135 /* we already know it starts with refs/ to get here */
2136 if (check_refname_format(refname + 5, 0))
2137 return 0;
2139 ref = alloc_ref(refname);
2140 oidcpy(&ref->new_oid, oid);
2141 **local_tail = ref;
2142 *local_tail = &ref->next;
2143 return 0;
2146 struct ref *get_local_heads(void)
2148 struct ref *local_refs = NULL, **local_tail = &local_refs;
2150 for_each_ref(one_local_ref, &local_tail);
2151 return local_refs;
2154 struct ref *guess_remote_head(const struct ref *head,
2155 const struct ref *refs,
2156 int all)
2158 const struct ref *r;
2159 struct ref *list = NULL;
2160 struct ref **tail = &list;
2162 if (!head)
2163 return NULL;
2166 * Some transports support directly peeking at
2167 * where HEAD points; if that is the case, then
2168 * we don't have to guess.
2170 if (head->symref)
2171 return copy_ref(find_ref_by_name(refs, head->symref));
2173 /* If refs/heads/master could be right, it is. */
2174 if (!all) {
2175 r = find_ref_by_name(refs, "refs/heads/master");
2176 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2177 return copy_ref(r);
2180 /* Look for another ref that points there */
2181 for (r = refs; r; r = r->next) {
2182 if (r != head &&
2183 starts_with(r->name, "refs/heads/") &&
2184 !oidcmp(&r->old_oid, &head->old_oid)) {
2185 *tail = copy_ref(r);
2186 tail = &((*tail)->next);
2187 if (!all)
2188 break;
2192 return list;
2195 struct stale_heads_info {
2196 struct string_list *ref_names;
2197 struct ref **stale_refs_tail;
2198 struct refspec *refs;
2199 int ref_count;
2202 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2203 int flags, void *cb_data)
2205 struct stale_heads_info *info = cb_data;
2206 struct string_list matches = STRING_LIST_INIT_DUP;
2207 struct refspec query;
2208 int i, stale = 1;
2209 memset(&query, 0, sizeof(struct refspec));
2210 query.dst = (char *)refname;
2212 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2213 if (matches.nr == 0)
2214 goto clean_exit; /* No matches */
2217 * If we did find a suitable refspec and it's not a symref and
2218 * it's not in the list of refs that currently exist in that
2219 * remote, we consider it to be stale. In order to deal with
2220 * overlapping refspecs, we need to go over all of the
2221 * matching refs.
2223 if (flags & REF_ISSYMREF)
2224 goto clean_exit;
2226 for (i = 0; stale && i < matches.nr; i++)
2227 if (string_list_has_string(info->ref_names, matches.items[i].string))
2228 stale = 0;
2230 if (stale) {
2231 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2232 oidcpy(&ref->new_oid, oid);
2235 clean_exit:
2236 string_list_clear(&matches, 0);
2237 return 0;
2240 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2242 struct ref *ref, *stale_refs = NULL;
2243 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2244 struct stale_heads_info info;
2246 info.ref_names = &ref_names;
2247 info.stale_refs_tail = &stale_refs;
2248 info.refs = refs;
2249 info.ref_count = ref_count;
2250 for (ref = fetch_map; ref; ref = ref->next)
2251 string_list_append(&ref_names, ref->name);
2252 string_list_sort(&ref_names);
2253 for_each_ref(get_stale_heads_cb, &info);
2254 string_list_clear(&ref_names, 0);
2255 return stale_refs;
2259 * Compare-and-swap
2261 static void clear_cas_option(struct push_cas_option *cas)
2263 int i;
2265 for (i = 0; i < cas->nr; i++)
2266 free(cas->entry[i].refname);
2267 free(cas->entry);
2268 memset(cas, 0, sizeof(*cas));
2271 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2272 const char *refname,
2273 size_t refnamelen)
2275 struct push_cas *entry;
2276 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2277 entry = &cas->entry[cas->nr++];
2278 memset(entry, 0, sizeof(*entry));
2279 entry->refname = xmemdupz(refname, refnamelen);
2280 return entry;
2283 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2285 const char *colon;
2286 struct push_cas *entry;
2288 if (unset) {
2289 /* "--no-<option>" */
2290 clear_cas_option(cas);
2291 return 0;
2294 if (!arg) {
2295 /* just "--<option>" */
2296 cas->use_tracking_for_rest = 1;
2297 return 0;
2300 /* "--<option>=refname" or "--<option>=refname:value" */
2301 colon = strchrnul(arg, ':');
2302 entry = add_cas_entry(cas, arg, colon - arg);
2303 if (!*colon)
2304 entry->use_tracking = 1;
2305 else if (!colon[1])
2306 hashclr(entry->expect);
2307 else if (get_sha1(colon + 1, entry->expect))
2308 return error("cannot parse expected object name '%s'", colon + 1);
2309 return 0;
2312 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2314 return parse_push_cas_option(opt->value, arg, unset);
2317 int is_empty_cas(const struct push_cas_option *cas)
2319 return !cas->use_tracking_for_rest && !cas->nr;
2323 * Look at remote.fetch refspec and see if we have a remote
2324 * tracking branch for the refname there. Fill its current
2325 * value in sha1[].
2326 * If we cannot do so, return negative to signal an error.
2328 static int remote_tracking(struct remote *remote, const char *refname,
2329 struct object_id *oid)
2331 char *dst;
2333 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2334 if (!dst)
2335 return -1; /* no tracking ref for refname at remote */
2336 if (read_ref(dst, oid->hash))
2337 return -1; /* we know what the tracking ref is but we cannot read it */
2338 return 0;
2341 static void apply_cas(struct push_cas_option *cas,
2342 struct remote *remote,
2343 struct ref *ref)
2345 int i;
2347 /* Find an explicit --<option>=<name>[:<value>] entry */
2348 for (i = 0; i < cas->nr; i++) {
2349 struct push_cas *entry = &cas->entry[i];
2350 if (!refname_match(entry->refname, ref->name))
2351 continue;
2352 ref->expect_old_sha1 = 1;
2353 if (!entry->use_tracking)
2354 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2355 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2356 oidclr(&ref->old_oid_expect);
2357 return;
2360 /* Are we using "--<option>" to cover all? */
2361 if (!cas->use_tracking_for_rest)
2362 return;
2364 ref->expect_old_sha1 = 1;
2365 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2366 oidclr(&ref->old_oid_expect);
2369 void apply_push_cas(struct push_cas_option *cas,
2370 struct remote *remote,
2371 struct ref *remote_refs)
2373 struct ref *ref;
2374 for (ref = remote_refs; ref; ref = ref->next)
2375 apply_cas(cas, remote, ref);