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(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(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);
481 * This function frees a refspec array.
482 * Warning: code paths should be checked to ensure that the src
483 * and dst pointers are always freeable pointers as well
484 * as the refspec pointer itself.
486 static void free_refspecs(struct refspec *refspec, int nr_refspec)
493 for (i = 0; i < nr_refspec; i++) {
494 free(refspec[i].src);
495 free(refspec[i].dst);
500 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
503 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
505 for (i = 0; i < nr_refspec; i++) {
508 const char *lhs, *rhs;
519 rhs = strrchr(lhs, ':');
522 * Before going on, special case ":" (or "+:") as a refspec
523 * for pushing matching refs.
525 if (!fetch && rhs == lhs && rhs[1] == '\0') {
531 size_t rlen = strlen(++rhs);
532 is_glob = (1 <= rlen && strchr(rhs, '*'));
533 rs[i].dst = xstrndup(rhs, rlen);
536 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
537 if (1 <= llen && memchr(lhs, '*', llen)) {
538 if ((rhs && !is_glob) || (!rhs && fetch))
541 } else if (rhs && is_glob) {
545 rs[i].pattern = is_glob;
546 rs[i].src = xstrndup(lhs, llen);
547 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
550 struct object_id unused;
554 ; /* empty is ok; it means "HEAD" */
555 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
556 rs[i].exact_sha1 = 1; /* ok */
557 else if (!check_refname_format(rs[i].src, flags))
558 ; /* valid looking ref is ok */
563 ; /* missing is ok; it is the same as empty */
564 else if (!*rs[i].dst)
565 ; /* empty is ok; it means "do not store" */
566 else if (!check_refname_format(rs[i].dst, flags))
567 ; /* valid looking ref is ok */
573 * - empty is allowed; it means delete.
574 * - when wildcarded, it must be a valid looking ref.
575 * - otherwise, it must be an extended SHA-1, but
576 * there is no existing way to validate this.
581 if (check_refname_format(rs[i].src, flags))
585 ; /* anything goes, for now */
588 * - missing is allowed, but LHS then must be a
590 * - empty is not allowed.
591 * - otherwise it must be a valid looking ref.
594 if (check_refname_format(rs[i].src, flags))
596 } else if (!*rs[i].dst) {
599 if (check_refname_format(rs[i].dst, flags))
609 * nr_refspec must be greater than zero and i must be valid
610 * since it is only possible to reach this point from within
611 * the for loop above.
613 free_refspecs(rs, i+1);
616 die("Invalid refspec '%s'", refspec[i]);
619 int valid_fetch_refspec(const char *fetch_refspec_str)
621 struct refspec *refspec;
623 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
624 free_refspecs(refspec, 1);
628 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
630 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
633 struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
635 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
638 void free_refspec(int nr_refspec, struct refspec *refspec)
641 for (i = 0; i < nr_refspec; i++) {
642 free(refspec[i].src);
643 free(refspec[i].dst);
648 static int valid_remote_nick(const char *name)
650 if (!name[0] || is_dot_or_dotdot(name))
653 /* remote nicknames cannot contain slashes */
655 if (is_dir_sep(*name++))
660 const char *remote_for_branch(struct branch *branch, int *explicit)
662 if (branch && branch->remote_name) {
665 return branch->remote_name;
672 const char *pushremote_for_branch(struct branch *branch, int *explicit)
674 if (branch && branch->pushremote_name) {
677 return branch->pushremote_name;
679 if (pushremote_name) {
682 return pushremote_name;
684 return remote_for_branch(branch, explicit);
687 static struct remote *remote_get_1(const char *name,
688 const char *(*get_default)(struct branch *, int *))
698 name = get_default(current_branch, &name_given);
700 ret = make_remote(name, 0);
701 if (valid_remote_nick(name) && have_git_dir()) {
702 if (!valid_remote(ret))
703 read_remotes_file(ret);
704 if (!valid_remote(ret))
705 read_branches_file(ret);
707 if (name_given && !valid_remote(ret))
708 add_url_alias(ret, name);
709 if (!valid_remote(ret))
711 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
712 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
716 struct remote *remote_get(const char *name)
718 return remote_get_1(name, remote_for_branch);
721 struct remote *pushremote_get(const char *name)
723 return remote_get_1(name, pushremote_for_branch);
726 int remote_is_configured(struct remote *remote, int in_repo)
731 return remote->configured_in_repo;
732 return !!remote->origin;
735 int for_each_remote(each_remote_fn fn, void *priv)
739 for (i = 0; i < remotes_nr && !result; i++) {
740 struct remote *r = remotes[i];
744 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
747 r->push = parse_push_refspec(r->push_refspec_nr,
749 result = fn(r, priv);
754 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
756 if (strcmp(ref1->name, ref2->name)) {
757 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
758 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
759 die(_("Cannot fetch both %s and %s to %s"),
760 ref1->name, ref2->name, ref2->peer_ref->name);
761 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
762 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
763 warning(_("%s usually tracks %s, not %s"),
764 ref2->peer_ref->name, ref2->name, ref1->name);
765 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
766 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
767 die(_("%s tracks both %s and %s"),
768 ref2->peer_ref->name, ref1->name, ref2->name);
771 * This last possibility doesn't occur because
772 * FETCH_HEAD_IGNORE entries always appear at
773 * the end of the list.
775 die(_("Internal error"));
778 free(ref2->peer_ref);
782 struct ref *ref_remove_duplicates(struct ref *ref_map)
784 struct string_list refs = STRING_LIST_INIT_NODUP;
785 struct ref *retval = NULL;
786 struct ref **p = &retval;
789 struct ref *ref = ref_map;
791 ref_map = ref_map->next;
794 if (!ref->peer_ref) {
798 struct string_list_item *item =
799 string_list_insert(&refs, ref->peer_ref->name);
802 /* Entry already existed */
803 handle_duplicate((struct ref *)item->util, ref);
812 string_list_clear(&refs, 0);
816 int remote_has_url(struct remote *remote, const char *url)
819 for (i = 0; i < remote->url_nr; i++) {
820 if (!strcmp(remote->url[i], url))
826 static int match_name_with_pattern(const char *key, const char *name,
827 const char *value, char **result)
829 const char *kstar = strchr(key, '*');
835 die("Key '%s' of pattern had no '*'", key);
837 ksuffixlen = strlen(kstar + 1);
838 namelen = strlen(name);
839 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
840 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
842 struct strbuf sb = STRBUF_INIT;
843 const char *vstar = strchr(value, '*');
845 die("Value '%s' of pattern has no '*'", value);
846 strbuf_add(&sb, value, vstar - value);
847 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
848 strbuf_addstr(&sb, vstar + 1);
849 *result = strbuf_detach(&sb, NULL);
854 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
857 int find_src = !query->src;
859 if (find_src && !query->dst)
860 error("query_refspecs_multiple: need either src or dst");
862 for (i = 0; i < ref_count; i++) {
863 struct refspec *refspec = &refs[i];
864 const char *key = find_src ? refspec->dst : refspec->src;
865 const char *value = find_src ? refspec->src : refspec->dst;
866 const char *needle = find_src ? query->dst : query->src;
867 char **result = find_src ? &query->src : &query->dst;
871 if (refspec->pattern) {
872 if (match_name_with_pattern(key, needle, value, result))
873 string_list_append_nodup(results, *result);
874 } else if (!strcmp(needle, key)) {
875 string_list_append(results, value);
880 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
883 int find_src = !query->src;
884 const char *needle = find_src ? query->dst : query->src;
885 char **result = find_src ? &query->src : &query->dst;
887 if (find_src && !query->dst)
888 return error("query_refspecs: need either src or dst");
890 for (i = 0; i < ref_count; i++) {
891 struct refspec *refspec = &refs[i];
892 const char *key = find_src ? refspec->dst : refspec->src;
893 const char *value = find_src ? refspec->src : refspec->dst;
897 if (refspec->pattern) {
898 if (match_name_with_pattern(key, needle, value, result)) {
899 query->force = refspec->force;
902 } else if (!strcmp(needle, key)) {
903 *result = xstrdup(value);
904 query->force = refspec->force;
911 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
914 struct refspec query;
916 memset(&query, 0, sizeof(struct refspec));
917 query.src = (char *)name;
919 if (query_refspecs(refspecs, nr_refspec, &query))
925 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
927 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
930 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
933 size_t len = strlen(name);
934 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
935 memcpy(ref->name, prefix, prefixlen);
936 memcpy(ref->name + prefixlen, name, len);
940 struct ref *alloc_ref(const char *name)
942 return alloc_ref_with_prefix("", 0, name);
945 struct ref *copy_ref(const struct ref *ref)
951 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
953 memcpy(cpy, ref, len);
955 cpy->symref = xstrdup_or_null(ref->symref);
956 cpy->remote_status = xstrdup_or_null(ref->remote_status);
957 cpy->peer_ref = copy_ref(ref->peer_ref);
961 struct ref *copy_ref_list(const struct ref *ref)
963 struct ref *ret = NULL;
964 struct ref **tail = &ret;
966 *tail = copy_ref(ref);
968 tail = &((*tail)->next);
973 static void free_ref(struct ref *ref)
977 free_ref(ref->peer_ref);
978 free(ref->remote_status);
983 void free_refs(struct ref *ref)
993 int ref_compare_name(const void *va, const void *vb)
995 const struct ref *a = va, *b = vb;
996 return strcmp(a->name, b->name);
999 static void *ref_list_get_next(const void *a)
1001 return ((const struct ref *)a)->next;
1004 static void ref_list_set_next(void *a, void *next)
1006 ((struct ref *)a)->next = next;
1009 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
1011 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1014 int count_refspec_match(const char *pattern,
1016 struct ref **matched_ref)
1018 int patlen = strlen(pattern);
1019 struct ref *matched_weak = NULL;
1020 struct ref *matched = NULL;
1024 for (weak_match = match = 0; refs; refs = refs->next) {
1025 char *name = refs->name;
1026 int namelen = strlen(name);
1028 if (!refname_match(pattern, name))
1031 /* A match is "weak" if it is with refs outside
1032 * heads or tags, and did not specify the pattern
1033 * in full (e.g. "refs/remotes/origin/master") or at
1034 * least from the toplevel (e.g. "remotes/origin/master");
1035 * otherwise "git push $URL master" would result in
1036 * ambiguity between remotes/origin/master and heads/master
1037 * at the remote site.
1039 if (namelen != patlen &&
1040 patlen != namelen - 5 &&
1041 !starts_with(name, "refs/heads/") &&
1042 !starts_with(name, "refs/tags/")) {
1043 /* We want to catch the case where only weak
1044 * matches are found and there are multiple
1045 * matches, and where more than one strong
1046 * matches are found, as ambiguous. One
1047 * strong match with zero or more weak matches
1048 * are acceptable as a unique match.
1050 matched_weak = refs;
1060 *matched_ref = matched_weak;
1065 *matched_ref = matched;
1070 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1078 static struct ref *alloc_delete_ref(void)
1080 struct ref *ref = alloc_ref("(delete)");
1081 oidclr(&ref->new_oid);
1085 static int try_explicit_object_name(const char *name,
1088 struct object_id oid;
1092 *match = alloc_delete_ref();
1096 if (get_sha1(name, oid.hash))
1100 *match = alloc_ref(name);
1101 oidcpy(&(*match)->new_oid, &oid);
1106 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1108 struct ref *ret = alloc_ref(name);
1109 tail_link_ref(ret, tail);
1113 static char *guess_ref(const char *name, struct ref *peer)
1115 struct strbuf buf = STRBUF_INIT;
1116 struct object_id oid;
1118 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1123 if (starts_with(r, "refs/heads/"))
1124 strbuf_addstr(&buf, "refs/heads/");
1125 else if (starts_with(r, "refs/tags/"))
1126 strbuf_addstr(&buf, "refs/tags/");
1130 strbuf_addstr(&buf, name);
1131 return strbuf_detach(&buf, NULL);
1134 static int match_explicit_lhs(struct ref *src,
1137 int *allocated_match)
1139 switch (count_refspec_match(rs->src, src, match)) {
1141 if (allocated_match)
1142 *allocated_match = 0;
1145 /* The source could be in the get_sha1() format
1146 * not a reference name. :refs/other is a
1147 * way to delete 'other' ref at the remote end.
1149 if (try_explicit_object_name(rs->src, match) < 0)
1150 return error("src refspec %s does not match any.", rs->src);
1151 if (allocated_match)
1152 *allocated_match = 1;
1155 return error("src refspec %s matches more than one.", rs->src);
1159 static int match_explicit(struct ref *src, struct ref *dst,
1160 struct ref ***dst_tail,
1163 struct ref *matched_src, *matched_dst;
1166 const char *dst_value = rs->dst;
1169 if (rs->pattern || rs->matching)
1172 matched_src = matched_dst = NULL;
1173 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1177 struct object_id oid;
1180 dst_value = resolve_ref_unsafe(matched_src->name,
1181 RESOLVE_REF_READING,
1184 ((flag & REF_ISSYMREF) &&
1185 !starts_with(dst_value, "refs/heads/")))
1186 die("%s cannot be resolved to branch.",
1190 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1194 if (starts_with(dst_value, "refs/"))
1195 matched_dst = make_linked_ref(dst_value, dst_tail);
1196 else if (is_null_oid(&matched_src->new_oid))
1197 error("unable to delete '%s': remote ref does not exist",
1199 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1200 matched_dst = make_linked_ref(dst_guess, dst_tail);
1203 error("unable to push to unqualified destination: %s\n"
1204 "The destination refspec neither matches an "
1205 "existing ref on the remote nor\n"
1206 "begins with refs/, and we are unable to "
1207 "guess a prefix based on the source ref.",
1212 error("dst refspec %s matches more than one.",
1218 if (matched_dst->peer_ref)
1219 return error("dst ref %s receives from more than one src.",
1222 matched_dst->peer_ref = allocated_src ?
1224 copy_ref(matched_src);
1225 matched_dst->force = rs->force;
1230 static int match_explicit_refs(struct ref *src, struct ref *dst,
1231 struct ref ***dst_tail, struct refspec *rs,
1235 for (i = errs = 0; i < rs_nr; i++)
1236 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1240 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1241 int send_mirror, int direction, const struct refspec **ret_pat)
1243 const struct refspec *pat;
1246 int matching_refs = -1;
1247 for (i = 0; i < rs_nr; i++) {
1248 if (rs[i].matching &&
1249 (matching_refs == -1 || rs[i].force)) {
1254 if (rs[i].pattern) {
1255 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1257 if (direction == FROM_SRC)
1258 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1260 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1267 if (matching_refs == -1)
1270 pat = rs + matching_refs;
1271 if (pat->matching) {
1273 * "matching refs"; traditionally we pushed everything
1274 * including refs outside refs/heads/ hierarchy, but
1275 * that does not make much sense these days.
1277 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1279 name = xstrdup(ref->name);
1286 static struct ref **tail_ref(struct ref **head)
1288 struct ref **tail = head;
1290 tail = &((*tail)->next);
1295 struct commit **tip;
1299 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1301 struct commit *commit;
1303 if (is_null_oid(oid))
1305 commit = lookup_commit_reference_gently(oid, 1);
1306 if (!commit || (commit->object.flags & TMP_MARK))
1308 commit->object.flags |= TMP_MARK;
1309 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1310 tips->tip[tips->nr++] = commit;
1313 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1315 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1316 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1317 struct string_list_item *item;
1319 struct tips sent_tips;
1322 * Collect everything we know they would have at the end of
1323 * this push, and collect all tags they have.
1325 memset(&sent_tips, 0, sizeof(sent_tips));
1326 for (ref = *dst; ref; ref = ref->next) {
1327 if (ref->peer_ref &&
1328 !is_null_oid(&ref->peer_ref->new_oid))
1329 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1331 add_to_tips(&sent_tips, &ref->old_oid);
1332 if (starts_with(ref->name, "refs/tags/"))
1333 string_list_append(&dst_tag, ref->name);
1335 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1337 string_list_sort(&dst_tag);
1339 /* Collect tags they do not have. */
1340 for (ref = src; ref; ref = ref->next) {
1341 if (!starts_with(ref->name, "refs/tags/"))
1342 continue; /* not a tag */
1343 if (string_list_has_string(&dst_tag, ref->name))
1344 continue; /* they already have it */
1345 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1346 continue; /* be conservative */
1347 item = string_list_append(&src_tag, ref->name);
1350 string_list_clear(&dst_tag, 0);
1353 * At this point, src_tag lists tags that are missing from
1354 * dst, and sent_tips lists the tips we are pushing or those
1355 * that we know they already have. An element in the src_tag
1356 * that is an ancestor of any of the sent_tips needs to be
1357 * sent to the other side.
1360 for_each_string_list_item(item, &src_tag) {
1361 struct ref *ref = item->util;
1362 struct ref *dst_ref;
1363 struct commit *commit;
1365 if (is_null_oid(&ref->new_oid))
1367 commit = lookup_commit_reference_gently(&ref->new_oid,
1370 /* not pushing a commit, which is not an error */
1374 * Is this tag, which they do not have, reachable from
1375 * any of the commits we are sending?
1377 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1381 dst_ref = make_linked_ref(ref->name, dst_tail);
1382 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1383 dst_ref->peer_ref = copy_ref(ref);
1386 string_list_clear(&src_tag, 0);
1387 free(sent_tips.tip);
1390 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1392 for ( ; list; list = list->next)
1393 if (!strcmp(list->name, name))
1394 return (struct ref *)list;
1398 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1400 for ( ; ref; ref = ref->next)
1401 string_list_append_nodup(ref_index, ref->name)->util = ref;
1403 string_list_sort(ref_index);
1407 * Given only the set of local refs, sanity-check the set of push
1408 * refspecs. We can't catch all errors that match_push_refs would,
1409 * but we can catch some errors early before even talking to the
1412 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1414 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1418 for (i = 0; i < nr_refspec; i++) {
1419 struct refspec *rs = refspec + i;
1421 if (rs->pattern || rs->matching)
1424 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1427 free_refspec(nr_refspec, refspec);
1432 * Given the set of refs the local repository has, the set of refs the
1433 * remote repository has, and the refspec used for push, determine
1434 * what remote refs we will update and with what value by setting
1435 * peer_ref (which object is being pushed) and force (if the push is
1436 * forced) in elements of "dst". The function may add new elements to
1437 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1439 int match_push_refs(struct ref *src, struct ref **dst,
1440 int nr_refspec, const char **refspec, int flags)
1443 int send_all = flags & MATCH_REFS_ALL;
1444 int send_mirror = flags & MATCH_REFS_MIRROR;
1445 int send_prune = flags & MATCH_REFS_PRUNE;
1447 static const char *default_refspec[] = { ":", NULL };
1448 struct ref *ref, **dst_tail = tail_ref(dst);
1449 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1453 refspec = default_refspec;
1455 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1456 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1458 /* pick the remainder */
1459 for (ref = src; ref; ref = ref->next) {
1460 struct string_list_item *dst_item;
1461 struct ref *dst_peer;
1462 const struct refspec *pat = NULL;
1465 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1469 if (!dst_ref_index.nr)
1470 prepare_ref_index(&dst_ref_index, *dst);
1472 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1473 dst_peer = dst_item ? dst_item->util : NULL;
1475 if (dst_peer->peer_ref)
1476 /* We're already sending something to this ref. */
1479 if (pat->matching && !(send_all || send_mirror))
1481 * Remote doesn't have it, and we have no
1482 * explicit pattern, and we don't have
1483 * --all or --mirror.
1487 /* Create a new one and link it */
1488 dst_peer = make_linked_ref(dst_name, &dst_tail);
1489 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1490 string_list_insert(&dst_ref_index,
1491 dst_peer->name)->util = dst_peer;
1493 dst_peer->peer_ref = copy_ref(ref);
1494 dst_peer->force = pat->force;
1499 string_list_clear(&dst_ref_index, 0);
1501 if (flags & MATCH_REFS_FOLLOW_TAGS)
1502 add_missing_tags(src, dst, &dst_tail);
1505 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1506 /* check for missing refs on the remote */
1507 for (ref = *dst; ref; ref = ref->next) {
1511 /* We're already sending something to this ref. */
1514 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1516 if (!src_ref_index.nr)
1517 prepare_ref_index(&src_ref_index, src);
1518 if (!string_list_has_string(&src_ref_index,
1520 ref->peer_ref = alloc_delete_ref();
1524 string_list_clear(&src_ref_index, 0);
1531 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1536 for (ref = remote_refs; ref; ref = ref->next) {
1537 int force_ref_update = ref->force || force_update;
1538 int reject_reason = 0;
1541 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1542 else if (!send_mirror)
1545 ref->deletion = is_null_oid(&ref->new_oid);
1546 if (!ref->deletion &&
1547 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1548 ref->status = REF_STATUS_UPTODATE;
1553 * If the remote ref has moved and is now different
1554 * from what we expect, reject any push.
1556 * It also is an error if the user told us to check
1557 * with the remote-tracking branch to find the value
1558 * to expect, but we did not have such a tracking
1561 if (ref->expect_old_sha1) {
1562 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1563 reject_reason = REF_STATUS_REJECT_STALE;
1565 /* If the ref isn't stale then force the update. */
1566 force_ref_update = 1;
1570 * If the update isn't already rejected then check
1571 * the usual "must fast-forward" rules.
1573 * Decide whether an individual refspec A:B can be
1574 * pushed. The push will succeed if any of the
1575 * following are true:
1577 * (1) the remote reference B does not exist
1579 * (2) the remote reference B is being removed (i.e.,
1580 * pushing :B where no source is specified)
1582 * (3) the destination is not under refs/tags/, and
1583 * if the old and new value is a commit, the new
1584 * is a descendant of the old.
1586 * (4) it is forced using the +A:B notation, or by
1587 * passing the --force argument
1590 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1591 if (starts_with(ref->name, "refs/tags/"))
1592 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1593 else if (!has_object_file(&ref->old_oid))
1594 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1595 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1596 !lookup_commit_reference_gently(&ref->new_oid, 1))
1597 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1598 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1599 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1603 * "--force" will defeat any rejection implemented
1604 * by the rules above.
1606 if (!force_ref_update)
1607 ref->status = reject_reason;
1608 else if (reject_reason)
1609 ref->forced_update = 1;
1613 static void set_merge(struct branch *ret)
1615 struct remote *remote;
1617 struct object_id oid;
1621 return; /* no branch */
1623 return; /* already run */
1624 if (!ret->remote_name || !ret->merge_nr) {
1626 * no merge config; let's make sure we don't confuse callers
1627 * with a non-zero merge_nr but a NULL merge
1633 remote = remote_get(ret->remote_name);
1635 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1636 for (i = 0; i < ret->merge_nr; i++) {
1637 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1638 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1639 if (!remote_find_tracking(remote, ret->merge[i]) ||
1640 strcmp(ret->remote_name, "."))
1642 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1643 oid.hash, &ref) == 1)
1644 ret->merge[i]->dst = ref;
1646 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1650 struct branch *branch_get(const char *name)
1655 if (!name || !*name || !strcmp(name, "HEAD"))
1656 ret = current_branch;
1658 ret = make_branch(name, 0);
1663 int branch_has_merge_config(struct branch *branch)
1665 return branch && !!branch->merge;
1668 int branch_merge_matches(struct branch *branch,
1670 const char *refname)
1672 if (!branch || i < 0 || i >= branch->merge_nr)
1674 return refname_match(branch->merge[i]->src, refname);
1677 __attribute__((format (printf,2,3)))
1678 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1683 strbuf_vaddf(err, fmt, ap);
1689 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1692 return error_buf(err, _("HEAD does not point to a branch"));
1694 if (!branch->merge || !branch->merge[0]) {
1696 * no merge config; is it because the user didn't define any,
1697 * or because it is not a real branch, and get_branch
1700 if (!ref_exists(branch->refname))
1701 return error_buf(err, _("no such branch: '%s'"),
1703 return error_buf(err,
1704 _("no upstream configured for branch '%s'"),
1708 if (!branch->merge[0]->dst)
1709 return error_buf(err,
1710 _("upstream branch '%s' not stored as a remote-tracking branch"),
1711 branch->merge[0]->src);
1713 return branch->merge[0]->dst;
1716 static const char *tracking_for_push_dest(struct remote *remote,
1717 const char *refname,
1722 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1724 return error_buf(err,
1725 _("push destination '%s' on remote '%s' has no local tracking branch"),
1726 refname, remote->name);
1730 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1732 struct remote *remote;
1734 remote = remote_get(pushremote_for_branch(branch, NULL));
1736 return error_buf(err,
1737 _("branch '%s' has no remote for pushing"),
1740 if (remote->push_refspec_nr) {
1744 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1747 return error_buf(err,
1748 _("push refspecs for '%s' do not include '%s'"),
1749 remote->name, branch->name);
1751 ret = tracking_for_push_dest(remote, dst, err);
1757 return tracking_for_push_dest(remote, branch->refname, err);
1759 switch (push_default) {
1760 case PUSH_DEFAULT_NOTHING:
1761 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1763 case PUSH_DEFAULT_MATCHING:
1764 case PUSH_DEFAULT_CURRENT:
1765 return tracking_for_push_dest(remote, branch->refname, err);
1767 case PUSH_DEFAULT_UPSTREAM:
1768 return branch_get_upstream(branch, err);
1770 case PUSH_DEFAULT_UNSPECIFIED:
1771 case PUSH_DEFAULT_SIMPLE:
1773 const char *up, *cur;
1775 up = branch_get_upstream(branch, err);
1778 cur = tracking_for_push_dest(remote, branch->refname, err);
1781 if (strcmp(cur, up))
1782 return error_buf(err,
1783 _("cannot resolve 'simple' push to a single destination"));
1788 die("BUG: unhandled push situation");
1791 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1794 return error_buf(err, _("HEAD does not point to a branch"));
1796 if (!branch->push_tracking_ref)
1797 branch->push_tracking_ref = branch_get_push_1(branch, err);
1798 return branch->push_tracking_ref;
1801 static int ignore_symref_update(const char *refname)
1803 struct object_id oid;
1806 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1807 return 0; /* non-existing refs are OK */
1808 return (flag & REF_ISSYMREF);
1812 * Create and return a list of (struct ref) consisting of copies of
1813 * each remote_ref that matches refspec. refspec must be a pattern.
1814 * Fill in the copies' peer_ref to describe the local tracking refs to
1815 * which they map. Omit any references that would map to an existing
1816 * local symbolic ref.
1818 static struct ref *get_expanded_map(const struct ref *remote_refs,
1819 const struct refspec *refspec)
1821 const struct ref *ref;
1822 struct ref *ret = NULL;
1823 struct ref **tail = &ret;
1825 for (ref = remote_refs; ref; ref = ref->next) {
1826 char *expn_name = NULL;
1828 if (strchr(ref->name, '^'))
1829 continue; /* a dereference item */
1830 if (match_name_with_pattern(refspec->src, ref->name,
1831 refspec->dst, &expn_name) &&
1832 !ignore_symref_update(expn_name)) {
1833 struct ref *cpy = copy_ref(ref);
1835 cpy->peer_ref = alloc_ref(expn_name);
1837 cpy->peer_ref->force = 1;
1847 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1849 const struct ref *ref;
1850 for (ref = refs; ref; ref = ref->next) {
1851 if (refname_match(name, ref->name))
1857 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1859 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1864 return copy_ref(ref);
1867 static struct ref *get_local_ref(const char *name)
1869 if (!name || name[0] == '\0')
1872 if (starts_with(name, "refs/"))
1873 return alloc_ref(name);
1875 if (starts_with(name, "heads/") ||
1876 starts_with(name, "tags/") ||
1877 starts_with(name, "remotes/"))
1878 return alloc_ref_with_prefix("refs/", 5, name);
1880 return alloc_ref_with_prefix("refs/heads/", 11, name);
1883 int get_fetch_map(const struct ref *remote_refs,
1884 const struct refspec *refspec,
1888 struct ref *ref_map, **rmp;
1890 if (refspec->pattern) {
1891 ref_map = get_expanded_map(remote_refs, refspec);
1893 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1895 if (refspec->exact_sha1) {
1896 ref_map = alloc_ref(name);
1897 get_oid_hex(name, &ref_map->old_oid);
1899 ref_map = get_remote_ref(remote_refs, name);
1901 if (!missing_ok && !ref_map)
1902 die("Couldn't find remote ref %s", name);
1904 ref_map->peer_ref = get_local_ref(refspec->dst);
1905 if (ref_map->peer_ref && refspec->force)
1906 ref_map->peer_ref->force = 1;
1910 for (rmp = &ref_map; *rmp; ) {
1911 if ((*rmp)->peer_ref) {
1912 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1913 check_refname_format((*rmp)->peer_ref->name, 0)) {
1914 struct ref *ignore = *rmp;
1915 error("* Ignoring funny ref '%s' locally",
1916 (*rmp)->peer_ref->name);
1917 *rmp = (*rmp)->next;
1918 free(ignore->peer_ref);
1923 rmp = &((*rmp)->next);
1927 tail_link_ref(ref_map, tail);
1932 int resolve_remote_symref(struct ref *ref, struct ref *list)
1936 for (; list; list = list->next)
1937 if (!strcmp(ref->symref, list->name)) {
1938 oidcpy(&ref->old_oid, &list->old_oid);
1944 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1947 struct commit *commit = pop_commit(&list);
1948 commit->object.flags &= ~mark;
1952 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1955 struct commit *old, *new;
1956 struct commit_list *list, *used;
1960 * Both new and old must be commit-ish and new is descendant of
1961 * old. Otherwise we require --force.
1963 o = deref_tag(parse_object(old_oid), NULL, 0);
1964 if (!o || o->type != OBJ_COMMIT)
1966 old = (struct commit *) o;
1968 o = deref_tag(parse_object(new_oid), NULL, 0);
1969 if (!o || o->type != OBJ_COMMIT)
1971 new = (struct commit *) o;
1973 if (parse_commit(new) < 0)
1977 commit_list_insert(new, &list);
1979 new = pop_most_recent_commit(&list, TMP_MARK);
1980 commit_list_insert(new, &used);
1986 unmark_and_free(list, TMP_MARK);
1987 unmark_and_free(used, TMP_MARK);
1992 * Compare a branch with its upstream, and save their differences (number
1993 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1994 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1995 * is not itself NULL.
1997 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1998 * upstream defined, or ref does not exist), 0 otherwise.
2000 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
2001 const char **upstream_name)
2003 struct object_id oid;
2004 struct commit *ours, *theirs;
2005 struct rev_info revs;
2007 struct argv_array argv = ARGV_ARRAY_INIT;
2009 /* Cannot stat unless we are marked to build on top of somebody else. */
2010 base = branch_get_upstream(branch, NULL);
2012 *upstream_name = base;
2016 /* Cannot stat if what we used to build on no longer exists */
2017 if (read_ref(base, oid.hash))
2019 theirs = lookup_commit_reference(&oid);
2023 if (read_ref(branch->refname, oid.hash))
2025 ours = lookup_commit_reference(&oid);
2029 /* are we the same? */
2030 if (theirs == ours) {
2031 *num_theirs = *num_ours = 0;
2035 /* Run "rev-list --left-right ours...theirs" internally... */
2036 argv_array_push(&argv, ""); /* ignored */
2037 argv_array_push(&argv, "--left-right");
2038 argv_array_pushf(&argv, "%s...%s",
2039 oid_to_hex(&ours->object.oid),
2040 oid_to_hex(&theirs->object.oid));
2041 argv_array_push(&argv, "--");
2043 init_revisions(&revs, NULL);
2044 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2045 if (prepare_revision_walk(&revs))
2046 die("revision walk setup failed");
2048 /* ... and count the commits on each side. */
2052 struct commit *c = get_revision(&revs);
2055 if (c->object.flags & SYMMETRIC_LEFT)
2061 /* clear object flags smudged by the above traversal */
2062 clear_commit_marks(ours, ALL_REV_FLAGS);
2063 clear_commit_marks(theirs, ALL_REV_FLAGS);
2065 argv_array_clear(&argv);
2070 * Return true when there is anything to report, otherwise false.
2072 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2075 const char *full_base;
2077 int upstream_is_gone = 0;
2079 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2082 upstream_is_gone = 1;
2085 base = shorten_unambiguous_ref(full_base, 0);
2086 if (upstream_is_gone) {
2088 _("Your branch is based on '%s', but the upstream is gone.\n"),
2090 if (advice_status_hints)
2092 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2093 } else if (!ours && !theirs) {
2095 _("Your branch is up-to-date with '%s'.\n"),
2097 } else if (!theirs) {
2099 Q_("Your branch is ahead of '%s' by %d commit.\n",
2100 "Your branch is ahead of '%s' by %d commits.\n",
2103 if (advice_status_hints)
2105 _(" (use \"git push\" to publish your local commits)\n"));
2108 Q_("Your branch is behind '%s' by %d commit, "
2109 "and can be fast-forwarded.\n",
2110 "Your branch is behind '%s' by %d commits, "
2111 "and can be fast-forwarded.\n",
2114 if (advice_status_hints)
2116 _(" (use \"git pull\" to update your local branch)\n"));
2119 Q_("Your branch and '%s' have diverged,\n"
2120 "and have %d and %d different commit each, "
2122 "Your branch and '%s' have diverged,\n"
2123 "and have %d and %d different commits each, "
2126 base, ours, theirs);
2127 if (advice_status_hints)
2129 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2135 static int one_local_ref(const char *refname, const struct object_id *oid,
2136 int flag, void *cb_data)
2138 struct ref ***local_tail = cb_data;
2141 /* we already know it starts with refs/ to get here */
2142 if (check_refname_format(refname + 5, 0))
2145 ref = alloc_ref(refname);
2146 oidcpy(&ref->new_oid, oid);
2148 *local_tail = &ref->next;
2152 struct ref *get_local_heads(void)
2154 struct ref *local_refs = NULL, **local_tail = &local_refs;
2156 for_each_ref(one_local_ref, &local_tail);
2160 struct ref *guess_remote_head(const struct ref *head,
2161 const struct ref *refs,
2164 const struct ref *r;
2165 struct ref *list = NULL;
2166 struct ref **tail = &list;
2172 * Some transports support directly peeking at
2173 * where HEAD points; if that is the case, then
2174 * we don't have to guess.
2177 return copy_ref(find_ref_by_name(refs, head->symref));
2179 /* If refs/heads/master could be right, it is. */
2181 r = find_ref_by_name(refs, "refs/heads/master");
2182 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2186 /* Look for another ref that points there */
2187 for (r = refs; r; r = r->next) {
2189 starts_with(r->name, "refs/heads/") &&
2190 !oidcmp(&r->old_oid, &head->old_oid)) {
2191 *tail = copy_ref(r);
2192 tail = &((*tail)->next);
2201 struct stale_heads_info {
2202 struct string_list *ref_names;
2203 struct ref **stale_refs_tail;
2204 struct refspec *refs;
2208 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2209 int flags, void *cb_data)
2211 struct stale_heads_info *info = cb_data;
2212 struct string_list matches = STRING_LIST_INIT_DUP;
2213 struct refspec query;
2215 memset(&query, 0, sizeof(struct refspec));
2216 query.dst = (char *)refname;
2218 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2219 if (matches.nr == 0)
2220 goto clean_exit; /* No matches */
2223 * If we did find a suitable refspec and it's not a symref and
2224 * it's not in the list of refs that currently exist in that
2225 * remote, we consider it to be stale. In order to deal with
2226 * overlapping refspecs, we need to go over all of the
2229 if (flags & REF_ISSYMREF)
2232 for (i = 0; stale && i < matches.nr; i++)
2233 if (string_list_has_string(info->ref_names, matches.items[i].string))
2237 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2238 oidcpy(&ref->new_oid, oid);
2242 string_list_clear(&matches, 0);
2246 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2248 struct ref *ref, *stale_refs = NULL;
2249 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2250 struct stale_heads_info info;
2252 info.ref_names = &ref_names;
2253 info.stale_refs_tail = &stale_refs;
2255 info.ref_count = ref_count;
2256 for (ref = fetch_map; ref; ref = ref->next)
2257 string_list_append(&ref_names, ref->name);
2258 string_list_sort(&ref_names);
2259 for_each_ref(get_stale_heads_cb, &info);
2260 string_list_clear(&ref_names, 0);
2267 static void clear_cas_option(struct push_cas_option *cas)
2271 for (i = 0; i < cas->nr; i++)
2272 free(cas->entry[i].refname);
2274 memset(cas, 0, sizeof(*cas));
2277 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2278 const char *refname,
2281 struct push_cas *entry;
2282 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2283 entry = &cas->entry[cas->nr++];
2284 memset(entry, 0, sizeof(*entry));
2285 entry->refname = xmemdupz(refname, refnamelen);
2289 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2292 struct push_cas *entry;
2295 /* "--no-<option>" */
2296 clear_cas_option(cas);
2301 /* just "--<option>" */
2302 cas->use_tracking_for_rest = 1;
2306 /* "--<option>=refname" or "--<option>=refname:value" */
2307 colon = strchrnul(arg, ':');
2308 entry = add_cas_entry(cas, arg, colon - arg);
2310 entry->use_tracking = 1;
2312 hashclr(entry->expect);
2313 else if (get_sha1(colon + 1, entry->expect))
2314 return error("cannot parse expected object name '%s'", colon + 1);
2318 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2320 return parse_push_cas_option(opt->value, arg, unset);
2323 int is_empty_cas(const struct push_cas_option *cas)
2325 return !cas->use_tracking_for_rest && !cas->nr;
2329 * Look at remote.fetch refspec and see if we have a remote
2330 * tracking branch for the refname there. Fill its current
2332 * If we cannot do so, return negative to signal an error.
2334 static int remote_tracking(struct remote *remote, const char *refname,
2335 struct object_id *oid)
2339 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2341 return -1; /* no tracking ref for refname at remote */
2342 if (read_ref(dst, oid->hash))
2343 return -1; /* we know what the tracking ref is but we cannot read it */
2347 static void apply_cas(struct push_cas_option *cas,
2348 struct remote *remote,
2353 /* Find an explicit --<option>=<name>[:<value>] entry */
2354 for (i = 0; i < cas->nr; i++) {
2355 struct push_cas *entry = &cas->entry[i];
2356 if (!refname_match(entry->refname, ref->name))
2358 ref->expect_old_sha1 = 1;
2359 if (!entry->use_tracking)
2360 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2361 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2362 oidclr(&ref->old_oid_expect);
2366 /* Are we using "--<option>" to cover all? */
2367 if (!cas->use_tracking_for_rest)
2370 ref->expect_old_sha1 = 1;
2371 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2372 oidclr(&ref->old_oid_expect);
2375 void apply_push_cas(struct push_cas_option *cas,
2376 struct remote *remote,
2377 struct ref *remote_refs)
2380 for (ref = remote_refs; ref; ref = ref->next)
2381 apply_cas(cas, remote, ref);