6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
15 #include "commit-reach.h"
18 enum map_direction { FROM_SRC, FROM_DST };
20 struct counted_string {
27 struct counted_string *instead_of;
32 struct rewrite **rewrite;
37 static struct remote **remotes;
38 static int remotes_alloc;
39 static int remotes_nr;
40 static struct hashmap remotes_hash;
42 static struct branch **branches;
43 static int branches_alloc;
44 static int branches_nr;
46 static struct branch *current_branch;
47 static const char *pushremote_name;
49 static struct rewrites rewrites;
50 static struct rewrites rewrites_push;
52 static int valid_remote(const struct remote *remote)
54 return (!!remote->url) || (!!remote->foreign_vcs);
57 static const char *alias_url(const char *url, struct rewrites *r)
60 struct counted_string *longest;
65 for (i = 0; i < r->rewrite_nr; i++) {
68 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
69 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
71 longest->len < r->rewrite[i]->instead_of[j].len)) {
72 longest = &(r->rewrite[i]->instead_of[j]);
80 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
83 static void add_url(struct remote *remote, const char *url)
85 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
86 remote->url[remote->url_nr++] = url;
89 static void add_pushurl(struct remote *remote, const char *pushurl)
91 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
92 remote->pushurl[remote->pushurl_nr++] = pushurl;
95 static void add_pushurl_alias(struct remote *remote, const char *url)
97 const char *pushurl = alias_url(url, &rewrites_push);
99 add_pushurl(remote, pushurl);
102 static void add_url_alias(struct remote *remote, const char *url)
104 add_url(remote, alias_url(url, &rewrites));
105 add_pushurl_alias(remote, url);
108 struct remotes_hash_key {
113 static int remotes_hash_cmp(const void *unused_cmp_data,
114 const struct hashmap_entry *eptr,
115 const struct hashmap_entry *entry_or_key,
118 const struct remote *a, *b;
119 const struct remotes_hash_key *key = keydata;
121 a = container_of(eptr, const struct remote, ent);
122 b = container_of(entry_or_key, const struct remote, ent);
125 return strncmp(a->name, key->str, key->len) || a->name[key->len];
127 return strcmp(a->name, b->name);
130 static inline void init_remotes_hash(void)
132 if (!remotes_hash.cmpfn)
133 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
136 static struct remote *make_remote(const char *name, int len)
138 struct remote *ret, *replaced;
139 struct remotes_hash_key lookup;
140 struct hashmap_entry lookup_entry, *e;
148 hashmap_entry_init(&lookup_entry, memhash(name, len));
150 e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
152 return container_of(e, struct remote, ent);
154 ret = xcalloc(1, sizeof(struct remote));
155 ret->prune = -1; /* unspecified */
156 ret->prune_tags = -1; /* unspecified */
157 ret->name = xstrndup(name, len);
158 refspec_init(&ret->push, REFSPEC_PUSH);
159 refspec_init(&ret->fetch, REFSPEC_FETCH);
161 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
162 remotes[remotes_nr++] = ret;
164 hashmap_entry_init(&ret->ent, lookup_entry.hash);
165 replaced = hashmap_put_entry(&remotes_hash, ret, ent);
166 assert(replaced == NULL); /* no previous entry overwritten */
170 static void add_merge(struct branch *branch, const char *name)
172 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
173 branch->merge_alloc);
174 branch->merge_name[branch->merge_nr++] = name;
177 static struct branch *make_branch(const char *name, size_t len)
182 for (i = 0; i < branches_nr; i++) {
183 if (!strncmp(name, branches[i]->name, len) &&
184 !branches[i]->name[len])
188 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189 ret = xcalloc(1, sizeof(struct branch));
190 branches[branches_nr++] = ret;
191 ret->name = xstrndup(name, len);
192 ret->refname = xstrfmt("refs/heads/%s", ret->name);
197 static struct rewrite *make_rewrite(struct rewrites *r,
198 const char *base, size_t len)
203 for (i = 0; i < r->rewrite_nr; i++) {
204 if (len == r->rewrite[i]->baselen &&
205 !strncmp(base, r->rewrite[i]->base, len))
206 return r->rewrite[i];
209 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
210 ret = xcalloc(1, sizeof(struct rewrite));
211 r->rewrite[r->rewrite_nr++] = ret;
212 ret->base = xstrndup(base, len);
217 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
219 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
220 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
221 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
222 rewrite->instead_of_nr++;
225 static const char *skip_spaces(const char *s)
232 static void read_remotes_file(struct remote *remote)
234 struct strbuf buf = STRBUF_INIT;
235 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
239 remote->configured_in_repo = 1;
240 remote->origin = REMOTE_REMOTES;
241 while (strbuf_getline(&buf, f) != EOF) {
246 if (skip_prefix(buf.buf, "URL:", &v))
247 add_url_alias(remote, xstrdup(skip_spaces(v)));
248 else if (skip_prefix(buf.buf, "Push:", &v))
249 refspec_append(&remote->push, skip_spaces(v));
250 else if (skip_prefix(buf.buf, "Pull:", &v))
251 refspec_append(&remote->fetch, skip_spaces(v));
253 strbuf_release(&buf);
257 static void read_branches_file(struct remote *remote)
260 struct strbuf buf = STRBUF_INIT;
261 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
266 strbuf_getline_lf(&buf, f);
270 strbuf_release(&buf);
274 remote->configured_in_repo = 1;
275 remote->origin = REMOTE_BRANCHES;
278 * The branches file would have URL and optionally
279 * #branch specified. The default (or specified) branch is
280 * fetched and stored in the local branch matching the
283 frag = strchr(buf.buf, '#');
287 frag = (char *)git_default_branch_name(0);
289 add_url_alias(remote, strbuf_detach(&buf, NULL));
290 refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
294 * Cogito compatible push: push current HEAD to remote #branch
295 * (master if missing)
297 refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
298 remote->fetch_tags = 1; /* always auto-follow */
301 static int handle_config(const char *key, const char *value, void *cb)
306 struct remote *remote;
307 struct branch *branch;
308 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
311 branch = make_branch(name, namelen);
312 if (!strcmp(subkey, "remote")) {
313 return git_config_string(&branch->remote_name, key, value);
314 } else if (!strcmp(subkey, "pushremote")) {
315 return git_config_string(&branch->pushremote_name, key, value);
316 } else if (!strcmp(subkey, "merge")) {
318 return config_error_nonbool(key);
319 add_merge(branch, xstrdup(value));
323 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
324 struct rewrite *rewrite;
327 if (!strcmp(subkey, "insteadof")) {
329 return config_error_nonbool(key);
330 rewrite = make_rewrite(&rewrites, name, namelen);
331 add_instead_of(rewrite, xstrdup(value));
332 } else if (!strcmp(subkey, "pushinsteadof")) {
334 return config_error_nonbool(key);
335 rewrite = make_rewrite(&rewrites_push, name, namelen);
336 add_instead_of(rewrite, xstrdup(value));
340 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
343 /* Handle remote.* variables */
344 if (!name && !strcmp(subkey, "pushdefault"))
345 return git_config_string(&pushremote_name, key, value);
349 /* Handle remote.<name>.* variables */
351 warning(_("config remote shorthand cannot begin with '/': %s"),
355 remote = make_remote(name, namelen);
356 remote->origin = REMOTE_CONFIG;
357 if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
358 current_config_scope() == CONFIG_SCOPE_WORKTREE)
359 remote->configured_in_repo = 1;
360 if (!strcmp(subkey, "mirror"))
361 remote->mirror = git_config_bool(key, value);
362 else if (!strcmp(subkey, "skipdefaultupdate"))
363 remote->skip_default_update = git_config_bool(key, value);
364 else if (!strcmp(subkey, "skipfetchall"))
365 remote->skip_default_update = git_config_bool(key, value);
366 else if (!strcmp(subkey, "prune"))
367 remote->prune = git_config_bool(key, value);
368 else if (!strcmp(subkey, "prunetags"))
369 remote->prune_tags = git_config_bool(key, value);
370 else if (!strcmp(subkey, "url")) {
372 if (git_config_string(&v, key, value))
375 } else if (!strcmp(subkey, "pushurl")) {
377 if (git_config_string(&v, key, value))
379 add_pushurl(remote, v);
380 } else if (!strcmp(subkey, "push")) {
382 if (git_config_string(&v, key, value))
384 refspec_append(&remote->push, v);
386 } else if (!strcmp(subkey, "fetch")) {
388 if (git_config_string(&v, key, value))
390 refspec_append(&remote->fetch, v);
392 } else if (!strcmp(subkey, "receivepack")) {
394 if (git_config_string(&v, key, value))
396 if (!remote->receivepack)
397 remote->receivepack = v;
399 error(_("more than one receivepack given, using the first"));
400 } else if (!strcmp(subkey, "uploadpack")) {
402 if (git_config_string(&v, key, value))
404 if (!remote->uploadpack)
405 remote->uploadpack = v;
407 error(_("more than one uploadpack given, using the first"));
408 } else if (!strcmp(subkey, "tagopt")) {
409 if (!strcmp(value, "--no-tags"))
410 remote->fetch_tags = -1;
411 else if (!strcmp(value, "--tags"))
412 remote->fetch_tags = 2;
413 } else if (!strcmp(subkey, "proxy")) {
414 return git_config_string((const char **)&remote->http_proxy,
416 } else if (!strcmp(subkey, "proxyauthmethod")) {
417 return git_config_string((const char **)&remote->http_proxy_authmethod,
419 } else if (!strcmp(subkey, "vcs")) {
420 return git_config_string(&remote->foreign_vcs, key, value);
425 static void alias_all_urls(void)
428 for (i = 0; i < remotes_nr; i++) {
429 int add_pushurl_aliases;
432 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
433 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
435 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
436 for (j = 0; j < remotes[i]->url_nr; j++) {
437 if (add_pushurl_aliases)
438 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
439 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
444 static void read_config(void)
453 current_branch = NULL;
454 if (startup_info->have_repository) {
455 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
456 if (head_ref && (flag & REF_ISSYMREF) &&
457 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
458 current_branch = make_branch(head_ref, strlen(head_ref));
461 git_config(handle_config, NULL);
465 static int valid_remote_nick(const char *name)
467 if (!name[0] || is_dot_or_dotdot(name))
470 /* remote nicknames cannot contain slashes */
472 if (is_dir_sep(*name++))
477 const char *remote_for_branch(struct branch *branch, int *explicit)
479 if (branch && branch->remote_name) {
482 return branch->remote_name;
489 const char *pushremote_for_branch(struct branch *branch, int *explicit)
491 if (branch && branch->pushremote_name) {
494 return branch->pushremote_name;
496 if (pushremote_name) {
499 return pushremote_name;
501 return remote_for_branch(branch, explicit);
504 const char *remote_ref_for_branch(struct branch *branch, int for_push)
508 if (branch->merge_nr) {
509 return branch->merge_name[0];
512 const char *dst, *remote_name =
513 pushremote_for_branch(branch, NULL);
514 struct remote *remote = remote_get(remote_name);
516 if (remote && remote->push.nr &&
517 (dst = apply_refspecs(&remote->push,
526 static struct remote *remote_get_1(const char *name,
527 const char *(*get_default)(struct branch *, int *))
537 name = get_default(current_branch, &name_given);
539 ret = make_remote(name, 0);
540 if (valid_remote_nick(name) && have_git_dir()) {
541 if (!valid_remote(ret))
542 read_remotes_file(ret);
543 if (!valid_remote(ret))
544 read_branches_file(ret);
546 if (name_given && !valid_remote(ret))
547 add_url_alias(ret, name);
548 if (!valid_remote(ret))
553 struct remote *remote_get(const char *name)
555 return remote_get_1(name, remote_for_branch);
558 struct remote *pushremote_get(const char *name)
560 return remote_get_1(name, pushremote_for_branch);
563 int remote_is_configured(struct remote *remote, int in_repo)
568 return remote->configured_in_repo;
569 return !!remote->origin;
572 int for_each_remote(each_remote_fn fn, void *priv)
576 for (i = 0; i < remotes_nr && !result; i++) {
577 struct remote *r = remotes[i];
580 result = fn(r, priv);
585 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
587 if (strcmp(ref1->name, ref2->name)) {
588 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
589 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
590 die(_("Cannot fetch both %s and %s to %s"),
591 ref1->name, ref2->name, ref2->peer_ref->name);
592 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
593 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
594 warning(_("%s usually tracks %s, not %s"),
595 ref2->peer_ref->name, ref2->name, ref1->name);
596 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
597 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
598 die(_("%s tracks both %s and %s"),
599 ref2->peer_ref->name, ref1->name, ref2->name);
602 * This last possibility doesn't occur because
603 * FETCH_HEAD_IGNORE entries always appear at
604 * the end of the list.
606 BUG("Internal error");
609 free(ref2->peer_ref);
613 struct ref *ref_remove_duplicates(struct ref *ref_map)
615 struct string_list refs = STRING_LIST_INIT_NODUP;
616 struct ref *retval = NULL;
617 struct ref **p = &retval;
620 struct ref *ref = ref_map;
622 ref_map = ref_map->next;
625 if (!ref->peer_ref) {
629 struct string_list_item *item =
630 string_list_insert(&refs, ref->peer_ref->name);
633 /* Entry already existed */
634 handle_duplicate((struct ref *)item->util, ref);
643 string_list_clear(&refs, 0);
647 int remote_has_url(struct remote *remote, const char *url)
650 for (i = 0; i < remote->url_nr; i++) {
651 if (!strcmp(remote->url[i], url))
657 static int match_name_with_pattern(const char *key, const char *name,
658 const char *value, char **result)
660 const char *kstar = strchr(key, '*');
666 die(_("key '%s' of pattern had no '*'"), key);
668 ksuffixlen = strlen(kstar + 1);
669 namelen = strlen(name);
670 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
671 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
673 struct strbuf sb = STRBUF_INIT;
674 const char *vstar = strchr(value, '*');
676 die(_("value '%s' of pattern has no '*'"), value);
677 strbuf_add(&sb, value, vstar - value);
678 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
679 strbuf_addstr(&sb, vstar + 1);
680 *result = strbuf_detach(&sb, NULL);
685 static int refspec_match(const struct refspec_item *refspec,
688 if (refspec->pattern)
689 return match_name_with_pattern(refspec->src, name, NULL, NULL);
691 return !strcmp(refspec->src, name);
694 static int omit_name_by_refspec(const char *name, struct refspec *rs)
698 for (i = 0; i < rs->nr; i++) {
699 if (rs->items[i].negative && refspec_match(&rs->items[i], name))
705 struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
709 for (tail = &ref_map; *tail; ) {
710 struct ref *ref = *tail;
712 if (omit_name_by_refspec(ref->name, rs)) {
723 static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query)
725 int i, matched_negative = 0;
726 int find_src = !query->src;
727 struct string_list reversed = STRING_LIST_INIT_NODUP;
728 const char *needle = find_src ? query->dst : query->src;
731 * Check whether the queried ref matches any negative refpsec. If so,
732 * then we should ultimately treat this as not matching the query at
735 * Note that negative refspecs always match the source, but the query
736 * item uses the destination. To handle this, we apply pattern
737 * refspecs in reverse to figure out if the query source matches any
738 * of the negative refspecs.
740 for (i = 0; i < rs->nr; i++) {
741 struct refspec_item *refspec = &rs->items[i];
744 if (refspec->negative)
747 /* Note the reversal of src and dst */
748 if (refspec->pattern) {
749 const char *key = refspec->dst ? refspec->dst : refspec->src;
750 const char *value = refspec->src;
752 if (match_name_with_pattern(key, needle, value, &expn_name))
753 string_list_append_nodup(&reversed, expn_name);
755 if (!strcmp(needle, refspec->src))
756 string_list_append(&reversed, refspec->src);
760 for (i = 0; !matched_negative && i < reversed.nr; i++) {
761 if (omit_name_by_refspec(reversed.items[i].string, rs))
762 matched_negative = 1;
765 string_list_clear(&reversed, 0);
767 return matched_negative;
770 static void query_refspecs_multiple(struct refspec *rs,
771 struct refspec_item *query,
772 struct string_list *results)
775 int find_src = !query->src;
777 if (find_src && !query->dst)
778 BUG("query_refspecs_multiple: need either src or dst");
780 if (query_matches_negative_refspec(rs, query))
783 for (i = 0; i < rs->nr; i++) {
784 struct refspec_item *refspec = &rs->items[i];
785 const char *key = find_src ? refspec->dst : refspec->src;
786 const char *value = find_src ? refspec->src : refspec->dst;
787 const char *needle = find_src ? query->dst : query->src;
788 char **result = find_src ? &query->src : &query->dst;
790 if (!refspec->dst || refspec->negative)
792 if (refspec->pattern) {
793 if (match_name_with_pattern(key, needle, value, result))
794 string_list_append_nodup(results, *result);
795 } else if (!strcmp(needle, key)) {
796 string_list_append(results, value);
801 int query_refspecs(struct refspec *rs, struct refspec_item *query)
804 int find_src = !query->src;
805 const char *needle = find_src ? query->dst : query->src;
806 char **result = find_src ? &query->src : &query->dst;
808 if (find_src && !query->dst)
809 BUG("query_refspecs: need either src or dst");
811 if (query_matches_negative_refspec(rs, query))
814 for (i = 0; i < rs->nr; i++) {
815 struct refspec_item *refspec = &rs->items[i];
816 const char *key = find_src ? refspec->dst : refspec->src;
817 const char *value = find_src ? refspec->src : refspec->dst;
819 if (!refspec->dst || refspec->negative)
821 if (refspec->pattern) {
822 if (match_name_with_pattern(key, needle, value, result)) {
823 query->force = refspec->force;
826 } else if (!strcmp(needle, key)) {
827 *result = xstrdup(value);
828 query->force = refspec->force;
835 char *apply_refspecs(struct refspec *rs, const char *name)
837 struct refspec_item query;
839 memset(&query, 0, sizeof(struct refspec_item));
840 query.src = (char *)name;
842 if (query_refspecs(rs, &query))
848 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
850 return query_refspecs(&remote->fetch, refspec);
853 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
856 size_t len = strlen(name);
857 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
858 memcpy(ref->name, prefix, prefixlen);
859 memcpy(ref->name + prefixlen, name, len);
863 struct ref *alloc_ref(const char *name)
865 return alloc_ref_with_prefix("", 0, name);
868 struct ref *copy_ref(const struct ref *ref)
874 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
876 memcpy(cpy, ref, len);
878 cpy->symref = xstrdup_or_null(ref->symref);
879 cpy->remote_status = xstrdup_or_null(ref->remote_status);
880 cpy->peer_ref = copy_ref(ref->peer_ref);
884 struct ref *copy_ref_list(const struct ref *ref)
886 struct ref *ret = NULL;
887 struct ref **tail = &ret;
889 *tail = copy_ref(ref);
891 tail = &((*tail)->next);
896 void free_one_ref(struct ref *ref)
900 free_one_ref(ref->peer_ref);
901 free(ref->remote_status);
906 void free_refs(struct ref *ref)
916 int ref_compare_name(const void *va, const void *vb)
918 const struct ref *a = va, *b = vb;
919 return strcmp(a->name, b->name);
922 static void *ref_list_get_next(const void *a)
924 return ((const struct ref *)a)->next;
927 static void ref_list_set_next(void *a, void *next)
929 ((struct ref *)a)->next = next;
932 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
934 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
937 int count_refspec_match(const char *pattern,
939 struct ref **matched_ref)
941 int patlen = strlen(pattern);
942 struct ref *matched_weak = NULL;
943 struct ref *matched = NULL;
947 for (weak_match = match = 0; refs; refs = refs->next) {
948 char *name = refs->name;
949 int namelen = strlen(name);
951 if (!refname_match(pattern, name))
954 /* A match is "weak" if it is with refs outside
955 * heads or tags, and did not specify the pattern
956 * in full (e.g. "refs/remotes/origin/master") or at
957 * least from the toplevel (e.g. "remotes/origin/master");
958 * otherwise "git push $URL master" would result in
959 * ambiguity between remotes/origin/master and heads/master
960 * at the remote site.
962 if (namelen != patlen &&
963 patlen != namelen - 5 &&
964 !starts_with(name, "refs/heads/") &&
965 !starts_with(name, "refs/tags/")) {
966 /* We want to catch the case where only weak
967 * matches are found and there are multiple
968 * matches, and where more than one strong
969 * matches are found, as ambiguous. One
970 * strong match with zero or more weak matches
971 * are acceptable as a unique match.
983 *matched_ref = matched_weak;
988 *matched_ref = matched;
993 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1001 static struct ref *alloc_delete_ref(void)
1003 struct ref *ref = alloc_ref("(delete)");
1004 oidclr(&ref->new_oid);
1008 static int try_explicit_object_name(const char *name,
1011 struct object_id oid;
1015 *match = alloc_delete_ref();
1019 if (get_oid(name, &oid))
1023 *match = alloc_ref(name);
1024 oidcpy(&(*match)->new_oid, &oid);
1029 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1031 struct ref *ret = alloc_ref(name);
1032 tail_link_ref(ret, tail);
1036 static char *guess_ref(const char *name, struct ref *peer)
1038 struct strbuf buf = STRBUF_INIT;
1040 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1045 if (starts_with(r, "refs/heads/")) {
1046 strbuf_addstr(&buf, "refs/heads/");
1047 } else if (starts_with(r, "refs/tags/")) {
1048 strbuf_addstr(&buf, "refs/tags/");
1053 strbuf_addstr(&buf, name);
1054 return strbuf_detach(&buf, NULL);
1057 static int match_explicit_lhs(struct ref *src,
1058 struct refspec_item *rs,
1060 int *allocated_match)
1062 switch (count_refspec_match(rs->src, src, match)) {
1064 if (allocated_match)
1065 *allocated_match = 0;
1068 /* The source could be in the get_sha1() format
1069 * not a reference name. :refs/other is a
1070 * way to delete 'other' ref at the remote end.
1072 if (try_explicit_object_name(rs->src, match) < 0)
1073 return error(_("src refspec %s does not match any"), rs->src);
1074 if (allocated_match)
1075 *allocated_match = 1;
1078 return error(_("src refspec %s matches more than one"), rs->src);
1082 static void show_push_unqualified_ref_name_error(const char *dst_value,
1083 const char *matched_src_name)
1085 struct object_id oid;
1086 enum object_type type;
1089 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1090 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1093 error(_("The destination you provided is not a full refname (i.e.,\n"
1094 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1096 "- Looking for a ref that matches '%s' on the remote side.\n"
1097 "- Checking if the <src> being pushed ('%s')\n"
1098 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1099 " refs/{heads,tags}/ prefix on the remote side.\n"
1101 "Neither worked, so we gave up. You must fully qualify the ref."),
1102 dst_value, matched_src_name);
1104 if (!advice_push_unqualified_ref_name)
1107 if (get_oid(matched_src_name, &oid))
1108 BUG("'%s' is not a valid object, "
1109 "match_explicit_lhs() should catch this!",
1111 type = oid_object_info(the_repository, &oid, NULL);
1112 if (type == OBJ_COMMIT) {
1113 advise(_("The <src> part of the refspec is a commit object.\n"
1114 "Did you mean to create a new branch by pushing to\n"
1115 "'%s:refs/heads/%s'?"),
1116 matched_src_name, dst_value);
1117 } else if (type == OBJ_TAG) {
1118 advise(_("The <src> part of the refspec is a tag object.\n"
1119 "Did you mean to create a new tag by pushing to\n"
1120 "'%s:refs/tags/%s'?"),
1121 matched_src_name, dst_value);
1122 } else if (type == OBJ_TREE) {
1123 advise(_("The <src> part of the refspec is a tree object.\n"
1124 "Did you mean to tag a new tree by pushing to\n"
1125 "'%s:refs/tags/%s'?"),
1126 matched_src_name, dst_value);
1127 } else if (type == OBJ_BLOB) {
1128 advise(_("The <src> part of the refspec is a blob object.\n"
1129 "Did you mean to tag a new blob by pushing to\n"
1130 "'%s:refs/tags/%s'?"),
1131 matched_src_name, dst_value);
1133 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1134 matched_src_name, type);
1138 static int match_explicit(struct ref *src, struct ref *dst,
1139 struct ref ***dst_tail,
1140 struct refspec_item *rs)
1142 struct ref *matched_src, *matched_dst;
1145 const char *dst_value = rs->dst;
1148 if (rs->pattern || rs->matching || rs->negative)
1151 matched_src = matched_dst = NULL;
1152 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1158 dst_value = resolve_ref_unsafe(matched_src->name,
1159 RESOLVE_REF_READING,
1162 ((flag & REF_ISSYMREF) &&
1163 !starts_with(dst_value, "refs/heads/")))
1164 die(_("%s cannot be resolved to branch"),
1168 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1172 if (starts_with(dst_value, "refs/")) {
1173 matched_dst = make_linked_ref(dst_value, dst_tail);
1174 } else if (is_null_oid(&matched_src->new_oid)) {
1175 error(_("unable to delete '%s': remote ref does not exist"),
1177 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1178 matched_dst = make_linked_ref(dst_guess, dst_tail);
1181 show_push_unqualified_ref_name_error(dst_value,
1187 error(_("dst refspec %s matches more than one"),
1193 if (matched_dst->peer_ref)
1194 return error(_("dst ref %s receives from more than one src"),
1197 matched_dst->peer_ref = allocated_src ?
1199 copy_ref(matched_src);
1200 matched_dst->force = rs->force;
1205 static int match_explicit_refs(struct ref *src, struct ref *dst,
1206 struct ref ***dst_tail, struct refspec *rs)
1209 for (i = errs = 0; i < rs->nr; i++)
1210 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1214 static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1215 int send_mirror, int direction,
1216 const struct refspec_item **ret_pat)
1218 const struct refspec_item *pat;
1221 int matching_refs = -1;
1222 for (i = 0; i < rs->nr; i++) {
1223 const struct refspec_item *item = &rs->items[i];
1228 if (item->matching &&
1229 (matching_refs == -1 || item->force)) {
1234 if (item->pattern) {
1235 const char *dst_side = item->dst ? item->dst : item->src;
1237 if (direction == FROM_SRC)
1238 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
1240 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
1247 if (matching_refs == -1)
1250 pat = &rs->items[matching_refs];
1251 if (pat->matching) {
1253 * "matching refs"; traditionally we pushed everything
1254 * including refs outside refs/heads/ hierarchy, but
1255 * that does not make much sense these days.
1257 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1259 name = xstrdup(ref->name);
1266 static struct ref **tail_ref(struct ref **head)
1268 struct ref **tail = head;
1270 tail = &((*tail)->next);
1275 struct commit **tip;
1279 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1281 struct commit *commit;
1283 if (is_null_oid(oid))
1285 commit = lookup_commit_reference_gently(the_repository, oid, 1);
1286 if (!commit || (commit->object.flags & TMP_MARK))
1288 commit->object.flags |= TMP_MARK;
1289 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1290 tips->tip[tips->nr++] = commit;
1293 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1295 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1296 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1297 struct string_list_item *item;
1299 struct tips sent_tips;
1302 * Collect everything we know they would have at the end of
1303 * this push, and collect all tags they have.
1305 memset(&sent_tips, 0, sizeof(sent_tips));
1306 for (ref = *dst; ref; ref = ref->next) {
1307 if (ref->peer_ref &&
1308 !is_null_oid(&ref->peer_ref->new_oid))
1309 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1311 add_to_tips(&sent_tips, &ref->old_oid);
1312 if (starts_with(ref->name, "refs/tags/"))
1313 string_list_append(&dst_tag, ref->name);
1315 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1317 string_list_sort(&dst_tag);
1319 /* Collect tags they do not have. */
1320 for (ref = src; ref; ref = ref->next) {
1321 if (!starts_with(ref->name, "refs/tags/"))
1322 continue; /* not a tag */
1323 if (string_list_has_string(&dst_tag, ref->name))
1324 continue; /* they already have it */
1325 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
1326 continue; /* be conservative */
1327 item = string_list_append(&src_tag, ref->name);
1330 string_list_clear(&dst_tag, 0);
1333 * At this point, src_tag lists tags that are missing from
1334 * dst, and sent_tips lists the tips we are pushing or those
1335 * that we know they already have. An element in the src_tag
1336 * that is an ancestor of any of the sent_tips needs to be
1337 * sent to the other side.
1340 const int reachable_flag = 1;
1341 struct commit_list *found_commits;
1342 struct commit **src_commits;
1343 int nr_src_commits = 0, alloc_src_commits = 16;
1344 ALLOC_ARRAY(src_commits, alloc_src_commits);
1346 for_each_string_list_item(item, &src_tag) {
1347 struct ref *ref = item->util;
1348 struct commit *commit;
1350 if (is_null_oid(&ref->new_oid))
1352 commit = lookup_commit_reference_gently(the_repository,
1356 /* not pushing a commit, which is not an error */
1359 ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
1360 src_commits[nr_src_commits++] = commit;
1363 found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
1364 src_commits, nr_src_commits,
1367 for_each_string_list_item(item, &src_tag) {
1368 struct ref *dst_ref;
1369 struct ref *ref = item->util;
1370 struct commit *commit;
1372 if (is_null_oid(&ref->new_oid))
1374 commit = lookup_commit_reference_gently(the_repository,
1378 /* not pushing a commit, which is not an error */
1382 * Is this tag, which they do not have, reachable from
1383 * any of the commits we are sending?
1385 if (!(commit->object.flags & reachable_flag))
1389 dst_ref = make_linked_ref(ref->name, dst_tail);
1390 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1391 dst_ref->peer_ref = copy_ref(ref);
1394 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1396 free_commit_list(found_commits);
1399 string_list_clear(&src_tag, 0);
1400 free(sent_tips.tip);
1403 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1405 for ( ; list; list = list->next)
1406 if (!strcmp(list->name, name))
1407 return (struct ref *)list;
1411 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1413 for ( ; ref; ref = ref->next)
1414 string_list_append_nodup(ref_index, ref->name)->util = ref;
1416 string_list_sort(ref_index);
1420 * Given only the set of local refs, sanity-check the set of push
1421 * refspecs. We can't catch all errors that match_push_refs would,
1422 * but we can catch some errors early before even talking to the
1425 int check_push_refs(struct ref *src, struct refspec *rs)
1430 for (i = 0; i < rs->nr; i++) {
1431 struct refspec_item *item = &rs->items[i];
1433 if (item->pattern || item->matching || item->negative)
1436 ret |= match_explicit_lhs(src, item, NULL, NULL);
1443 * Given the set of refs the local repository has, the set of refs the
1444 * remote repository has, and the refspec used for push, determine
1445 * what remote refs we will update and with what value by setting
1446 * peer_ref (which object is being pushed) and force (if the push is
1447 * forced) in elements of "dst". The function may add new elements to
1448 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1450 int match_push_refs(struct ref *src, struct ref **dst,
1451 struct refspec *rs, int flags)
1453 int send_all = flags & MATCH_REFS_ALL;
1454 int send_mirror = flags & MATCH_REFS_MIRROR;
1455 int send_prune = flags & MATCH_REFS_PRUNE;
1457 struct ref *ref, **dst_tail = tail_ref(dst);
1458 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1460 /* If no refspec is provided, use the default ":" */
1462 refspec_append(rs, ":");
1464 errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1466 /* pick the remainder */
1467 for (ref = src; ref; ref = ref->next) {
1468 struct string_list_item *dst_item;
1469 struct ref *dst_peer;
1470 const struct refspec_item *pat = NULL;
1473 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1477 if (!dst_ref_index.nr)
1478 prepare_ref_index(&dst_ref_index, *dst);
1480 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1481 dst_peer = dst_item ? dst_item->util : NULL;
1483 if (dst_peer->peer_ref)
1484 /* We're already sending something to this ref. */
1487 if (pat->matching && !(send_all || send_mirror))
1489 * Remote doesn't have it, and we have no
1490 * explicit pattern, and we don't have
1491 * --all or --mirror.
1495 /* Create a new one and link it */
1496 dst_peer = make_linked_ref(dst_name, &dst_tail);
1497 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1498 string_list_insert(&dst_ref_index,
1499 dst_peer->name)->util = dst_peer;
1501 dst_peer->peer_ref = copy_ref(ref);
1502 dst_peer->force = pat->force;
1507 string_list_clear(&dst_ref_index, 0);
1509 if (flags & MATCH_REFS_FOLLOW_TAGS)
1510 add_missing_tags(src, dst, &dst_tail);
1513 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1514 /* check for missing refs on the remote */
1515 for (ref = *dst; ref; ref = ref->next) {
1519 /* We're already sending something to this ref. */
1522 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
1524 if (!src_ref_index.nr)
1525 prepare_ref_index(&src_ref_index, src);
1526 if (!string_list_has_string(&src_ref_index,
1528 ref->peer_ref = alloc_delete_ref();
1532 string_list_clear(&src_ref_index, 0);
1535 *dst = apply_negative_refspecs(*dst, rs);
1542 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1547 for (ref = remote_refs; ref; ref = ref->next) {
1548 int force_ref_update = ref->force || force_update;
1549 int reject_reason = 0;
1552 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1553 else if (!send_mirror)
1556 ref->deletion = is_null_oid(&ref->new_oid);
1557 if (!ref->deletion &&
1558 oideq(&ref->old_oid, &ref->new_oid)) {
1559 ref->status = REF_STATUS_UPTODATE;
1564 * If the remote ref has moved and is now different
1565 * from what we expect, reject any push.
1567 * It also is an error if the user told us to check
1568 * with the remote-tracking branch to find the value
1569 * to expect, but we did not have such a tracking
1572 * If the tip of the remote-tracking ref is unreachable
1573 * from any reflog entry of its local ref indicating a
1574 * possible update since checkout; reject the push.
1576 if (ref->expect_old_sha1) {
1577 if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1578 reject_reason = REF_STATUS_REJECT_STALE;
1579 else if (ref->check_reachable && ref->unreachable)
1581 REF_STATUS_REJECT_REMOTE_UPDATED;
1584 * If the ref isn't stale, and is reachable
1585 * from from one of the reflog entries of
1586 * the local branch, force the update.
1588 force_ref_update = 1;
1592 * If the update isn't already rejected then check
1593 * the usual "must fast-forward" rules.
1595 * Decide whether an individual refspec A:B can be
1596 * pushed. The push will succeed if any of the
1597 * following are true:
1599 * (1) the remote reference B does not exist
1601 * (2) the remote reference B is being removed (i.e.,
1602 * pushing :B where no source is specified)
1604 * (3) the destination is not under refs/tags/, and
1605 * if the old and new value is a commit, the new
1606 * is a descendant of the old.
1608 * (4) it is forced using the +A:B notation, or by
1609 * passing the --force argument
1612 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1613 if (starts_with(ref->name, "refs/tags/"))
1614 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1615 else if (!has_object_file(&ref->old_oid))
1616 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1617 else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
1618 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1619 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1620 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1621 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1625 * "--force" will defeat any rejection implemented
1626 * by the rules above.
1628 if (!force_ref_update)
1629 ref->status = reject_reason;
1630 else if (reject_reason)
1631 ref->forced_update = 1;
1635 static void set_merge(struct branch *ret)
1637 struct remote *remote;
1639 struct object_id oid;
1643 return; /* no branch */
1645 return; /* already run */
1646 if (!ret->remote_name || !ret->merge_nr) {
1648 * no merge config; let's make sure we don't confuse callers
1649 * with a non-zero merge_nr but a NULL merge
1655 remote = remote_get(ret->remote_name);
1657 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1658 for (i = 0; i < ret->merge_nr; i++) {
1659 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1660 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1661 if (!remote_find_tracking(remote, ret->merge[i]) ||
1662 strcmp(ret->remote_name, "."))
1664 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1665 &oid, &ref, 0) == 1)
1666 ret->merge[i]->dst = ref;
1668 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1672 struct branch *branch_get(const char *name)
1677 if (!name || !*name || !strcmp(name, "HEAD"))
1678 ret = current_branch;
1680 ret = make_branch(name, strlen(name));
1685 int branch_has_merge_config(struct branch *branch)
1687 return branch && !!branch->merge;
1690 int branch_merge_matches(struct branch *branch,
1692 const char *refname)
1694 if (!branch || i < 0 || i >= branch->merge_nr)
1696 return refname_match(branch->merge[i]->src, refname);
1699 __attribute__((format (printf,2,3)))
1700 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1705 strbuf_vaddf(err, fmt, ap);
1711 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1714 return error_buf(err, _("HEAD does not point to a branch"));
1716 if (!branch->merge || !branch->merge[0]) {
1718 * no merge config; is it because the user didn't define any,
1719 * or because it is not a real branch, and get_branch
1722 if (!ref_exists(branch->refname))
1723 return error_buf(err, _("no such branch: '%s'"),
1725 return error_buf(err,
1726 _("no upstream configured for branch '%s'"),
1730 if (!branch->merge[0]->dst)
1731 return error_buf(err,
1732 _("upstream branch '%s' not stored as a remote-tracking branch"),
1733 branch->merge[0]->src);
1735 return branch->merge[0]->dst;
1738 static const char *tracking_for_push_dest(struct remote *remote,
1739 const char *refname,
1744 ret = apply_refspecs(&remote->fetch, refname);
1746 return error_buf(err,
1747 _("push destination '%s' on remote '%s' has no local tracking branch"),
1748 refname, remote->name);
1752 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1754 struct remote *remote;
1756 remote = remote_get(pushremote_for_branch(branch, NULL));
1758 return error_buf(err,
1759 _("branch '%s' has no remote for pushing"),
1762 if (remote->push.nr) {
1766 dst = apply_refspecs(&remote->push, branch->refname);
1768 return error_buf(err,
1769 _("push refspecs for '%s' do not include '%s'"),
1770 remote->name, branch->name);
1772 ret = tracking_for_push_dest(remote, dst, err);
1778 return tracking_for_push_dest(remote, branch->refname, err);
1780 switch (push_default) {
1781 case PUSH_DEFAULT_NOTHING:
1782 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1784 case PUSH_DEFAULT_MATCHING:
1785 case PUSH_DEFAULT_CURRENT:
1786 return tracking_for_push_dest(remote, branch->refname, err);
1788 case PUSH_DEFAULT_UPSTREAM:
1789 return branch_get_upstream(branch, err);
1791 case PUSH_DEFAULT_UNSPECIFIED:
1792 case PUSH_DEFAULT_SIMPLE:
1794 const char *up, *cur;
1796 up = branch_get_upstream(branch, err);
1799 cur = tracking_for_push_dest(remote, branch->refname, err);
1802 if (strcmp(cur, up))
1803 return error_buf(err,
1804 _("cannot resolve 'simple' push to a single destination"));
1809 BUG("unhandled push situation");
1812 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1815 return error_buf(err, _("HEAD does not point to a branch"));
1817 if (!branch->push_tracking_ref)
1818 branch->push_tracking_ref = branch_get_push_1(branch, err);
1819 return branch->push_tracking_ref;
1822 static int ignore_symref_update(const char *refname)
1826 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1827 return 0; /* non-existing refs are OK */
1828 return (flag & REF_ISSYMREF);
1832 * Create and return a list of (struct ref) consisting of copies of
1833 * each remote_ref that matches refspec. refspec must be a pattern.
1834 * Fill in the copies' peer_ref to describe the local tracking refs to
1835 * which they map. Omit any references that would map to an existing
1836 * local symbolic ref.
1838 static struct ref *get_expanded_map(const struct ref *remote_refs,
1839 const struct refspec_item *refspec)
1841 const struct ref *ref;
1842 struct ref *ret = NULL;
1843 struct ref **tail = &ret;
1845 for (ref = remote_refs; ref; ref = ref->next) {
1846 char *expn_name = NULL;
1848 if (strchr(ref->name, '^'))
1849 continue; /* a dereference item */
1850 if (match_name_with_pattern(refspec->src, ref->name,
1851 refspec->dst, &expn_name) &&
1852 !ignore_symref_update(expn_name)) {
1853 struct ref *cpy = copy_ref(ref);
1855 cpy->peer_ref = alloc_ref(expn_name);
1857 cpy->peer_ref->force = 1;
1867 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1869 const struct ref *ref;
1870 const struct ref *best_match = NULL;
1873 for (ref = refs; ref; ref = ref->next) {
1874 int score = refname_match(name, ref->name);
1876 if (best_score < score) {
1884 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1886 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1891 return copy_ref(ref);
1894 static struct ref *get_local_ref(const char *name)
1896 if (!name || name[0] == '\0')
1899 if (starts_with(name, "refs/"))
1900 return alloc_ref(name);
1902 if (starts_with(name, "heads/") ||
1903 starts_with(name, "tags/") ||
1904 starts_with(name, "remotes/"))
1905 return alloc_ref_with_prefix("refs/", 5, name);
1907 return alloc_ref_with_prefix("refs/heads/", 11, name);
1910 int get_fetch_map(const struct ref *remote_refs,
1911 const struct refspec_item *refspec,
1915 struct ref *ref_map, **rmp;
1917 if (refspec->negative)
1920 if (refspec->pattern) {
1921 ref_map = get_expanded_map(remote_refs, refspec);
1923 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1925 if (refspec->exact_sha1) {
1926 ref_map = alloc_ref(name);
1927 get_oid_hex(name, &ref_map->old_oid);
1928 ref_map->exact_oid = 1;
1930 ref_map = get_remote_ref(remote_refs, name);
1932 if (!missing_ok && !ref_map)
1933 die(_("couldn't find remote ref %s"), name);
1935 ref_map->peer_ref = get_local_ref(refspec->dst);
1936 if (ref_map->peer_ref && refspec->force)
1937 ref_map->peer_ref->force = 1;
1941 for (rmp = &ref_map; *rmp; ) {
1942 if ((*rmp)->peer_ref) {
1943 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1944 check_refname_format((*rmp)->peer_ref->name, 0)) {
1945 struct ref *ignore = *rmp;
1946 error(_("* Ignoring funny ref '%s' locally"),
1947 (*rmp)->peer_ref->name);
1948 *rmp = (*rmp)->next;
1949 free(ignore->peer_ref);
1954 rmp = &((*rmp)->next);
1958 tail_link_ref(ref_map, tail);
1963 int resolve_remote_symref(struct ref *ref, struct ref *list)
1967 for (; list; list = list->next)
1968 if (!strcmp(ref->symref, list->name)) {
1969 oidcpy(&ref->old_oid, &list->old_oid);
1976 * Compute the commit ahead/behind values for the pair branch_name, base.
1978 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1979 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1980 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1983 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1984 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1985 * commits are different.
1988 static int stat_branch_pair(const char *branch_name, const char *base,
1989 int *num_ours, int *num_theirs,
1990 enum ahead_behind_flags abf)
1992 struct object_id oid;
1993 struct commit *ours, *theirs;
1994 struct rev_info revs;
1995 struct strvec argv = STRVEC_INIT;
1997 /* Cannot stat if what we used to build on no longer exists */
1998 if (read_ref(base, &oid))
2000 theirs = lookup_commit_reference(the_repository, &oid);
2004 if (read_ref(branch_name, &oid))
2006 ours = lookup_commit_reference(the_repository, &oid);
2010 *num_theirs = *num_ours = 0;
2012 /* are we the same? */
2015 if (abf == AHEAD_BEHIND_QUICK)
2017 if (abf != AHEAD_BEHIND_FULL)
2018 BUG("stat_branch_pair: invalid abf '%d'", abf);
2020 /* Run "rev-list --left-right ours...theirs" internally... */
2021 strvec_push(&argv, ""); /* ignored */
2022 strvec_push(&argv, "--left-right");
2023 strvec_pushf(&argv, "%s...%s",
2024 oid_to_hex(&ours->object.oid),
2025 oid_to_hex(&theirs->object.oid));
2026 strvec_push(&argv, "--");
2028 repo_init_revisions(the_repository, &revs, NULL);
2029 setup_revisions(argv.nr, argv.v, &revs, NULL);
2030 if (prepare_revision_walk(&revs))
2031 die(_("revision walk setup failed"));
2033 /* ... and count the commits on each side. */
2035 struct commit *c = get_revision(&revs);
2038 if (c->object.flags & SYMMETRIC_LEFT)
2044 /* clear object flags smudged by the above traversal */
2045 clear_commit_marks(ours, ALL_REV_FLAGS);
2046 clear_commit_marks(theirs, ALL_REV_FLAGS);
2048 strvec_clear(&argv);
2053 * Lookup the tracking branch for the given branch and if present, optionally
2054 * compute the commit ahead/behind values for the pair.
2056 * If for_push is true, the tracking branch refers to the push branch,
2057 * otherwise it refers to the upstream branch.
2059 * The name of the tracking branch (or NULL if it is not defined) is
2060 * returned via *tracking_name, if it is not itself NULL.
2062 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2063 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2064 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2067 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2068 * upstream defined, or ref does not exist). Returns 0 if the commits are
2069 * identical. Returns 1 if commits are different.
2071 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
2072 const char **tracking_name, int for_push,
2073 enum ahead_behind_flags abf)
2077 /* Cannot stat unless we are marked to build on top of somebody else. */
2078 base = for_push ? branch_get_push(branch, NULL) :
2079 branch_get_upstream(branch, NULL);
2081 *tracking_name = base;
2085 return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
2089 * Return true when there is anything to report, otherwise false.
2091 int format_tracking_info(struct branch *branch, struct strbuf *sb,
2092 enum ahead_behind_flags abf)
2094 int ours, theirs, sti;
2095 const char *full_base;
2097 int upstream_is_gone = 0;
2099 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
2103 upstream_is_gone = 1;
2106 base = shorten_unambiguous_ref(full_base, 0);
2107 if (upstream_is_gone) {
2109 _("Your branch is based on '%s', but the upstream is gone.\n"),
2111 if (advice_status_hints)
2113 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2116 _("Your branch is up to date with '%s'.\n"),
2118 } else if (abf == AHEAD_BEHIND_QUICK) {
2120 _("Your branch and '%s' refer to different commits.\n"),
2122 if (advice_status_hints)
2123 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
2124 "git status --ahead-behind");
2125 } else if (!theirs) {
2127 Q_("Your branch is ahead of '%s' by %d commit.\n",
2128 "Your branch is ahead of '%s' by %d commits.\n",
2131 if (advice_status_hints)
2133 _(" (use \"git push\" to publish your local commits)\n"));
2136 Q_("Your branch is behind '%s' by %d commit, "
2137 "and can be fast-forwarded.\n",
2138 "Your branch is behind '%s' by %d commits, "
2139 "and can be fast-forwarded.\n",
2142 if (advice_status_hints)
2144 _(" (use \"git pull\" to update your local branch)\n"));
2147 Q_("Your branch and '%s' have diverged,\n"
2148 "and have %d and %d different commit each, "
2150 "Your branch and '%s' have diverged,\n"
2151 "and have %d and %d different commits each, "
2154 base, ours, theirs);
2155 if (advice_status_hints)
2157 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2163 static int one_local_ref(const char *refname, const struct object_id *oid,
2164 int flag, void *cb_data)
2166 struct ref ***local_tail = cb_data;
2169 /* we already know it starts with refs/ to get here */
2170 if (check_refname_format(refname + 5, 0))
2173 ref = alloc_ref(refname);
2174 oidcpy(&ref->new_oid, oid);
2176 *local_tail = &ref->next;
2180 struct ref *get_local_heads(void)
2182 struct ref *local_refs = NULL, **local_tail = &local_refs;
2184 for_each_ref(one_local_ref, &local_tail);
2188 struct ref *guess_remote_head(const struct ref *head,
2189 const struct ref *refs,
2192 const struct ref *r;
2193 struct ref *list = NULL;
2194 struct ref **tail = &list;
2200 * Some transports support directly peeking at
2201 * where HEAD points; if that is the case, then
2202 * we don't have to guess.
2205 return copy_ref(find_ref_by_name(refs, head->symref));
2207 /* If a remote branch exists with the default branch name, let's use it. */
2209 char *ref = xstrfmt("refs/heads/%s",
2210 git_default_branch_name(0));
2212 r = find_ref_by_name(refs, ref);
2214 if (r && oideq(&r->old_oid, &head->old_oid))
2217 /* Fall back to the hard-coded historical default */
2218 r = find_ref_by_name(refs, "refs/heads/master");
2219 if (r && oideq(&r->old_oid, &head->old_oid))
2223 /* Look for another ref that points there */
2224 for (r = refs; r; r = r->next) {
2226 starts_with(r->name, "refs/heads/") &&
2227 oideq(&r->old_oid, &head->old_oid)) {
2228 *tail = copy_ref(r);
2229 tail = &((*tail)->next);
2238 struct stale_heads_info {
2239 struct string_list *ref_names;
2240 struct ref **stale_refs_tail;
2244 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2245 int flags, void *cb_data)
2247 struct stale_heads_info *info = cb_data;
2248 struct string_list matches = STRING_LIST_INIT_DUP;
2249 struct refspec_item query;
2251 memset(&query, 0, sizeof(struct refspec_item));
2252 query.dst = (char *)refname;
2254 query_refspecs_multiple(info->rs, &query, &matches);
2255 if (matches.nr == 0)
2256 goto clean_exit; /* No matches */
2259 * If we did find a suitable refspec and it's not a symref and
2260 * it's not in the list of refs that currently exist in that
2261 * remote, we consider it to be stale. In order to deal with
2262 * overlapping refspecs, we need to go over all of the
2265 if (flags & REF_ISSYMREF)
2268 for (i = 0; stale && i < matches.nr; i++)
2269 if (string_list_has_string(info->ref_names, matches.items[i].string))
2273 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2274 oidcpy(&ref->new_oid, oid);
2278 string_list_clear(&matches, 0);
2282 struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2284 struct ref *ref, *stale_refs = NULL;
2285 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2286 struct stale_heads_info info;
2288 info.ref_names = &ref_names;
2289 info.stale_refs_tail = &stale_refs;
2291 for (ref = fetch_map; ref; ref = ref->next)
2292 string_list_append(&ref_names, ref->name);
2293 string_list_sort(&ref_names);
2294 for_each_ref(get_stale_heads_cb, &info);
2295 string_list_clear(&ref_names, 0);
2302 static void clear_cas_option(struct push_cas_option *cas)
2306 for (i = 0; i < cas->nr; i++)
2307 free(cas->entry[i].refname);
2309 memset(cas, 0, sizeof(*cas));
2312 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2313 const char *refname,
2316 struct push_cas *entry;
2317 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2318 entry = &cas->entry[cas->nr++];
2319 memset(entry, 0, sizeof(*entry));
2320 entry->refname = xmemdupz(refname, refnamelen);
2324 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2327 struct push_cas *entry;
2330 /* "--no-<option>" */
2331 clear_cas_option(cas);
2336 /* just "--<option>" */
2337 cas->use_tracking_for_rest = 1;
2341 /* "--<option>=refname" or "--<option>=refname:value" */
2342 colon = strchrnul(arg, ':');
2343 entry = add_cas_entry(cas, arg, colon - arg);
2345 entry->use_tracking = 1;
2347 oidclr(&entry->expect);
2348 else if (get_oid(colon + 1, &entry->expect))
2349 return error(_("cannot parse expected object name '%s'"),
2354 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2356 return parse_push_cas_option(opt->value, arg, unset);
2359 int is_empty_cas(const struct push_cas_option *cas)
2361 return !cas->use_tracking_for_rest && !cas->nr;
2365 * Look at remote.fetch refspec and see if we have a remote
2366 * tracking branch for the refname there. Fill the name of
2367 * the remote-tracking branch in *dst_refname, and the name
2368 * of the commit object at its tip in oid[].
2369 * If we cannot do so, return negative to signal an error.
2371 static int remote_tracking(struct remote *remote, const char *refname,
2372 struct object_id *oid, char **dst_refname)
2376 dst = apply_refspecs(&remote->fetch, refname);
2378 return -1; /* no tracking ref for refname at remote */
2379 if (read_ref(dst, oid))
2380 return -1; /* we know what the tracking ref is but we cannot read it */
2387 * The struct "reflog_commit_array" and related helper functions
2388 * are used for collecting commits into an array during reflog
2389 * traversals in "check_and_collect_until()".
2391 struct reflog_commit_array {
2392 struct commit **item;
2396 #define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
2398 /* Append a commit to the array. */
2399 static void append_commit(struct reflog_commit_array *arr,
2400 struct commit *commit)
2402 ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
2403 arr->item[arr->nr++] = commit;
2406 /* Free and reset the array. */
2407 static void free_commit_array(struct reflog_commit_array *arr)
2409 FREE_AND_NULL(arr->item);
2410 arr->nr = arr->alloc = 0;
2413 struct check_and_collect_until_cb_data {
2414 struct commit *remote_commit;
2415 struct reflog_commit_array *local_commits;
2416 timestamp_t remote_reflog_timestamp;
2419 /* Get the timestamp of the latest entry. */
2420 static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
2421 const char *ident, timestamp_t timestamp,
2422 int tz, const char *message, void *cb_data)
2424 timestamp_t *ts = cb_data;
2429 static int check_and_collect_until(struct object_id *o_oid,
2430 struct object_id *n_oid,
2431 const char *ident, timestamp_t timestamp,
2432 int tz, const char *message, void *cb_data)
2434 struct commit *commit;
2435 struct check_and_collect_until_cb_data *cb = cb_data;
2437 /* An entry was found. */
2438 if (oideq(n_oid, &cb->remote_commit->object.oid))
2441 if ((commit = lookup_commit_reference(the_repository, n_oid)))
2442 append_commit(cb->local_commits, commit);
2445 * If the reflog entry timestamp is older than the remote ref's
2446 * latest reflog entry, there is no need to check or collect
2447 * entries older than this one.
2449 if (timestamp < cb->remote_reflog_timestamp)
2455 #define MERGE_BASES_BATCH_SIZE 8
2458 * Iterate through the reflog of the local ref to check if there is an entry
2459 * for the given remote-tracking ref; runs until the timestamp of an entry is
2460 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2461 * are that seen along the way are collected into an array to check if the
2462 * remote-tracking ref is reachable from any of them.
2464 static int is_reachable_in_reflog(const char *local, const struct ref *remote)
2467 struct commit *commit;
2468 struct commit **chunk;
2469 struct check_and_collect_until_cb_data cb;
2470 struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
2474 commit = lookup_commit_reference(the_repository, &remote->old_oid);
2476 goto cleanup_return;
2479 * Get the timestamp from the latest entry
2480 * of the remote-tracking ref's reflog.
2482 for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
2484 cb.remote_commit = commit;
2485 cb.local_commits = &arr;
2486 cb.remote_reflog_timestamp = date;
2487 ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
2489 /* We found an entry in the reflog. */
2491 goto cleanup_return;
2494 * Check if the remote commit is reachable from any
2495 * of the commits in the collected array, in batches.
2497 for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
2498 size = arr.item + arr.nr - chunk;
2499 if (MERGE_BASES_BATCH_SIZE < size)
2500 size = MERGE_BASES_BATCH_SIZE;
2502 if ((ret = in_merge_bases_many(commit, size, chunk)))
2507 free_commit_array(&arr);
2512 * Check for reachability of a remote-tracking
2513 * ref in the reflog entries of its local ref.
2515 static void check_if_includes_upstream(struct ref *remote)
2517 struct ref *local = get_local_ref(remote->name);
2521 if (is_reachable_in_reflog(local->name, remote) <= 0)
2522 remote->unreachable = 1;
2525 static void apply_cas(struct push_cas_option *cas,
2526 struct remote *remote,
2531 /* Find an explicit --<option>=<name>[:<value>] entry */
2532 for (i = 0; i < cas->nr; i++) {
2533 struct push_cas *entry = &cas->entry[i];
2534 if (!refname_match(entry->refname, ref->name))
2536 ref->expect_old_sha1 = 1;
2537 if (!entry->use_tracking)
2538 oidcpy(&ref->old_oid_expect, &entry->expect);
2539 else if (remote_tracking(remote, ref->name,
2540 &ref->old_oid_expect,
2541 &ref->tracking_ref))
2542 oidclr(&ref->old_oid_expect);
2544 ref->check_reachable = cas->use_force_if_includes;
2548 /* Are we using "--<option>" to cover all? */
2549 if (!cas->use_tracking_for_rest)
2552 ref->expect_old_sha1 = 1;
2553 if (remote_tracking(remote, ref->name,
2554 &ref->old_oid_expect,
2555 &ref->tracking_ref))
2556 oidclr(&ref->old_oid_expect);
2558 ref->check_reachable = cas->use_force_if_includes;
2561 void apply_push_cas(struct push_cas_option *cas,
2562 struct remote *remote,
2563 struct ref *remote_refs)
2566 for (ref = remote_refs; ref; ref = ref->next) {
2567 apply_cas(cas, remote, ref);
2570 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2571 * mode, and if "--force-if-includes" was specified, run
2574 if (ref->check_reachable)
2575 check_if_includes_upstream(ref);