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 void add_prune_tags_to_fetch_refspec(struct remote *remote)
82 refspec_append(&remote->fetch, TAG_REFSPEC);
85 static void add_url(struct remote *remote, const char *url)
87 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
88 remote->url[remote->url_nr++] = url;
91 static void add_pushurl(struct remote *remote, const char *pushurl)
93 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
94 remote->pushurl[remote->pushurl_nr++] = pushurl;
97 static void add_pushurl_alias(struct remote *remote, const char *url)
99 const char *pushurl = alias_url(url, &rewrites_push);
101 add_pushurl(remote, pushurl);
104 static void add_url_alias(struct remote *remote, const char *url)
106 add_url(remote, alias_url(url, &rewrites));
107 add_pushurl_alias(remote, url);
110 struct remotes_hash_key {
115 static int remotes_hash_cmp(const void *unused_cmp_data,
117 const void *entry_or_key,
120 const struct remote *a = entry;
121 const struct remote *b = entry_or_key;
122 const struct remotes_hash_key *key = keydata;
125 return strncmp(a->name, key->str, key->len) || a->name[key->len];
127 return strcmp(a->name, b->name);
130 static inline void init_remotes_hash(void)
132 if (!remotes_hash.cmpfn)
133 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
136 static struct remote *make_remote(const char *name, int len)
138 struct remote *ret, *replaced;
139 struct remotes_hash_key lookup;
140 struct hashmap_entry lookup_entry;
148 hashmap_entry_init(&lookup_entry, memhash(name, len));
150 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
153 ret = xcalloc(1, sizeof(struct remote));
154 ret->prune = -1; /* unspecified */
155 ret->prune_tags = -1; /* unspecified */
156 ret->name = xstrndup(name, len);
157 refspec_init(&ret->push, REFSPEC_PUSH);
158 refspec_init(&ret->fetch, REFSPEC_FETCH);
160 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
161 remotes[remotes_nr++] = ret;
163 hashmap_entry_init(ret, lookup_entry.hash);
164 replaced = hashmap_put(&remotes_hash, ret);
165 assert(replaced == NULL); /* no previous entry overwritten */
169 static void add_merge(struct branch *branch, const char *name)
171 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
172 branch->merge_alloc);
173 branch->merge_name[branch->merge_nr++] = name;
176 static struct branch *make_branch(const char *name, int len)
181 for (i = 0; i < branches_nr; i++) {
182 if (len ? (!strncmp(name, branches[i]->name, len) &&
183 !branches[i]->name[len]) :
184 !strcmp(name, branches[i]->name))
188 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189 ret = xcalloc(1, sizeof(struct branch));
190 branches[branches_nr++] = ret;
192 ret->name = xstrndup(name, len);
194 ret->name = xstrdup(name);
195 ret->refname = xstrfmt("refs/heads/%s", ret->name);
200 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
205 for (i = 0; i < r->rewrite_nr; i++) {
207 ? (len == r->rewrite[i]->baselen &&
208 !strncmp(base, r->rewrite[i]->base, len))
209 : !strcmp(base, r->rewrite[i]->base))
210 return r->rewrite[i];
213 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
214 ret = xcalloc(1, sizeof(struct rewrite));
215 r->rewrite[r->rewrite_nr++] = ret;
217 ret->base = xstrndup(base, len);
221 ret->base = xstrdup(base);
222 ret->baselen = strlen(base);
227 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
229 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
230 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
231 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
232 rewrite->instead_of_nr++;
235 static const char *skip_spaces(const char *s)
242 static void read_remotes_file(struct remote *remote)
244 struct strbuf buf = STRBUF_INIT;
245 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
249 remote->configured_in_repo = 1;
250 remote->origin = REMOTE_REMOTES;
251 while (strbuf_getline(&buf, f) != EOF) {
256 if (skip_prefix(buf.buf, "URL:", &v))
257 add_url_alias(remote, xstrdup(skip_spaces(v)));
258 else if (skip_prefix(buf.buf, "Push:", &v))
259 refspec_append(&remote->push, skip_spaces(v));
260 else if (skip_prefix(buf.buf, "Pull:", &v))
261 refspec_append(&remote->fetch, skip_spaces(v));
263 strbuf_release(&buf);
267 static void read_branches_file(struct remote *remote)
270 struct strbuf buf = STRBUF_INIT;
271 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
276 strbuf_getline_lf(&buf, f);
280 strbuf_release(&buf);
284 remote->configured_in_repo = 1;
285 remote->origin = REMOTE_BRANCHES;
288 * The branches file would have URL and optionally
289 * #branch specified. The "master" (or specified) branch is
290 * fetched and stored in the local branch matching the
293 frag = strchr(buf.buf, '#');
299 add_url_alias(remote, strbuf_detach(&buf, NULL));
300 strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
302 refspec_append(&remote->fetch, buf.buf);
305 * Cogito compatible push: push current HEAD to remote #branch
306 * (master if missing)
309 strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
310 refspec_append(&remote->push, buf.buf);
311 remote->fetch_tags = 1; /* always auto-follow */
312 strbuf_release(&buf);
315 static int handle_config(const char *key, const char *value, void *cb)
320 struct remote *remote;
321 struct branch *branch;
322 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
325 branch = make_branch(name, namelen);
326 if (!strcmp(subkey, "remote")) {
327 return git_config_string(&branch->remote_name, key, value);
328 } else if (!strcmp(subkey, "pushremote")) {
329 return git_config_string(&branch->pushremote_name, key, value);
330 } else if (!strcmp(subkey, "merge")) {
332 return config_error_nonbool(key);
333 add_merge(branch, xstrdup(value));
337 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
338 struct rewrite *rewrite;
341 if (!strcmp(subkey, "insteadof")) {
342 rewrite = make_rewrite(&rewrites, name, namelen);
344 return config_error_nonbool(key);
345 add_instead_of(rewrite, xstrdup(value));
346 } else if (!strcmp(subkey, "pushinsteadof")) {
347 rewrite = make_rewrite(&rewrites_push, name, namelen);
349 return config_error_nonbool(key);
350 add_instead_of(rewrite, xstrdup(value));
354 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
357 /* Handle remote.* variables */
358 if (!name && !strcmp(subkey, "pushdefault"))
359 return git_config_string(&pushremote_name, key, value);
363 /* Handle remote.<name>.* variables */
365 warning("Config remote shorthand cannot begin with '/': %s",
369 remote = make_remote(name, namelen);
370 remote->origin = REMOTE_CONFIG;
371 if (current_config_scope() == CONFIG_SCOPE_REPO)
372 remote->configured_in_repo = 1;
373 if (!strcmp(subkey, "mirror"))
374 remote->mirror = git_config_bool(key, value);
375 else if (!strcmp(subkey, "skipdefaultupdate"))
376 remote->skip_default_update = git_config_bool(key, value);
377 else if (!strcmp(subkey, "skipfetchall"))
378 remote->skip_default_update = git_config_bool(key, value);
379 else if (!strcmp(subkey, "prune"))
380 remote->prune = git_config_bool(key, value);
381 else if (!strcmp(subkey, "prunetags"))
382 remote->prune_tags = git_config_bool(key, value);
383 else if (!strcmp(subkey, "url")) {
385 if (git_config_string(&v, key, value))
388 } else if (!strcmp(subkey, "pushurl")) {
390 if (git_config_string(&v, key, value))
392 add_pushurl(remote, v);
393 } else if (!strcmp(subkey, "push")) {
395 if (git_config_string(&v, key, value))
397 refspec_append(&remote->push, v);
399 } else if (!strcmp(subkey, "fetch")) {
401 if (git_config_string(&v, key, value))
403 refspec_append(&remote->fetch, v);
405 } else if (!strcmp(subkey, "receivepack")) {
407 if (git_config_string(&v, key, value))
409 if (!remote->receivepack)
410 remote->receivepack = v;
412 error("more than one receivepack given, using the first");
413 } else if (!strcmp(subkey, "uploadpack")) {
415 if (git_config_string(&v, key, value))
417 if (!remote->uploadpack)
418 remote->uploadpack = v;
420 error("more than one uploadpack given, using the first");
421 } else if (!strcmp(subkey, "tagopt")) {
422 if (!strcmp(value, "--no-tags"))
423 remote->fetch_tags = -1;
424 else if (!strcmp(value, "--tags"))
425 remote->fetch_tags = 2;
426 } else if (!strcmp(subkey, "proxy")) {
427 return git_config_string((const char **)&remote->http_proxy,
429 } else if (!strcmp(subkey, "proxyauthmethod")) {
430 return git_config_string((const char **)&remote->http_proxy_authmethod,
432 } else if (!strcmp(subkey, "vcs")) {
433 return git_config_string(&remote->foreign_vcs, key, value);
438 static void alias_all_urls(void)
441 for (i = 0; i < remotes_nr; i++) {
442 int add_pushurl_aliases;
445 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
446 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
448 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
449 for (j = 0; j < remotes[i]->url_nr; j++) {
450 if (add_pushurl_aliases)
451 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
452 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
457 static void read_config(void)
466 current_branch = NULL;
467 if (startup_info->have_repository) {
468 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
469 if (head_ref && (flag & REF_ISSYMREF) &&
470 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
471 current_branch = make_branch(head_ref, 0);
474 git_config(handle_config, NULL);
478 static int valid_remote_nick(const char *name)
480 if (!name[0] || is_dot_or_dotdot(name))
483 /* remote nicknames cannot contain slashes */
485 if (is_dir_sep(*name++))
490 const char *remote_for_branch(struct branch *branch, int *explicit)
492 if (branch && branch->remote_name) {
495 return branch->remote_name;
502 const char *pushremote_for_branch(struct branch *branch, int *explicit)
504 if (branch && branch->pushremote_name) {
507 return branch->pushremote_name;
509 if (pushremote_name) {
512 return pushremote_name;
514 return remote_for_branch(branch, explicit);
517 const char *remote_ref_for_branch(struct branch *branch, int for_push,
522 if (branch->merge_nr) {
525 return branch->merge_name[0];
528 const char *dst, *remote_name =
529 pushremote_for_branch(branch, NULL);
530 struct remote *remote = remote_get(remote_name);
532 if (remote && remote->push.nr &&
533 (dst = apply_refspecs(remote->push.items,
547 static struct remote *remote_get_1(const char *name,
548 const char *(*get_default)(struct branch *, int *))
558 name = get_default(current_branch, &name_given);
560 ret = make_remote(name, 0);
561 if (valid_remote_nick(name) && have_git_dir()) {
562 if (!valid_remote(ret))
563 read_remotes_file(ret);
564 if (!valid_remote(ret))
565 read_branches_file(ret);
567 if (name_given && !valid_remote(ret))
568 add_url_alias(ret, name);
569 if (!valid_remote(ret))
574 struct remote *remote_get(const char *name)
576 return remote_get_1(name, remote_for_branch);
579 struct remote *pushremote_get(const char *name)
581 return remote_get_1(name, pushremote_for_branch);
584 int remote_is_configured(struct remote *remote, int in_repo)
589 return remote->configured_in_repo;
590 return !!remote->origin;
593 int for_each_remote(each_remote_fn fn, void *priv)
597 for (i = 0; i < remotes_nr && !result; i++) {
598 struct remote *r = remotes[i];
601 result = fn(r, priv);
606 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
608 if (strcmp(ref1->name, ref2->name)) {
609 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
610 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
611 die(_("Cannot fetch both %s and %s to %s"),
612 ref1->name, ref2->name, ref2->peer_ref->name);
613 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
614 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
615 warning(_("%s usually tracks %s, not %s"),
616 ref2->peer_ref->name, ref2->name, ref1->name);
617 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
618 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
619 die(_("%s tracks both %s and %s"),
620 ref2->peer_ref->name, ref1->name, ref2->name);
623 * This last possibility doesn't occur because
624 * FETCH_HEAD_IGNORE entries always appear at
625 * the end of the list.
627 die(_("Internal error"));
630 free(ref2->peer_ref);
634 struct ref *ref_remove_duplicates(struct ref *ref_map)
636 struct string_list refs = STRING_LIST_INIT_NODUP;
637 struct ref *retval = NULL;
638 struct ref **p = &retval;
641 struct ref *ref = ref_map;
643 ref_map = ref_map->next;
646 if (!ref->peer_ref) {
650 struct string_list_item *item =
651 string_list_insert(&refs, ref->peer_ref->name);
654 /* Entry already existed */
655 handle_duplicate((struct ref *)item->util, ref);
664 string_list_clear(&refs, 0);
668 int remote_has_url(struct remote *remote, const char *url)
671 for (i = 0; i < remote->url_nr; i++) {
672 if (!strcmp(remote->url[i], url))
678 static int match_name_with_pattern(const char *key, const char *name,
679 const char *value, char **result)
681 const char *kstar = strchr(key, '*');
687 die("Key '%s' of pattern had no '*'", key);
689 ksuffixlen = strlen(kstar + 1);
690 namelen = strlen(name);
691 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
692 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
694 struct strbuf sb = STRBUF_INIT;
695 const char *vstar = strchr(value, '*');
697 die("Value '%s' of pattern has no '*'", value);
698 strbuf_add(&sb, value, vstar - value);
699 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
700 strbuf_addstr(&sb, vstar + 1);
701 *result = strbuf_detach(&sb, NULL);
706 static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
709 int find_src = !query->src;
711 if (find_src && !query->dst)
712 error("query_refspecs_multiple: need either src or dst");
714 for (i = 0; i < ref_count; i++) {
715 struct refspec_item *refspec = &refs[i];
716 const char *key = find_src ? refspec->dst : refspec->src;
717 const char *value = find_src ? refspec->src : refspec->dst;
718 const char *needle = find_src ? query->dst : query->src;
719 char **result = find_src ? &query->src : &query->dst;
723 if (refspec->pattern) {
724 if (match_name_with_pattern(key, needle, value, result))
725 string_list_append_nodup(results, *result);
726 } else if (!strcmp(needle, key)) {
727 string_list_append(results, value);
732 int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query)
735 int find_src = !query->src;
736 const char *needle = find_src ? query->dst : query->src;
737 char **result = find_src ? &query->src : &query->dst;
739 if (find_src && !query->dst)
740 return error("query_refspecs: need either src or dst");
742 for (i = 0; i < ref_count; i++) {
743 struct refspec_item *refspec = &refs[i];
744 const char *key = find_src ? refspec->dst : refspec->src;
745 const char *value = find_src ? refspec->src : refspec->dst;
749 if (refspec->pattern) {
750 if (match_name_with_pattern(key, needle, value, result)) {
751 query->force = refspec->force;
754 } else if (!strcmp(needle, key)) {
755 *result = xstrdup(value);
756 query->force = refspec->force;
763 char *apply_refspecs(struct refspec_item *refspecs, int nr_refspec,
766 struct refspec_item query;
768 memset(&query, 0, sizeof(struct refspec_item));
769 query.src = (char *)name;
771 if (query_refspecs(refspecs, nr_refspec, &query))
777 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
779 return query_refspecs(remote->fetch.items, remote->fetch.nr, refspec);
782 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
785 size_t len = strlen(name);
786 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
787 memcpy(ref->name, prefix, prefixlen);
788 memcpy(ref->name + prefixlen, name, len);
792 struct ref *alloc_ref(const char *name)
794 return alloc_ref_with_prefix("", 0, name);
797 struct ref *copy_ref(const struct ref *ref)
803 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
805 memcpy(cpy, ref, len);
807 cpy->symref = xstrdup_or_null(ref->symref);
808 cpy->remote_status = xstrdup_or_null(ref->remote_status);
809 cpy->peer_ref = copy_ref(ref->peer_ref);
813 struct ref *copy_ref_list(const struct ref *ref)
815 struct ref *ret = NULL;
816 struct ref **tail = &ret;
818 *tail = copy_ref(ref);
820 tail = &((*tail)->next);
825 static void free_ref(struct ref *ref)
829 free_ref(ref->peer_ref);
830 free(ref->remote_status);
835 void free_refs(struct ref *ref)
845 int ref_compare_name(const void *va, const void *vb)
847 const struct ref *a = va, *b = vb;
848 return strcmp(a->name, b->name);
851 static void *ref_list_get_next(const void *a)
853 return ((const struct ref *)a)->next;
856 static void ref_list_set_next(void *a, void *next)
858 ((struct ref *)a)->next = next;
861 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
863 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
866 int count_refspec_match(const char *pattern,
868 struct ref **matched_ref)
870 int patlen = strlen(pattern);
871 struct ref *matched_weak = NULL;
872 struct ref *matched = NULL;
876 for (weak_match = match = 0; refs; refs = refs->next) {
877 char *name = refs->name;
878 int namelen = strlen(name);
880 if (!refname_match(pattern, name))
883 /* A match is "weak" if it is with refs outside
884 * heads or tags, and did not specify the pattern
885 * in full (e.g. "refs/remotes/origin/master") or at
886 * least from the toplevel (e.g. "remotes/origin/master");
887 * otherwise "git push $URL master" would result in
888 * ambiguity between remotes/origin/master and heads/master
889 * at the remote site.
891 if (namelen != patlen &&
892 patlen != namelen - 5 &&
893 !starts_with(name, "refs/heads/") &&
894 !starts_with(name, "refs/tags/")) {
895 /* We want to catch the case where only weak
896 * matches are found and there are multiple
897 * matches, and where more than one strong
898 * matches are found, as ambiguous. One
899 * strong match with zero or more weak matches
900 * are acceptable as a unique match.
912 *matched_ref = matched_weak;
917 *matched_ref = matched;
922 static void tail_link_ref(struct ref *ref, struct ref ***tail)
930 static struct ref *alloc_delete_ref(void)
932 struct ref *ref = alloc_ref("(delete)");
933 oidclr(&ref->new_oid);
937 static int try_explicit_object_name(const char *name,
940 struct object_id oid;
944 *match = alloc_delete_ref();
948 if (get_oid(name, &oid))
952 *match = alloc_ref(name);
953 oidcpy(&(*match)->new_oid, &oid);
958 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
960 struct ref *ret = alloc_ref(name);
961 tail_link_ref(ret, tail);
965 static char *guess_ref(const char *name, struct ref *peer)
967 struct strbuf buf = STRBUF_INIT;
969 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
974 if (starts_with(r, "refs/heads/"))
975 strbuf_addstr(&buf, "refs/heads/");
976 else if (starts_with(r, "refs/tags/"))
977 strbuf_addstr(&buf, "refs/tags/");
981 strbuf_addstr(&buf, name);
982 return strbuf_detach(&buf, NULL);
985 static int match_explicit_lhs(struct ref *src,
986 struct refspec_item *rs,
988 int *allocated_match)
990 switch (count_refspec_match(rs->src, src, match)) {
993 *allocated_match = 0;
996 /* The source could be in the get_sha1() format
997 * not a reference name. :refs/other is a
998 * way to delete 'other' ref at the remote end.
1000 if (try_explicit_object_name(rs->src, match) < 0)
1001 return error("src refspec %s does not match any.", rs->src);
1002 if (allocated_match)
1003 *allocated_match = 1;
1006 return error("src refspec %s matches more than one.", rs->src);
1010 static int match_explicit(struct ref *src, struct ref *dst,
1011 struct ref ***dst_tail,
1012 struct refspec_item *rs)
1014 struct ref *matched_src, *matched_dst;
1017 const char *dst_value = rs->dst;
1020 if (rs->pattern || rs->matching)
1023 matched_src = matched_dst = NULL;
1024 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1030 dst_value = resolve_ref_unsafe(matched_src->name,
1031 RESOLVE_REF_READING,
1034 ((flag & REF_ISSYMREF) &&
1035 !starts_with(dst_value, "refs/heads/")))
1036 die("%s cannot be resolved to branch.",
1040 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1044 if (starts_with(dst_value, "refs/"))
1045 matched_dst = make_linked_ref(dst_value, dst_tail);
1046 else if (is_null_oid(&matched_src->new_oid))
1047 error("unable to delete '%s': remote ref does not exist",
1049 else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1050 matched_dst = make_linked_ref(dst_guess, dst_tail);
1053 error("unable to push to unqualified destination: %s\n"
1054 "The destination refspec neither matches an "
1055 "existing ref on the remote nor\n"
1056 "begins with refs/, and we are unable to "
1057 "guess a prefix based on the source ref.",
1062 error("dst refspec %s matches more than one.",
1068 if (matched_dst->peer_ref)
1069 return error("dst ref %s receives from more than one src.",
1072 matched_dst->peer_ref = allocated_src ?
1074 copy_ref(matched_src);
1075 matched_dst->force = rs->force;
1080 static int match_explicit_refs(struct ref *src, struct ref *dst,
1081 struct ref ***dst_tail, struct refspec_item *rs,
1085 for (i = errs = 0; i < rs_nr; i++)
1086 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1090 static char *get_ref_match(const struct refspec_item *rs, int rs_nr, const struct ref *ref,
1091 int send_mirror, int direction, const struct refspec_item **ret_pat)
1093 const struct refspec_item *pat;
1096 int matching_refs = -1;
1097 for (i = 0; i < rs_nr; i++) {
1098 if (rs[i].matching &&
1099 (matching_refs == -1 || rs[i].force)) {
1104 if (rs[i].pattern) {
1105 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1107 if (direction == FROM_SRC)
1108 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1110 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1117 if (matching_refs == -1)
1120 pat = rs + matching_refs;
1121 if (pat->matching) {
1123 * "matching refs"; traditionally we pushed everything
1124 * including refs outside refs/heads/ hierarchy, but
1125 * that does not make much sense these days.
1127 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1129 name = xstrdup(ref->name);
1136 static struct ref **tail_ref(struct ref **head)
1138 struct ref **tail = head;
1140 tail = &((*tail)->next);
1145 struct commit **tip;
1149 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1151 struct commit *commit;
1153 if (is_null_oid(oid))
1155 commit = lookup_commit_reference_gently(oid, 1);
1156 if (!commit || (commit->object.flags & TMP_MARK))
1158 commit->object.flags |= TMP_MARK;
1159 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1160 tips->tip[tips->nr++] = commit;
1163 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1165 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1166 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1167 struct string_list_item *item;
1169 struct tips sent_tips;
1172 * Collect everything we know they would have at the end of
1173 * this push, and collect all tags they have.
1175 memset(&sent_tips, 0, sizeof(sent_tips));
1176 for (ref = *dst; ref; ref = ref->next) {
1177 if (ref->peer_ref &&
1178 !is_null_oid(&ref->peer_ref->new_oid))
1179 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1181 add_to_tips(&sent_tips, &ref->old_oid);
1182 if (starts_with(ref->name, "refs/tags/"))
1183 string_list_append(&dst_tag, ref->name);
1185 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1187 string_list_sort(&dst_tag);
1189 /* Collect tags they do not have. */
1190 for (ref = src; ref; ref = ref->next) {
1191 if (!starts_with(ref->name, "refs/tags/"))
1192 continue; /* not a tag */
1193 if (string_list_has_string(&dst_tag, ref->name))
1194 continue; /* they already have it */
1195 if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
1196 continue; /* be conservative */
1197 item = string_list_append(&src_tag, ref->name);
1200 string_list_clear(&dst_tag, 0);
1203 * At this point, src_tag lists tags that are missing from
1204 * dst, and sent_tips lists the tips we are pushing or those
1205 * that we know they already have. An element in the src_tag
1206 * that is an ancestor of any of the sent_tips needs to be
1207 * sent to the other side.
1210 for_each_string_list_item(item, &src_tag) {
1211 struct ref *ref = item->util;
1212 struct ref *dst_ref;
1213 struct commit *commit;
1215 if (is_null_oid(&ref->new_oid))
1217 commit = lookup_commit_reference_gently(&ref->new_oid,
1220 /* not pushing a commit, which is not an error */
1224 * Is this tag, which they do not have, reachable from
1225 * any of the commits we are sending?
1227 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1231 dst_ref = make_linked_ref(ref->name, dst_tail);
1232 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1233 dst_ref->peer_ref = copy_ref(ref);
1236 string_list_clear(&src_tag, 0);
1237 free(sent_tips.tip);
1240 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1242 for ( ; list; list = list->next)
1243 if (!strcmp(list->name, name))
1244 return (struct ref *)list;
1248 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1250 for ( ; ref; ref = ref->next)
1251 string_list_append_nodup(ref_index, ref->name)->util = ref;
1253 string_list_sort(ref_index);
1257 * Given only the set of local refs, sanity-check the set of push
1258 * refspecs. We can't catch all errors that match_push_refs would,
1259 * but we can catch some errors early before even talking to the
1262 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1264 struct refspec refspec = REFSPEC_INIT_PUSH;
1268 refspec_appendn(&refspec, refspec_names, nr_refspec);
1270 for (i = 0; i < refspec.nr; i++) {
1271 struct refspec_item *rs = &refspec.items[i];
1273 if (rs->pattern || rs->matching)
1276 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1279 refspec_clear(&refspec);
1284 * Given the set of refs the local repository has, the set of refs the
1285 * remote repository has, and the refspec used for push, determine
1286 * what remote refs we will update and with what value by setting
1287 * peer_ref (which object is being pushed) and force (if the push is
1288 * forced) in elements of "dst". The function may add new elements to
1289 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1291 int match_push_refs(struct ref *src, struct ref **dst,
1292 int nr_refspec, const char **refspec, int flags)
1294 struct refspec rs = REFSPEC_INIT_PUSH;
1295 int send_all = flags & MATCH_REFS_ALL;
1296 int send_mirror = flags & MATCH_REFS_MIRROR;
1297 int send_prune = flags & MATCH_REFS_PRUNE;
1299 static const char *default_refspec[] = { ":", NULL };
1300 struct ref *ref, **dst_tail = tail_ref(dst);
1301 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1305 refspec = default_refspec;
1307 refspec_appendn(&rs, refspec, nr_refspec);
1308 errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);
1310 /* pick the remainder */
1311 for (ref = src; ref; ref = ref->next) {
1312 struct string_list_item *dst_item;
1313 struct ref *dst_peer;
1314 const struct refspec_item *pat = NULL;
1317 dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat);
1321 if (!dst_ref_index.nr)
1322 prepare_ref_index(&dst_ref_index, *dst);
1324 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1325 dst_peer = dst_item ? dst_item->util : NULL;
1327 if (dst_peer->peer_ref)
1328 /* We're already sending something to this ref. */
1331 if (pat->matching && !(send_all || send_mirror))
1333 * Remote doesn't have it, and we have no
1334 * explicit pattern, and we don't have
1335 * --all or --mirror.
1339 /* Create a new one and link it */
1340 dst_peer = make_linked_ref(dst_name, &dst_tail);
1341 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1342 string_list_insert(&dst_ref_index,
1343 dst_peer->name)->util = dst_peer;
1345 dst_peer->peer_ref = copy_ref(ref);
1346 dst_peer->force = pat->force;
1351 string_list_clear(&dst_ref_index, 0);
1353 if (flags & MATCH_REFS_FOLLOW_TAGS)
1354 add_missing_tags(src, dst, &dst_tail);
1357 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1358 /* check for missing refs on the remote */
1359 for (ref = *dst; ref; ref = ref->next) {
1363 /* We're already sending something to this ref. */
1366 src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL);
1368 if (!src_ref_index.nr)
1369 prepare_ref_index(&src_ref_index, src);
1370 if (!string_list_has_string(&src_ref_index,
1372 ref->peer_ref = alloc_delete_ref();
1376 string_list_clear(&src_ref_index, 0);
1386 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1391 for (ref = remote_refs; ref; ref = ref->next) {
1392 int force_ref_update = ref->force || force_update;
1393 int reject_reason = 0;
1396 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1397 else if (!send_mirror)
1400 ref->deletion = is_null_oid(&ref->new_oid);
1401 if (!ref->deletion &&
1402 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1403 ref->status = REF_STATUS_UPTODATE;
1408 * If the remote ref has moved and is now different
1409 * from what we expect, reject any push.
1411 * It also is an error if the user told us to check
1412 * with the remote-tracking branch to find the value
1413 * to expect, but we did not have such a tracking
1416 if (ref->expect_old_sha1) {
1417 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1418 reject_reason = REF_STATUS_REJECT_STALE;
1420 /* If the ref isn't stale then force the update. */
1421 force_ref_update = 1;
1425 * If the update isn't already rejected then check
1426 * the usual "must fast-forward" rules.
1428 * Decide whether an individual refspec A:B can be
1429 * pushed. The push will succeed if any of the
1430 * following are true:
1432 * (1) the remote reference B does not exist
1434 * (2) the remote reference B is being removed (i.e.,
1435 * pushing :B where no source is specified)
1437 * (3) the destination is not under refs/tags/, and
1438 * if the old and new value is a commit, the new
1439 * is a descendant of the old.
1441 * (4) it is forced using the +A:B notation, or by
1442 * passing the --force argument
1445 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1446 if (starts_with(ref->name, "refs/tags/"))
1447 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1448 else if (!has_object_file(&ref->old_oid))
1449 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1450 else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
1451 !lookup_commit_reference_gently(&ref->new_oid, 1))
1452 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1453 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1454 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1458 * "--force" will defeat any rejection implemented
1459 * by the rules above.
1461 if (!force_ref_update)
1462 ref->status = reject_reason;
1463 else if (reject_reason)
1464 ref->forced_update = 1;
1468 static void set_merge(struct branch *ret)
1470 struct remote *remote;
1472 struct object_id oid;
1476 return; /* no branch */
1478 return; /* already run */
1479 if (!ret->remote_name || !ret->merge_nr) {
1481 * no merge config; let's make sure we don't confuse callers
1482 * with a non-zero merge_nr but a NULL merge
1488 remote = remote_get(ret->remote_name);
1490 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1491 for (i = 0; i < ret->merge_nr; i++) {
1492 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1493 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1494 if (!remote_find_tracking(remote, ret->merge[i]) ||
1495 strcmp(ret->remote_name, "."))
1497 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1499 ret->merge[i]->dst = ref;
1501 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1505 struct branch *branch_get(const char *name)
1510 if (!name || !*name || !strcmp(name, "HEAD"))
1511 ret = current_branch;
1513 ret = make_branch(name, 0);
1518 int branch_has_merge_config(struct branch *branch)
1520 return branch && !!branch->merge;
1523 int branch_merge_matches(struct branch *branch,
1525 const char *refname)
1527 if (!branch || i < 0 || i >= branch->merge_nr)
1529 return refname_match(branch->merge[i]->src, refname);
1532 __attribute__((format (printf,2,3)))
1533 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1538 strbuf_vaddf(err, fmt, ap);
1544 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1547 return error_buf(err, _("HEAD does not point to a branch"));
1549 if (!branch->merge || !branch->merge[0]) {
1551 * no merge config; is it because the user didn't define any,
1552 * or because it is not a real branch, and get_branch
1555 if (!ref_exists(branch->refname))
1556 return error_buf(err, _("no such branch: '%s'"),
1558 return error_buf(err,
1559 _("no upstream configured for branch '%s'"),
1563 if (!branch->merge[0]->dst)
1564 return error_buf(err,
1565 _("upstream branch '%s' not stored as a remote-tracking branch"),
1566 branch->merge[0]->src);
1568 return branch->merge[0]->dst;
1571 static const char *tracking_for_push_dest(struct remote *remote,
1572 const char *refname,
1577 ret = apply_refspecs(remote->fetch.items, remote->fetch.nr, refname);
1579 return error_buf(err,
1580 _("push destination '%s' on remote '%s' has no local tracking branch"),
1581 refname, remote->name);
1585 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1587 struct remote *remote;
1589 remote = remote_get(pushremote_for_branch(branch, NULL));
1591 return error_buf(err,
1592 _("branch '%s' has no remote for pushing"),
1595 if (remote->push.nr) {
1599 dst = apply_refspecs(remote->push.items, remote->push.nr,
1602 return error_buf(err,
1603 _("push refspecs for '%s' do not include '%s'"),
1604 remote->name, branch->name);
1606 ret = tracking_for_push_dest(remote, dst, err);
1612 return tracking_for_push_dest(remote, branch->refname, err);
1614 switch (push_default) {
1615 case PUSH_DEFAULT_NOTHING:
1616 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1618 case PUSH_DEFAULT_MATCHING:
1619 case PUSH_DEFAULT_CURRENT:
1620 return tracking_for_push_dest(remote, branch->refname, err);
1622 case PUSH_DEFAULT_UPSTREAM:
1623 return branch_get_upstream(branch, err);
1625 case PUSH_DEFAULT_UNSPECIFIED:
1626 case PUSH_DEFAULT_SIMPLE:
1628 const char *up, *cur;
1630 up = branch_get_upstream(branch, err);
1633 cur = tracking_for_push_dest(remote, branch->refname, err);
1636 if (strcmp(cur, up))
1637 return error_buf(err,
1638 _("cannot resolve 'simple' push to a single destination"));
1643 die("BUG: unhandled push situation");
1646 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1649 return error_buf(err, _("HEAD does not point to a branch"));
1651 if (!branch->push_tracking_ref)
1652 branch->push_tracking_ref = branch_get_push_1(branch, err);
1653 return branch->push_tracking_ref;
1656 static int ignore_symref_update(const char *refname)
1660 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1661 return 0; /* non-existing refs are OK */
1662 return (flag & REF_ISSYMREF);
1666 * Create and return a list of (struct ref) consisting of copies of
1667 * each remote_ref that matches refspec. refspec must be a pattern.
1668 * Fill in the copies' peer_ref to describe the local tracking refs to
1669 * which they map. Omit any references that would map to an existing
1670 * local symbolic ref.
1672 static struct ref *get_expanded_map(const struct ref *remote_refs,
1673 const struct refspec_item *refspec)
1675 const struct ref *ref;
1676 struct ref *ret = NULL;
1677 struct ref **tail = &ret;
1679 for (ref = remote_refs; ref; ref = ref->next) {
1680 char *expn_name = NULL;
1682 if (strchr(ref->name, '^'))
1683 continue; /* a dereference item */
1684 if (match_name_with_pattern(refspec->src, ref->name,
1685 refspec->dst, &expn_name) &&
1686 !ignore_symref_update(expn_name)) {
1687 struct ref *cpy = copy_ref(ref);
1689 cpy->peer_ref = alloc_ref(expn_name);
1691 cpy->peer_ref->force = 1;
1701 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1703 const struct ref *ref;
1704 for (ref = refs; ref; ref = ref->next) {
1705 if (refname_match(name, ref->name))
1711 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1713 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1718 return copy_ref(ref);
1721 static struct ref *get_local_ref(const char *name)
1723 if (!name || name[0] == '\0')
1726 if (starts_with(name, "refs/"))
1727 return alloc_ref(name);
1729 if (starts_with(name, "heads/") ||
1730 starts_with(name, "tags/") ||
1731 starts_with(name, "remotes/"))
1732 return alloc_ref_with_prefix("refs/", 5, name);
1734 return alloc_ref_with_prefix("refs/heads/", 11, name);
1737 int get_fetch_map(const struct ref *remote_refs,
1738 const struct refspec_item *refspec,
1742 struct ref *ref_map, **rmp;
1744 if (refspec->pattern) {
1745 ref_map = get_expanded_map(remote_refs, refspec);
1747 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1749 if (refspec->exact_sha1) {
1750 ref_map = alloc_ref(name);
1751 get_oid_hex(name, &ref_map->old_oid);
1753 ref_map = get_remote_ref(remote_refs, name);
1755 if (!missing_ok && !ref_map)
1756 die("Couldn't find remote ref %s", name);
1758 ref_map->peer_ref = get_local_ref(refspec->dst);
1759 if (ref_map->peer_ref && refspec->force)
1760 ref_map->peer_ref->force = 1;
1764 for (rmp = &ref_map; *rmp; ) {
1765 if ((*rmp)->peer_ref) {
1766 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1767 check_refname_format((*rmp)->peer_ref->name, 0)) {
1768 struct ref *ignore = *rmp;
1769 error("* Ignoring funny ref '%s' locally",
1770 (*rmp)->peer_ref->name);
1771 *rmp = (*rmp)->next;
1772 free(ignore->peer_ref);
1777 rmp = &((*rmp)->next);
1781 tail_link_ref(ref_map, tail);
1786 int resolve_remote_symref(struct ref *ref, struct ref *list)
1790 for (; list; list = list->next)
1791 if (!strcmp(ref->symref, list->name)) {
1792 oidcpy(&ref->old_oid, &list->old_oid);
1798 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1801 struct commit *commit = pop_commit(&list);
1802 commit->object.flags &= ~mark;
1806 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1809 struct commit *old_commit, *new_commit;
1810 struct commit_list *list, *used;
1814 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1815 * old_commit. Otherwise we require --force.
1817 o = deref_tag(parse_object(old_oid), NULL, 0);
1818 if (!o || o->type != OBJ_COMMIT)
1820 old_commit = (struct commit *) o;
1822 o = deref_tag(parse_object(new_oid), NULL, 0);
1823 if (!o || o->type != OBJ_COMMIT)
1825 new_commit = (struct commit *) o;
1827 if (parse_commit(new_commit) < 0)
1831 commit_list_insert(new_commit, &list);
1833 new_commit = pop_most_recent_commit(&list, TMP_MARK);
1834 commit_list_insert(new_commit, &used);
1835 if (new_commit == old_commit) {
1840 unmark_and_free(list, TMP_MARK);
1841 unmark_and_free(used, TMP_MARK);
1846 * Lookup the upstream branch for the given branch and if present, optionally
1847 * compute the commit ahead/behind values for the pair.
1849 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1850 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1851 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1854 * The name of the upstream branch (or NULL if no upstream is defined) is
1855 * returned via *upstream_name, if it is not itself NULL.
1857 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1858 * upstream defined, or ref does not exist). Returns 0 if the commits are
1859 * identical. Returns 1 if commits are different.
1861 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1862 const char **upstream_name, enum ahead_behind_flags abf)
1864 struct object_id oid;
1865 struct commit *ours, *theirs;
1866 struct rev_info revs;
1868 struct argv_array argv = ARGV_ARRAY_INIT;
1870 /* Cannot stat unless we are marked to build on top of somebody else. */
1871 base = branch_get_upstream(branch, NULL);
1873 *upstream_name = base;
1877 /* Cannot stat if what we used to build on no longer exists */
1878 if (read_ref(base, &oid))
1880 theirs = lookup_commit_reference(&oid);
1884 if (read_ref(branch->refname, &oid))
1886 ours = lookup_commit_reference(&oid);
1890 *num_theirs = *num_ours = 0;
1892 /* are we the same? */
1895 if (abf == AHEAD_BEHIND_QUICK)
1897 if (abf != AHEAD_BEHIND_FULL)
1898 BUG("stat_tracking_info: invalid abf '%d'", abf);
1900 /* Run "rev-list --left-right ours...theirs" internally... */
1901 argv_array_push(&argv, ""); /* ignored */
1902 argv_array_push(&argv, "--left-right");
1903 argv_array_pushf(&argv, "%s...%s",
1904 oid_to_hex(&ours->object.oid),
1905 oid_to_hex(&theirs->object.oid));
1906 argv_array_push(&argv, "--");
1908 init_revisions(&revs, NULL);
1909 setup_revisions(argv.argc, argv.argv, &revs, NULL);
1910 if (prepare_revision_walk(&revs))
1911 die("revision walk setup failed");
1913 /* ... and count the commits on each side. */
1915 struct commit *c = get_revision(&revs);
1918 if (c->object.flags & SYMMETRIC_LEFT)
1924 /* clear object flags smudged by the above traversal */
1925 clear_commit_marks(ours, ALL_REV_FLAGS);
1926 clear_commit_marks(theirs, ALL_REV_FLAGS);
1928 argv_array_clear(&argv);
1933 * Return true when there is anything to report, otherwise false.
1935 int format_tracking_info(struct branch *branch, struct strbuf *sb,
1936 enum ahead_behind_flags abf)
1938 int ours, theirs, sti;
1939 const char *full_base;
1941 int upstream_is_gone = 0;
1943 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
1947 upstream_is_gone = 1;
1950 base = shorten_unambiguous_ref(full_base, 0);
1951 if (upstream_is_gone) {
1953 _("Your branch is based on '%s', but the upstream is gone.\n"),
1955 if (advice_status_hints)
1957 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1960 _("Your branch is up to date with '%s'.\n"),
1962 } else if (abf == AHEAD_BEHIND_QUICK) {
1964 _("Your branch and '%s' refer to different commits.\n"),
1966 if (advice_status_hints)
1967 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
1968 "git status --ahead-behind");
1969 } else if (!theirs) {
1971 Q_("Your branch is ahead of '%s' by %d commit.\n",
1972 "Your branch is ahead of '%s' by %d commits.\n",
1975 if (advice_status_hints)
1977 _(" (use \"git push\" to publish your local commits)\n"));
1980 Q_("Your branch is behind '%s' by %d commit, "
1981 "and can be fast-forwarded.\n",
1982 "Your branch is behind '%s' by %d commits, "
1983 "and can be fast-forwarded.\n",
1986 if (advice_status_hints)
1988 _(" (use \"git pull\" to update your local branch)\n"));
1991 Q_("Your branch and '%s' have diverged,\n"
1992 "and have %d and %d different commit each, "
1994 "Your branch and '%s' have diverged,\n"
1995 "and have %d and %d different commits each, "
1998 base, ours, theirs);
1999 if (advice_status_hints)
2001 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2007 static int one_local_ref(const char *refname, const struct object_id *oid,
2008 int flag, void *cb_data)
2010 struct ref ***local_tail = cb_data;
2013 /* we already know it starts with refs/ to get here */
2014 if (check_refname_format(refname + 5, 0))
2017 ref = alloc_ref(refname);
2018 oidcpy(&ref->new_oid, oid);
2020 *local_tail = &ref->next;
2024 struct ref *get_local_heads(void)
2026 struct ref *local_refs = NULL, **local_tail = &local_refs;
2028 for_each_ref(one_local_ref, &local_tail);
2032 struct ref *guess_remote_head(const struct ref *head,
2033 const struct ref *refs,
2036 const struct ref *r;
2037 struct ref *list = NULL;
2038 struct ref **tail = &list;
2044 * Some transports support directly peeking at
2045 * where HEAD points; if that is the case, then
2046 * we don't have to guess.
2049 return copy_ref(find_ref_by_name(refs, head->symref));
2051 /* If refs/heads/master could be right, it is. */
2053 r = find_ref_by_name(refs, "refs/heads/master");
2054 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2058 /* Look for another ref that points there */
2059 for (r = refs; r; r = r->next) {
2061 starts_with(r->name, "refs/heads/") &&
2062 !oidcmp(&r->old_oid, &head->old_oid)) {
2063 *tail = copy_ref(r);
2064 tail = &((*tail)->next);
2073 struct stale_heads_info {
2074 struct string_list *ref_names;
2075 struct ref **stale_refs_tail;
2076 struct refspec_item *refs;
2080 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2081 int flags, void *cb_data)
2083 struct stale_heads_info *info = cb_data;
2084 struct string_list matches = STRING_LIST_INIT_DUP;
2085 struct refspec_item query;
2087 memset(&query, 0, sizeof(struct refspec_item));
2088 query.dst = (char *)refname;
2090 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2091 if (matches.nr == 0)
2092 goto clean_exit; /* No matches */
2095 * If we did find a suitable refspec and it's not a symref and
2096 * it's not in the list of refs that currently exist in that
2097 * remote, we consider it to be stale. In order to deal with
2098 * overlapping refspecs, we need to go over all of the
2101 if (flags & REF_ISSYMREF)
2104 for (i = 0; stale && i < matches.nr; i++)
2105 if (string_list_has_string(info->ref_names, matches.items[i].string))
2109 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2110 oidcpy(&ref->new_oid, oid);
2114 string_list_clear(&matches, 0);
2118 struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
2120 struct ref *ref, *stale_refs = NULL;
2121 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2122 struct stale_heads_info info;
2124 info.ref_names = &ref_names;
2125 info.stale_refs_tail = &stale_refs;
2127 info.ref_count = ref_count;
2128 for (ref = fetch_map; ref; ref = ref->next)
2129 string_list_append(&ref_names, ref->name);
2130 string_list_sort(&ref_names);
2131 for_each_ref(get_stale_heads_cb, &info);
2132 string_list_clear(&ref_names, 0);
2139 static void clear_cas_option(struct push_cas_option *cas)
2143 for (i = 0; i < cas->nr; i++)
2144 free(cas->entry[i].refname);
2146 memset(cas, 0, sizeof(*cas));
2149 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2150 const char *refname,
2153 struct push_cas *entry;
2154 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2155 entry = &cas->entry[cas->nr++];
2156 memset(entry, 0, sizeof(*entry));
2157 entry->refname = xmemdupz(refname, refnamelen);
2161 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2164 struct push_cas *entry;
2167 /* "--no-<option>" */
2168 clear_cas_option(cas);
2173 /* just "--<option>" */
2174 cas->use_tracking_for_rest = 1;
2178 /* "--<option>=refname" or "--<option>=refname:value" */
2179 colon = strchrnul(arg, ':');
2180 entry = add_cas_entry(cas, arg, colon - arg);
2182 entry->use_tracking = 1;
2184 oidclr(&entry->expect);
2185 else if (get_oid(colon + 1, &entry->expect))
2186 return error("cannot parse expected object name '%s'", colon + 1);
2190 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2192 return parse_push_cas_option(opt->value, arg, unset);
2195 int is_empty_cas(const struct push_cas_option *cas)
2197 return !cas->use_tracking_for_rest && !cas->nr;
2201 * Look at remote.fetch refspec and see if we have a remote
2202 * tracking branch for the refname there. Fill its current
2204 * If we cannot do so, return negative to signal an error.
2206 static int remote_tracking(struct remote *remote, const char *refname,
2207 struct object_id *oid)
2211 dst = apply_refspecs(remote->fetch.items, remote->fetch.nr, refname);
2213 return -1; /* no tracking ref for refname at remote */
2214 if (read_ref(dst, oid))
2215 return -1; /* we know what the tracking ref is but we cannot read it */
2219 static void apply_cas(struct push_cas_option *cas,
2220 struct remote *remote,
2225 /* Find an explicit --<option>=<name>[:<value>] entry */
2226 for (i = 0; i < cas->nr; i++) {
2227 struct push_cas *entry = &cas->entry[i];
2228 if (!refname_match(entry->refname, ref->name))
2230 ref->expect_old_sha1 = 1;
2231 if (!entry->use_tracking)
2232 oidcpy(&ref->old_oid_expect, &entry->expect);
2233 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2234 oidclr(&ref->old_oid_expect);
2238 /* Are we using "--<option>" to cover all? */
2239 if (!cas->use_tracking_for_rest)
2242 ref->expect_old_sha1 = 1;
2243 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2244 oidclr(&ref->old_oid_expect);
2247 void apply_push_cas(struct push_cas_option *cas,
2248 struct remote *remote,
2249 struct ref *remote_refs)
2252 for (ref = remote_refs; ref; ref = ref->next)
2253 apply_cas(cas, remote, ref);