9 #include "string-list.h"
10 #include "mergesort.h"
11 #include "argv-array.h"
13 enum map_direction { FROM_SRC, FROM_DST };
15 static struct refspec s_tag_refspec = {
24 const struct refspec *tag_refspec = &s_tag_refspec;
26 struct counted_string {
33 struct counted_string *instead_of;
38 struct rewrite **rewrite;
43 static struct remote **remotes;
44 static int remotes_alloc;
45 static int remotes_nr;
46 static struct hashmap remotes_hash;
48 static struct branch **branches;
49 static int branches_alloc;
50 static int branches_nr;
52 static struct branch *current_branch;
53 static const char *pushremote_name;
55 static struct rewrites rewrites;
56 static struct rewrites rewrites_push;
58 static int valid_remote(const struct remote *remote)
60 return (!!remote->url) || (!!remote->foreign_vcs);
63 static const char *alias_url(const char *url, struct rewrites *r)
66 struct counted_string *longest;
71 for (i = 0; i < r->rewrite_nr; i++) {
74 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
75 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
77 longest->len < r->rewrite[i]->instead_of[j].len)) {
78 longest = &(r->rewrite[i]->instead_of[j]);
86 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
89 static void add_push_refspec(struct remote *remote, const char *ref)
91 ALLOC_GROW(remote->push_refspec,
92 remote->push_refspec_nr + 1,
93 remote->push_refspec_alloc);
94 remote->push_refspec[remote->push_refspec_nr++] = ref;
97 static void add_fetch_refspec(struct remote *remote, const char *ref)
99 ALLOC_GROW(remote->fetch_refspec,
100 remote->fetch_refspec_nr + 1,
101 remote->fetch_refspec_alloc);
102 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
105 static void add_url(struct remote *remote, const char *url)
107 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
108 remote->url[remote->url_nr++] = url;
111 static void add_pushurl(struct remote *remote, const char *pushurl)
113 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
114 remote->pushurl[remote->pushurl_nr++] = pushurl;
117 static void add_pushurl_alias(struct remote *remote, const char *url)
119 const char *pushurl = alias_url(url, &rewrites_push);
121 add_pushurl(remote, pushurl);
124 static void add_url_alias(struct remote *remote, const char *url)
126 add_url(remote, alias_url(url, &rewrites));
127 add_pushurl_alias(remote, url);
130 struct remotes_hash_key {
135 static int remotes_hash_cmp(const struct remote *a, const struct remote *b, const struct remotes_hash_key *key)
138 return strncmp(a->name, key->str, key->len) || a->name[key->len];
140 return strcmp(a->name, b->name);
143 static inline void init_remotes_hash(void)
145 if (!remotes_hash.cmpfn)
146 hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0);
149 static struct remote *make_remote(const char *name, int len)
151 struct remote *ret, *replaced;
152 struct remotes_hash_key lookup;
153 struct hashmap_entry lookup_entry;
161 hashmap_entry_init(&lookup_entry, memhash(name, len));
163 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
166 ret = xcalloc(1, sizeof(struct remote));
167 ret->prune = -1; /* unspecified */
168 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
169 remotes[remotes_nr++] = ret;
170 ret->name = xstrndup(name, len);
172 hashmap_entry_init(ret, lookup_entry.hash);
173 replaced = hashmap_put(&remotes_hash, ret);
174 assert(replaced == NULL); /* no previous entry overwritten */
178 static void add_merge(struct branch *branch, const char *name)
180 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
181 branch->merge_alloc);
182 branch->merge_name[branch->merge_nr++] = name;
185 static struct branch *make_branch(const char *name, int len)
190 for (i = 0; i < branches_nr; i++) {
191 if (len ? (!strncmp(name, branches[i]->name, len) &&
192 !branches[i]->name[len]) :
193 !strcmp(name, branches[i]->name))
197 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
198 ret = xcalloc(1, sizeof(struct branch));
199 branches[branches_nr++] = ret;
201 ret->name = xstrndup(name, len);
203 ret->name = xstrdup(name);
204 ret->refname = xstrfmt("refs/heads/%s", ret->name);
209 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
214 for (i = 0; i < r->rewrite_nr; i++) {
216 ? (len == r->rewrite[i]->baselen &&
217 !strncmp(base, r->rewrite[i]->base, len))
218 : !strcmp(base, r->rewrite[i]->base))
219 return r->rewrite[i];
222 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
223 ret = xcalloc(1, sizeof(struct rewrite));
224 r->rewrite[r->rewrite_nr++] = ret;
226 ret->base = xstrndup(base, len);
230 ret->base = xstrdup(base);
231 ret->baselen = strlen(base);
236 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
238 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
239 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
240 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
241 rewrite->instead_of_nr++;
244 static const char *skip_spaces(const char *s)
251 static void read_remotes_file(struct remote *remote)
253 struct strbuf buf = STRBUF_INIT;
254 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
258 remote->configured_in_repo = 1;
259 remote->origin = REMOTE_REMOTES;
260 while (strbuf_getline(&buf, f) != EOF) {
265 if (skip_prefix(buf.buf, "URL:", &v))
266 add_url_alias(remote, xstrdup(skip_spaces(v)));
267 else if (skip_prefix(buf.buf, "Push:", &v))
268 add_push_refspec(remote, xstrdup(skip_spaces(v)));
269 else if (skip_prefix(buf.buf, "Pull:", &v))
270 add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
272 strbuf_release(&buf);
276 static void read_branches_file(struct remote *remote)
279 struct strbuf buf = STRBUF_INIT;
280 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
285 strbuf_getline_lf(&buf, f);
289 strbuf_release(&buf);
293 remote->configured_in_repo = 1;
294 remote->origin = REMOTE_BRANCHES;
297 * The branches file would have URL and optionally
298 * #branch specified. The "master" (or specified) branch is
299 * fetched and stored in the local branch matching the
302 frag = strchr(buf.buf, '#');
308 add_url_alias(remote, strbuf_detach(&buf, NULL));
309 add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
310 frag, remote->name));
313 * Cogito compatible push: push current HEAD to remote #branch
314 * (master if missing)
316 add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
317 remote->fetch_tags = 1; /* always auto-follow */
320 static int handle_config(const char *key, const char *value, void *cb)
325 struct remote *remote;
326 struct branch *branch;
327 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
330 branch = make_branch(name, namelen);
331 if (!strcmp(subkey, "remote")) {
332 return git_config_string(&branch->remote_name, key, value);
333 } else if (!strcmp(subkey, "pushremote")) {
334 return git_config_string(&branch->pushremote_name, key, value);
335 } else if (!strcmp(subkey, "merge")) {
337 return config_error_nonbool(key);
338 add_merge(branch, xstrdup(value));
342 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
343 struct rewrite *rewrite;
346 if (!strcmp(subkey, "insteadof")) {
347 rewrite = make_rewrite(&rewrites, name, namelen);
349 return config_error_nonbool(key);
350 add_instead_of(rewrite, xstrdup(value));
351 } else if (!strcmp(subkey, "pushinsteadof")) {
352 rewrite = make_rewrite(&rewrites_push, name, namelen);
354 return config_error_nonbool(key);
355 add_instead_of(rewrite, xstrdup(value));
359 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
362 /* Handle remote.* variables */
363 if (!name && !strcmp(subkey, "pushdefault"))
364 return git_config_string(&pushremote_name, key, value);
368 /* Handle remote.<name>.* variables */
370 warning("Config remote shorthand cannot begin with '/': %s",
374 remote = make_remote(name, namelen);
375 remote->origin = REMOTE_CONFIG;
376 if (current_config_scope() == CONFIG_SCOPE_REPO)
377 remote->configured_in_repo = 1;
378 if (!strcmp(subkey, "mirror"))
379 remote->mirror = git_config_bool(key, value);
380 else if (!strcmp(subkey, "skipdefaultupdate"))
381 remote->skip_default_update = git_config_bool(key, value);
382 else if (!strcmp(subkey, "skipfetchall"))
383 remote->skip_default_update = git_config_bool(key, value);
384 else if (!strcmp(subkey, "prune"))
385 remote->prune = git_config_bool(key, value);
386 else if (!strcmp(subkey, "url")) {
388 if (git_config_string(&v, key, value))
391 } else if (!strcmp(subkey, "pushurl")) {
393 if (git_config_string(&v, key, value))
395 add_pushurl(remote, v);
396 } else if (!strcmp(subkey, "push")) {
398 if (git_config_string(&v, key, value))
400 add_push_refspec(remote, v);
401 } else if (!strcmp(subkey, "fetch")) {
403 if (git_config_string(&v, key, value))
405 add_fetch_refspec(remote, v);
406 } else if (!strcmp(subkey, "receivepack")) {
408 if (git_config_string(&v, key, value))
410 if (!remote->receivepack)
411 remote->receivepack = v;
413 error("more than one receivepack given, using the first");
414 } else if (!strcmp(subkey, "uploadpack")) {
416 if (git_config_string(&v, key, value))
418 if (!remote->uploadpack)
419 remote->uploadpack = v;
421 error("more than one uploadpack given, using the first");
422 } else if (!strcmp(subkey, "tagopt")) {
423 if (!strcmp(value, "--no-tags"))
424 remote->fetch_tags = -1;
425 else if (!strcmp(value, "--tags"))
426 remote->fetch_tags = 2;
427 } else if (!strcmp(subkey, "proxy")) {
428 return git_config_string((const char **)&remote->http_proxy,
430 } else if (!strcmp(subkey, "proxyauthmethod")) {
431 return git_config_string((const char **)&remote->http_proxy_authmethod,
433 } else if (!strcmp(subkey, "vcs")) {
434 return git_config_string(&remote->foreign_vcs, key, value);
439 static void alias_all_urls(void)
442 for (i = 0; i < remotes_nr; i++) {
443 int add_pushurl_aliases;
446 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
447 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
449 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
450 for (j = 0; j < remotes[i]->url_nr; j++) {
451 if (add_pushurl_aliases)
452 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
453 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
458 static void read_config(void)
461 struct object_id oid;
468 current_branch = NULL;
469 if (startup_info->have_repository) {
470 const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
471 if (head_ref && (flag & REF_ISSYMREF) &&
472 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
473 current_branch = make_branch(head_ref, 0);
476 git_config(handle_config, NULL);
480 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
483 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
485 for (i = 0; i < nr_refspec; i++) {
488 const char *lhs, *rhs;
499 rhs = strrchr(lhs, ':');
502 * Before going on, special case ":" (or "+:") as a refspec
503 * for pushing matching refs.
505 if (!fetch && rhs == lhs && rhs[1] == '\0') {
511 size_t rlen = strlen(++rhs);
512 is_glob = (1 <= rlen && strchr(rhs, '*'));
513 rs[i].dst = xstrndup(rhs, rlen);
516 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
517 if (1 <= llen && memchr(lhs, '*', llen)) {
518 if ((rhs && !is_glob) || (!rhs && fetch))
521 } else if (rhs && is_glob) {
525 rs[i].pattern = is_glob;
526 rs[i].src = xstrndup(lhs, llen);
527 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
530 struct object_id unused;
534 ; /* empty is ok; it means "HEAD" */
535 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
536 rs[i].exact_sha1 = 1; /* ok */
537 else if (!check_refname_format(rs[i].src, flags))
538 ; /* valid looking ref is ok */
543 ; /* missing is ok; it is the same as empty */
544 else if (!*rs[i].dst)
545 ; /* empty is ok; it means "do not store" */
546 else if (!check_refname_format(rs[i].dst, flags))
547 ; /* valid looking ref is ok */
553 * - empty is allowed; it means delete.
554 * - when wildcarded, it must be a valid looking ref.
555 * - otherwise, it must be an extended SHA-1, but
556 * there is no existing way to validate this.
561 if (check_refname_format(rs[i].src, flags))
565 ; /* anything goes, for now */
568 * - missing is allowed, but LHS then must be a
570 * - empty is not allowed.
571 * - otherwise it must be a valid looking ref.
574 if (check_refname_format(rs[i].src, flags))
576 } else if (!*rs[i].dst) {
579 if (check_refname_format(rs[i].dst, flags))
589 * nr_refspec must be greater than zero and i must be valid
590 * since it is only possible to reach this point from within
591 * the for loop above.
593 free_refspec(i+1, rs);
596 die("Invalid refspec '%s'", refspec[i]);
599 int valid_fetch_refspec(const char *fetch_refspec_str)
601 struct refspec *refspec;
603 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
604 free_refspec(1, refspec);
608 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
610 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
613 struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
615 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
618 void free_refspec(int nr_refspec, struct refspec *refspec)
625 for (i = 0; i < nr_refspec; i++) {
626 free(refspec[i].src);
627 free(refspec[i].dst);
632 static int valid_remote_nick(const char *name)
634 if (!name[0] || is_dot_or_dotdot(name))
637 /* remote nicknames cannot contain slashes */
639 if (is_dir_sep(*name++))
644 const char *remote_for_branch(struct branch *branch, int *explicit)
646 if (branch && branch->remote_name) {
649 return branch->remote_name;
656 const char *pushremote_for_branch(struct branch *branch, int *explicit)
658 if (branch && branch->pushremote_name) {
661 return branch->pushremote_name;
663 if (pushremote_name) {
666 return pushremote_name;
668 return remote_for_branch(branch, explicit);
671 static struct remote *remote_get_1(const char *name,
672 const char *(*get_default)(struct branch *, int *))
682 name = get_default(current_branch, &name_given);
684 ret = make_remote(name, 0);
685 if (valid_remote_nick(name) && have_git_dir()) {
686 if (!valid_remote(ret))
687 read_remotes_file(ret);
688 if (!valid_remote(ret))
689 read_branches_file(ret);
691 if (name_given && !valid_remote(ret))
692 add_url_alias(ret, name);
693 if (!valid_remote(ret))
695 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
696 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
700 struct remote *remote_get(const char *name)
702 return remote_get_1(name, remote_for_branch);
705 struct remote *pushremote_get(const char *name)
707 return remote_get_1(name, pushremote_for_branch);
710 int remote_is_configured(struct remote *remote, int in_repo)
715 return remote->configured_in_repo;
716 return !!remote->origin;
719 int for_each_remote(each_remote_fn fn, void *priv)
723 for (i = 0; i < remotes_nr && !result; i++) {
724 struct remote *r = remotes[i];
728 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
731 r->push = parse_push_refspec(r->push_refspec_nr,
733 result = fn(r, priv);
738 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
740 if (strcmp(ref1->name, ref2->name)) {
741 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
742 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
743 die(_("Cannot fetch both %s and %s to %s"),
744 ref1->name, ref2->name, ref2->peer_ref->name);
745 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
746 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
747 warning(_("%s usually tracks %s, not %s"),
748 ref2->peer_ref->name, ref2->name, ref1->name);
749 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
750 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
751 die(_("%s tracks both %s and %s"),
752 ref2->peer_ref->name, ref1->name, ref2->name);
755 * This last possibility doesn't occur because
756 * FETCH_HEAD_IGNORE entries always appear at
757 * the end of the list.
759 die(_("Internal error"));
762 free(ref2->peer_ref);
766 struct ref *ref_remove_duplicates(struct ref *ref_map)
768 struct string_list refs = STRING_LIST_INIT_NODUP;
769 struct ref *retval = NULL;
770 struct ref **p = &retval;
773 struct ref *ref = ref_map;
775 ref_map = ref_map->next;
778 if (!ref->peer_ref) {
782 struct string_list_item *item =
783 string_list_insert(&refs, ref->peer_ref->name);
786 /* Entry already existed */
787 handle_duplicate((struct ref *)item->util, ref);
796 string_list_clear(&refs, 0);
800 int remote_has_url(struct remote *remote, const char *url)
803 for (i = 0; i < remote->url_nr; i++) {
804 if (!strcmp(remote->url[i], url))
810 static int match_name_with_pattern(const char *key, const char *name,
811 const char *value, char **result)
813 const char *kstar = strchr(key, '*');
819 die("Key '%s' of pattern had no '*'", key);
821 ksuffixlen = strlen(kstar + 1);
822 namelen = strlen(name);
823 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
824 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
826 struct strbuf sb = STRBUF_INIT;
827 const char *vstar = strchr(value, '*');
829 die("Value '%s' of pattern has no '*'", value);
830 strbuf_add(&sb, value, vstar - value);
831 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
832 strbuf_addstr(&sb, vstar + 1);
833 *result = strbuf_detach(&sb, NULL);
838 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
841 int find_src = !query->src;
843 if (find_src && !query->dst)
844 error("query_refspecs_multiple: need either src or dst");
846 for (i = 0; i < ref_count; i++) {
847 struct refspec *refspec = &refs[i];
848 const char *key = find_src ? refspec->dst : refspec->src;
849 const char *value = find_src ? refspec->src : refspec->dst;
850 const char *needle = find_src ? query->dst : query->src;
851 char **result = find_src ? &query->src : &query->dst;
855 if (refspec->pattern) {
856 if (match_name_with_pattern(key, needle, value, result))
857 string_list_append_nodup(results, *result);
858 } else if (!strcmp(needle, key)) {
859 string_list_append(results, value);
864 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
867 int find_src = !query->src;
868 const char *needle = find_src ? query->dst : query->src;
869 char **result = find_src ? &query->src : &query->dst;
871 if (find_src && !query->dst)
872 return error("query_refspecs: need either src or dst");
874 for (i = 0; i < ref_count; i++) {
875 struct refspec *refspec = &refs[i];
876 const char *key = find_src ? refspec->dst : refspec->src;
877 const char *value = find_src ? refspec->src : refspec->dst;
881 if (refspec->pattern) {
882 if (match_name_with_pattern(key, needle, value, result)) {
883 query->force = refspec->force;
886 } else if (!strcmp(needle, key)) {
887 *result = xstrdup(value);
888 query->force = refspec->force;
895 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
898 struct refspec query;
900 memset(&query, 0, sizeof(struct refspec));
901 query.src = (char *)name;
903 if (query_refspecs(refspecs, nr_refspec, &query))
909 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
911 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
914 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
917 size_t len = strlen(name);
918 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
919 memcpy(ref->name, prefix, prefixlen);
920 memcpy(ref->name + prefixlen, name, len);
924 struct ref *alloc_ref(const char *name)
926 return alloc_ref_with_prefix("", 0, name);
929 struct ref *copy_ref(const struct ref *ref)
935 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
937 memcpy(cpy, ref, len);
939 cpy->symref = xstrdup_or_null(ref->symref);
940 cpy->remote_status = xstrdup_or_null(ref->remote_status);
941 cpy->peer_ref = copy_ref(ref->peer_ref);
945 struct ref *copy_ref_list(const struct ref *ref)
947 struct ref *ret = NULL;
948 struct ref **tail = &ret;
950 *tail = copy_ref(ref);
952 tail = &((*tail)->next);
957 static void free_ref(struct ref *ref)
961 free_ref(ref->peer_ref);
962 free(ref->remote_status);
967 void free_refs(struct ref *ref)
977 int ref_compare_name(const void *va, const void *vb)
979 const struct ref *a = va, *b = vb;
980 return strcmp(a->name, b->name);
983 static void *ref_list_get_next(const void *a)
985 return ((const struct ref *)a)->next;
988 static void ref_list_set_next(void *a, void *next)
990 ((struct ref *)a)->next = next;
993 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
995 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
998 int count_refspec_match(const char *pattern,
1000 struct ref **matched_ref)
1002 int patlen = strlen(pattern);
1003 struct ref *matched_weak = NULL;
1004 struct ref *matched = NULL;
1008 for (weak_match = match = 0; refs; refs = refs->next) {
1009 char *name = refs->name;
1010 int namelen = strlen(name);
1012 if (!refname_match(pattern, name))
1015 /* A match is "weak" if it is with refs outside
1016 * heads or tags, and did not specify the pattern
1017 * in full (e.g. "refs/remotes/origin/master") or at
1018 * least from the toplevel (e.g. "remotes/origin/master");
1019 * otherwise "git push $URL master" would result in
1020 * ambiguity between remotes/origin/master and heads/master
1021 * at the remote site.
1023 if (namelen != patlen &&
1024 patlen != namelen - 5 &&
1025 !starts_with(name, "refs/heads/") &&
1026 !starts_with(name, "refs/tags/")) {
1027 /* We want to catch the case where only weak
1028 * matches are found and there are multiple
1029 * matches, and where more than one strong
1030 * matches are found, as ambiguous. One
1031 * strong match with zero or more weak matches
1032 * are acceptable as a unique match.
1034 matched_weak = refs;
1044 *matched_ref = matched_weak;
1049 *matched_ref = matched;
1054 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1062 static struct ref *alloc_delete_ref(void)
1064 struct ref *ref = alloc_ref("(delete)");
1065 oidclr(&ref->new_oid);
1069 static int try_explicit_object_name(const char *name,
1072 struct object_id oid;
1076 *match = alloc_delete_ref();
1080 if (get_sha1(name, oid.hash))
1084 *match = alloc_ref(name);
1085 oidcpy(&(*match)->new_oid, &oid);
1090 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1092 struct ref *ret = alloc_ref(name);
1093 tail_link_ref(ret, tail);
1097 static char *guess_ref(const char *name, struct ref *peer)
1099 struct strbuf buf = STRBUF_INIT;
1100 struct object_id oid;
1102 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1107 if (starts_with(r, "refs/heads/"))
1108 strbuf_addstr(&buf, "refs/heads/");
1109 else if (starts_with(r, "refs/tags/"))
1110 strbuf_addstr(&buf, "refs/tags/");
1114 strbuf_addstr(&buf, name);
1115 return strbuf_detach(&buf, NULL);
1118 static int match_explicit_lhs(struct ref *src,
1121 int *allocated_match)
1123 switch (count_refspec_match(rs->src, src, match)) {
1125 if (allocated_match)
1126 *allocated_match = 0;
1129 /* The source could be in the get_sha1() format
1130 * not a reference name. :refs/other is a
1131 * way to delete 'other' ref at the remote end.
1133 if (try_explicit_object_name(rs->src, match) < 0)
1134 return error("src refspec %s does not match any.", rs->src);
1135 if (allocated_match)
1136 *allocated_match = 1;
1139 return error("src refspec %s matches more than one.", rs->src);
1143 static int match_explicit(struct ref *src, struct ref *dst,
1144 struct ref ***dst_tail,
1147 struct ref *matched_src, *matched_dst;
1150 const char *dst_value = rs->dst;
1153 if (rs->pattern || rs->matching)
1156 matched_src = matched_dst = NULL;
1157 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1161 struct object_id oid;
1164 dst_value = resolve_ref_unsafe(matched_src->name,
1165 RESOLVE_REF_READING,
1168 ((flag & REF_ISSYMREF) &&
1169 !starts_with(dst_value, "refs/heads/")))
1170 die("%s cannot be resolved to branch.",
1174 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1178 if (starts_with(dst_value, "refs/"))
1179 matched_dst = make_linked_ref(dst_value, dst_tail);
1180 else if (is_null_oid(&matched_src->new_oid))
1181 error("unable to delete '%s': remote ref does not exist",
1183 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1184 matched_dst = make_linked_ref(dst_guess, dst_tail);
1187 error("unable to push to unqualified destination: %s\n"
1188 "The destination refspec neither matches an "
1189 "existing ref on the remote nor\n"
1190 "begins with refs/, and we are unable to "
1191 "guess a prefix based on the source ref.",
1196 error("dst refspec %s matches more than one.",
1202 if (matched_dst->peer_ref)
1203 return error("dst ref %s receives from more than one src.",
1206 matched_dst->peer_ref = allocated_src ?
1208 copy_ref(matched_src);
1209 matched_dst->force = rs->force;
1214 static int match_explicit_refs(struct ref *src, struct ref *dst,
1215 struct ref ***dst_tail, struct refspec *rs,
1219 for (i = errs = 0; i < rs_nr; i++)
1220 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1224 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1225 int send_mirror, int direction, const struct refspec **ret_pat)
1227 const struct refspec *pat;
1230 int matching_refs = -1;
1231 for (i = 0; i < rs_nr; i++) {
1232 if (rs[i].matching &&
1233 (matching_refs == -1 || rs[i].force)) {
1238 if (rs[i].pattern) {
1239 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1241 if (direction == FROM_SRC)
1242 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1244 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1251 if (matching_refs == -1)
1254 pat = rs + matching_refs;
1255 if (pat->matching) {
1257 * "matching refs"; traditionally we pushed everything
1258 * including refs outside refs/heads/ hierarchy, but
1259 * that does not make much sense these days.
1261 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1263 name = xstrdup(ref->name);
1270 static struct ref **tail_ref(struct ref **head)
1272 struct ref **tail = head;
1274 tail = &((*tail)->next);
1279 struct commit **tip;
1283 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1285 struct commit *commit;
1287 if (is_null_oid(oid))
1289 commit = lookup_commit_reference_gently(oid, 1);
1290 if (!commit || (commit->object.flags & TMP_MARK))
1292 commit->object.flags |= TMP_MARK;
1293 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1294 tips->tip[tips->nr++] = commit;
1297 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1299 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1300 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1301 struct string_list_item *item;
1303 struct tips sent_tips;
1306 * Collect everything we know they would have at the end of
1307 * this push, and collect all tags they have.
1309 memset(&sent_tips, 0, sizeof(sent_tips));
1310 for (ref = *dst; ref; ref = ref->next) {
1311 if (ref->peer_ref &&
1312 !is_null_oid(&ref->peer_ref->new_oid))
1313 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1315 add_to_tips(&sent_tips, &ref->old_oid);
1316 if (starts_with(ref->name, "refs/tags/"))
1317 string_list_append(&dst_tag, ref->name);
1319 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1321 string_list_sort(&dst_tag);
1323 /* Collect tags they do not have. */
1324 for (ref = src; ref; ref = ref->next) {
1325 if (!starts_with(ref->name, "refs/tags/"))
1326 continue; /* not a tag */
1327 if (string_list_has_string(&dst_tag, ref->name))
1328 continue; /* they already have it */
1329 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1330 continue; /* be conservative */
1331 item = string_list_append(&src_tag, ref->name);
1334 string_list_clear(&dst_tag, 0);
1337 * At this point, src_tag lists tags that are missing from
1338 * dst, and sent_tips lists the tips we are pushing or those
1339 * that we know they already have. An element in the src_tag
1340 * that is an ancestor of any of the sent_tips needs to be
1341 * sent to the other side.
1344 for_each_string_list_item(item, &src_tag) {
1345 struct ref *ref = item->util;
1346 struct ref *dst_ref;
1347 struct commit *commit;
1349 if (is_null_oid(&ref->new_oid))
1351 commit = lookup_commit_reference_gently(&ref->new_oid,
1354 /* not pushing a commit, which is not an error */
1358 * Is this tag, which they do not have, reachable from
1359 * any of the commits we are sending?
1361 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1365 dst_ref = make_linked_ref(ref->name, dst_tail);
1366 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1367 dst_ref->peer_ref = copy_ref(ref);
1370 string_list_clear(&src_tag, 0);
1371 free(sent_tips.tip);
1374 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1376 for ( ; list; list = list->next)
1377 if (!strcmp(list->name, name))
1378 return (struct ref *)list;
1382 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1384 for ( ; ref; ref = ref->next)
1385 string_list_append_nodup(ref_index, ref->name)->util = ref;
1387 string_list_sort(ref_index);
1391 * Given only the set of local refs, sanity-check the set of push
1392 * refspecs. We can't catch all errors that match_push_refs would,
1393 * but we can catch some errors early before even talking to the
1396 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1398 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1402 for (i = 0; i < nr_refspec; i++) {
1403 struct refspec *rs = refspec + i;
1405 if (rs->pattern || rs->matching)
1408 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1411 free_refspec(nr_refspec, refspec);
1416 * Given the set of refs the local repository has, the set of refs the
1417 * remote repository has, and the refspec used for push, determine
1418 * what remote refs we will update and with what value by setting
1419 * peer_ref (which object is being pushed) and force (if the push is
1420 * forced) in elements of "dst". The function may add new elements to
1421 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1423 int match_push_refs(struct ref *src, struct ref **dst,
1424 int nr_refspec, const char **refspec, int flags)
1427 int send_all = flags & MATCH_REFS_ALL;
1428 int send_mirror = flags & MATCH_REFS_MIRROR;
1429 int send_prune = flags & MATCH_REFS_PRUNE;
1431 static const char *default_refspec[] = { ":", NULL };
1432 struct ref *ref, **dst_tail = tail_ref(dst);
1433 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1437 refspec = default_refspec;
1439 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1440 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1442 /* pick the remainder */
1443 for (ref = src; ref; ref = ref->next) {
1444 struct string_list_item *dst_item;
1445 struct ref *dst_peer;
1446 const struct refspec *pat = NULL;
1449 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1453 if (!dst_ref_index.nr)
1454 prepare_ref_index(&dst_ref_index, *dst);
1456 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1457 dst_peer = dst_item ? dst_item->util : NULL;
1459 if (dst_peer->peer_ref)
1460 /* We're already sending something to this ref. */
1463 if (pat->matching && !(send_all || send_mirror))
1465 * Remote doesn't have it, and we have no
1466 * explicit pattern, and we don't have
1467 * --all or --mirror.
1471 /* Create a new one and link it */
1472 dst_peer = make_linked_ref(dst_name, &dst_tail);
1473 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1474 string_list_insert(&dst_ref_index,
1475 dst_peer->name)->util = dst_peer;
1477 dst_peer->peer_ref = copy_ref(ref);
1478 dst_peer->force = pat->force;
1483 string_list_clear(&dst_ref_index, 0);
1485 if (flags & MATCH_REFS_FOLLOW_TAGS)
1486 add_missing_tags(src, dst, &dst_tail);
1489 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1490 /* check for missing refs on the remote */
1491 for (ref = *dst; ref; ref = ref->next) {
1495 /* We're already sending something to this ref. */
1498 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1500 if (!src_ref_index.nr)
1501 prepare_ref_index(&src_ref_index, src);
1502 if (!string_list_has_string(&src_ref_index,
1504 ref->peer_ref = alloc_delete_ref();
1508 string_list_clear(&src_ref_index, 0);
1515 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1520 for (ref = remote_refs; ref; ref = ref->next) {
1521 int force_ref_update = ref->force || force_update;
1522 int reject_reason = 0;
1525 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1526 else if (!send_mirror)
1529 ref->deletion = is_null_oid(&ref->new_oid);
1530 if (!ref->deletion &&
1531 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1532 ref->status = REF_STATUS_UPTODATE;
1537 * If the remote ref has moved and is now different
1538 * from what we expect, reject any push.
1540 * It also is an error if the user told us to check
1541 * with the remote-tracking branch to find the value
1542 * to expect, but we did not have such a tracking
1545 if (ref->expect_old_sha1) {
1546 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1547 reject_reason = REF_STATUS_REJECT_STALE;
1549 /* If the ref isn't stale then force the update. */
1550 force_ref_update = 1;
1554 * If the update isn't already rejected then check
1555 * the usual "must fast-forward" rules.
1557 * Decide whether an individual refspec A:B can be
1558 * pushed. The push will succeed if any of the
1559 * following are true:
1561 * (1) the remote reference B does not exist
1563 * (2) the remote reference B is being removed (i.e.,
1564 * pushing :B where no source is specified)
1566 * (3) the destination is not under refs/tags/, and
1567 * if the old and new value is a commit, the new
1568 * is a descendant of the old.
1570 * (4) it is forced using the +A:B notation, or by
1571 * passing the --force argument
1574 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1575 if (starts_with(ref->name, "refs/tags/"))
1576 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1577 else if (!has_object_file(&ref->old_oid))
1578 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1579 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1580 !lookup_commit_reference_gently(&ref->new_oid, 1))
1581 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1582 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1583 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1587 * "--force" will defeat any rejection implemented
1588 * by the rules above.
1590 if (!force_ref_update)
1591 ref->status = reject_reason;
1592 else if (reject_reason)
1593 ref->forced_update = 1;
1597 static void set_merge(struct branch *ret)
1599 struct remote *remote;
1601 struct object_id oid;
1605 return; /* no branch */
1607 return; /* already run */
1608 if (!ret->remote_name || !ret->merge_nr) {
1610 * no merge config; let's make sure we don't confuse callers
1611 * with a non-zero merge_nr but a NULL merge
1617 remote = remote_get(ret->remote_name);
1619 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1620 for (i = 0; i < ret->merge_nr; i++) {
1621 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1622 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1623 if (!remote_find_tracking(remote, ret->merge[i]) ||
1624 strcmp(ret->remote_name, "."))
1626 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1627 oid.hash, &ref) == 1)
1628 ret->merge[i]->dst = ref;
1630 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1634 struct branch *branch_get(const char *name)
1639 if (!name || !*name || !strcmp(name, "HEAD"))
1640 ret = current_branch;
1642 ret = make_branch(name, 0);
1647 int branch_has_merge_config(struct branch *branch)
1649 return branch && !!branch->merge;
1652 int branch_merge_matches(struct branch *branch,
1654 const char *refname)
1656 if (!branch || i < 0 || i >= branch->merge_nr)
1658 return refname_match(branch->merge[i]->src, refname);
1661 __attribute__((format (printf,2,3)))
1662 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1667 strbuf_vaddf(err, fmt, ap);
1673 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1676 return error_buf(err, _("HEAD does not point to a branch"));
1678 if (!branch->merge || !branch->merge[0]) {
1680 * no merge config; is it because the user didn't define any,
1681 * or because it is not a real branch, and get_branch
1684 if (!ref_exists(branch->refname))
1685 return error_buf(err, _("no such branch: '%s'"),
1687 return error_buf(err,
1688 _("no upstream configured for branch '%s'"),
1692 if (!branch->merge[0]->dst)
1693 return error_buf(err,
1694 _("upstream branch '%s' not stored as a remote-tracking branch"),
1695 branch->merge[0]->src);
1697 return branch->merge[0]->dst;
1700 static const char *tracking_for_push_dest(struct remote *remote,
1701 const char *refname,
1706 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1708 return error_buf(err,
1709 _("push destination '%s' on remote '%s' has no local tracking branch"),
1710 refname, remote->name);
1714 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1716 struct remote *remote;
1718 remote = remote_get(pushremote_for_branch(branch, NULL));
1720 return error_buf(err,
1721 _("branch '%s' has no remote for pushing"),
1724 if (remote->push_refspec_nr) {
1728 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1731 return error_buf(err,
1732 _("push refspecs for '%s' do not include '%s'"),
1733 remote->name, branch->name);
1735 ret = tracking_for_push_dest(remote, dst, err);
1741 return tracking_for_push_dest(remote, branch->refname, err);
1743 switch (push_default) {
1744 case PUSH_DEFAULT_NOTHING:
1745 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1747 case PUSH_DEFAULT_MATCHING:
1748 case PUSH_DEFAULT_CURRENT:
1749 return tracking_for_push_dest(remote, branch->refname, err);
1751 case PUSH_DEFAULT_UPSTREAM:
1752 return branch_get_upstream(branch, err);
1754 case PUSH_DEFAULT_UNSPECIFIED:
1755 case PUSH_DEFAULT_SIMPLE:
1757 const char *up, *cur;
1759 up = branch_get_upstream(branch, err);
1762 cur = tracking_for_push_dest(remote, branch->refname, err);
1765 if (strcmp(cur, up))
1766 return error_buf(err,
1767 _("cannot resolve 'simple' push to a single destination"));
1772 die("BUG: unhandled push situation");
1775 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1778 return error_buf(err, _("HEAD does not point to a branch"));
1780 if (!branch->push_tracking_ref)
1781 branch->push_tracking_ref = branch_get_push_1(branch, err);
1782 return branch->push_tracking_ref;
1785 static int ignore_symref_update(const char *refname)
1787 struct object_id oid;
1790 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1791 return 0; /* non-existing refs are OK */
1792 return (flag & REF_ISSYMREF);
1796 * Create and return a list of (struct ref) consisting of copies of
1797 * each remote_ref that matches refspec. refspec must be a pattern.
1798 * Fill in the copies' peer_ref to describe the local tracking refs to
1799 * which they map. Omit any references that would map to an existing
1800 * local symbolic ref.
1802 static struct ref *get_expanded_map(const struct ref *remote_refs,
1803 const struct refspec *refspec)
1805 const struct ref *ref;
1806 struct ref *ret = NULL;
1807 struct ref **tail = &ret;
1809 for (ref = remote_refs; ref; ref = ref->next) {
1810 char *expn_name = NULL;
1812 if (strchr(ref->name, '^'))
1813 continue; /* a dereference item */
1814 if (match_name_with_pattern(refspec->src, ref->name,
1815 refspec->dst, &expn_name) &&
1816 !ignore_symref_update(expn_name)) {
1817 struct ref *cpy = copy_ref(ref);
1819 cpy->peer_ref = alloc_ref(expn_name);
1821 cpy->peer_ref->force = 1;
1831 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1833 const struct ref *ref;
1834 for (ref = refs; ref; ref = ref->next) {
1835 if (refname_match(name, ref->name))
1841 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1843 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1848 return copy_ref(ref);
1851 static struct ref *get_local_ref(const char *name)
1853 if (!name || name[0] == '\0')
1856 if (starts_with(name, "refs/"))
1857 return alloc_ref(name);
1859 if (starts_with(name, "heads/") ||
1860 starts_with(name, "tags/") ||
1861 starts_with(name, "remotes/"))
1862 return alloc_ref_with_prefix("refs/", 5, name);
1864 return alloc_ref_with_prefix("refs/heads/", 11, name);
1867 int get_fetch_map(const struct ref *remote_refs,
1868 const struct refspec *refspec,
1872 struct ref *ref_map, **rmp;
1874 if (refspec->pattern) {
1875 ref_map = get_expanded_map(remote_refs, refspec);
1877 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1879 if (refspec->exact_sha1) {
1880 ref_map = alloc_ref(name);
1881 get_oid_hex(name, &ref_map->old_oid);
1883 ref_map = get_remote_ref(remote_refs, name);
1885 if (!missing_ok && !ref_map)
1886 die("Couldn't find remote ref %s", name);
1888 ref_map->peer_ref = get_local_ref(refspec->dst);
1889 if (ref_map->peer_ref && refspec->force)
1890 ref_map->peer_ref->force = 1;
1894 for (rmp = &ref_map; *rmp; ) {
1895 if ((*rmp)->peer_ref) {
1896 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1897 check_refname_format((*rmp)->peer_ref->name, 0)) {
1898 struct ref *ignore = *rmp;
1899 error("* Ignoring funny ref '%s' locally",
1900 (*rmp)->peer_ref->name);
1901 *rmp = (*rmp)->next;
1902 free(ignore->peer_ref);
1907 rmp = &((*rmp)->next);
1911 tail_link_ref(ref_map, tail);
1916 int resolve_remote_symref(struct ref *ref, struct ref *list)
1920 for (; list; list = list->next)
1921 if (!strcmp(ref->symref, list->name)) {
1922 oidcpy(&ref->old_oid, &list->old_oid);
1928 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1931 struct commit *commit = pop_commit(&list);
1932 commit->object.flags &= ~mark;
1936 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1939 struct commit *old, *new;
1940 struct commit_list *list, *used;
1944 * Both new and old must be commit-ish and new is descendant of
1945 * old. Otherwise we require --force.
1947 o = deref_tag(parse_object(old_oid), NULL, 0);
1948 if (!o || o->type != OBJ_COMMIT)
1950 old = (struct commit *) o;
1952 o = deref_tag(parse_object(new_oid), NULL, 0);
1953 if (!o || o->type != OBJ_COMMIT)
1955 new = (struct commit *) o;
1957 if (parse_commit(new) < 0)
1961 commit_list_insert(new, &list);
1963 new = pop_most_recent_commit(&list, TMP_MARK);
1964 commit_list_insert(new, &used);
1970 unmark_and_free(list, TMP_MARK);
1971 unmark_and_free(used, TMP_MARK);
1976 * Compare a branch with its upstream, and save their differences (number
1977 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1978 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1979 * is not itself NULL.
1981 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1982 * upstream defined, or ref does not exist), 0 otherwise.
1984 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1985 const char **upstream_name)
1987 struct object_id oid;
1988 struct commit *ours, *theirs;
1989 struct rev_info revs;
1991 struct argv_array argv = ARGV_ARRAY_INIT;
1993 /* Cannot stat unless we are marked to build on top of somebody else. */
1994 base = branch_get_upstream(branch, NULL);
1996 *upstream_name = base;
2000 /* Cannot stat if what we used to build on no longer exists */
2001 if (read_ref(base, oid.hash))
2003 theirs = lookup_commit_reference(&oid);
2007 if (read_ref(branch->refname, oid.hash))
2009 ours = lookup_commit_reference(&oid);
2013 /* are we the same? */
2014 if (theirs == ours) {
2015 *num_theirs = *num_ours = 0;
2019 /* Run "rev-list --left-right ours...theirs" internally... */
2020 argv_array_push(&argv, ""); /* ignored */
2021 argv_array_push(&argv, "--left-right");
2022 argv_array_pushf(&argv, "%s...%s",
2023 oid_to_hex(&ours->object.oid),
2024 oid_to_hex(&theirs->object.oid));
2025 argv_array_push(&argv, "--");
2027 init_revisions(&revs, NULL);
2028 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2029 if (prepare_revision_walk(&revs))
2030 die("revision walk setup failed");
2032 /* ... and count the commits on each side. */
2036 struct commit *c = get_revision(&revs);
2039 if (c->object.flags & SYMMETRIC_LEFT)
2045 /* clear object flags smudged by the above traversal */
2046 clear_commit_marks(ours, ALL_REV_FLAGS);
2047 clear_commit_marks(theirs, ALL_REV_FLAGS);
2049 argv_array_clear(&argv);
2054 * Return true when there is anything to report, otherwise false.
2056 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2059 const char *full_base;
2061 int upstream_is_gone = 0;
2063 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2066 upstream_is_gone = 1;
2069 base = shorten_unambiguous_ref(full_base, 0);
2070 if (upstream_is_gone) {
2072 _("Your branch is based on '%s', but the upstream is gone.\n"),
2074 if (advice_status_hints)
2076 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2077 } else if (!ours && !theirs) {
2079 _("Your branch is up-to-date with '%s'.\n"),
2081 } else if (!theirs) {
2083 Q_("Your branch is ahead of '%s' by %d commit.\n",
2084 "Your branch is ahead of '%s' by %d commits.\n",
2087 if (advice_status_hints)
2089 _(" (use \"git push\" to publish your local commits)\n"));
2092 Q_("Your branch is behind '%s' by %d commit, "
2093 "and can be fast-forwarded.\n",
2094 "Your branch is behind '%s' by %d commits, "
2095 "and can be fast-forwarded.\n",
2098 if (advice_status_hints)
2100 _(" (use \"git pull\" to update your local branch)\n"));
2103 Q_("Your branch and '%s' have diverged,\n"
2104 "and have %d and %d different commit each, "
2106 "Your branch and '%s' have diverged,\n"
2107 "and have %d and %d different commits each, "
2110 base, ours, theirs);
2111 if (advice_status_hints)
2113 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2119 static int one_local_ref(const char *refname, const struct object_id *oid,
2120 int flag, void *cb_data)
2122 struct ref ***local_tail = cb_data;
2125 /* we already know it starts with refs/ to get here */
2126 if (check_refname_format(refname + 5, 0))
2129 ref = alloc_ref(refname);
2130 oidcpy(&ref->new_oid, oid);
2132 *local_tail = &ref->next;
2136 struct ref *get_local_heads(void)
2138 struct ref *local_refs = NULL, **local_tail = &local_refs;
2140 for_each_ref(one_local_ref, &local_tail);
2144 struct ref *guess_remote_head(const struct ref *head,
2145 const struct ref *refs,
2148 const struct ref *r;
2149 struct ref *list = NULL;
2150 struct ref **tail = &list;
2156 * Some transports support directly peeking at
2157 * where HEAD points; if that is the case, then
2158 * we don't have to guess.
2161 return copy_ref(find_ref_by_name(refs, head->symref));
2163 /* If refs/heads/master could be right, it is. */
2165 r = find_ref_by_name(refs, "refs/heads/master");
2166 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2170 /* Look for another ref that points there */
2171 for (r = refs; r; r = r->next) {
2173 starts_with(r->name, "refs/heads/") &&
2174 !oidcmp(&r->old_oid, &head->old_oid)) {
2175 *tail = copy_ref(r);
2176 tail = &((*tail)->next);
2185 struct stale_heads_info {
2186 struct string_list *ref_names;
2187 struct ref **stale_refs_tail;
2188 struct refspec *refs;
2192 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2193 int flags, void *cb_data)
2195 struct stale_heads_info *info = cb_data;
2196 struct string_list matches = STRING_LIST_INIT_DUP;
2197 struct refspec query;
2199 memset(&query, 0, sizeof(struct refspec));
2200 query.dst = (char *)refname;
2202 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2203 if (matches.nr == 0)
2204 goto clean_exit; /* No matches */
2207 * If we did find a suitable refspec and it's not a symref and
2208 * it's not in the list of refs that currently exist in that
2209 * remote, we consider it to be stale. In order to deal with
2210 * overlapping refspecs, we need to go over all of the
2213 if (flags & REF_ISSYMREF)
2216 for (i = 0; stale && i < matches.nr; i++)
2217 if (string_list_has_string(info->ref_names, matches.items[i].string))
2221 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2222 oidcpy(&ref->new_oid, oid);
2226 string_list_clear(&matches, 0);
2230 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2232 struct ref *ref, *stale_refs = NULL;
2233 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2234 struct stale_heads_info info;
2236 info.ref_names = &ref_names;
2237 info.stale_refs_tail = &stale_refs;
2239 info.ref_count = ref_count;
2240 for (ref = fetch_map; ref; ref = ref->next)
2241 string_list_append(&ref_names, ref->name);
2242 string_list_sort(&ref_names);
2243 for_each_ref(get_stale_heads_cb, &info);
2244 string_list_clear(&ref_names, 0);
2251 static void clear_cas_option(struct push_cas_option *cas)
2255 for (i = 0; i < cas->nr; i++)
2256 free(cas->entry[i].refname);
2258 memset(cas, 0, sizeof(*cas));
2261 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2262 const char *refname,
2265 struct push_cas *entry;
2266 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2267 entry = &cas->entry[cas->nr++];
2268 memset(entry, 0, sizeof(*entry));
2269 entry->refname = xmemdupz(refname, refnamelen);
2273 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2276 struct push_cas *entry;
2279 /* "--no-<option>" */
2280 clear_cas_option(cas);
2285 /* just "--<option>" */
2286 cas->use_tracking_for_rest = 1;
2290 /* "--<option>=refname" or "--<option>=refname:value" */
2291 colon = strchrnul(arg, ':');
2292 entry = add_cas_entry(cas, arg, colon - arg);
2294 entry->use_tracking = 1;
2296 hashclr(entry->expect);
2297 else if (get_sha1(colon + 1, entry->expect))
2298 return error("cannot parse expected object name '%s'", colon + 1);
2302 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2304 return parse_push_cas_option(opt->value, arg, unset);
2307 int is_empty_cas(const struct push_cas_option *cas)
2309 return !cas->use_tracking_for_rest && !cas->nr;
2313 * Look at remote.fetch refspec and see if we have a remote
2314 * tracking branch for the refname there. Fill its current
2316 * If we cannot do so, return negative to signal an error.
2318 static int remote_tracking(struct remote *remote, const char *refname,
2319 struct object_id *oid)
2323 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2325 return -1; /* no tracking ref for refname at remote */
2326 if (read_ref(dst, oid->hash))
2327 return -1; /* we know what the tracking ref is but we cannot read it */
2331 static void apply_cas(struct push_cas_option *cas,
2332 struct remote *remote,
2337 /* Find an explicit --<option>=<name>[:<value>] entry */
2338 for (i = 0; i < cas->nr; i++) {
2339 struct push_cas *entry = &cas->entry[i];
2340 if (!refname_match(entry->refname, ref->name))
2342 ref->expect_old_sha1 = 1;
2343 if (!entry->use_tracking)
2344 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2345 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2346 oidclr(&ref->old_oid_expect);
2350 /* Are we using "--<option>" to cover all? */
2351 if (!cas->use_tracking_for_rest)
2354 ref->expect_old_sha1 = 1;
2355 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2356 oidclr(&ref->old_oid_expect);
2359 void apply_push_cas(struct push_cas_option *cas,
2360 struct remote *remote,
2361 struct ref *remote_refs)
2364 for (ref = remote_refs; ref; ref = ref->next)
2365 apply_cas(cas, remote, ref);