Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'
[git/raj.git] / remote.c
blobd87482573d38b057257c08024fbe6b4339661481
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_or_warn(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_or_warn(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();
481 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
483 int i;
484 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
486 for (i = 0; i < nr_refspec; i++) {
487 size_t llen;
488 int is_glob;
489 const char *lhs, *rhs;
490 int flags;
492 is_glob = 0;
494 lhs = refspec[i];
495 if (*lhs == '+') {
496 rs[i].force = 1;
497 lhs++;
500 rhs = strrchr(lhs, ':');
503 * Before going on, special case ":" (or "+:") as a refspec
504 * for pushing matching refs.
506 if (!fetch && rhs == lhs && rhs[1] == '\0') {
507 rs[i].matching = 1;
508 continue;
511 if (rhs) {
512 size_t rlen = strlen(++rhs);
513 is_glob = (1 <= rlen && strchr(rhs, '*'));
514 rs[i].dst = xstrndup(rhs, rlen);
517 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
518 if (1 <= llen && memchr(lhs, '*', llen)) {
519 if ((rhs && !is_glob) || (!rhs && fetch))
520 goto invalid;
521 is_glob = 1;
522 } else if (rhs && is_glob) {
523 goto invalid;
526 rs[i].pattern = is_glob;
527 rs[i].src = xstrndup(lhs, llen);
528 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
530 if (fetch) {
531 struct object_id unused;
533 /* LHS */
534 if (!*rs[i].src)
535 ; /* empty is ok; it means "HEAD" */
536 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
537 rs[i].exact_sha1 = 1; /* ok */
538 else if (!check_refname_format(rs[i].src, flags))
539 ; /* valid looking ref is ok */
540 else
541 goto invalid;
542 /* RHS */
543 if (!rs[i].dst)
544 ; /* missing is ok; it is the same as empty */
545 else if (!*rs[i].dst)
546 ; /* empty is ok; it means "do not store" */
547 else if (!check_refname_format(rs[i].dst, flags))
548 ; /* valid looking ref is ok */
549 else
550 goto invalid;
551 } else {
553 * LHS
554 * - empty is allowed; it means delete.
555 * - when wildcarded, it must be a valid looking ref.
556 * - otherwise, it must be an extended SHA-1, but
557 * there is no existing way to validate this.
559 if (!*rs[i].src)
560 ; /* empty is ok */
561 else if (is_glob) {
562 if (check_refname_format(rs[i].src, flags))
563 goto invalid;
565 else
566 ; /* anything goes, for now */
568 * RHS
569 * - missing is allowed, but LHS then must be a
570 * valid looking ref.
571 * - empty is not allowed.
572 * - otherwise it must be a valid looking ref.
574 if (!rs[i].dst) {
575 if (check_refname_format(rs[i].src, flags))
576 goto invalid;
577 } else if (!*rs[i].dst) {
578 goto invalid;
579 } else {
580 if (check_refname_format(rs[i].dst, flags))
581 goto invalid;
585 return rs;
587 invalid:
588 if (verify) {
590 * nr_refspec must be greater than zero and i must be valid
591 * since it is only possible to reach this point from within
592 * the for loop above.
594 free_refspec(i+1, rs);
595 return NULL;
597 die("Invalid refspec '%s'", refspec[i]);
600 int valid_fetch_refspec(const char *fetch_refspec_str)
602 struct refspec *refspec;
604 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
605 free_refspec(1, refspec);
606 return !!refspec;
609 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
611 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
614 struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
616 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
619 void free_refspec(int nr_refspec, struct refspec *refspec)
621 int i;
623 if (!refspec)
624 return;
626 for (i = 0; i < nr_refspec; i++) {
627 free(refspec[i].src);
628 free(refspec[i].dst);
630 free(refspec);
633 static int valid_remote_nick(const char *name)
635 if (!name[0] || is_dot_or_dotdot(name))
636 return 0;
638 /* remote nicknames cannot contain slashes */
639 while (*name)
640 if (is_dir_sep(*name++))
641 return 0;
642 return 1;
645 const char *remote_for_branch(struct branch *branch, int *explicit)
647 if (branch && branch->remote_name) {
648 if (explicit)
649 *explicit = 1;
650 return branch->remote_name;
652 if (explicit)
653 *explicit = 0;
654 return "origin";
657 const char *pushremote_for_branch(struct branch *branch, int *explicit)
659 if (branch && branch->pushremote_name) {
660 if (explicit)
661 *explicit = 1;
662 return branch->pushremote_name;
664 if (pushremote_name) {
665 if (explicit)
666 *explicit = 1;
667 return pushremote_name;
669 return remote_for_branch(branch, explicit);
672 static struct remote *remote_get_1(const char *name,
673 const char *(*get_default)(struct branch *, int *))
675 struct remote *ret;
676 int name_given = 0;
678 read_config();
680 if (name)
681 name_given = 1;
682 else
683 name = get_default(current_branch, &name_given);
685 ret = make_remote(name, 0);
686 if (valid_remote_nick(name) && have_git_dir()) {
687 if (!valid_remote(ret))
688 read_remotes_file(ret);
689 if (!valid_remote(ret))
690 read_branches_file(ret);
692 if (name_given && !valid_remote(ret))
693 add_url_alias(ret, name);
694 if (!valid_remote(ret))
695 return NULL;
696 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
697 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
698 return ret;
701 struct remote *remote_get(const char *name)
703 return remote_get_1(name, remote_for_branch);
706 struct remote *pushremote_get(const char *name)
708 return remote_get_1(name, pushremote_for_branch);
711 int remote_is_configured(struct remote *remote, int in_repo)
713 if (!remote)
714 return 0;
715 if (in_repo)
716 return remote->configured_in_repo;
717 return !!remote->origin;
720 int for_each_remote(each_remote_fn fn, void *priv)
722 int i, result = 0;
723 read_config();
724 for (i = 0; i < remotes_nr && !result; i++) {
725 struct remote *r = remotes[i];
726 if (!r)
727 continue;
728 if (!r->fetch)
729 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
730 r->fetch_refspec);
731 if (!r->push)
732 r->push = parse_push_refspec(r->push_refspec_nr,
733 r->push_refspec);
734 result = fn(r, priv);
736 return result;
739 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
741 if (strcmp(ref1->name, ref2->name)) {
742 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
743 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
744 die(_("Cannot fetch both %s and %s to %s"),
745 ref1->name, ref2->name, ref2->peer_ref->name);
746 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
747 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
748 warning(_("%s usually tracks %s, not %s"),
749 ref2->peer_ref->name, ref2->name, ref1->name);
750 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
751 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
752 die(_("%s tracks both %s and %s"),
753 ref2->peer_ref->name, ref1->name, ref2->name);
754 } else {
756 * This last possibility doesn't occur because
757 * FETCH_HEAD_IGNORE entries always appear at
758 * the end of the list.
760 die(_("Internal error"));
763 free(ref2->peer_ref);
764 free(ref2);
767 struct ref *ref_remove_duplicates(struct ref *ref_map)
769 struct string_list refs = STRING_LIST_INIT_NODUP;
770 struct ref *retval = NULL;
771 struct ref **p = &retval;
773 while (ref_map) {
774 struct ref *ref = ref_map;
776 ref_map = ref_map->next;
777 ref->next = NULL;
779 if (!ref->peer_ref) {
780 *p = ref;
781 p = &ref->next;
782 } else {
783 struct string_list_item *item =
784 string_list_insert(&refs, ref->peer_ref->name);
786 if (item->util) {
787 /* Entry already existed */
788 handle_duplicate((struct ref *)item->util, ref);
789 } else {
790 *p = ref;
791 p = &ref->next;
792 item->util = ref;
797 string_list_clear(&refs, 0);
798 return retval;
801 int remote_has_url(struct remote *remote, const char *url)
803 int i;
804 for (i = 0; i < remote->url_nr; i++) {
805 if (!strcmp(remote->url[i], url))
806 return 1;
808 return 0;
811 static int match_name_with_pattern(const char *key, const char *name,
812 const char *value, char **result)
814 const char *kstar = strchr(key, '*');
815 size_t klen;
816 size_t ksuffixlen;
817 size_t namelen;
818 int ret;
819 if (!kstar)
820 die("Key '%s' of pattern had no '*'", key);
821 klen = kstar - key;
822 ksuffixlen = strlen(kstar + 1);
823 namelen = strlen(name);
824 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
825 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
826 if (ret && value) {
827 struct strbuf sb = STRBUF_INIT;
828 const char *vstar = strchr(value, '*');
829 if (!vstar)
830 die("Value '%s' of pattern has no '*'", value);
831 strbuf_add(&sb, value, vstar - value);
832 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
833 strbuf_addstr(&sb, vstar + 1);
834 *result = strbuf_detach(&sb, NULL);
836 return ret;
839 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
841 int i;
842 int find_src = !query->src;
844 if (find_src && !query->dst)
845 error("query_refspecs_multiple: need either src or dst");
847 for (i = 0; i < ref_count; i++) {
848 struct refspec *refspec = &refs[i];
849 const char *key = find_src ? refspec->dst : refspec->src;
850 const char *value = find_src ? refspec->src : refspec->dst;
851 const char *needle = find_src ? query->dst : query->src;
852 char **result = find_src ? &query->src : &query->dst;
854 if (!refspec->dst)
855 continue;
856 if (refspec->pattern) {
857 if (match_name_with_pattern(key, needle, value, result))
858 string_list_append_nodup(results, *result);
859 } else if (!strcmp(needle, key)) {
860 string_list_append(results, value);
865 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
867 int i;
868 int find_src = !query->src;
869 const char *needle = find_src ? query->dst : query->src;
870 char **result = find_src ? &query->src : &query->dst;
872 if (find_src && !query->dst)
873 return error("query_refspecs: need either src or dst");
875 for (i = 0; i < ref_count; i++) {
876 struct refspec *refspec = &refs[i];
877 const char *key = find_src ? refspec->dst : refspec->src;
878 const char *value = find_src ? refspec->src : refspec->dst;
880 if (!refspec->dst)
881 continue;
882 if (refspec->pattern) {
883 if (match_name_with_pattern(key, needle, value, result)) {
884 query->force = refspec->force;
885 return 0;
887 } else if (!strcmp(needle, key)) {
888 *result = xstrdup(value);
889 query->force = refspec->force;
890 return 0;
893 return -1;
896 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
897 const char *name)
899 struct refspec query;
901 memset(&query, 0, sizeof(struct refspec));
902 query.src = (char *)name;
904 if (query_refspecs(refspecs, nr_refspec, &query))
905 return NULL;
907 return query.dst;
910 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
912 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
915 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
916 const char *name)
918 size_t len = strlen(name);
919 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
920 memcpy(ref->name, prefix, prefixlen);
921 memcpy(ref->name + prefixlen, name, len);
922 return ref;
925 struct ref *alloc_ref(const char *name)
927 return alloc_ref_with_prefix("", 0, name);
930 struct ref *copy_ref(const struct ref *ref)
932 struct ref *cpy;
933 size_t len;
934 if (!ref)
935 return NULL;
936 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
937 cpy = xmalloc(len);
938 memcpy(cpy, ref, len);
939 cpy->next = NULL;
940 cpy->symref = xstrdup_or_null(ref->symref);
941 cpy->remote_status = xstrdup_or_null(ref->remote_status);
942 cpy->peer_ref = copy_ref(ref->peer_ref);
943 return cpy;
946 struct ref *copy_ref_list(const struct ref *ref)
948 struct ref *ret = NULL;
949 struct ref **tail = &ret;
950 while (ref) {
951 *tail = copy_ref(ref);
952 ref = ref->next;
953 tail = &((*tail)->next);
955 return ret;
958 static void free_ref(struct ref *ref)
960 if (!ref)
961 return;
962 free_ref(ref->peer_ref);
963 free(ref->remote_status);
964 free(ref->symref);
965 free(ref);
968 void free_refs(struct ref *ref)
970 struct ref *next;
971 while (ref) {
972 next = ref->next;
973 free_ref(ref);
974 ref = next;
978 int ref_compare_name(const void *va, const void *vb)
980 const struct ref *a = va, *b = vb;
981 return strcmp(a->name, b->name);
984 static void *ref_list_get_next(const void *a)
986 return ((const struct ref *)a)->next;
989 static void ref_list_set_next(void *a, void *next)
991 ((struct ref *)a)->next = next;
994 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
996 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
999 int count_refspec_match(const char *pattern,
1000 struct ref *refs,
1001 struct ref **matched_ref)
1003 int patlen = strlen(pattern);
1004 struct ref *matched_weak = NULL;
1005 struct ref *matched = NULL;
1006 int weak_match = 0;
1007 int match = 0;
1009 for (weak_match = match = 0; refs; refs = refs->next) {
1010 char *name = refs->name;
1011 int namelen = strlen(name);
1013 if (!refname_match(pattern, name))
1014 continue;
1016 /* A match is "weak" if it is with refs outside
1017 * heads or tags, and did not specify the pattern
1018 * in full (e.g. "refs/remotes/origin/master") or at
1019 * least from the toplevel (e.g. "remotes/origin/master");
1020 * otherwise "git push $URL master" would result in
1021 * ambiguity between remotes/origin/master and heads/master
1022 * at the remote site.
1024 if (namelen != patlen &&
1025 patlen != namelen - 5 &&
1026 !starts_with(name, "refs/heads/") &&
1027 !starts_with(name, "refs/tags/")) {
1028 /* We want to catch the case where only weak
1029 * matches are found and there are multiple
1030 * matches, and where more than one strong
1031 * matches are found, as ambiguous. One
1032 * strong match with zero or more weak matches
1033 * are acceptable as a unique match.
1035 matched_weak = refs;
1036 weak_match++;
1038 else {
1039 matched = refs;
1040 match++;
1043 if (!matched) {
1044 if (matched_ref)
1045 *matched_ref = matched_weak;
1046 return weak_match;
1048 else {
1049 if (matched_ref)
1050 *matched_ref = matched;
1051 return match;
1055 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1057 **tail = ref;
1058 while (ref->next)
1059 ref = ref->next;
1060 *tail = &ref->next;
1063 static struct ref *alloc_delete_ref(void)
1065 struct ref *ref = alloc_ref("(delete)");
1066 oidclr(&ref->new_oid);
1067 return ref;
1070 static int try_explicit_object_name(const char *name,
1071 struct ref **match)
1073 struct object_id oid;
1075 if (!*name) {
1076 if (match)
1077 *match = alloc_delete_ref();
1078 return 0;
1081 if (get_sha1(name, oid.hash))
1082 return -1;
1084 if (match) {
1085 *match = alloc_ref(name);
1086 oidcpy(&(*match)->new_oid, &oid);
1088 return 0;
1091 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1093 struct ref *ret = alloc_ref(name);
1094 tail_link_ref(ret, tail);
1095 return ret;
1098 static char *guess_ref(const char *name, struct ref *peer)
1100 struct strbuf buf = STRBUF_INIT;
1101 struct object_id oid;
1103 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1104 oid.hash, NULL);
1105 if (!r)
1106 return NULL;
1108 if (starts_with(r, "refs/heads/"))
1109 strbuf_addstr(&buf, "refs/heads/");
1110 else if (starts_with(r, "refs/tags/"))
1111 strbuf_addstr(&buf, "refs/tags/");
1112 else
1113 return NULL;
1115 strbuf_addstr(&buf, name);
1116 return strbuf_detach(&buf, NULL);
1119 static int match_explicit_lhs(struct ref *src,
1120 struct refspec *rs,
1121 struct ref **match,
1122 int *allocated_match)
1124 switch (count_refspec_match(rs->src, src, match)) {
1125 case 1:
1126 if (allocated_match)
1127 *allocated_match = 0;
1128 return 0;
1129 case 0:
1130 /* The source could be in the get_sha1() format
1131 * not a reference name. :refs/other is a
1132 * way to delete 'other' ref at the remote end.
1134 if (try_explicit_object_name(rs->src, match) < 0)
1135 return error("src refspec %s does not match any.", rs->src);
1136 if (allocated_match)
1137 *allocated_match = 1;
1138 return 0;
1139 default:
1140 return error("src refspec %s matches more than one.", rs->src);
1144 static int match_explicit(struct ref *src, struct ref *dst,
1145 struct ref ***dst_tail,
1146 struct refspec *rs)
1148 struct ref *matched_src, *matched_dst;
1149 int allocated_src;
1151 const char *dst_value = rs->dst;
1152 char *dst_guess;
1154 if (rs->pattern || rs->matching)
1155 return 0;
1157 matched_src = matched_dst = NULL;
1158 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1159 return -1;
1161 if (!dst_value) {
1162 struct object_id oid;
1163 int flag;
1165 dst_value = resolve_ref_unsafe(matched_src->name,
1166 RESOLVE_REF_READING,
1167 oid.hash, &flag);
1168 if (!dst_value ||
1169 ((flag & REF_ISSYMREF) &&
1170 !starts_with(dst_value, "refs/heads/")))
1171 die("%s cannot be resolved to branch.",
1172 matched_src->name);
1175 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1176 case 1:
1177 break;
1178 case 0:
1179 if (starts_with(dst_value, "refs/"))
1180 matched_dst = make_linked_ref(dst_value, dst_tail);
1181 else if (is_null_oid(&matched_src->new_oid))
1182 error("unable to delete '%s': remote ref does not exist",
1183 dst_value);
1184 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1185 matched_dst = make_linked_ref(dst_guess, dst_tail);
1186 free(dst_guess);
1187 } else
1188 error("unable to push to unqualified destination: %s\n"
1189 "The destination refspec neither matches an "
1190 "existing ref on the remote nor\n"
1191 "begins with refs/, and we are unable to "
1192 "guess a prefix based on the source ref.",
1193 dst_value);
1194 break;
1195 default:
1196 matched_dst = NULL;
1197 error("dst refspec %s matches more than one.",
1198 dst_value);
1199 break;
1201 if (!matched_dst)
1202 return -1;
1203 if (matched_dst->peer_ref)
1204 return error("dst ref %s receives from more than one src.",
1205 matched_dst->name);
1206 else {
1207 matched_dst->peer_ref = allocated_src ?
1208 matched_src :
1209 copy_ref(matched_src);
1210 matched_dst->force = rs->force;
1212 return 0;
1215 static int match_explicit_refs(struct ref *src, struct ref *dst,
1216 struct ref ***dst_tail, struct refspec *rs,
1217 int rs_nr)
1219 int i, errs;
1220 for (i = errs = 0; i < rs_nr; i++)
1221 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1222 return errs;
1225 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1226 int send_mirror, int direction, const struct refspec **ret_pat)
1228 const struct refspec *pat;
1229 char *name;
1230 int i;
1231 int matching_refs = -1;
1232 for (i = 0; i < rs_nr; i++) {
1233 if (rs[i].matching &&
1234 (matching_refs == -1 || rs[i].force)) {
1235 matching_refs = i;
1236 continue;
1239 if (rs[i].pattern) {
1240 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1241 int match;
1242 if (direction == FROM_SRC)
1243 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1244 else
1245 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1246 if (match) {
1247 matching_refs = i;
1248 break;
1252 if (matching_refs == -1)
1253 return NULL;
1255 pat = rs + matching_refs;
1256 if (pat->matching) {
1258 * "matching refs"; traditionally we pushed everything
1259 * including refs outside refs/heads/ hierarchy, but
1260 * that does not make much sense these days.
1262 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1263 return NULL;
1264 name = xstrdup(ref->name);
1266 if (ret_pat)
1267 *ret_pat = pat;
1268 return name;
1271 static struct ref **tail_ref(struct ref **head)
1273 struct ref **tail = head;
1274 while (*tail)
1275 tail = &((*tail)->next);
1276 return tail;
1279 struct tips {
1280 struct commit **tip;
1281 int nr, alloc;
1284 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1286 struct commit *commit;
1288 if (is_null_oid(oid))
1289 return;
1290 commit = lookup_commit_reference_gently(oid, 1);
1291 if (!commit || (commit->object.flags & TMP_MARK))
1292 return;
1293 commit->object.flags |= TMP_MARK;
1294 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1295 tips->tip[tips->nr++] = commit;
1298 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1300 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1301 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1302 struct string_list_item *item;
1303 struct ref *ref;
1304 struct tips sent_tips;
1307 * Collect everything we know they would have at the end of
1308 * this push, and collect all tags they have.
1310 memset(&sent_tips, 0, sizeof(sent_tips));
1311 for (ref = *dst; ref; ref = ref->next) {
1312 if (ref->peer_ref &&
1313 !is_null_oid(&ref->peer_ref->new_oid))
1314 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1315 else
1316 add_to_tips(&sent_tips, &ref->old_oid);
1317 if (starts_with(ref->name, "refs/tags/"))
1318 string_list_append(&dst_tag, ref->name);
1320 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1322 string_list_sort(&dst_tag);
1324 /* Collect tags they do not have. */
1325 for (ref = src; ref; ref = ref->next) {
1326 if (!starts_with(ref->name, "refs/tags/"))
1327 continue; /* not a tag */
1328 if (string_list_has_string(&dst_tag, ref->name))
1329 continue; /* they already have it */
1330 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1331 continue; /* be conservative */
1332 item = string_list_append(&src_tag, ref->name);
1333 item->util = ref;
1335 string_list_clear(&dst_tag, 0);
1338 * At this point, src_tag lists tags that are missing from
1339 * dst, and sent_tips lists the tips we are pushing or those
1340 * that we know they already have. An element in the src_tag
1341 * that is an ancestor of any of the sent_tips needs to be
1342 * sent to the other side.
1344 if (sent_tips.nr) {
1345 for_each_string_list_item(item, &src_tag) {
1346 struct ref *ref = item->util;
1347 struct ref *dst_ref;
1348 struct commit *commit;
1350 if (is_null_oid(&ref->new_oid))
1351 continue;
1352 commit = lookup_commit_reference_gently(&ref->new_oid,
1354 if (!commit)
1355 /* not pushing a commit, which is not an error */
1356 continue;
1359 * Is this tag, which they do not have, reachable from
1360 * any of the commits we are sending?
1362 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1363 continue;
1365 /* Add it in */
1366 dst_ref = make_linked_ref(ref->name, dst_tail);
1367 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1368 dst_ref->peer_ref = copy_ref(ref);
1371 string_list_clear(&src_tag, 0);
1372 free(sent_tips.tip);
1375 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1377 for ( ; list; list = list->next)
1378 if (!strcmp(list->name, name))
1379 return (struct ref *)list;
1380 return NULL;
1383 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1385 for ( ; ref; ref = ref->next)
1386 string_list_append_nodup(ref_index, ref->name)->util = ref;
1388 string_list_sort(ref_index);
1392 * Given only the set of local refs, sanity-check the set of push
1393 * refspecs. We can't catch all errors that match_push_refs would,
1394 * but we can catch some errors early before even talking to the
1395 * remote side.
1397 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1399 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1400 int ret = 0;
1401 int i;
1403 for (i = 0; i < nr_refspec; i++) {
1404 struct refspec *rs = refspec + i;
1406 if (rs->pattern || rs->matching)
1407 continue;
1409 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1412 free_refspec(nr_refspec, refspec);
1413 return ret;
1417 * Given the set of refs the local repository has, the set of refs the
1418 * remote repository has, and the refspec used for push, determine
1419 * what remote refs we will update and with what value by setting
1420 * peer_ref (which object is being pushed) and force (if the push is
1421 * forced) in elements of "dst". The function may add new elements to
1422 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1424 int match_push_refs(struct ref *src, struct ref **dst,
1425 int nr_refspec, const char **refspec, int flags)
1427 struct refspec *rs;
1428 int send_all = flags & MATCH_REFS_ALL;
1429 int send_mirror = flags & MATCH_REFS_MIRROR;
1430 int send_prune = flags & MATCH_REFS_PRUNE;
1431 int errs;
1432 static const char *default_refspec[] = { ":", NULL };
1433 struct ref *ref, **dst_tail = tail_ref(dst);
1434 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1436 if (!nr_refspec) {
1437 nr_refspec = 1;
1438 refspec = default_refspec;
1440 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1441 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1443 /* pick the remainder */
1444 for (ref = src; ref; ref = ref->next) {
1445 struct string_list_item *dst_item;
1446 struct ref *dst_peer;
1447 const struct refspec *pat = NULL;
1448 char *dst_name;
1450 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1451 if (!dst_name)
1452 continue;
1454 if (!dst_ref_index.nr)
1455 prepare_ref_index(&dst_ref_index, *dst);
1457 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1458 dst_peer = dst_item ? dst_item->util : NULL;
1459 if (dst_peer) {
1460 if (dst_peer->peer_ref)
1461 /* We're already sending something to this ref. */
1462 goto free_name;
1463 } else {
1464 if (pat->matching && !(send_all || send_mirror))
1466 * Remote doesn't have it, and we have no
1467 * explicit pattern, and we don't have
1468 * --all or --mirror.
1470 goto free_name;
1472 /* Create a new one and link it */
1473 dst_peer = make_linked_ref(dst_name, &dst_tail);
1474 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1475 string_list_insert(&dst_ref_index,
1476 dst_peer->name)->util = dst_peer;
1478 dst_peer->peer_ref = copy_ref(ref);
1479 dst_peer->force = pat->force;
1480 free_name:
1481 free(dst_name);
1484 string_list_clear(&dst_ref_index, 0);
1486 if (flags & MATCH_REFS_FOLLOW_TAGS)
1487 add_missing_tags(src, dst, &dst_tail);
1489 if (send_prune) {
1490 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1491 /* check for missing refs on the remote */
1492 for (ref = *dst; ref; ref = ref->next) {
1493 char *src_name;
1495 if (ref->peer_ref)
1496 /* We're already sending something to this ref. */
1497 continue;
1499 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1500 if (src_name) {
1501 if (!src_ref_index.nr)
1502 prepare_ref_index(&src_ref_index, src);
1503 if (!string_list_has_string(&src_ref_index,
1504 src_name))
1505 ref->peer_ref = alloc_delete_ref();
1506 free(src_name);
1509 string_list_clear(&src_ref_index, 0);
1511 if (errs)
1512 return -1;
1513 return 0;
1516 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1517 int force_update)
1519 struct ref *ref;
1521 for (ref = remote_refs; ref; ref = ref->next) {
1522 int force_ref_update = ref->force || force_update;
1523 int reject_reason = 0;
1525 if (ref->peer_ref)
1526 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1527 else if (!send_mirror)
1528 continue;
1530 ref->deletion = is_null_oid(&ref->new_oid);
1531 if (!ref->deletion &&
1532 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1533 ref->status = REF_STATUS_UPTODATE;
1534 continue;
1538 * If the remote ref has moved and is now different
1539 * from what we expect, reject any push.
1541 * It also is an error if the user told us to check
1542 * with the remote-tracking branch to find the value
1543 * to expect, but we did not have such a tracking
1544 * branch.
1546 if (ref->expect_old_sha1) {
1547 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1548 reject_reason = REF_STATUS_REJECT_STALE;
1549 else
1550 /* If the ref isn't stale then force the update. */
1551 force_ref_update = 1;
1555 * If the update isn't already rejected then check
1556 * the usual "must fast-forward" rules.
1558 * Decide whether an individual refspec A:B can be
1559 * pushed. The push will succeed if any of the
1560 * following are true:
1562 * (1) the remote reference B does not exist
1564 * (2) the remote reference B is being removed (i.e.,
1565 * pushing :B where no source is specified)
1567 * (3) the destination is not under refs/tags/, and
1568 * if the old and new value is a commit, the new
1569 * is a descendant of the old.
1571 * (4) it is forced using the +A:B notation, or by
1572 * passing the --force argument
1575 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1576 if (starts_with(ref->name, "refs/tags/"))
1577 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1578 else if (!has_object_file(&ref->old_oid))
1579 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1580 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1581 !lookup_commit_reference_gently(&ref->new_oid, 1))
1582 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1583 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1584 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1588 * "--force" will defeat any rejection implemented
1589 * by the rules above.
1591 if (!force_ref_update)
1592 ref->status = reject_reason;
1593 else if (reject_reason)
1594 ref->forced_update = 1;
1598 static void set_merge(struct branch *ret)
1600 struct remote *remote;
1601 char *ref;
1602 struct object_id oid;
1603 int i;
1605 if (!ret)
1606 return; /* no branch */
1607 if (ret->merge)
1608 return; /* already run */
1609 if (!ret->remote_name || !ret->merge_nr) {
1611 * no merge config; let's make sure we don't confuse callers
1612 * with a non-zero merge_nr but a NULL merge
1614 ret->merge_nr = 0;
1615 return;
1618 remote = remote_get(ret->remote_name);
1620 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1621 for (i = 0; i < ret->merge_nr; i++) {
1622 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1623 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1624 if (!remote_find_tracking(remote, ret->merge[i]) ||
1625 strcmp(ret->remote_name, "."))
1626 continue;
1627 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1628 oid.hash, &ref) == 1)
1629 ret->merge[i]->dst = ref;
1630 else
1631 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1635 struct branch *branch_get(const char *name)
1637 struct branch *ret;
1639 read_config();
1640 if (!name || !*name || !strcmp(name, "HEAD"))
1641 ret = current_branch;
1642 else
1643 ret = make_branch(name, 0);
1644 set_merge(ret);
1645 return ret;
1648 int branch_has_merge_config(struct branch *branch)
1650 return branch && !!branch->merge;
1653 int branch_merge_matches(struct branch *branch,
1654 int i,
1655 const char *refname)
1657 if (!branch || i < 0 || i >= branch->merge_nr)
1658 return 0;
1659 return refname_match(branch->merge[i]->src, refname);
1662 __attribute__((format (printf,2,3)))
1663 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1665 if (err) {
1666 va_list ap;
1667 va_start(ap, fmt);
1668 strbuf_vaddf(err, fmt, ap);
1669 va_end(ap);
1671 return NULL;
1674 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1676 if (!branch)
1677 return error_buf(err, _("HEAD does not point to a branch"));
1679 if (!branch->merge || !branch->merge[0]) {
1681 * no merge config; is it because the user didn't define any,
1682 * or because it is not a real branch, and get_branch
1683 * auto-vivified it?
1685 if (!ref_exists(branch->refname))
1686 return error_buf(err, _("no such branch: '%s'"),
1687 branch->name);
1688 return error_buf(err,
1689 _("no upstream configured for branch '%s'"),
1690 branch->name);
1693 if (!branch->merge[0]->dst)
1694 return error_buf(err,
1695 _("upstream branch '%s' not stored as a remote-tracking branch"),
1696 branch->merge[0]->src);
1698 return branch->merge[0]->dst;
1701 static const char *tracking_for_push_dest(struct remote *remote,
1702 const char *refname,
1703 struct strbuf *err)
1705 char *ret;
1707 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1708 if (!ret)
1709 return error_buf(err,
1710 _("push destination '%s' on remote '%s' has no local tracking branch"),
1711 refname, remote->name);
1712 return ret;
1715 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1717 struct remote *remote;
1719 remote = remote_get(pushremote_for_branch(branch, NULL));
1720 if (!remote)
1721 return error_buf(err,
1722 _("branch '%s' has no remote for pushing"),
1723 branch->name);
1725 if (remote->push_refspec_nr) {
1726 char *dst;
1727 const char *ret;
1729 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1730 branch->refname);
1731 if (!dst)
1732 return error_buf(err,
1733 _("push refspecs for '%s' do not include '%s'"),
1734 remote->name, branch->name);
1736 ret = tracking_for_push_dest(remote, dst, err);
1737 free(dst);
1738 return ret;
1741 if (remote->mirror)
1742 return tracking_for_push_dest(remote, branch->refname, err);
1744 switch (push_default) {
1745 case PUSH_DEFAULT_NOTHING:
1746 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1748 case PUSH_DEFAULT_MATCHING:
1749 case PUSH_DEFAULT_CURRENT:
1750 return tracking_for_push_dest(remote, branch->refname, err);
1752 case PUSH_DEFAULT_UPSTREAM:
1753 return branch_get_upstream(branch, err);
1755 case PUSH_DEFAULT_UNSPECIFIED:
1756 case PUSH_DEFAULT_SIMPLE:
1758 const char *up, *cur;
1760 up = branch_get_upstream(branch, err);
1761 if (!up)
1762 return NULL;
1763 cur = tracking_for_push_dest(remote, branch->refname, err);
1764 if (!cur)
1765 return NULL;
1766 if (strcmp(cur, up))
1767 return error_buf(err,
1768 _("cannot resolve 'simple' push to a single destination"));
1769 return cur;
1773 die("BUG: unhandled push situation");
1776 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1778 if (!branch)
1779 return error_buf(err, _("HEAD does not point to a branch"));
1781 if (!branch->push_tracking_ref)
1782 branch->push_tracking_ref = branch_get_push_1(branch, err);
1783 return branch->push_tracking_ref;
1786 static int ignore_symref_update(const char *refname)
1788 struct object_id oid;
1789 int flag;
1791 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1792 return 0; /* non-existing refs are OK */
1793 return (flag & REF_ISSYMREF);
1797 * Create and return a list of (struct ref) consisting of copies of
1798 * each remote_ref that matches refspec. refspec must be a pattern.
1799 * Fill in the copies' peer_ref to describe the local tracking refs to
1800 * which they map. Omit any references that would map to an existing
1801 * local symbolic ref.
1803 static struct ref *get_expanded_map(const struct ref *remote_refs,
1804 const struct refspec *refspec)
1806 const struct ref *ref;
1807 struct ref *ret = NULL;
1808 struct ref **tail = &ret;
1810 for (ref = remote_refs; ref; ref = ref->next) {
1811 char *expn_name = NULL;
1813 if (strchr(ref->name, '^'))
1814 continue; /* a dereference item */
1815 if (match_name_with_pattern(refspec->src, ref->name,
1816 refspec->dst, &expn_name) &&
1817 !ignore_symref_update(expn_name)) {
1818 struct ref *cpy = copy_ref(ref);
1820 cpy->peer_ref = alloc_ref(expn_name);
1821 if (refspec->force)
1822 cpy->peer_ref->force = 1;
1823 *tail = cpy;
1824 tail = &cpy->next;
1826 free(expn_name);
1829 return ret;
1832 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1834 const struct ref *ref;
1835 for (ref = refs; ref; ref = ref->next) {
1836 if (refname_match(name, ref->name))
1837 return ref;
1839 return NULL;
1842 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1844 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1846 if (!ref)
1847 return NULL;
1849 return copy_ref(ref);
1852 static struct ref *get_local_ref(const char *name)
1854 if (!name || name[0] == '\0')
1855 return NULL;
1857 if (starts_with(name, "refs/"))
1858 return alloc_ref(name);
1860 if (starts_with(name, "heads/") ||
1861 starts_with(name, "tags/") ||
1862 starts_with(name, "remotes/"))
1863 return alloc_ref_with_prefix("refs/", 5, name);
1865 return alloc_ref_with_prefix("refs/heads/", 11, name);
1868 int get_fetch_map(const struct ref *remote_refs,
1869 const struct refspec *refspec,
1870 struct ref ***tail,
1871 int missing_ok)
1873 struct ref *ref_map, **rmp;
1875 if (refspec->pattern) {
1876 ref_map = get_expanded_map(remote_refs, refspec);
1877 } else {
1878 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1880 if (refspec->exact_sha1) {
1881 ref_map = alloc_ref(name);
1882 get_oid_hex(name, &ref_map->old_oid);
1883 } else {
1884 ref_map = get_remote_ref(remote_refs, name);
1886 if (!missing_ok && !ref_map)
1887 die("Couldn't find remote ref %s", name);
1888 if (ref_map) {
1889 ref_map->peer_ref = get_local_ref(refspec->dst);
1890 if (ref_map->peer_ref && refspec->force)
1891 ref_map->peer_ref->force = 1;
1895 for (rmp = &ref_map; *rmp; ) {
1896 if ((*rmp)->peer_ref) {
1897 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1898 check_refname_format((*rmp)->peer_ref->name, 0)) {
1899 struct ref *ignore = *rmp;
1900 error("* Ignoring funny ref '%s' locally",
1901 (*rmp)->peer_ref->name);
1902 *rmp = (*rmp)->next;
1903 free(ignore->peer_ref);
1904 free(ignore);
1905 continue;
1908 rmp = &((*rmp)->next);
1911 if (ref_map)
1912 tail_link_ref(ref_map, tail);
1914 return 0;
1917 int resolve_remote_symref(struct ref *ref, struct ref *list)
1919 if (!ref->symref)
1920 return 0;
1921 for (; list; list = list->next)
1922 if (!strcmp(ref->symref, list->name)) {
1923 oidcpy(&ref->old_oid, &list->old_oid);
1924 return 0;
1926 return 1;
1929 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1931 while (list) {
1932 struct commit *commit = pop_commit(&list);
1933 commit->object.flags &= ~mark;
1937 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1939 struct object *o;
1940 struct commit *old, *new;
1941 struct commit_list *list, *used;
1942 int found = 0;
1945 * Both new and old must be commit-ish and new is descendant of
1946 * old. Otherwise we require --force.
1948 o = deref_tag(parse_object(old_oid), NULL, 0);
1949 if (!o || o->type != OBJ_COMMIT)
1950 return 0;
1951 old = (struct commit *) o;
1953 o = deref_tag(parse_object(new_oid), NULL, 0);
1954 if (!o || o->type != OBJ_COMMIT)
1955 return 0;
1956 new = (struct commit *) o;
1958 if (parse_commit(new) < 0)
1959 return 0;
1961 used = list = NULL;
1962 commit_list_insert(new, &list);
1963 while (list) {
1964 new = pop_most_recent_commit(&list, TMP_MARK);
1965 commit_list_insert(new, &used);
1966 if (new == old) {
1967 found = 1;
1968 break;
1971 unmark_and_free(list, TMP_MARK);
1972 unmark_and_free(used, TMP_MARK);
1973 return found;
1977 * Compare a branch with its upstream, and save their differences (number
1978 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1979 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1980 * is not itself NULL.
1982 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1983 * upstream defined, or ref does not exist), 0 otherwise.
1985 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1986 const char **upstream_name)
1988 struct object_id oid;
1989 struct commit *ours, *theirs;
1990 struct rev_info revs;
1991 const char *base;
1992 struct argv_array argv = ARGV_ARRAY_INIT;
1994 /* Cannot stat unless we are marked to build on top of somebody else. */
1995 base = branch_get_upstream(branch, NULL);
1996 if (upstream_name)
1997 *upstream_name = base;
1998 if (!base)
1999 return -1;
2001 /* Cannot stat if what we used to build on no longer exists */
2002 if (read_ref(base, oid.hash))
2003 return -1;
2004 theirs = lookup_commit_reference(&oid);
2005 if (!theirs)
2006 return -1;
2008 if (read_ref(branch->refname, oid.hash))
2009 return -1;
2010 ours = lookup_commit_reference(&oid);
2011 if (!ours)
2012 return -1;
2014 /* are we the same? */
2015 if (theirs == ours) {
2016 *num_theirs = *num_ours = 0;
2017 return 0;
2020 /* Run "rev-list --left-right ours...theirs" internally... */
2021 argv_array_push(&argv, ""); /* ignored */
2022 argv_array_push(&argv, "--left-right");
2023 argv_array_pushf(&argv, "%s...%s",
2024 oid_to_hex(&ours->object.oid),
2025 oid_to_hex(&theirs->object.oid));
2026 argv_array_push(&argv, "--");
2028 init_revisions(&revs, NULL);
2029 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2030 if (prepare_revision_walk(&revs))
2031 die("revision walk setup failed");
2033 /* ... and count the commits on each side. */
2034 *num_ours = 0;
2035 *num_theirs = 0;
2036 while (1) {
2037 struct commit *c = get_revision(&revs);
2038 if (!c)
2039 break;
2040 if (c->object.flags & SYMMETRIC_LEFT)
2041 (*num_ours)++;
2042 else
2043 (*num_theirs)++;
2046 /* clear object flags smudged by the above traversal */
2047 clear_commit_marks(ours, ALL_REV_FLAGS);
2048 clear_commit_marks(theirs, ALL_REV_FLAGS);
2050 argv_array_clear(&argv);
2051 return 0;
2055 * Return true when there is anything to report, otherwise false.
2057 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2059 int ours, theirs;
2060 const char *full_base;
2061 char *base;
2062 int upstream_is_gone = 0;
2064 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2065 if (!full_base)
2066 return 0;
2067 upstream_is_gone = 1;
2070 base = shorten_unambiguous_ref(full_base, 0);
2071 if (upstream_is_gone) {
2072 strbuf_addf(sb,
2073 _("Your branch is based on '%s', but the upstream is gone.\n"),
2074 base);
2075 if (advice_status_hints)
2076 strbuf_addstr(sb,
2077 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2078 } else if (!ours && !theirs) {
2079 strbuf_addf(sb,
2080 _("Your branch is up-to-date with '%s'.\n"),
2081 base);
2082 } else if (!theirs) {
2083 strbuf_addf(sb,
2084 Q_("Your branch is ahead of '%s' by %d commit.\n",
2085 "Your branch is ahead of '%s' by %d commits.\n",
2086 ours),
2087 base, ours);
2088 if (advice_status_hints)
2089 strbuf_addstr(sb,
2090 _(" (use \"git push\" to publish your local commits)\n"));
2091 } else if (!ours) {
2092 strbuf_addf(sb,
2093 Q_("Your branch is behind '%s' by %d commit, "
2094 "and can be fast-forwarded.\n",
2095 "Your branch is behind '%s' by %d commits, "
2096 "and can be fast-forwarded.\n",
2097 theirs),
2098 base, theirs);
2099 if (advice_status_hints)
2100 strbuf_addstr(sb,
2101 _(" (use \"git pull\" to update your local branch)\n"));
2102 } else {
2103 strbuf_addf(sb,
2104 Q_("Your branch and '%s' have diverged,\n"
2105 "and have %d and %d different commit each, "
2106 "respectively.\n",
2107 "Your branch and '%s' have diverged,\n"
2108 "and have %d and %d different commits each, "
2109 "respectively.\n",
2110 ours + theirs),
2111 base, ours, theirs);
2112 if (advice_status_hints)
2113 strbuf_addstr(sb,
2114 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2116 free(base);
2117 return 1;
2120 static int one_local_ref(const char *refname, const struct object_id *oid,
2121 int flag, void *cb_data)
2123 struct ref ***local_tail = cb_data;
2124 struct ref *ref;
2126 /* we already know it starts with refs/ to get here */
2127 if (check_refname_format(refname + 5, 0))
2128 return 0;
2130 ref = alloc_ref(refname);
2131 oidcpy(&ref->new_oid, oid);
2132 **local_tail = ref;
2133 *local_tail = &ref->next;
2134 return 0;
2137 struct ref *get_local_heads(void)
2139 struct ref *local_refs = NULL, **local_tail = &local_refs;
2141 for_each_ref(one_local_ref, &local_tail);
2142 return local_refs;
2145 struct ref *guess_remote_head(const struct ref *head,
2146 const struct ref *refs,
2147 int all)
2149 const struct ref *r;
2150 struct ref *list = NULL;
2151 struct ref **tail = &list;
2153 if (!head)
2154 return NULL;
2157 * Some transports support directly peeking at
2158 * where HEAD points; if that is the case, then
2159 * we don't have to guess.
2161 if (head->symref)
2162 return copy_ref(find_ref_by_name(refs, head->symref));
2164 /* If refs/heads/master could be right, it is. */
2165 if (!all) {
2166 r = find_ref_by_name(refs, "refs/heads/master");
2167 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2168 return copy_ref(r);
2171 /* Look for another ref that points there */
2172 for (r = refs; r; r = r->next) {
2173 if (r != head &&
2174 starts_with(r->name, "refs/heads/") &&
2175 !oidcmp(&r->old_oid, &head->old_oid)) {
2176 *tail = copy_ref(r);
2177 tail = &((*tail)->next);
2178 if (!all)
2179 break;
2183 return list;
2186 struct stale_heads_info {
2187 struct string_list *ref_names;
2188 struct ref **stale_refs_tail;
2189 struct refspec *refs;
2190 int ref_count;
2193 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2194 int flags, void *cb_data)
2196 struct stale_heads_info *info = cb_data;
2197 struct string_list matches = STRING_LIST_INIT_DUP;
2198 struct refspec query;
2199 int i, stale = 1;
2200 memset(&query, 0, sizeof(struct refspec));
2201 query.dst = (char *)refname;
2203 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2204 if (matches.nr == 0)
2205 goto clean_exit; /* No matches */
2208 * If we did find a suitable refspec and it's not a symref and
2209 * it's not in the list of refs that currently exist in that
2210 * remote, we consider it to be stale. In order to deal with
2211 * overlapping refspecs, we need to go over all of the
2212 * matching refs.
2214 if (flags & REF_ISSYMREF)
2215 goto clean_exit;
2217 for (i = 0; stale && i < matches.nr; i++)
2218 if (string_list_has_string(info->ref_names, matches.items[i].string))
2219 stale = 0;
2221 if (stale) {
2222 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2223 oidcpy(&ref->new_oid, oid);
2226 clean_exit:
2227 string_list_clear(&matches, 0);
2228 return 0;
2231 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2233 struct ref *ref, *stale_refs = NULL;
2234 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2235 struct stale_heads_info info;
2237 info.ref_names = &ref_names;
2238 info.stale_refs_tail = &stale_refs;
2239 info.refs = refs;
2240 info.ref_count = ref_count;
2241 for (ref = fetch_map; ref; ref = ref->next)
2242 string_list_append(&ref_names, ref->name);
2243 string_list_sort(&ref_names);
2244 for_each_ref(get_stale_heads_cb, &info);
2245 string_list_clear(&ref_names, 0);
2246 return stale_refs;
2250 * Compare-and-swap
2252 static void clear_cas_option(struct push_cas_option *cas)
2254 int i;
2256 for (i = 0; i < cas->nr; i++)
2257 free(cas->entry[i].refname);
2258 free(cas->entry);
2259 memset(cas, 0, sizeof(*cas));
2262 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2263 const char *refname,
2264 size_t refnamelen)
2266 struct push_cas *entry;
2267 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2268 entry = &cas->entry[cas->nr++];
2269 memset(entry, 0, sizeof(*entry));
2270 entry->refname = xmemdupz(refname, refnamelen);
2271 return entry;
2274 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2276 const char *colon;
2277 struct push_cas *entry;
2279 if (unset) {
2280 /* "--no-<option>" */
2281 clear_cas_option(cas);
2282 return 0;
2285 if (!arg) {
2286 /* just "--<option>" */
2287 cas->use_tracking_for_rest = 1;
2288 return 0;
2291 /* "--<option>=refname" or "--<option>=refname:value" */
2292 colon = strchrnul(arg, ':');
2293 entry = add_cas_entry(cas, arg, colon - arg);
2294 if (!*colon)
2295 entry->use_tracking = 1;
2296 else if (!colon[1])
2297 hashclr(entry->expect);
2298 else if (get_sha1(colon + 1, entry->expect))
2299 return error("cannot parse expected object name '%s'", colon + 1);
2300 return 0;
2303 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2305 return parse_push_cas_option(opt->value, arg, unset);
2308 int is_empty_cas(const struct push_cas_option *cas)
2310 return !cas->use_tracking_for_rest && !cas->nr;
2314 * Look at remote.fetch refspec and see if we have a remote
2315 * tracking branch for the refname there. Fill its current
2316 * value in sha1[].
2317 * If we cannot do so, return negative to signal an error.
2319 static int remote_tracking(struct remote *remote, const char *refname,
2320 struct object_id *oid)
2322 char *dst;
2324 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2325 if (!dst)
2326 return -1; /* no tracking ref for refname at remote */
2327 if (read_ref(dst, oid->hash))
2328 return -1; /* we know what the tracking ref is but we cannot read it */
2329 return 0;
2332 static void apply_cas(struct push_cas_option *cas,
2333 struct remote *remote,
2334 struct ref *ref)
2336 int i;
2338 /* Find an explicit --<option>=<name>[:<value>] entry */
2339 for (i = 0; i < cas->nr; i++) {
2340 struct push_cas *entry = &cas->entry[i];
2341 if (!refname_match(entry->refname, ref->name))
2342 continue;
2343 ref->expect_old_sha1 = 1;
2344 if (!entry->use_tracking)
2345 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2346 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2347 oidclr(&ref->old_oid_expect);
2348 return;
2351 /* Are we using "--<option>" to cover all? */
2352 if (!cas->use_tracking_for_rest)
2353 return;
2355 ref->expect_old_sha1 = 1;
2356 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2357 oidclr(&ref->old_oid_expect);
2360 void apply_push_cas(struct push_cas_option *cas,
2361 struct remote *remote,
2362 struct ref *remote_refs)
2364 struct ref *ref;
2365 for (ref = remote_refs; ref; ref = ref->next)
2366 apply_cas(cas, remote, ref);