6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
14 #include "argv-array.h"
15 #include "commit-reach.h"
18 enum map_direction { FROM_SRC, FROM_DST };
20 struct counted_string {
27 struct counted_string *instead_of;
32 struct rewrite **rewrite;
37 static struct remote **remotes;
38 static int remotes_alloc;
39 static int remotes_nr;
40 static struct hashmap remotes_hash;
42 static struct branch **branches;
43 static int branches_alloc;
44 static int branches_nr;
46 static struct branch *current_branch;
47 static const char *pushremote_name;
49 static struct rewrites rewrites;
50 static struct rewrites rewrites_push;
52 static int valid_remote(const struct remote *remote)
54 return (!!remote->url) || (!!remote->foreign_vcs);
57 static const char *alias_url(const char *url, struct rewrites *r)
60 struct counted_string *longest;
65 for (i = 0; i < r->rewrite_nr; i++) {
68 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
69 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
71 longest->len < r->rewrite[i]->instead_of[j].len)) {
72 longest = &(r->rewrite[i]->instead_of[j]);
80 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
83 static void add_url(struct remote *remote, const char *url)
85 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
86 remote->url[remote->url_nr++] = url;
89 static void add_pushurl(struct remote *remote, const char *pushurl)
91 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
92 remote->pushurl[remote->pushurl_nr++] = pushurl;
95 static void add_pushurl_alias(struct remote *remote, const char *url)
97 const char *pushurl = alias_url(url, &rewrites_push);
99 add_pushurl(remote, pushurl);
102 static void add_url_alias(struct remote *remote, const char *url)
104 add_url(remote, alias_url(url, &rewrites));
105 add_pushurl_alias(remote, url);
108 struct remotes_hash_key {
113 static int remotes_hash_cmp(const void *unused_cmp_data,
114 const struct hashmap_entry *eptr,
115 const struct hashmap_entry *entry_or_key,
118 const struct remote *a, *b;
119 const struct remotes_hash_key *key = keydata;
121 a = container_of(eptr, const struct remote, ent);
122 b = container_of(entry_or_key, const struct remote, ent);
125 return strncmp(a->name, key->str, key->len) || a->name[key->len];
127 return strcmp(a->name, b->name);
130 static inline void init_remotes_hash(void)
132 if (!remotes_hash.cmpfn)
133 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
136 static struct remote *make_remote(const char *name, int len)
138 struct remote *ret, *replaced;
139 struct remotes_hash_key lookup;
140 struct hashmap_entry lookup_entry, *e;
148 hashmap_entry_init(&lookup_entry, memhash(name, len));
150 e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
152 return container_of(e, struct remote, ent);
154 ret = xcalloc(1, sizeof(struct remote));
155 ret->prune = -1; /* unspecified */
156 ret->prune_tags = -1; /* unspecified */
157 ret->name = xstrndup(name, len);
158 refspec_init(&ret->push, REFSPEC_PUSH);
159 refspec_init(&ret->fetch, REFSPEC_FETCH);
161 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
162 remotes[remotes_nr++] = ret;
164 hashmap_entry_init(&ret->ent, lookup_entry.hash);
165 replaced = hashmap_put_entry(&remotes_hash, ret, ent);
166 assert(replaced == NULL); /* no previous entry overwritten */
170 static void add_merge(struct branch *branch, const char *name)
172 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
173 branch->merge_alloc);
174 branch->merge_name[branch->merge_nr++] = name;
177 static struct branch *make_branch(const char *name, int len)
182 for (i = 0; i < branches_nr; i++) {
183 if (len ? (!strncmp(name, branches[i]->name, len) &&
184 !branches[i]->name[len]) :
185 !strcmp(name, branches[i]->name))
189 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
190 ret = xcalloc(1, sizeof(struct branch));
191 branches[branches_nr++] = ret;
193 ret->name = xstrndup(name, len);
195 ret->name = xstrdup(name);
196 ret->refname = xstrfmt("refs/heads/%s", ret->name);
201 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
206 for (i = 0; i < r->rewrite_nr; i++) {
208 ? (len == r->rewrite[i]->baselen &&
209 !strncmp(base, r->rewrite[i]->base, len))
210 : !strcmp(base, r->rewrite[i]->base))
211 return r->rewrite[i];
214 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
215 ret = xcalloc(1, sizeof(struct rewrite));
216 r->rewrite[r->rewrite_nr++] = ret;
218 ret->base = xstrndup(base, len);
222 ret->base = xstrdup(base);
223 ret->baselen = strlen(base);
228 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
230 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
231 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
232 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
233 rewrite->instead_of_nr++;
236 static const char *skip_spaces(const char *s)
243 static void read_remotes_file(struct remote *remote)
245 struct strbuf buf = STRBUF_INIT;
246 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
250 remote->configured_in_repo = 1;
251 remote->origin = REMOTE_REMOTES;
252 while (strbuf_getline(&buf, f) != EOF) {
257 if (skip_prefix(buf.buf, "URL:", &v))
258 add_url_alias(remote, xstrdup(skip_spaces(v)));
259 else if (skip_prefix(buf.buf, "Push:", &v))
260 refspec_append(&remote->push, skip_spaces(v));
261 else if (skip_prefix(buf.buf, "Pull:", &v))
262 refspec_append(&remote->fetch, skip_spaces(v));
264 strbuf_release(&buf);
268 static void read_branches_file(struct remote *remote)
271 struct strbuf buf = STRBUF_INIT;
272 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
277 strbuf_getline_lf(&buf, f);
281 strbuf_release(&buf);
285 remote->configured_in_repo = 1;
286 remote->origin = REMOTE_BRANCHES;
289 * The branches file would have URL and optionally
290 * #branch specified. The "master" (or specified) branch is
291 * fetched and stored in the local branch matching the
294 frag = strchr(buf.buf, '#');
300 add_url_alias(remote, strbuf_detach(&buf, NULL));
301 strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
303 refspec_append(&remote->fetch, buf.buf);
306 * Cogito compatible push: push current HEAD to remote #branch
307 * (master if missing)
310 strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
311 refspec_append(&remote->push, buf.buf);
312 remote->fetch_tags = 1; /* always auto-follow */
313 strbuf_release(&buf);
316 static int handle_config(const char *key, const char *value, void *cb)
321 struct remote *remote;
322 struct branch *branch;
323 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
326 branch = make_branch(name, namelen);
327 if (!strcmp(subkey, "remote")) {
328 return git_config_string(&branch->remote_name, key, value);
329 } else if (!strcmp(subkey, "pushremote")) {
330 return git_config_string(&branch->pushremote_name, key, value);
331 } else if (!strcmp(subkey, "merge")) {
333 return config_error_nonbool(key);
334 add_merge(branch, xstrdup(value));
338 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
339 struct rewrite *rewrite;
342 if (!strcmp(subkey, "insteadof")) {
344 return config_error_nonbool(key);
345 rewrite = make_rewrite(&rewrites, name, namelen);
346 add_instead_of(rewrite, xstrdup(value));
347 } else if (!strcmp(subkey, "pushinsteadof")) {
349 return config_error_nonbool(key);
350 rewrite = make_rewrite(&rewrites_push, name, namelen);
351 add_instead_of(rewrite, xstrdup(value));
355 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
358 /* Handle remote.* variables */
359 if (!name && !strcmp(subkey, "pushdefault"))
360 return git_config_string(&pushremote_name, key, value);
364 /* Handle remote.<name>.* variables */
366 warning(_("config remote shorthand cannot begin with '/': %s"),
370 remote = make_remote(name, namelen);
371 remote->origin = REMOTE_CONFIG;
372 if (current_config_scope() == CONFIG_SCOPE_REPO)
373 remote->configured_in_repo = 1;
374 if (!strcmp(subkey, "mirror"))
375 remote->mirror = git_config_bool(key, value);
376 else if (!strcmp(subkey, "skipdefaultupdate"))
377 remote->skip_default_update = git_config_bool(key, value);
378 else if (!strcmp(subkey, "skipfetchall"))
379 remote->skip_default_update = git_config_bool(key, value);
380 else if (!strcmp(subkey, "prune"))
381 remote->prune = git_config_bool(key, value);
382 else if (!strcmp(subkey, "prunetags"))
383 remote->prune_tags = git_config_bool(key, value);
384 else if (!strcmp(subkey, "url")) {
386 if (git_config_string(&v, key, value))
389 } else if (!strcmp(subkey, "pushurl")) {
391 if (git_config_string(&v, key, value))
393 add_pushurl(remote, v);
394 } else if (!strcmp(subkey, "push")) {
396 if (git_config_string(&v, key, value))
398 refspec_append(&remote->push, v);
400 } else if (!strcmp(subkey, "fetch")) {
402 if (git_config_string(&v, key, value))
404 refspec_append(&remote->fetch, v);
406 } else if (!strcmp(subkey, "receivepack")) {
408 if (git_config_string(&v, key, value))
410 if (!remote->receivepack)
411 remote->receivepack = v;
413 error(_("more than one receivepack given, using the first"));
414 } else if (!strcmp(subkey, "uploadpack")) {
416 if (git_config_string(&v, key, value))
418 if (!remote->uploadpack)
419 remote->uploadpack = v;
421 error(_("more than one uploadpack given, using the first"));
422 } else if (!strcmp(subkey, "tagopt")) {
423 if (!strcmp(value, "--no-tags"))
424 remote->fetch_tags = -1;
425 else if (!strcmp(value, "--tags"))
426 remote->fetch_tags = 2;
427 } else if (!strcmp(subkey, "proxy")) {
428 return git_config_string((const char **)&remote->http_proxy,
430 } else if (!strcmp(subkey, "proxyauthmethod")) {
431 return git_config_string((const char **)&remote->http_proxy_authmethod,
433 } else if (!strcmp(subkey, "vcs")) {
434 return git_config_string(&remote->foreign_vcs, key, value);
439 static void alias_all_urls(void)
442 for (i = 0; i < remotes_nr; i++) {
443 int add_pushurl_aliases;
446 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
447 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
449 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
450 for (j = 0; j < remotes[i]->url_nr; j++) {
451 if (add_pushurl_aliases)
452 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
453 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
458 static void read_config(void)
467 current_branch = NULL;
468 if (startup_info->have_repository) {
469 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
470 if (head_ref && (flag & REF_ISSYMREF) &&
471 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
472 current_branch = make_branch(head_ref, 0);
475 git_config(handle_config, NULL);
479 static int valid_remote_nick(const char *name)
481 if (!name[0] || is_dot_or_dotdot(name))
484 /* remote nicknames cannot contain slashes */
486 if (is_dir_sep(*name++))
491 const char *remote_for_branch(struct branch *branch, int *explicit)
493 if (branch && branch->remote_name) {
496 return branch->remote_name;
503 const char *pushremote_for_branch(struct branch *branch, int *explicit)
505 if (branch && branch->pushremote_name) {
508 return branch->pushremote_name;
510 if (pushremote_name) {
513 return pushremote_name;
515 return remote_for_branch(branch, explicit);
518 const char *remote_ref_for_branch(struct branch *branch, int for_push,
523 if (branch->merge_nr) {
526 return branch->merge_name[0];
529 const char *dst, *remote_name =
530 pushremote_for_branch(branch, NULL);
531 struct remote *remote = remote_get(remote_name);
533 if (remote && remote->push.nr &&
534 (dst = apply_refspecs(&remote->push,
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 BUG("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 *rs,
707 struct refspec_item *query,
708 struct string_list *results)
711 int find_src = !query->src;
713 if (find_src && !query->dst)
714 BUG("query_refspecs_multiple: need either src or dst");
716 for (i = 0; i < rs->nr; i++) {
717 struct refspec_item *refspec = &rs->items[i];
718 const char *key = find_src ? refspec->dst : refspec->src;
719 const char *value = find_src ? refspec->src : refspec->dst;
720 const char *needle = find_src ? query->dst : query->src;
721 char **result = find_src ? &query->src : &query->dst;
725 if (refspec->pattern) {
726 if (match_name_with_pattern(key, needle, value, result))
727 string_list_append_nodup(results, *result);
728 } else if (!strcmp(needle, key)) {
729 string_list_append(results, value);
734 int query_refspecs(struct refspec *rs, struct refspec_item *query)
737 int find_src = !query->src;
738 const char *needle = find_src ? query->dst : query->src;
739 char **result = find_src ? &query->src : &query->dst;
741 if (find_src && !query->dst)
742 BUG("query_refspecs: need either src or dst");
744 for (i = 0; i < rs->nr; i++) {
745 struct refspec_item *refspec = &rs->items[i];
746 const char *key = find_src ? refspec->dst : refspec->src;
747 const char *value = find_src ? refspec->src : refspec->dst;
751 if (refspec->pattern) {
752 if (match_name_with_pattern(key, needle, value, result)) {
753 query->force = refspec->force;
756 } else if (!strcmp(needle, key)) {
757 *result = xstrdup(value);
758 query->force = refspec->force;
765 char *apply_refspecs(struct refspec *rs, const char *name)
767 struct refspec_item query;
769 memset(&query, 0, sizeof(struct refspec_item));
770 query.src = (char *)name;
772 if (query_refspecs(rs, &query))
778 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
780 return query_refspecs(&remote->fetch, refspec);
783 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
786 size_t len = strlen(name);
787 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
788 memcpy(ref->name, prefix, prefixlen);
789 memcpy(ref->name + prefixlen, name, len);
793 struct ref *alloc_ref(const char *name)
795 return alloc_ref_with_prefix("", 0, name);
798 struct ref *copy_ref(const struct ref *ref)
804 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
806 memcpy(cpy, ref, len);
808 cpy->symref = xstrdup_or_null(ref->symref);
809 cpy->remote_status = xstrdup_or_null(ref->remote_status);
810 cpy->peer_ref = copy_ref(ref->peer_ref);
814 struct ref *copy_ref_list(const struct ref *ref)
816 struct ref *ret = NULL;
817 struct ref **tail = &ret;
819 *tail = copy_ref(ref);
821 tail = &((*tail)->next);
826 void free_one_ref(struct ref *ref)
830 free_one_ref(ref->peer_ref);
831 free(ref->remote_status);
836 void free_refs(struct ref *ref)
846 int ref_compare_name(const void *va, const void *vb)
848 const struct ref *a = va, *b = vb;
849 return strcmp(a->name, b->name);
852 static void *ref_list_get_next(const void *a)
854 return ((const struct ref *)a)->next;
857 static void ref_list_set_next(void *a, void *next)
859 ((struct ref *)a)->next = next;
862 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
864 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
867 int count_refspec_match(const char *pattern,
869 struct ref **matched_ref)
871 int patlen = strlen(pattern);
872 struct ref *matched_weak = NULL;
873 struct ref *matched = NULL;
877 for (weak_match = match = 0; refs; refs = refs->next) {
878 char *name = refs->name;
879 int namelen = strlen(name);
881 if (!refname_match(pattern, name))
884 /* A match is "weak" if it is with refs outside
885 * heads or tags, and did not specify the pattern
886 * in full (e.g. "refs/remotes/origin/master") or at
887 * least from the toplevel (e.g. "remotes/origin/master");
888 * otherwise "git push $URL master" would result in
889 * ambiguity between remotes/origin/master and heads/master
890 * at the remote site.
892 if (namelen != patlen &&
893 patlen != namelen - 5 &&
894 !starts_with(name, "refs/heads/") &&
895 !starts_with(name, "refs/tags/")) {
896 /* We want to catch the case where only weak
897 * matches are found and there are multiple
898 * matches, and where more than one strong
899 * matches are found, as ambiguous. One
900 * strong match with zero or more weak matches
901 * are acceptable as a unique match.
913 *matched_ref = matched_weak;
918 *matched_ref = matched;
923 static void tail_link_ref(struct ref *ref, struct ref ***tail)
931 static struct ref *alloc_delete_ref(void)
933 struct ref *ref = alloc_ref("(delete)");
934 oidclr(&ref->new_oid);
938 static int try_explicit_object_name(const char *name,
941 struct object_id oid;
945 *match = alloc_delete_ref();
949 if (get_oid(name, &oid))
953 *match = alloc_ref(name);
954 oidcpy(&(*match)->new_oid, &oid);
959 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
961 struct ref *ret = alloc_ref(name);
962 tail_link_ref(ret, tail);
966 static char *guess_ref(const char *name, struct ref *peer)
968 struct strbuf buf = STRBUF_INIT;
970 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
975 if (starts_with(r, "refs/heads/")) {
976 strbuf_addstr(&buf, "refs/heads/");
977 } else if (starts_with(r, "refs/tags/")) {
978 strbuf_addstr(&buf, "refs/tags/");
983 strbuf_addstr(&buf, name);
984 return strbuf_detach(&buf, NULL);
987 static int match_explicit_lhs(struct ref *src,
988 struct refspec_item *rs,
990 int *allocated_match)
992 switch (count_refspec_match(rs->src, src, match)) {
995 *allocated_match = 0;
998 /* The source could be in the get_sha1() format
999 * not a reference name. :refs/other is a
1000 * way to delete 'other' ref at the remote end.
1002 if (try_explicit_object_name(rs->src, match) < 0)
1003 return error(_("src refspec %s does not match any"), rs->src);
1004 if (allocated_match)
1005 *allocated_match = 1;
1008 return error(_("src refspec %s matches more than one"), rs->src);
1012 static void show_push_unqualified_ref_name_error(const char *dst_value,
1013 const char *matched_src_name)
1015 struct object_id oid;
1016 enum object_type type;
1019 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1020 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1023 error(_("The destination you provided is not a full refname (i.e.,\n"
1024 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1026 "- Looking for a ref that matches '%s' on the remote side.\n"
1027 "- Checking if the <src> being pushed ('%s')\n"
1028 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1029 " refs/{heads,tags}/ prefix on the remote side.\n"
1031 "Neither worked, so we gave up. You must fully qualify the ref."),
1032 dst_value, matched_src_name);
1034 if (!advice_push_unqualified_ref_name)
1037 if (get_oid(matched_src_name, &oid))
1038 BUG("'%s' is not a valid object, "
1039 "match_explicit_lhs() should catch this!",
1041 type = oid_object_info(the_repository, &oid, NULL);
1042 if (type == OBJ_COMMIT) {
1043 advise(_("The <src> part of the refspec is a commit object.\n"
1044 "Did you mean to create a new branch by pushing to\n"
1045 "'%s:refs/heads/%s'?"),
1046 matched_src_name, dst_value);
1047 } else if (type == OBJ_TAG) {
1048 advise(_("The <src> part of the refspec is a tag object.\n"
1049 "Did you mean to create a new tag by pushing to\n"
1050 "'%s:refs/tags/%s'?"),
1051 matched_src_name, dst_value);
1052 } else if (type == OBJ_TREE) {
1053 advise(_("The <src> part of the refspec is a tree object.\n"
1054 "Did you mean to tag a new tree by pushing to\n"
1055 "'%s:refs/tags/%s'?"),
1056 matched_src_name, dst_value);
1057 } else if (type == OBJ_BLOB) {
1058 advise(_("The <src> part of the refspec is a blob object.\n"
1059 "Did you mean to tag a new blob by pushing to\n"
1060 "'%s:refs/tags/%s'?"),
1061 matched_src_name, dst_value);
1063 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1064 matched_src_name, type);
1068 static int match_explicit(struct ref *src, struct ref *dst,
1069 struct ref ***dst_tail,
1070 struct refspec_item *rs)
1072 struct ref *matched_src, *matched_dst;
1075 const char *dst_value = rs->dst;
1078 if (rs->pattern || rs->matching)
1081 matched_src = matched_dst = NULL;
1082 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1088 dst_value = resolve_ref_unsafe(matched_src->name,
1089 RESOLVE_REF_READING,
1092 ((flag & REF_ISSYMREF) &&
1093 !starts_with(dst_value, "refs/heads/")))
1094 die(_("%s cannot be resolved to branch"),
1098 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1102 if (starts_with(dst_value, "refs/")) {
1103 matched_dst = make_linked_ref(dst_value, dst_tail);
1104 } else if (is_null_oid(&matched_src->new_oid)) {
1105 error(_("unable to delete '%s': remote ref does not exist"),
1107 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1108 matched_dst = make_linked_ref(dst_guess, dst_tail);
1111 show_push_unqualified_ref_name_error(dst_value,
1117 error(_("dst refspec %s matches more than one"),
1123 if (matched_dst->peer_ref)
1124 return error(_("dst ref %s receives from more than one src"),
1127 matched_dst->peer_ref = allocated_src ?
1129 copy_ref(matched_src);
1130 matched_dst->force = rs->force;
1135 static int match_explicit_refs(struct ref *src, struct ref *dst,
1136 struct ref ***dst_tail, struct refspec *rs)
1139 for (i = errs = 0; i < rs->nr; i++)
1140 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1144 static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1145 int send_mirror, int direction,
1146 const struct refspec_item **ret_pat)
1148 const struct refspec_item *pat;
1151 int matching_refs = -1;
1152 for (i = 0; i < rs->nr; i++) {
1153 const struct refspec_item *item = &rs->items[i];
1154 if (item->matching &&
1155 (matching_refs == -1 || item->force)) {
1160 if (item->pattern) {
1161 const char *dst_side = item->dst ? item->dst : item->src;
1163 if (direction == FROM_SRC)
1164 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
1166 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
1173 if (matching_refs == -1)
1176 pat = &rs->items[matching_refs];
1177 if (pat->matching) {
1179 * "matching refs"; traditionally we pushed everything
1180 * including refs outside refs/heads/ hierarchy, but
1181 * that does not make much sense these days.
1183 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1185 name = xstrdup(ref->name);
1192 static struct ref **tail_ref(struct ref **head)
1194 struct ref **tail = head;
1196 tail = &((*tail)->next);
1201 struct commit **tip;
1205 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1207 struct commit *commit;
1209 if (is_null_oid(oid))
1211 commit = lookup_commit_reference_gently(the_repository, oid, 1);
1212 if (!commit || (commit->object.flags & TMP_MARK))
1214 commit->object.flags |= TMP_MARK;
1215 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1216 tips->tip[tips->nr++] = commit;
1219 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1221 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1222 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1223 struct string_list_item *item;
1225 struct tips sent_tips;
1228 * Collect everything we know they would have at the end of
1229 * this push, and collect all tags they have.
1231 memset(&sent_tips, 0, sizeof(sent_tips));
1232 for (ref = *dst; ref; ref = ref->next) {
1233 if (ref->peer_ref &&
1234 !is_null_oid(&ref->peer_ref->new_oid))
1235 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1237 add_to_tips(&sent_tips, &ref->old_oid);
1238 if (starts_with(ref->name, "refs/tags/"))
1239 string_list_append(&dst_tag, ref->name);
1241 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1243 string_list_sort(&dst_tag);
1245 /* Collect tags they do not have. */
1246 for (ref = src; ref; ref = ref->next) {
1247 if (!starts_with(ref->name, "refs/tags/"))
1248 continue; /* not a tag */
1249 if (string_list_has_string(&dst_tag, ref->name))
1250 continue; /* they already have it */
1251 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
1252 continue; /* be conservative */
1253 item = string_list_append(&src_tag, ref->name);
1256 string_list_clear(&dst_tag, 0);
1259 * At this point, src_tag lists tags that are missing from
1260 * dst, and sent_tips lists the tips we are pushing or those
1261 * that we know they already have. An element in the src_tag
1262 * that is an ancestor of any of the sent_tips needs to be
1263 * sent to the other side.
1266 const int reachable_flag = 1;
1267 struct commit_list *found_commits;
1268 struct commit **src_commits;
1269 int nr_src_commits = 0, alloc_src_commits = 16;
1270 ALLOC_ARRAY(src_commits, alloc_src_commits);
1272 for_each_string_list_item(item, &src_tag) {
1273 struct ref *ref = item->util;
1274 struct commit *commit;
1276 if (is_null_oid(&ref->new_oid))
1278 commit = lookup_commit_reference_gently(the_repository,
1282 /* not pushing a commit, which is not an error */
1285 ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
1286 src_commits[nr_src_commits++] = commit;
1289 found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
1290 src_commits, nr_src_commits,
1293 for_each_string_list_item(item, &src_tag) {
1294 struct ref *dst_ref;
1295 struct ref *ref = item->util;
1296 struct commit *commit;
1298 if (is_null_oid(&ref->new_oid))
1300 commit = lookup_commit_reference_gently(the_repository,
1304 /* not pushing a commit, which is not an error */
1308 * Is this tag, which they do not have, reachable from
1309 * any of the commits we are sending?
1311 if (!(commit->object.flags & reachable_flag))
1315 dst_ref = make_linked_ref(ref->name, dst_tail);
1316 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1317 dst_ref->peer_ref = copy_ref(ref);
1320 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1322 free_commit_list(found_commits);
1325 string_list_clear(&src_tag, 0);
1326 free(sent_tips.tip);
1329 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1331 for ( ; list; list = list->next)
1332 if (!strcmp(list->name, name))
1333 return (struct ref *)list;
1337 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1339 for ( ; ref; ref = ref->next)
1340 string_list_append_nodup(ref_index, ref->name)->util = ref;
1342 string_list_sort(ref_index);
1346 * Given only the set of local refs, sanity-check the set of push
1347 * refspecs. We can't catch all errors that match_push_refs would,
1348 * but we can catch some errors early before even talking to the
1351 int check_push_refs(struct ref *src, struct refspec *rs)
1356 for (i = 0; i < rs->nr; i++) {
1357 struct refspec_item *item = &rs->items[i];
1359 if (item->pattern || item->matching)
1362 ret |= match_explicit_lhs(src, item, NULL, NULL);
1369 * Given the set of refs the local repository has, the set of refs the
1370 * remote repository has, and the refspec used for push, determine
1371 * what remote refs we will update and with what value by setting
1372 * peer_ref (which object is being pushed) and force (if the push is
1373 * forced) in elements of "dst". The function may add new elements to
1374 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1376 int match_push_refs(struct ref *src, struct ref **dst,
1377 struct refspec *rs, int flags)
1379 int send_all = flags & MATCH_REFS_ALL;
1380 int send_mirror = flags & MATCH_REFS_MIRROR;
1381 int send_prune = flags & MATCH_REFS_PRUNE;
1383 struct ref *ref, **dst_tail = tail_ref(dst);
1384 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1386 /* If no refspec is provided, use the default ":" */
1388 refspec_append(rs, ":");
1390 errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1392 /* pick the remainder */
1393 for (ref = src; ref; ref = ref->next) {
1394 struct string_list_item *dst_item;
1395 struct ref *dst_peer;
1396 const struct refspec_item *pat = NULL;
1399 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1403 if (!dst_ref_index.nr)
1404 prepare_ref_index(&dst_ref_index, *dst);
1406 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1407 dst_peer = dst_item ? dst_item->util : NULL;
1409 if (dst_peer->peer_ref)
1410 /* We're already sending something to this ref. */
1413 if (pat->matching && !(send_all || send_mirror))
1415 * Remote doesn't have it, and we have no
1416 * explicit pattern, and we don't have
1417 * --all or --mirror.
1421 /* Create a new one and link it */
1422 dst_peer = make_linked_ref(dst_name, &dst_tail);
1423 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1424 string_list_insert(&dst_ref_index,
1425 dst_peer->name)->util = dst_peer;
1427 dst_peer->peer_ref = copy_ref(ref);
1428 dst_peer->force = pat->force;
1433 string_list_clear(&dst_ref_index, 0);
1435 if (flags & MATCH_REFS_FOLLOW_TAGS)
1436 add_missing_tags(src, dst, &dst_tail);
1439 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1440 /* check for missing refs on the remote */
1441 for (ref = *dst; ref; ref = ref->next) {
1445 /* We're already sending something to this ref. */
1448 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
1450 if (!src_ref_index.nr)
1451 prepare_ref_index(&src_ref_index, src);
1452 if (!string_list_has_string(&src_ref_index,
1454 ref->peer_ref = alloc_delete_ref();
1458 string_list_clear(&src_ref_index, 0);
1466 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1471 for (ref = remote_refs; ref; ref = ref->next) {
1472 int force_ref_update = ref->force || force_update;
1473 int reject_reason = 0;
1476 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1477 else if (!send_mirror)
1480 ref->deletion = is_null_oid(&ref->new_oid);
1481 if (!ref->deletion &&
1482 oideq(&ref->old_oid, &ref->new_oid)) {
1483 ref->status = REF_STATUS_UPTODATE;
1488 * If the remote ref has moved and is now different
1489 * from what we expect, reject any push.
1491 * It also is an error if the user told us to check
1492 * with the remote-tracking branch to find the value
1493 * to expect, but we did not have such a tracking
1496 if (ref->expect_old_sha1) {
1497 if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1498 reject_reason = REF_STATUS_REJECT_STALE;
1500 /* If the ref isn't stale then force the update. */
1501 force_ref_update = 1;
1505 * If the update isn't already rejected then check
1506 * the usual "must fast-forward" rules.
1508 * Decide whether an individual refspec A:B can be
1509 * pushed. The push will succeed if any of the
1510 * following are true:
1512 * (1) the remote reference B does not exist
1514 * (2) the remote reference B is being removed (i.e.,
1515 * pushing :B where no source is specified)
1517 * (3) the destination is not under refs/tags/, and
1518 * if the old and new value is a commit, the new
1519 * is a descendant of the old.
1521 * (4) it is forced using the +A:B notation, or by
1522 * passing the --force argument
1525 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1526 if (starts_with(ref->name, "refs/tags/"))
1527 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1528 else if (!has_object_file(&ref->old_oid))
1529 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1530 else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
1531 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1532 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1533 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1534 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1538 * "--force" will defeat any rejection implemented
1539 * by the rules above.
1541 if (!force_ref_update)
1542 ref->status = reject_reason;
1543 else if (reject_reason)
1544 ref->forced_update = 1;
1548 static void set_merge(struct branch *ret)
1550 struct remote *remote;
1552 struct object_id oid;
1556 return; /* no branch */
1558 return; /* already run */
1559 if (!ret->remote_name || !ret->merge_nr) {
1561 * no merge config; let's make sure we don't confuse callers
1562 * with a non-zero merge_nr but a NULL merge
1568 remote = remote_get(ret->remote_name);
1570 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1571 for (i = 0; i < ret->merge_nr; i++) {
1572 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1573 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1574 if (!remote_find_tracking(remote, ret->merge[i]) ||
1575 strcmp(ret->remote_name, "."))
1577 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1579 ret->merge[i]->dst = ref;
1581 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1585 struct branch *branch_get(const char *name)
1590 if (!name || !*name || !strcmp(name, "HEAD"))
1591 ret = current_branch;
1593 ret = make_branch(name, 0);
1598 int branch_has_merge_config(struct branch *branch)
1600 return branch && !!branch->merge;
1603 int branch_merge_matches(struct branch *branch,
1605 const char *refname)
1607 if (!branch || i < 0 || i >= branch->merge_nr)
1609 return refname_match(branch->merge[i]->src, refname);
1612 __attribute__((format (printf,2,3)))
1613 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1618 strbuf_vaddf(err, fmt, ap);
1624 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1627 return error_buf(err, _("HEAD does not point to a branch"));
1629 if (!branch->merge || !branch->merge[0]) {
1631 * no merge config; is it because the user didn't define any,
1632 * or because it is not a real branch, and get_branch
1635 if (!ref_exists(branch->refname))
1636 return error_buf(err, _("no such branch: '%s'"),
1638 return error_buf(err,
1639 _("no upstream configured for branch '%s'"),
1643 if (!branch->merge[0]->dst)
1644 return error_buf(err,
1645 _("upstream branch '%s' not stored as a remote-tracking branch"),
1646 branch->merge[0]->src);
1648 return branch->merge[0]->dst;
1651 static const char *tracking_for_push_dest(struct remote *remote,
1652 const char *refname,
1657 ret = apply_refspecs(&remote->fetch, refname);
1659 return error_buf(err,
1660 _("push destination '%s' on remote '%s' has no local tracking branch"),
1661 refname, remote->name);
1665 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1667 struct remote *remote;
1669 remote = remote_get(pushremote_for_branch(branch, NULL));
1671 return error_buf(err,
1672 _("branch '%s' has no remote for pushing"),
1675 if (remote->push.nr) {
1679 dst = apply_refspecs(&remote->push, branch->refname);
1681 return error_buf(err,
1682 _("push refspecs for '%s' do not include '%s'"),
1683 remote->name, branch->name);
1685 ret = tracking_for_push_dest(remote, dst, err);
1691 return tracking_for_push_dest(remote, branch->refname, err);
1693 switch (push_default) {
1694 case PUSH_DEFAULT_NOTHING:
1695 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1697 case PUSH_DEFAULT_MATCHING:
1698 case PUSH_DEFAULT_CURRENT:
1699 return tracking_for_push_dest(remote, branch->refname, err);
1701 case PUSH_DEFAULT_UPSTREAM:
1702 return branch_get_upstream(branch, err);
1704 case PUSH_DEFAULT_UNSPECIFIED:
1705 case PUSH_DEFAULT_SIMPLE:
1707 const char *up, *cur;
1709 up = branch_get_upstream(branch, err);
1712 cur = tracking_for_push_dest(remote, branch->refname, err);
1715 if (strcmp(cur, up))
1716 return error_buf(err,
1717 _("cannot resolve 'simple' push to a single destination"));
1722 BUG("unhandled push situation");
1725 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1728 return error_buf(err, _("HEAD does not point to a branch"));
1730 if (!branch->push_tracking_ref)
1731 branch->push_tracking_ref = branch_get_push_1(branch, err);
1732 return branch->push_tracking_ref;
1735 static int ignore_symref_update(const char *refname)
1739 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1740 return 0; /* non-existing refs are OK */
1741 return (flag & REF_ISSYMREF);
1745 * Create and return a list of (struct ref) consisting of copies of
1746 * each remote_ref that matches refspec. refspec must be a pattern.
1747 * Fill in the copies' peer_ref to describe the local tracking refs to
1748 * which they map. Omit any references that would map to an existing
1749 * local symbolic ref.
1751 static struct ref *get_expanded_map(const struct ref *remote_refs,
1752 const struct refspec_item *refspec)
1754 const struct ref *ref;
1755 struct ref *ret = NULL;
1756 struct ref **tail = &ret;
1758 for (ref = remote_refs; ref; ref = ref->next) {
1759 char *expn_name = NULL;
1761 if (strchr(ref->name, '^'))
1762 continue; /* a dereference item */
1763 if (match_name_with_pattern(refspec->src, ref->name,
1764 refspec->dst, &expn_name) &&
1765 !ignore_symref_update(expn_name)) {
1766 struct ref *cpy = copy_ref(ref);
1768 cpy->peer_ref = alloc_ref(expn_name);
1770 cpy->peer_ref->force = 1;
1780 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1782 const struct ref *ref;
1783 const struct ref *best_match = NULL;
1786 for (ref = refs; ref; ref = ref->next) {
1787 int score = refname_match(name, ref->name);
1789 if (best_score < score) {
1797 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1799 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1804 return copy_ref(ref);
1807 static struct ref *get_local_ref(const char *name)
1809 if (!name || name[0] == '\0')
1812 if (starts_with(name, "refs/"))
1813 return alloc_ref(name);
1815 if (starts_with(name, "heads/") ||
1816 starts_with(name, "tags/") ||
1817 starts_with(name, "remotes/"))
1818 return alloc_ref_with_prefix("refs/", 5, name);
1820 return alloc_ref_with_prefix("refs/heads/", 11, name);
1823 int get_fetch_map(const struct ref *remote_refs,
1824 const struct refspec_item *refspec,
1828 struct ref *ref_map, **rmp;
1830 if (refspec->pattern) {
1831 ref_map = get_expanded_map(remote_refs, refspec);
1833 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1835 if (refspec->exact_sha1) {
1836 ref_map = alloc_ref(name);
1837 get_oid_hex(name, &ref_map->old_oid);
1838 ref_map->exact_oid = 1;
1840 ref_map = get_remote_ref(remote_refs, name);
1842 if (!missing_ok && !ref_map)
1843 die(_("couldn't find remote ref %s"), name);
1845 ref_map->peer_ref = get_local_ref(refspec->dst);
1846 if (ref_map->peer_ref && refspec->force)
1847 ref_map->peer_ref->force = 1;
1851 for (rmp = &ref_map; *rmp; ) {
1852 if ((*rmp)->peer_ref) {
1853 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1854 check_refname_format((*rmp)->peer_ref->name, 0)) {
1855 struct ref *ignore = *rmp;
1856 error(_("* Ignoring funny ref '%s' locally"),
1857 (*rmp)->peer_ref->name);
1858 *rmp = (*rmp)->next;
1859 free(ignore->peer_ref);
1864 rmp = &((*rmp)->next);
1868 tail_link_ref(ref_map, tail);
1873 int resolve_remote_symref(struct ref *ref, struct ref *list)
1877 for (; list; list = list->next)
1878 if (!strcmp(ref->symref, list->name)) {
1879 oidcpy(&ref->old_oid, &list->old_oid);
1886 * Compute the commit ahead/behind values for the pair branch_name, base.
1888 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1889 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1890 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1893 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1894 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1895 * commits are different.
1898 static int stat_branch_pair(const char *branch_name, const char *base,
1899 int *num_ours, int *num_theirs,
1900 enum ahead_behind_flags abf)
1902 struct object_id oid;
1903 struct commit *ours, *theirs;
1904 struct rev_info revs;
1905 struct argv_array argv = ARGV_ARRAY_INIT;
1907 /* Cannot stat if what we used to build on no longer exists */
1908 if (read_ref(base, &oid))
1910 theirs = lookup_commit_reference(the_repository, &oid);
1914 if (read_ref(branch_name, &oid))
1916 ours = lookup_commit_reference(the_repository, &oid);
1920 *num_theirs = *num_ours = 0;
1922 /* are we the same? */
1925 if (abf == AHEAD_BEHIND_QUICK)
1927 if (abf != AHEAD_BEHIND_FULL)
1928 BUG("stat_branch_pair: invalid abf '%d'", abf);
1930 /* Run "rev-list --left-right ours...theirs" internally... */
1931 argv_array_push(&argv, ""); /* ignored */
1932 argv_array_push(&argv, "--left-right");
1933 argv_array_pushf(&argv, "%s...%s",
1934 oid_to_hex(&ours->object.oid),
1935 oid_to_hex(&theirs->object.oid));
1936 argv_array_push(&argv, "--");
1938 repo_init_revisions(the_repository, &revs, NULL);
1939 setup_revisions(argv.argc, argv.argv, &revs, NULL);
1940 if (prepare_revision_walk(&revs))
1941 die(_("revision walk setup failed"));
1943 /* ... and count the commits on each side. */
1945 struct commit *c = get_revision(&revs);
1948 if (c->object.flags & SYMMETRIC_LEFT)
1954 /* clear object flags smudged by the above traversal */
1955 clear_commit_marks(ours, ALL_REV_FLAGS);
1956 clear_commit_marks(theirs, ALL_REV_FLAGS);
1958 argv_array_clear(&argv);
1963 * Lookup the tracking branch for the given branch and if present, optionally
1964 * compute the commit ahead/behind values for the pair.
1966 * If for_push is true, the tracking branch refers to the push branch,
1967 * otherwise it refers to the upstream branch.
1969 * The name of the tracking branch (or NULL if it is not defined) is
1970 * returned via *tracking_name, if it is not itself NULL.
1972 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1973 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1974 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1977 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1978 * upstream defined, or ref does not exist). Returns 0 if the commits are
1979 * identical. Returns 1 if commits are different.
1981 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1982 const char **tracking_name, int for_push,
1983 enum ahead_behind_flags abf)
1987 /* Cannot stat unless we are marked to build on top of somebody else. */
1988 base = for_push ? branch_get_push(branch, NULL) :
1989 branch_get_upstream(branch, NULL);
1991 *tracking_name = base;
1995 return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
1999 * Return true when there is anything to report, otherwise false.
2001 int format_tracking_info(struct branch *branch, struct strbuf *sb,
2002 enum ahead_behind_flags abf)
2004 int ours, theirs, sti;
2005 const char *full_base;
2007 int upstream_is_gone = 0;
2009 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
2013 upstream_is_gone = 1;
2016 base = shorten_unambiguous_ref(full_base, 0);
2017 if (upstream_is_gone) {
2019 _("Your branch is based on '%s', but the upstream is gone.\n"),
2021 if (advice_status_hints)
2023 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2026 _("Your branch is up to date with '%s'.\n"),
2028 } else if (abf == AHEAD_BEHIND_QUICK) {
2030 _("Your branch and '%s' refer to different commits.\n"),
2032 if (advice_status_hints)
2033 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
2034 "git status --ahead-behind");
2035 } else if (!theirs) {
2037 Q_("Your branch is ahead of '%s' by %d commit.\n",
2038 "Your branch is ahead of '%s' by %d commits.\n",
2041 if (advice_status_hints)
2043 _(" (use \"git push\" to publish your local commits)\n"));
2046 Q_("Your branch is behind '%s' by %d commit, "
2047 "and can be fast-forwarded.\n",
2048 "Your branch is behind '%s' by %d commits, "
2049 "and can be fast-forwarded.\n",
2052 if (advice_status_hints)
2054 _(" (use \"git pull\" to update your local branch)\n"));
2057 Q_("Your branch and '%s' have diverged,\n"
2058 "and have %d and %d different commit each, "
2060 "Your branch and '%s' have diverged,\n"
2061 "and have %d and %d different commits each, "
2064 base, ours, theirs);
2065 if (advice_status_hints)
2067 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2073 static int one_local_ref(const char *refname, const struct object_id *oid,
2074 int flag, void *cb_data)
2076 struct ref ***local_tail = cb_data;
2079 /* we already know it starts with refs/ to get here */
2080 if (check_refname_format(refname + 5, 0))
2083 ref = alloc_ref(refname);
2084 oidcpy(&ref->new_oid, oid);
2086 *local_tail = &ref->next;
2090 struct ref *get_local_heads(void)
2092 struct ref *local_refs = NULL, **local_tail = &local_refs;
2094 for_each_ref(one_local_ref, &local_tail);
2098 struct ref *guess_remote_head(const struct ref *head,
2099 const struct ref *refs,
2102 const struct ref *r;
2103 struct ref *list = NULL;
2104 struct ref **tail = &list;
2110 * Some transports support directly peeking at
2111 * where HEAD points; if that is the case, then
2112 * we don't have to guess.
2115 return copy_ref(find_ref_by_name(refs, head->symref));
2117 /* If refs/heads/master could be right, it is. */
2119 r = find_ref_by_name(refs, "refs/heads/master");
2120 if (r && oideq(&r->old_oid, &head->old_oid))
2124 /* Look for another ref that points there */
2125 for (r = refs; r; r = r->next) {
2127 starts_with(r->name, "refs/heads/") &&
2128 oideq(&r->old_oid, &head->old_oid)) {
2129 *tail = copy_ref(r);
2130 tail = &((*tail)->next);
2139 struct stale_heads_info {
2140 struct string_list *ref_names;
2141 struct ref **stale_refs_tail;
2145 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2146 int flags, void *cb_data)
2148 struct stale_heads_info *info = cb_data;
2149 struct string_list matches = STRING_LIST_INIT_DUP;
2150 struct refspec_item query;
2152 memset(&query, 0, sizeof(struct refspec_item));
2153 query.dst = (char *)refname;
2155 query_refspecs_multiple(info->rs, &query, &matches);
2156 if (matches.nr == 0)
2157 goto clean_exit; /* No matches */
2160 * If we did find a suitable refspec and it's not a symref and
2161 * it's not in the list of refs that currently exist in that
2162 * remote, we consider it to be stale. In order to deal with
2163 * overlapping refspecs, we need to go over all of the
2166 if (flags & REF_ISSYMREF)
2169 for (i = 0; stale && i < matches.nr; i++)
2170 if (string_list_has_string(info->ref_names, matches.items[i].string))
2174 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2175 oidcpy(&ref->new_oid, oid);
2179 string_list_clear(&matches, 0);
2183 struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2185 struct ref *ref, *stale_refs = NULL;
2186 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2187 struct stale_heads_info info;
2189 info.ref_names = &ref_names;
2190 info.stale_refs_tail = &stale_refs;
2192 for (ref = fetch_map; ref; ref = ref->next)
2193 string_list_append(&ref_names, ref->name);
2194 string_list_sort(&ref_names);
2195 for_each_ref(get_stale_heads_cb, &info);
2196 string_list_clear(&ref_names, 0);
2203 static void clear_cas_option(struct push_cas_option *cas)
2207 for (i = 0; i < cas->nr; i++)
2208 free(cas->entry[i].refname);
2210 memset(cas, 0, sizeof(*cas));
2213 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2214 const char *refname,
2217 struct push_cas *entry;
2218 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2219 entry = &cas->entry[cas->nr++];
2220 memset(entry, 0, sizeof(*entry));
2221 entry->refname = xmemdupz(refname, refnamelen);
2225 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2228 struct push_cas *entry;
2231 /* "--no-<option>" */
2232 clear_cas_option(cas);
2237 /* just "--<option>" */
2238 cas->use_tracking_for_rest = 1;
2242 /* "--<option>=refname" or "--<option>=refname:value" */
2243 colon = strchrnul(arg, ':');
2244 entry = add_cas_entry(cas, arg, colon - arg);
2246 entry->use_tracking = 1;
2248 oidclr(&entry->expect);
2249 else if (get_oid(colon + 1, &entry->expect))
2250 return error(_("cannot parse expected object name '%s'"),
2255 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2257 return parse_push_cas_option(opt->value, arg, unset);
2260 int is_empty_cas(const struct push_cas_option *cas)
2262 return !cas->use_tracking_for_rest && !cas->nr;
2266 * Look at remote.fetch refspec and see if we have a remote
2267 * tracking branch for the refname there. Fill its current
2269 * If we cannot do so, return negative to signal an error.
2271 static int remote_tracking(struct remote *remote, const char *refname,
2272 struct object_id *oid)
2276 dst = apply_refspecs(&remote->fetch, refname);
2278 return -1; /* no tracking ref for refname at remote */
2279 if (read_ref(dst, oid))
2280 return -1; /* we know what the tracking ref is but we cannot read it */
2284 static void apply_cas(struct push_cas_option *cas,
2285 struct remote *remote,
2290 /* Find an explicit --<option>=<name>[:<value>] entry */
2291 for (i = 0; i < cas->nr; i++) {
2292 struct push_cas *entry = &cas->entry[i];
2293 if (!refname_match(entry->refname, ref->name))
2295 ref->expect_old_sha1 = 1;
2296 if (!entry->use_tracking)
2297 oidcpy(&ref->old_oid_expect, &entry->expect);
2298 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2299 oidclr(&ref->old_oid_expect);
2303 /* Are we using "--<option>" to cover all? */
2304 if (!cas->use_tracking_for_rest)
2307 ref->expect_old_sha1 = 1;
2308 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2309 oidclr(&ref->old_oid_expect);
2312 void apply_push_cas(struct push_cas_option *cas,
2313 struct remote *remote,
2314 struct ref *remote_refs)
2317 for (ref = remote_refs; ref; ref = ref->next)
2318 apply_cas(cas, remote, ref);