11 #include "string-list.h"
12 #include "mergesort.h"
13 #include "argv-array.h"
15 enum map_direction { FROM_SRC, FROM_DST };
17 struct counted_string {
24 struct counted_string *instead_of;
29 struct rewrite **rewrite;
34 static struct remote **remotes;
35 static int remotes_alloc;
36 static int remotes_nr;
37 static struct hashmap remotes_hash;
39 static struct branch **branches;
40 static int branches_alloc;
41 static int branches_nr;
43 static struct branch *current_branch;
44 static const char *pushremote_name;
46 static struct rewrites rewrites;
47 static struct rewrites rewrites_push;
49 static int valid_remote(const struct remote *remote)
51 return (!!remote->url) || (!!remote->foreign_vcs);
54 static const char *alias_url(const char *url, struct rewrites *r)
57 struct counted_string *longest;
62 for (i = 0; i < r->rewrite_nr; i++) {
65 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
66 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
68 longest->len < r->rewrite[i]->instead_of[j].len)) {
69 longest = &(r->rewrite[i]->instead_of[j]);
77 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
80 static void add_push_refspec(struct remote *remote, const char *ref)
82 ALLOC_GROW(remote->push_refspec,
83 remote->push_refspec_nr + 1,
84 remote->push_refspec_alloc);
85 remote->push_refspec[remote->push_refspec_nr++] = ref;
88 static void add_fetch_refspec(struct remote *remote, const char *ref)
90 ALLOC_GROW(remote->fetch_refspec,
91 remote->fetch_refspec_nr + 1,
92 remote->fetch_refspec_alloc);
93 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
96 void add_prune_tags_to_fetch_refspec(struct remote *remote)
98 int nr = remote->fetch_refspec_nr;
100 int size = sizeof(struct refspec_item);
102 remote->fetch = xrealloc(remote->fetch, size * bufsize);
103 memcpy(&remote->fetch[nr], tag_refspec, size);
104 add_fetch_refspec(remote, xstrdup(TAG_REFSPEC));
107 static void add_url(struct remote *remote, const char *url)
109 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
110 remote->url[remote->url_nr++] = url;
113 static void add_pushurl(struct remote *remote, const char *pushurl)
115 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
116 remote->pushurl[remote->pushurl_nr++] = pushurl;
119 static void add_pushurl_alias(struct remote *remote, const char *url)
121 const char *pushurl = alias_url(url, &rewrites_push);
123 add_pushurl(remote, pushurl);
126 static void add_url_alias(struct remote *remote, const char *url)
128 add_url(remote, alias_url(url, &rewrites));
129 add_pushurl_alias(remote, url);
132 struct remotes_hash_key {
137 static int remotes_hash_cmp(const void *unused_cmp_data,
139 const void *entry_or_key,
142 const struct remote *a = entry;
143 const struct remote *b = entry_or_key;
144 const struct remotes_hash_key *key = keydata;
147 return strncmp(a->name, key->str, key->len) || a->name[key->len];
149 return strcmp(a->name, b->name);
152 static inline void init_remotes_hash(void)
154 if (!remotes_hash.cmpfn)
155 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
158 static struct remote *make_remote(const char *name, int len)
160 struct remote *ret, *replaced;
161 struct remotes_hash_key lookup;
162 struct hashmap_entry lookup_entry;
170 hashmap_entry_init(&lookup_entry, memhash(name, len));
172 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
175 ret = xcalloc(1, sizeof(struct remote));
176 ret->prune = -1; /* unspecified */
177 ret->prune_tags = -1; /* unspecified */
178 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
179 remotes[remotes_nr++] = ret;
180 ret->name = xstrndup(name, len);
182 hashmap_entry_init(ret, lookup_entry.hash);
183 replaced = hashmap_put(&remotes_hash, ret);
184 assert(replaced == NULL); /* no previous entry overwritten */
188 static void add_merge(struct branch *branch, const char *name)
190 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
191 branch->merge_alloc);
192 branch->merge_name[branch->merge_nr++] = name;
195 static struct branch *make_branch(const char *name, int len)
200 for (i = 0; i < branches_nr; i++) {
201 if (len ? (!strncmp(name, branches[i]->name, len) &&
202 !branches[i]->name[len]) :
203 !strcmp(name, branches[i]->name))
207 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
208 ret = xcalloc(1, sizeof(struct branch));
209 branches[branches_nr++] = ret;
211 ret->name = xstrndup(name, len);
213 ret->name = xstrdup(name);
214 ret->refname = xstrfmt("refs/heads/%s", ret->name);
219 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
224 for (i = 0; i < r->rewrite_nr; i++) {
226 ? (len == r->rewrite[i]->baselen &&
227 !strncmp(base, r->rewrite[i]->base, len))
228 : !strcmp(base, r->rewrite[i]->base))
229 return r->rewrite[i];
232 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
233 ret = xcalloc(1, sizeof(struct rewrite));
234 r->rewrite[r->rewrite_nr++] = ret;
236 ret->base = xstrndup(base, len);
240 ret->base = xstrdup(base);
241 ret->baselen = strlen(base);
246 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
248 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
249 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
250 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
251 rewrite->instead_of_nr++;
254 static const char *skip_spaces(const char *s)
261 static void read_remotes_file(struct remote *remote)
263 struct strbuf buf = STRBUF_INIT;
264 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
268 remote->configured_in_repo = 1;
269 remote->origin = REMOTE_REMOTES;
270 while (strbuf_getline(&buf, f) != EOF) {
275 if (skip_prefix(buf.buf, "URL:", &v))
276 add_url_alias(remote, xstrdup(skip_spaces(v)));
277 else if (skip_prefix(buf.buf, "Push:", &v))
278 add_push_refspec(remote, xstrdup(skip_spaces(v)));
279 else if (skip_prefix(buf.buf, "Pull:", &v))
280 add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
282 strbuf_release(&buf);
286 static void read_branches_file(struct remote *remote)
289 struct strbuf buf = STRBUF_INIT;
290 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
295 strbuf_getline_lf(&buf, f);
299 strbuf_release(&buf);
303 remote->configured_in_repo = 1;
304 remote->origin = REMOTE_BRANCHES;
307 * The branches file would have URL and optionally
308 * #branch specified. The "master" (or specified) branch is
309 * fetched and stored in the local branch matching the
312 frag = strchr(buf.buf, '#');
318 add_url_alias(remote, strbuf_detach(&buf, NULL));
319 add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
320 frag, remote->name));
323 * Cogito compatible push: push current HEAD to remote #branch
324 * (master if missing)
326 add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
327 remote->fetch_tags = 1; /* always auto-follow */
330 static int handle_config(const char *key, const char *value, void *cb)
335 struct remote *remote;
336 struct branch *branch;
337 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
340 branch = make_branch(name, namelen);
341 if (!strcmp(subkey, "remote")) {
342 return git_config_string(&branch->remote_name, key, value);
343 } else if (!strcmp(subkey, "pushremote")) {
344 return git_config_string(&branch->pushremote_name, key, value);
345 } else if (!strcmp(subkey, "merge")) {
347 return config_error_nonbool(key);
348 add_merge(branch, xstrdup(value));
352 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
353 struct rewrite *rewrite;
356 if (!strcmp(subkey, "insteadof")) {
357 rewrite = make_rewrite(&rewrites, name, namelen);
359 return config_error_nonbool(key);
360 add_instead_of(rewrite, xstrdup(value));
361 } else if (!strcmp(subkey, "pushinsteadof")) {
362 rewrite = make_rewrite(&rewrites_push, name, namelen);
364 return config_error_nonbool(key);
365 add_instead_of(rewrite, xstrdup(value));
369 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
372 /* Handle remote.* variables */
373 if (!name && !strcmp(subkey, "pushdefault"))
374 return git_config_string(&pushremote_name, key, value);
378 /* Handle remote.<name>.* variables */
380 warning("Config remote shorthand cannot begin with '/': %s",
384 remote = make_remote(name, namelen);
385 remote->origin = REMOTE_CONFIG;
386 if (current_config_scope() == CONFIG_SCOPE_REPO)
387 remote->configured_in_repo = 1;
388 if (!strcmp(subkey, "mirror"))
389 remote->mirror = git_config_bool(key, value);
390 else if (!strcmp(subkey, "skipdefaultupdate"))
391 remote->skip_default_update = git_config_bool(key, value);
392 else if (!strcmp(subkey, "skipfetchall"))
393 remote->skip_default_update = git_config_bool(key, value);
394 else if (!strcmp(subkey, "prune"))
395 remote->prune = git_config_bool(key, value);
396 else if (!strcmp(subkey, "prunetags"))
397 remote->prune_tags = git_config_bool(key, value);
398 else if (!strcmp(subkey, "url")) {
400 if (git_config_string(&v, key, value))
403 } else if (!strcmp(subkey, "pushurl")) {
405 if (git_config_string(&v, key, value))
407 add_pushurl(remote, v);
408 } else if (!strcmp(subkey, "push")) {
410 if (git_config_string(&v, key, value))
412 add_push_refspec(remote, v);
413 } else if (!strcmp(subkey, "fetch")) {
415 if (git_config_string(&v, key, value))
417 add_fetch_refspec(remote, v);
418 } else if (!strcmp(subkey, "receivepack")) {
420 if (git_config_string(&v, key, value))
422 if (!remote->receivepack)
423 remote->receivepack = v;
425 error("more than one receivepack given, using the first");
426 } else if (!strcmp(subkey, "uploadpack")) {
428 if (git_config_string(&v, key, value))
430 if (!remote->uploadpack)
431 remote->uploadpack = v;
433 error("more than one uploadpack given, using the first");
434 } else if (!strcmp(subkey, "tagopt")) {
435 if (!strcmp(value, "--no-tags"))
436 remote->fetch_tags = -1;
437 else if (!strcmp(value, "--tags"))
438 remote->fetch_tags = 2;
439 } else if (!strcmp(subkey, "proxy")) {
440 return git_config_string((const char **)&remote->http_proxy,
442 } else if (!strcmp(subkey, "proxyauthmethod")) {
443 return git_config_string((const char **)&remote->http_proxy_authmethod,
445 } else if (!strcmp(subkey, "vcs")) {
446 return git_config_string(&remote->foreign_vcs, key, value);
451 static void alias_all_urls(void)
454 for (i = 0; i < remotes_nr; i++) {
455 int add_pushurl_aliases;
458 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
459 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
461 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
462 for (j = 0; j < remotes[i]->url_nr; j++) {
463 if (add_pushurl_aliases)
464 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
465 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
470 static void read_config(void)
479 current_branch = NULL;
480 if (startup_info->have_repository) {
481 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
482 if (head_ref && (flag & REF_ISSYMREF) &&
483 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
484 current_branch = make_branch(head_ref, 0);
487 git_config(handle_config, NULL);
491 static int valid_remote_nick(const char *name)
493 if (!name[0] || is_dot_or_dotdot(name))
496 /* remote nicknames cannot contain slashes */
498 if (is_dir_sep(*name++))
503 const char *remote_for_branch(struct branch *branch, int *explicit)
505 if (branch && branch->remote_name) {
508 return branch->remote_name;
515 const char *pushremote_for_branch(struct branch *branch, int *explicit)
517 if (branch && branch->pushremote_name) {
520 return branch->pushremote_name;
522 if (pushremote_name) {
525 return pushremote_name;
527 return remote_for_branch(branch, explicit);
530 const char *remote_ref_for_branch(struct branch *branch, int for_push,
535 if (branch->merge_nr) {
538 return branch->merge_name[0];
541 const char *dst, *remote_name =
542 pushremote_for_branch(branch, NULL);
543 struct remote *remote = remote_get(remote_name);
545 if (remote && remote->push_refspec_nr &&
546 (dst = apply_refspecs(remote->push,
547 remote->push_refspec_nr,
560 static struct remote *remote_get_1(const char *name,
561 const char *(*get_default)(struct branch *, int *))
571 name = get_default(current_branch, &name_given);
573 ret = make_remote(name, 0);
574 if (valid_remote_nick(name) && have_git_dir()) {
575 if (!valid_remote(ret))
576 read_remotes_file(ret);
577 if (!valid_remote(ret))
578 read_branches_file(ret);
580 if (name_given && !valid_remote(ret))
581 add_url_alias(ret, name);
582 if (!valid_remote(ret))
584 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
585 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
589 struct remote *remote_get(const char *name)
591 return remote_get_1(name, remote_for_branch);
594 struct remote *pushremote_get(const char *name)
596 return remote_get_1(name, pushremote_for_branch);
599 int remote_is_configured(struct remote *remote, int in_repo)
604 return remote->configured_in_repo;
605 return !!remote->origin;
608 int for_each_remote(each_remote_fn fn, void *priv)
612 for (i = 0; i < remotes_nr && !result; i++) {
613 struct remote *r = remotes[i];
617 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
620 r->push = parse_push_refspec(r->push_refspec_nr,
622 result = fn(r, priv);
627 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
629 if (strcmp(ref1->name, ref2->name)) {
630 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
631 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
632 die(_("Cannot fetch both %s and %s to %s"),
633 ref1->name, ref2->name, ref2->peer_ref->name);
634 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
635 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
636 warning(_("%s usually tracks %s, not %s"),
637 ref2->peer_ref->name, ref2->name, ref1->name);
638 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
639 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
640 die(_("%s tracks both %s and %s"),
641 ref2->peer_ref->name, ref1->name, ref2->name);
644 * This last possibility doesn't occur because
645 * FETCH_HEAD_IGNORE entries always appear at
646 * the end of the list.
648 die(_("Internal error"));
651 free(ref2->peer_ref);
655 struct ref *ref_remove_duplicates(struct ref *ref_map)
657 struct string_list refs = STRING_LIST_INIT_NODUP;
658 struct ref *retval = NULL;
659 struct ref **p = &retval;
662 struct ref *ref = ref_map;
664 ref_map = ref_map->next;
667 if (!ref->peer_ref) {
671 struct string_list_item *item =
672 string_list_insert(&refs, ref->peer_ref->name);
675 /* Entry already existed */
676 handle_duplicate((struct ref *)item->util, ref);
685 string_list_clear(&refs, 0);
689 int remote_has_url(struct remote *remote, const char *url)
692 for (i = 0; i < remote->url_nr; i++) {
693 if (!strcmp(remote->url[i], url))
699 static int match_name_with_pattern(const char *key, const char *name,
700 const char *value, char **result)
702 const char *kstar = strchr(key, '*');
708 die("Key '%s' of pattern had no '*'", key);
710 ksuffixlen = strlen(kstar + 1);
711 namelen = strlen(name);
712 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
713 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
715 struct strbuf sb = STRBUF_INIT;
716 const char *vstar = strchr(value, '*');
718 die("Value '%s' of pattern has no '*'", value);
719 strbuf_add(&sb, value, vstar - value);
720 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
721 strbuf_addstr(&sb, vstar + 1);
722 *result = strbuf_detach(&sb, NULL);
727 static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
730 int find_src = !query->src;
732 if (find_src && !query->dst)
733 error("query_refspecs_multiple: need either src or dst");
735 for (i = 0; i < ref_count; i++) {
736 struct refspec_item *refspec = &refs[i];
737 const char *key = find_src ? refspec->dst : refspec->src;
738 const char *value = find_src ? refspec->src : refspec->dst;
739 const char *needle = find_src ? query->dst : query->src;
740 char **result = find_src ? &query->src : &query->dst;
744 if (refspec->pattern) {
745 if (match_name_with_pattern(key, needle, value, result))
746 string_list_append_nodup(results, *result);
747 } else if (!strcmp(needle, key)) {
748 string_list_append(results, value);
753 int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query)
756 int find_src = !query->src;
757 const char *needle = find_src ? query->dst : query->src;
758 char **result = find_src ? &query->src : &query->dst;
760 if (find_src && !query->dst)
761 return error("query_refspecs: need either src or dst");
763 for (i = 0; i < ref_count; i++) {
764 struct refspec_item *refspec = &refs[i];
765 const char *key = find_src ? refspec->dst : refspec->src;
766 const char *value = find_src ? refspec->src : refspec->dst;
770 if (refspec->pattern) {
771 if (match_name_with_pattern(key, needle, value, result)) {
772 query->force = refspec->force;
775 } else if (!strcmp(needle, key)) {
776 *result = xstrdup(value);
777 query->force = refspec->force;
784 char *apply_refspecs(struct refspec_item *refspecs, int nr_refspec,
787 struct refspec_item query;
789 memset(&query, 0, sizeof(struct refspec_item));
790 query.src = (char *)name;
792 if (query_refspecs(refspecs, nr_refspec, &query))
798 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
800 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
803 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
806 size_t len = strlen(name);
807 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
808 memcpy(ref->name, prefix, prefixlen);
809 memcpy(ref->name + prefixlen, name, len);
813 struct ref *alloc_ref(const char *name)
815 return alloc_ref_with_prefix("", 0, name);
818 struct ref *copy_ref(const struct ref *ref)
824 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
826 memcpy(cpy, ref, len);
828 cpy->symref = xstrdup_or_null(ref->symref);
829 cpy->remote_status = xstrdup_or_null(ref->remote_status);
830 cpy->peer_ref = copy_ref(ref->peer_ref);
834 struct ref *copy_ref_list(const struct ref *ref)
836 struct ref *ret = NULL;
837 struct ref **tail = &ret;
839 *tail = copy_ref(ref);
841 tail = &((*tail)->next);
846 static void free_ref(struct ref *ref)
850 free_ref(ref->peer_ref);
851 free(ref->remote_status);
856 void free_refs(struct ref *ref)
866 int ref_compare_name(const void *va, const void *vb)
868 const struct ref *a = va, *b = vb;
869 return strcmp(a->name, b->name);
872 static void *ref_list_get_next(const void *a)
874 return ((const struct ref *)a)->next;
877 static void ref_list_set_next(void *a, void *next)
879 ((struct ref *)a)->next = next;
882 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
884 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
887 int count_refspec_match(const char *pattern,
889 struct ref **matched_ref)
891 int patlen = strlen(pattern);
892 struct ref *matched_weak = NULL;
893 struct ref *matched = NULL;
897 for (weak_match = match = 0; refs; refs = refs->next) {
898 char *name = refs->name;
899 int namelen = strlen(name);
901 if (!refname_match(pattern, name))
904 /* A match is "weak" if it is with refs outside
905 * heads or tags, and did not specify the pattern
906 * in full (e.g. "refs/remotes/origin/master") or at
907 * least from the toplevel (e.g. "remotes/origin/master");
908 * otherwise "git push $URL master" would result in
909 * ambiguity between remotes/origin/master and heads/master
910 * at the remote site.
912 if (namelen != patlen &&
913 patlen != namelen - 5 &&
914 !starts_with(name, "refs/heads/") &&
915 !starts_with(name, "refs/tags/")) {
916 /* We want to catch the case where only weak
917 * matches are found and there are multiple
918 * matches, and where more than one strong
919 * matches are found, as ambiguous. One
920 * strong match with zero or more weak matches
921 * are acceptable as a unique match.
933 *matched_ref = matched_weak;
938 *matched_ref = matched;
943 static void tail_link_ref(struct ref *ref, struct ref ***tail)
951 static struct ref *alloc_delete_ref(void)
953 struct ref *ref = alloc_ref("(delete)");
954 oidclr(&ref->new_oid);
958 static int try_explicit_object_name(const char *name,
961 struct object_id oid;
965 *match = alloc_delete_ref();
969 if (get_oid(name, &oid))
973 *match = alloc_ref(name);
974 oidcpy(&(*match)->new_oid, &oid);
979 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
981 struct ref *ret = alloc_ref(name);
982 tail_link_ref(ret, tail);
986 static char *guess_ref(const char *name, struct ref *peer)
988 struct strbuf buf = STRBUF_INIT;
990 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
995 if (starts_with(r, "refs/heads/"))
996 strbuf_addstr(&buf, "refs/heads/");
997 else if (starts_with(r, "refs/tags/"))
998 strbuf_addstr(&buf, "refs/tags/");
1002 strbuf_addstr(&buf, name);
1003 return strbuf_detach(&buf, NULL);
1006 static int match_explicit_lhs(struct ref *src,
1007 struct refspec_item *rs,
1009 int *allocated_match)
1011 switch (count_refspec_match(rs->src, src, match)) {
1013 if (allocated_match)
1014 *allocated_match = 0;
1017 /* The source could be in the get_sha1() format
1018 * not a reference name. :refs/other is a
1019 * way to delete 'other' ref at the remote end.
1021 if (try_explicit_object_name(rs->src, match) < 0)
1022 return error("src refspec %s does not match any.", rs->src);
1023 if (allocated_match)
1024 *allocated_match = 1;
1027 return error("src refspec %s matches more than one.", rs->src);
1031 static int match_explicit(struct ref *src, struct ref *dst,
1032 struct ref ***dst_tail,
1033 struct refspec_item *rs)
1035 struct ref *matched_src, *matched_dst;
1038 const char *dst_value = rs->dst;
1041 if (rs->pattern || rs->matching)
1044 matched_src = matched_dst = NULL;
1045 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1051 dst_value = resolve_ref_unsafe(matched_src->name,
1052 RESOLVE_REF_READING,
1055 ((flag & REF_ISSYMREF) &&
1056 !starts_with(dst_value, "refs/heads/")))
1057 die("%s cannot be resolved to branch.",
1061 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1065 if (starts_with(dst_value, "refs/"))
1066 matched_dst = make_linked_ref(dst_value, dst_tail);
1067 else if (is_null_oid(&matched_src->new_oid))
1068 error("unable to delete '%s': remote ref does not exist",
1070 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1071 matched_dst = make_linked_ref(dst_guess, dst_tail);
1074 error("unable to push to unqualified destination: %s\n"
1075 "The destination refspec neither matches an "
1076 "existing ref on the remote nor\n"
1077 "begins with refs/, and we are unable to "
1078 "guess a prefix based on the source ref.",
1083 error("dst refspec %s matches more than one.",
1089 if (matched_dst->peer_ref)
1090 return error("dst ref %s receives from more than one src.",
1093 matched_dst->peer_ref = allocated_src ?
1095 copy_ref(matched_src);
1096 matched_dst->force = rs->force;
1101 static int match_explicit_refs(struct ref *src, struct ref *dst,
1102 struct ref ***dst_tail, struct refspec_item *rs,
1106 for (i = errs = 0; i < rs_nr; i++)
1107 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1111 static char *get_ref_match(const struct refspec_item *rs, int rs_nr, const struct ref *ref,
1112 int send_mirror, int direction, const struct refspec_item **ret_pat)
1114 const struct refspec_item *pat;
1117 int matching_refs = -1;
1118 for (i = 0; i < rs_nr; i++) {
1119 if (rs[i].matching &&
1120 (matching_refs == -1 || rs[i].force)) {
1125 if (rs[i].pattern) {
1126 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1128 if (direction == FROM_SRC)
1129 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1131 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1138 if (matching_refs == -1)
1141 pat = rs + matching_refs;
1142 if (pat->matching) {
1144 * "matching refs"; traditionally we pushed everything
1145 * including refs outside refs/heads/ hierarchy, but
1146 * that does not make much sense these days.
1148 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1150 name = xstrdup(ref->name);
1157 static struct ref **tail_ref(struct ref **head)
1159 struct ref **tail = head;
1161 tail = &((*tail)->next);
1166 struct commit **tip;
1170 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1172 struct commit *commit;
1174 if (is_null_oid(oid))
1176 commit = lookup_commit_reference_gently(oid, 1);
1177 if (!commit || (commit->object.flags & TMP_MARK))
1179 commit->object.flags |= TMP_MARK;
1180 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1181 tips->tip[tips->nr++] = commit;
1184 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1186 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1187 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1188 struct string_list_item *item;
1190 struct tips sent_tips;
1193 * Collect everything we know they would have at the end of
1194 * this push, and collect all tags they have.
1196 memset(&sent_tips, 0, sizeof(sent_tips));
1197 for (ref = *dst; ref; ref = ref->next) {
1198 if (ref->peer_ref &&
1199 !is_null_oid(&ref->peer_ref->new_oid))
1200 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1202 add_to_tips(&sent_tips, &ref->old_oid);
1203 if (starts_with(ref->name, "refs/tags/"))
1204 string_list_append(&dst_tag, ref->name);
1206 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1208 string_list_sort(&dst_tag);
1210 /* Collect tags they do not have. */
1211 for (ref = src; ref; ref = ref->next) {
1212 if (!starts_with(ref->name, "refs/tags/"))
1213 continue; /* not a tag */
1214 if (string_list_has_string(&dst_tag, ref->name))
1215 continue; /* they already have it */
1216 if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
1217 continue; /* be conservative */
1218 item = string_list_append(&src_tag, ref->name);
1221 string_list_clear(&dst_tag, 0);
1224 * At this point, src_tag lists tags that are missing from
1225 * dst, and sent_tips lists the tips we are pushing or those
1226 * that we know they already have. An element in the src_tag
1227 * that is an ancestor of any of the sent_tips needs to be
1228 * sent to the other side.
1231 for_each_string_list_item(item, &src_tag) {
1232 struct ref *ref = item->util;
1233 struct ref *dst_ref;
1234 struct commit *commit;
1236 if (is_null_oid(&ref->new_oid))
1238 commit = lookup_commit_reference_gently(&ref->new_oid,
1241 /* not pushing a commit, which is not an error */
1245 * Is this tag, which they do not have, reachable from
1246 * any of the commits we are sending?
1248 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1252 dst_ref = make_linked_ref(ref->name, dst_tail);
1253 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1254 dst_ref->peer_ref = copy_ref(ref);
1257 string_list_clear(&src_tag, 0);
1258 free(sent_tips.tip);
1261 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1263 for ( ; list; list = list->next)
1264 if (!strcmp(list->name, name))
1265 return (struct ref *)list;
1269 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1271 for ( ; ref; ref = ref->next)
1272 string_list_append_nodup(ref_index, ref->name)->util = ref;
1274 string_list_sort(ref_index);
1278 * Given only the set of local refs, sanity-check the set of push
1279 * refspecs. We can't catch all errors that match_push_refs would,
1280 * but we can catch some errors early before even talking to the
1283 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1285 struct refspec refspec = REFSPEC_INIT_PUSH;
1289 refspec_appendn(&refspec, refspec_names, nr_refspec);
1291 for (i = 0; i < refspec.nr; i++) {
1292 struct refspec_item *rs = &refspec.items[i];
1294 if (rs->pattern || rs->matching)
1297 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1300 refspec_clear(&refspec);
1305 * Given the set of refs the local repository has, the set of refs the
1306 * remote repository has, and the refspec used for push, determine
1307 * what remote refs we will update and with what value by setting
1308 * peer_ref (which object is being pushed) and force (if the push is
1309 * forced) in elements of "dst". The function may add new elements to
1310 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1312 int match_push_refs(struct ref *src, struct ref **dst,
1313 int nr_refspec, const char **refspec, int flags)
1315 struct refspec_item *rs;
1316 int send_all = flags & MATCH_REFS_ALL;
1317 int send_mirror = flags & MATCH_REFS_MIRROR;
1318 int send_prune = flags & MATCH_REFS_PRUNE;
1320 static const char *default_refspec[] = { ":", NULL };
1321 struct ref *ref, **dst_tail = tail_ref(dst);
1322 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1326 refspec = default_refspec;
1328 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1329 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1331 /* pick the remainder */
1332 for (ref = src; ref; ref = ref->next) {
1333 struct string_list_item *dst_item;
1334 struct ref *dst_peer;
1335 const struct refspec_item *pat = NULL;
1338 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1342 if (!dst_ref_index.nr)
1343 prepare_ref_index(&dst_ref_index, *dst);
1345 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1346 dst_peer = dst_item ? dst_item->util : NULL;
1348 if (dst_peer->peer_ref)
1349 /* We're already sending something to this ref. */
1352 if (pat->matching && !(send_all || send_mirror))
1354 * Remote doesn't have it, and we have no
1355 * explicit pattern, and we don't have
1356 * --all or --mirror.
1360 /* Create a new one and link it */
1361 dst_peer = make_linked_ref(dst_name, &dst_tail);
1362 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1363 string_list_insert(&dst_ref_index,
1364 dst_peer->name)->util = dst_peer;
1366 dst_peer->peer_ref = copy_ref(ref);
1367 dst_peer->force = pat->force;
1372 string_list_clear(&dst_ref_index, 0);
1374 if (flags & MATCH_REFS_FOLLOW_TAGS)
1375 add_missing_tags(src, dst, &dst_tail);
1378 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1379 /* check for missing refs on the remote */
1380 for (ref = *dst; ref; ref = ref->next) {
1384 /* We're already sending something to this ref. */
1387 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1389 if (!src_ref_index.nr)
1390 prepare_ref_index(&src_ref_index, src);
1391 if (!string_list_has_string(&src_ref_index,
1393 ref->peer_ref = alloc_delete_ref();
1397 string_list_clear(&src_ref_index, 0);
1404 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1409 for (ref = remote_refs; ref; ref = ref->next) {
1410 int force_ref_update = ref->force || force_update;
1411 int reject_reason = 0;
1414 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1415 else if (!send_mirror)
1418 ref->deletion = is_null_oid(&ref->new_oid);
1419 if (!ref->deletion &&
1420 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1421 ref->status = REF_STATUS_UPTODATE;
1426 * If the remote ref has moved and is now different
1427 * from what we expect, reject any push.
1429 * It also is an error if the user told us to check
1430 * with the remote-tracking branch to find the value
1431 * to expect, but we did not have such a tracking
1434 if (ref->expect_old_sha1) {
1435 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1436 reject_reason = REF_STATUS_REJECT_STALE;
1438 /* If the ref isn't stale then force the update. */
1439 force_ref_update = 1;
1443 * If the update isn't already rejected then check
1444 * the usual "must fast-forward" rules.
1446 * Decide whether an individual refspec A:B can be
1447 * pushed. The push will succeed if any of the
1448 * following are true:
1450 * (1) the remote reference B does not exist
1452 * (2) the remote reference B is being removed (i.e.,
1453 * pushing :B where no source is specified)
1455 * (3) the destination is not under refs/tags/, and
1456 * if the old and new value is a commit, the new
1457 * is a descendant of the old.
1459 * (4) it is forced using the +A:B notation, or by
1460 * passing the --force argument
1463 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1464 if (starts_with(ref->name, "refs/tags/"))
1465 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1466 else if (!has_object_file(&ref->old_oid))
1467 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1468 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1469 !lookup_commit_reference_gently(&ref->new_oid, 1))
1470 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1471 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1472 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1476 * "--force" will defeat any rejection implemented
1477 * by the rules above.
1479 if (!force_ref_update)
1480 ref->status = reject_reason;
1481 else if (reject_reason)
1482 ref->forced_update = 1;
1486 static void set_merge(struct branch *ret)
1488 struct remote *remote;
1490 struct object_id oid;
1494 return; /* no branch */
1496 return; /* already run */
1497 if (!ret->remote_name || !ret->merge_nr) {
1499 * no merge config; let's make sure we don't confuse callers
1500 * with a non-zero merge_nr but a NULL merge
1506 remote = remote_get(ret->remote_name);
1508 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1509 for (i = 0; i < ret->merge_nr; i++) {
1510 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1511 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1512 if (!remote_find_tracking(remote, ret->merge[i]) ||
1513 strcmp(ret->remote_name, "."))
1515 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1517 ret->merge[i]->dst = ref;
1519 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1523 struct branch *branch_get(const char *name)
1528 if (!name || !*name || !strcmp(name, "HEAD"))
1529 ret = current_branch;
1531 ret = make_branch(name, 0);
1536 int branch_has_merge_config(struct branch *branch)
1538 return branch && !!branch->merge;
1541 int branch_merge_matches(struct branch *branch,
1543 const char *refname)
1545 if (!branch || i < 0 || i >= branch->merge_nr)
1547 return refname_match(branch->merge[i]->src, refname);
1550 __attribute__((format (printf,2,3)))
1551 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1556 strbuf_vaddf(err, fmt, ap);
1562 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1565 return error_buf(err, _("HEAD does not point to a branch"));
1567 if (!branch->merge || !branch->merge[0]) {
1569 * no merge config; is it because the user didn't define any,
1570 * or because it is not a real branch, and get_branch
1573 if (!ref_exists(branch->refname))
1574 return error_buf(err, _("no such branch: '%s'"),
1576 return error_buf(err,
1577 _("no upstream configured for branch '%s'"),
1581 if (!branch->merge[0]->dst)
1582 return error_buf(err,
1583 _("upstream branch '%s' not stored as a remote-tracking branch"),
1584 branch->merge[0]->src);
1586 return branch->merge[0]->dst;
1589 static const char *tracking_for_push_dest(struct remote *remote,
1590 const char *refname,
1595 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1597 return error_buf(err,
1598 _("push destination '%s' on remote '%s' has no local tracking branch"),
1599 refname, remote->name);
1603 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1605 struct remote *remote;
1607 remote = remote_get(pushremote_for_branch(branch, NULL));
1609 return error_buf(err,
1610 _("branch '%s' has no remote for pushing"),
1613 if (remote->push_refspec_nr) {
1617 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1620 return error_buf(err,
1621 _("push refspecs for '%s' do not include '%s'"),
1622 remote->name, branch->name);
1624 ret = tracking_for_push_dest(remote, dst, err);
1630 return tracking_for_push_dest(remote, branch->refname, err);
1632 switch (push_default) {
1633 case PUSH_DEFAULT_NOTHING:
1634 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1636 case PUSH_DEFAULT_MATCHING:
1637 case PUSH_DEFAULT_CURRENT:
1638 return tracking_for_push_dest(remote, branch->refname, err);
1640 case PUSH_DEFAULT_UPSTREAM:
1641 return branch_get_upstream(branch, err);
1643 case PUSH_DEFAULT_UNSPECIFIED:
1644 case PUSH_DEFAULT_SIMPLE:
1646 const char *up, *cur;
1648 up = branch_get_upstream(branch, err);
1651 cur = tracking_for_push_dest(remote, branch->refname, err);
1654 if (strcmp(cur, up))
1655 return error_buf(err,
1656 _("cannot resolve 'simple' push to a single destination"));
1661 die("BUG: unhandled push situation");
1664 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1667 return error_buf(err, _("HEAD does not point to a branch"));
1669 if (!branch->push_tracking_ref)
1670 branch->push_tracking_ref = branch_get_push_1(branch, err);
1671 return branch->push_tracking_ref;
1674 static int ignore_symref_update(const char *refname)
1678 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1679 return 0; /* non-existing refs are OK */
1680 return (flag & REF_ISSYMREF);
1684 * Create and return a list of (struct ref) consisting of copies of
1685 * each remote_ref that matches refspec. refspec must be a pattern.
1686 * Fill in the copies' peer_ref to describe the local tracking refs to
1687 * which they map. Omit any references that would map to an existing
1688 * local symbolic ref.
1690 static struct ref *get_expanded_map(const struct ref *remote_refs,
1691 const struct refspec_item *refspec)
1693 const struct ref *ref;
1694 struct ref *ret = NULL;
1695 struct ref **tail = &ret;
1697 for (ref = remote_refs; ref; ref = ref->next) {
1698 char *expn_name = NULL;
1700 if (strchr(ref->name, '^'))
1701 continue; /* a dereference item */
1702 if (match_name_with_pattern(refspec->src, ref->name,
1703 refspec->dst, &expn_name) &&
1704 !ignore_symref_update(expn_name)) {
1705 struct ref *cpy = copy_ref(ref);
1707 cpy->peer_ref = alloc_ref(expn_name);
1709 cpy->peer_ref->force = 1;
1719 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1721 const struct ref *ref;
1722 for (ref = refs; ref; ref = ref->next) {
1723 if (refname_match(name, ref->name))
1729 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1731 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1736 return copy_ref(ref);
1739 static struct ref *get_local_ref(const char *name)
1741 if (!name || name[0] == '\0')
1744 if (starts_with(name, "refs/"))
1745 return alloc_ref(name);
1747 if (starts_with(name, "heads/") ||
1748 starts_with(name, "tags/") ||
1749 starts_with(name, "remotes/"))
1750 return alloc_ref_with_prefix("refs/", 5, name);
1752 return alloc_ref_with_prefix("refs/heads/", 11, name);
1755 int get_fetch_map(const struct ref *remote_refs,
1756 const struct refspec_item *refspec,
1760 struct ref *ref_map, **rmp;
1762 if (refspec->pattern) {
1763 ref_map = get_expanded_map(remote_refs, refspec);
1765 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1767 if (refspec->exact_sha1) {
1768 ref_map = alloc_ref(name);
1769 get_oid_hex(name, &ref_map->old_oid);
1771 ref_map = get_remote_ref(remote_refs, name);
1773 if (!missing_ok && !ref_map)
1774 die("Couldn't find remote ref %s", name);
1776 ref_map->peer_ref = get_local_ref(refspec->dst);
1777 if (ref_map->peer_ref && refspec->force)
1778 ref_map->peer_ref->force = 1;
1782 for (rmp = &ref_map; *rmp; ) {
1783 if ((*rmp)->peer_ref) {
1784 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1785 check_refname_format((*rmp)->peer_ref->name, 0)) {
1786 struct ref *ignore = *rmp;
1787 error("* Ignoring funny ref '%s' locally",
1788 (*rmp)->peer_ref->name);
1789 *rmp = (*rmp)->next;
1790 free(ignore->peer_ref);
1795 rmp = &((*rmp)->next);
1799 tail_link_ref(ref_map, tail);
1804 int resolve_remote_symref(struct ref *ref, struct ref *list)
1808 for (; list; list = list->next)
1809 if (!strcmp(ref->symref, list->name)) {
1810 oidcpy(&ref->old_oid, &list->old_oid);
1816 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1819 struct commit *commit = pop_commit(&list);
1820 commit->object.flags &= ~mark;
1824 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1827 struct commit *old_commit, *new_commit;
1828 struct commit_list *list, *used;
1832 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1833 * old_commit. Otherwise we require --force.
1835 o = deref_tag(parse_object(old_oid), NULL, 0);
1836 if (!o || o->type != OBJ_COMMIT)
1838 old_commit = (struct commit *) o;
1840 o = deref_tag(parse_object(new_oid), NULL, 0);
1841 if (!o || o->type != OBJ_COMMIT)
1843 new_commit = (struct commit *) o;
1845 if (parse_commit(new_commit) < 0)
1849 commit_list_insert(new_commit, &list);
1851 new_commit = pop_most_recent_commit(&list, TMP_MARK);
1852 commit_list_insert(new_commit, &used);
1853 if (new_commit == old_commit) {
1858 unmark_and_free(list, TMP_MARK);
1859 unmark_and_free(used, TMP_MARK);
1864 * Lookup the upstream branch for the given branch and if present, optionally
1865 * compute the commit ahead/behind values for the pair.
1867 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1868 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1869 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1872 * The name of the upstream branch (or NULL if no upstream is defined) is
1873 * returned via *upstream_name, if it is not itself NULL.
1875 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1876 * upstream defined, or ref does not exist). Returns 0 if the commits are
1877 * identical. Returns 1 if commits are different.
1879 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1880 const char **upstream_name, enum ahead_behind_flags abf)
1882 struct object_id oid;
1883 struct commit *ours, *theirs;
1884 struct rev_info revs;
1886 struct argv_array argv = ARGV_ARRAY_INIT;
1888 /* Cannot stat unless we are marked to build on top of somebody else. */
1889 base = branch_get_upstream(branch, NULL);
1891 *upstream_name = base;
1895 /* Cannot stat if what we used to build on no longer exists */
1896 if (read_ref(base, &oid))
1898 theirs = lookup_commit_reference(&oid);
1902 if (read_ref(branch->refname, &oid))
1904 ours = lookup_commit_reference(&oid);
1908 *num_theirs = *num_ours = 0;
1910 /* are we the same? */
1913 if (abf == AHEAD_BEHIND_QUICK)
1915 if (abf != AHEAD_BEHIND_FULL)
1916 BUG("stat_tracking_info: invalid abf '%d'", abf);
1918 /* Run "rev-list --left-right ours...theirs" internally... */
1919 argv_array_push(&argv, ""); /* ignored */
1920 argv_array_push(&argv, "--left-right");
1921 argv_array_pushf(&argv, "%s...%s",
1922 oid_to_hex(&ours->object.oid),
1923 oid_to_hex(&theirs->object.oid));
1924 argv_array_push(&argv, "--");
1926 init_revisions(&revs, NULL);
1927 setup_revisions(argv.argc, argv.argv, &revs, NULL);
1928 if (prepare_revision_walk(&revs))
1929 die("revision walk setup failed");
1931 /* ... and count the commits on each side. */
1933 struct commit *c = get_revision(&revs);
1936 if (c->object.flags & SYMMETRIC_LEFT)
1942 /* clear object flags smudged by the above traversal */
1943 clear_commit_marks(ours, ALL_REV_FLAGS);
1944 clear_commit_marks(theirs, ALL_REV_FLAGS);
1946 argv_array_clear(&argv);
1951 * Return true when there is anything to report, otherwise false.
1953 int format_tracking_info(struct branch *branch, struct strbuf *sb,
1954 enum ahead_behind_flags abf)
1956 int ours, theirs, sti;
1957 const char *full_base;
1959 int upstream_is_gone = 0;
1961 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
1965 upstream_is_gone = 1;
1968 base = shorten_unambiguous_ref(full_base, 0);
1969 if (upstream_is_gone) {
1971 _("Your branch is based on '%s', but the upstream is gone.\n"),
1973 if (advice_status_hints)
1975 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1978 _("Your branch is up to date with '%s'.\n"),
1980 } else if (abf == AHEAD_BEHIND_QUICK) {
1982 _("Your branch and '%s' refer to different commits.\n"),
1984 if (advice_status_hints)
1985 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
1986 "git status --ahead-behind");
1987 } else if (!theirs) {
1989 Q_("Your branch is ahead of '%s' by %d commit.\n",
1990 "Your branch is ahead of '%s' by %d commits.\n",
1993 if (advice_status_hints)
1995 _(" (use \"git push\" to publish your local commits)\n"));
1998 Q_("Your branch is behind '%s' by %d commit, "
1999 "and can be fast-forwarded.\n",
2000 "Your branch is behind '%s' by %d commits, "
2001 "and can be fast-forwarded.\n",
2004 if (advice_status_hints)
2006 _(" (use \"git pull\" to update your local branch)\n"));
2009 Q_("Your branch and '%s' have diverged,\n"
2010 "and have %d and %d different commit each, "
2012 "Your branch and '%s' have diverged,\n"
2013 "and have %d and %d different commits each, "
2016 base, ours, theirs);
2017 if (advice_status_hints)
2019 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2025 static int one_local_ref(const char *refname, const struct object_id *oid,
2026 int flag, void *cb_data)
2028 struct ref ***local_tail = cb_data;
2031 /* we already know it starts with refs/ to get here */
2032 if (check_refname_format(refname + 5, 0))
2035 ref = alloc_ref(refname);
2036 oidcpy(&ref->new_oid, oid);
2038 *local_tail = &ref->next;
2042 struct ref *get_local_heads(void)
2044 struct ref *local_refs = NULL, **local_tail = &local_refs;
2046 for_each_ref(one_local_ref, &local_tail);
2050 struct ref *guess_remote_head(const struct ref *head,
2051 const struct ref *refs,
2054 const struct ref *r;
2055 struct ref *list = NULL;
2056 struct ref **tail = &list;
2062 * Some transports support directly peeking at
2063 * where HEAD points; if that is the case, then
2064 * we don't have to guess.
2067 return copy_ref(find_ref_by_name(refs, head->symref));
2069 /* If refs/heads/master could be right, it is. */
2071 r = find_ref_by_name(refs, "refs/heads/master");
2072 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2076 /* Look for another ref that points there */
2077 for (r = refs; r; r = r->next) {
2079 starts_with(r->name, "refs/heads/") &&
2080 !oidcmp(&r->old_oid, &head->old_oid)) {
2081 *tail = copy_ref(r);
2082 tail = &((*tail)->next);
2091 struct stale_heads_info {
2092 struct string_list *ref_names;
2093 struct ref **stale_refs_tail;
2094 struct refspec_item *refs;
2098 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2099 int flags, void *cb_data)
2101 struct stale_heads_info *info = cb_data;
2102 struct string_list matches = STRING_LIST_INIT_DUP;
2103 struct refspec_item query;
2105 memset(&query, 0, sizeof(struct refspec_item));
2106 query.dst = (char *)refname;
2108 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2109 if (matches.nr == 0)
2110 goto clean_exit; /* No matches */
2113 * If we did find a suitable refspec and it's not a symref and
2114 * it's not in the list of refs that currently exist in that
2115 * remote, we consider it to be stale. In order to deal with
2116 * overlapping refspecs, we need to go over all of the
2119 if (flags & REF_ISSYMREF)
2122 for (i = 0; stale && i < matches.nr; i++)
2123 if (string_list_has_string(info->ref_names, matches.items[i].string))
2127 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2128 oidcpy(&ref->new_oid, oid);
2132 string_list_clear(&matches, 0);
2136 struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
2138 struct ref *ref, *stale_refs = NULL;
2139 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2140 struct stale_heads_info info;
2142 info.ref_names = &ref_names;
2143 info.stale_refs_tail = &stale_refs;
2145 info.ref_count = ref_count;
2146 for (ref = fetch_map; ref; ref = ref->next)
2147 string_list_append(&ref_names, ref->name);
2148 string_list_sort(&ref_names);
2149 for_each_ref(get_stale_heads_cb, &info);
2150 string_list_clear(&ref_names, 0);
2157 static void clear_cas_option(struct push_cas_option *cas)
2161 for (i = 0; i < cas->nr; i++)
2162 free(cas->entry[i].refname);
2164 memset(cas, 0, sizeof(*cas));
2167 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2168 const char *refname,
2171 struct push_cas *entry;
2172 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2173 entry = &cas->entry[cas->nr++];
2174 memset(entry, 0, sizeof(*entry));
2175 entry->refname = xmemdupz(refname, refnamelen);
2179 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2182 struct push_cas *entry;
2185 /* "--no-<option>" */
2186 clear_cas_option(cas);
2191 /* just "--<option>" */
2192 cas->use_tracking_for_rest = 1;
2196 /* "--<option>=refname" or "--<option>=refname:value" */
2197 colon = strchrnul(arg, ':');
2198 entry = add_cas_entry(cas, arg, colon - arg);
2200 entry->use_tracking = 1;
2202 oidclr(&entry->expect);
2203 else if (get_oid(colon + 1, &entry->expect))
2204 return error("cannot parse expected object name '%s'", colon + 1);
2208 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2210 return parse_push_cas_option(opt->value, arg, unset);
2213 int is_empty_cas(const struct push_cas_option *cas)
2215 return !cas->use_tracking_for_rest && !cas->nr;
2219 * Look at remote.fetch refspec and see if we have a remote
2220 * tracking branch for the refname there. Fill its current
2222 * If we cannot do so, return negative to signal an error.
2224 static int remote_tracking(struct remote *remote, const char *refname,
2225 struct object_id *oid)
2229 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2231 return -1; /* no tracking ref for refname at remote */
2232 if (read_ref(dst, oid))
2233 return -1; /* we know what the tracking ref is but we cannot read it */
2237 static void apply_cas(struct push_cas_option *cas,
2238 struct remote *remote,
2243 /* Find an explicit --<option>=<name>[:<value>] entry */
2244 for (i = 0; i < cas->nr; i++) {
2245 struct push_cas *entry = &cas->entry[i];
2246 if (!refname_match(entry->refname, ref->name))
2248 ref->expect_old_sha1 = 1;
2249 if (!entry->use_tracking)
2250 oidcpy(&ref->old_oid_expect, &entry->expect);
2251 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2252 oidclr(&ref->old_oid_expect);
2256 /* Are we using "--<option>" to cover all? */
2257 if (!cas->use_tracking_for_rest)
2260 ref->expect_old_sha1 = 1;
2261 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2262 oidclr(&ref->old_oid_expect);
2265 void apply_push_cas(struct push_cas_option *cas,
2266 struct remote *remote,
2267 struct ref *remote_refs)
2270 for (ref = remote_refs; ref; ref = ref->next)
2271 apply_cas(cas, remote, ref);