6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.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, size_t len)
182 for (i = 0; i < branches_nr; i++) {
183 if (!strncmp(name, branches[i]->name, len) &&
184 !branches[i]->name[len])
188 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189 ret = xcalloc(1, sizeof(struct branch));
190 branches[branches_nr++] = ret;
191 ret->name = xstrndup(name, len);
192 ret->refname = xstrfmt("refs/heads/%s", ret->name);
197 static struct rewrite *make_rewrite(struct rewrites *r,
198 const char *base, size_t len)
203 for (i = 0; i < r->rewrite_nr; i++) {
204 if (len == r->rewrite[i]->baselen &&
205 !strncmp(base, r->rewrite[i]->base, len))
206 return r->rewrite[i];
209 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
210 ret = xcalloc(1, sizeof(struct rewrite));
211 r->rewrite[r->rewrite_nr++] = ret;
212 ret->base = xstrndup(base, len);
217 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
219 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
220 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
221 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
222 rewrite->instead_of_nr++;
225 static const char *skip_spaces(const char *s)
232 static void read_remotes_file(struct remote *remote)
234 struct strbuf buf = STRBUF_INIT;
235 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
239 remote->configured_in_repo = 1;
240 remote->origin = REMOTE_REMOTES;
241 while (strbuf_getline(&buf, f) != EOF) {
246 if (skip_prefix(buf.buf, "URL:", &v))
247 add_url_alias(remote, xstrdup(skip_spaces(v)));
248 else if (skip_prefix(buf.buf, "Push:", &v))
249 refspec_append(&remote->push, skip_spaces(v));
250 else if (skip_prefix(buf.buf, "Pull:", &v))
251 refspec_append(&remote->fetch, skip_spaces(v));
253 strbuf_release(&buf);
257 static void read_branches_file(struct remote *remote)
260 struct strbuf buf = STRBUF_INIT;
261 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
266 strbuf_getline_lf(&buf, f);
270 strbuf_release(&buf);
274 remote->configured_in_repo = 1;
275 remote->origin = REMOTE_BRANCHES;
278 * The branches file would have URL and optionally
279 * #branch specified. The default (or specified) branch is
280 * fetched and stored in the local branch matching the
283 frag = strchr(buf.buf, '#');
287 frag = (char *)git_default_branch_name();
289 add_url_alias(remote, strbuf_detach(&buf, NULL));
290 refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
294 * Cogito compatible push: push current HEAD to remote #branch
295 * (master if missing)
297 refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
298 remote->fetch_tags = 1; /* always auto-follow */
301 static int handle_config(const char *key, const char *value, void *cb)
306 struct remote *remote;
307 struct branch *branch;
308 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
311 branch = make_branch(name, namelen);
312 if (!strcmp(subkey, "remote")) {
313 return git_config_string(&branch->remote_name, key, value);
314 } else if (!strcmp(subkey, "pushremote")) {
315 return git_config_string(&branch->pushremote_name, key, value);
316 } else if (!strcmp(subkey, "merge")) {
318 return config_error_nonbool(key);
319 add_merge(branch, xstrdup(value));
323 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
324 struct rewrite *rewrite;
327 if (!strcmp(subkey, "insteadof")) {
329 return config_error_nonbool(key);
330 rewrite = make_rewrite(&rewrites, name, namelen);
331 add_instead_of(rewrite, xstrdup(value));
332 } else if (!strcmp(subkey, "pushinsteadof")) {
334 return config_error_nonbool(key);
335 rewrite = make_rewrite(&rewrites_push, name, namelen);
336 add_instead_of(rewrite, xstrdup(value));
340 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
343 /* Handle remote.* variables */
344 if (!name && !strcmp(subkey, "pushdefault"))
345 return git_config_string(&pushremote_name, key, value);
349 /* Handle remote.<name>.* variables */
351 warning(_("config remote shorthand cannot begin with '/': %s"),
355 remote = make_remote(name, namelen);
356 remote->origin = REMOTE_CONFIG;
357 if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
358 current_config_scope() == CONFIG_SCOPE_WORKTREE)
359 remote->configured_in_repo = 1;
360 if (!strcmp(subkey, "mirror"))
361 remote->mirror = git_config_bool(key, value);
362 else if (!strcmp(subkey, "skipdefaultupdate"))
363 remote->skip_default_update = git_config_bool(key, value);
364 else if (!strcmp(subkey, "skipfetchall"))
365 remote->skip_default_update = git_config_bool(key, value);
366 else if (!strcmp(subkey, "prune"))
367 remote->prune = git_config_bool(key, value);
368 else if (!strcmp(subkey, "prunetags"))
369 remote->prune_tags = git_config_bool(key, value);
370 else if (!strcmp(subkey, "url")) {
372 if (git_config_string(&v, key, value))
375 } else if (!strcmp(subkey, "pushurl")) {
377 if (git_config_string(&v, key, value))
379 add_pushurl(remote, v);
380 } else if (!strcmp(subkey, "push")) {
382 if (git_config_string(&v, key, value))
384 refspec_append(&remote->push, v);
386 } else if (!strcmp(subkey, "fetch")) {
388 if (git_config_string(&v, key, value))
390 refspec_append(&remote->fetch, v);
392 } else if (!strcmp(subkey, "receivepack")) {
394 if (git_config_string(&v, key, value))
396 if (!remote->receivepack)
397 remote->receivepack = v;
399 error(_("more than one receivepack given, using the first"));
400 } else if (!strcmp(subkey, "uploadpack")) {
402 if (git_config_string(&v, key, value))
404 if (!remote->uploadpack)
405 remote->uploadpack = v;
407 error(_("more than one uploadpack given, using the first"));
408 } else if (!strcmp(subkey, "tagopt")) {
409 if (!strcmp(value, "--no-tags"))
410 remote->fetch_tags = -1;
411 else if (!strcmp(value, "--tags"))
412 remote->fetch_tags = 2;
413 } else if (!strcmp(subkey, "proxy")) {
414 return git_config_string((const char **)&remote->http_proxy,
416 } else if (!strcmp(subkey, "proxyauthmethod")) {
417 return git_config_string((const char **)&remote->http_proxy_authmethod,
419 } else if (!strcmp(subkey, "vcs")) {
420 return git_config_string(&remote->foreign_vcs, key, value);
425 static void alias_all_urls(void)
428 for (i = 0; i < remotes_nr; i++) {
429 int add_pushurl_aliases;
432 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
433 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
435 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
436 for (j = 0; j < remotes[i]->url_nr; j++) {
437 if (add_pushurl_aliases)
438 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
439 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
444 static void read_config(void)
453 current_branch = NULL;
454 if (startup_info->have_repository) {
455 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
456 if (head_ref && (flag & REF_ISSYMREF) &&
457 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
458 current_branch = make_branch(head_ref, strlen(head_ref));
461 git_config(handle_config, NULL);
465 static int valid_remote_nick(const char *name)
467 if (!name[0] || is_dot_or_dotdot(name))
470 /* remote nicknames cannot contain slashes */
472 if (is_dir_sep(*name++))
477 const char *remote_for_branch(struct branch *branch, int *explicit)
479 if (branch && branch->remote_name) {
482 return branch->remote_name;
489 const char *pushremote_for_branch(struct branch *branch, int *explicit)
491 if (branch && branch->pushremote_name) {
494 return branch->pushremote_name;
496 if (pushremote_name) {
499 return pushremote_name;
501 return remote_for_branch(branch, explicit);
504 const char *remote_ref_for_branch(struct branch *branch, int for_push)
508 if (branch->merge_nr) {
509 return branch->merge_name[0];
512 const char *dst, *remote_name =
513 pushremote_for_branch(branch, NULL);
514 struct remote *remote = remote_get(remote_name);
516 if (remote && remote->push.nr &&
517 (dst = apply_refspecs(&remote->push,
526 static struct remote *remote_get_1(const char *name,
527 const char *(*get_default)(struct branch *, int *))
537 name = get_default(current_branch, &name_given);
539 ret = make_remote(name, 0);
540 if (valid_remote_nick(name) && have_git_dir()) {
541 if (!valid_remote(ret))
542 read_remotes_file(ret);
543 if (!valid_remote(ret))
544 read_branches_file(ret);
546 if (name_given && !valid_remote(ret))
547 add_url_alias(ret, name);
548 if (!valid_remote(ret))
553 struct remote *remote_get(const char *name)
555 return remote_get_1(name, remote_for_branch);
558 struct remote *pushremote_get(const char *name)
560 return remote_get_1(name, pushremote_for_branch);
563 int remote_is_configured(struct remote *remote, int in_repo)
568 return remote->configured_in_repo;
569 return !!remote->origin;
572 int for_each_remote(each_remote_fn fn, void *priv)
576 for (i = 0; i < remotes_nr && !result; i++) {
577 struct remote *r = remotes[i];
580 result = fn(r, priv);
585 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
587 if (strcmp(ref1->name, ref2->name)) {
588 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
589 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
590 die(_("Cannot fetch both %s and %s to %s"),
591 ref1->name, ref2->name, ref2->peer_ref->name);
592 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
593 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
594 warning(_("%s usually tracks %s, not %s"),
595 ref2->peer_ref->name, ref2->name, ref1->name);
596 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
597 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
598 die(_("%s tracks both %s and %s"),
599 ref2->peer_ref->name, ref1->name, ref2->name);
602 * This last possibility doesn't occur because
603 * FETCH_HEAD_IGNORE entries always appear at
604 * the end of the list.
606 BUG("Internal error");
609 free(ref2->peer_ref);
613 struct ref *ref_remove_duplicates(struct ref *ref_map)
615 struct string_list refs = STRING_LIST_INIT_NODUP;
616 struct ref *retval = NULL;
617 struct ref **p = &retval;
620 struct ref *ref = ref_map;
622 ref_map = ref_map->next;
625 if (!ref->peer_ref) {
629 struct string_list_item *item =
630 string_list_insert(&refs, ref->peer_ref->name);
633 /* Entry already existed */
634 handle_duplicate((struct ref *)item->util, ref);
643 string_list_clear(&refs, 0);
647 int remote_has_url(struct remote *remote, const char *url)
650 for (i = 0; i < remote->url_nr; i++) {
651 if (!strcmp(remote->url[i], url))
657 static int match_name_with_pattern(const char *key, const char *name,
658 const char *value, char **result)
660 const char *kstar = strchr(key, '*');
666 die(_("key '%s' of pattern had no '*'"), key);
668 ksuffixlen = strlen(kstar + 1);
669 namelen = strlen(name);
670 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
671 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
673 struct strbuf sb = STRBUF_INIT;
674 const char *vstar = strchr(value, '*');
676 die(_("value '%s' of pattern has no '*'"), value);
677 strbuf_add(&sb, value, vstar - value);
678 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
679 strbuf_addstr(&sb, vstar + 1);
680 *result = strbuf_detach(&sb, NULL);
685 static void query_refspecs_multiple(struct refspec *rs,
686 struct refspec_item *query,
687 struct string_list *results)
690 int find_src = !query->src;
692 if (find_src && !query->dst)
693 BUG("query_refspecs_multiple: need either src or dst");
695 for (i = 0; i < rs->nr; i++) {
696 struct refspec_item *refspec = &rs->items[i];
697 const char *key = find_src ? refspec->dst : refspec->src;
698 const char *value = find_src ? refspec->src : refspec->dst;
699 const char *needle = find_src ? query->dst : query->src;
700 char **result = find_src ? &query->src : &query->dst;
704 if (refspec->pattern) {
705 if (match_name_with_pattern(key, needle, value, result))
706 string_list_append_nodup(results, *result);
707 } else if (!strcmp(needle, key)) {
708 string_list_append(results, value);
713 int query_refspecs(struct refspec *rs, struct refspec_item *query)
716 int find_src = !query->src;
717 const char *needle = find_src ? query->dst : query->src;
718 char **result = find_src ? &query->src : &query->dst;
720 if (find_src && !query->dst)
721 BUG("query_refspecs: need either src or dst");
723 for (i = 0; i < rs->nr; i++) {
724 struct refspec_item *refspec = &rs->items[i];
725 const char *key = find_src ? refspec->dst : refspec->src;
726 const char *value = find_src ? refspec->src : refspec->dst;
730 if (refspec->pattern) {
731 if (match_name_with_pattern(key, needle, value, result)) {
732 query->force = refspec->force;
735 } else if (!strcmp(needle, key)) {
736 *result = xstrdup(value);
737 query->force = refspec->force;
744 char *apply_refspecs(struct refspec *rs, const char *name)
746 struct refspec_item query;
748 memset(&query, 0, sizeof(struct refspec_item));
749 query.src = (char *)name;
751 if (query_refspecs(rs, &query))
757 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
759 return query_refspecs(&remote->fetch, refspec);
762 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
765 size_t len = strlen(name);
766 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
767 memcpy(ref->name, prefix, prefixlen);
768 memcpy(ref->name + prefixlen, name, len);
772 struct ref *alloc_ref(const char *name)
774 return alloc_ref_with_prefix("", 0, name);
777 struct ref *copy_ref(const struct ref *ref)
783 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
785 memcpy(cpy, ref, len);
787 cpy->symref = xstrdup_or_null(ref->symref);
788 cpy->remote_status = xstrdup_or_null(ref->remote_status);
789 cpy->peer_ref = copy_ref(ref->peer_ref);
793 struct ref *copy_ref_list(const struct ref *ref)
795 struct ref *ret = NULL;
796 struct ref **tail = &ret;
798 *tail = copy_ref(ref);
800 tail = &((*tail)->next);
805 void free_one_ref(struct ref *ref)
809 free_one_ref(ref->peer_ref);
810 free(ref->remote_status);
815 void free_refs(struct ref *ref)
825 int ref_compare_name(const void *va, const void *vb)
827 const struct ref *a = va, *b = vb;
828 return strcmp(a->name, b->name);
831 static void *ref_list_get_next(const void *a)
833 return ((const struct ref *)a)->next;
836 static void ref_list_set_next(void *a, void *next)
838 ((struct ref *)a)->next = next;
841 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
843 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
846 int count_refspec_match(const char *pattern,
848 struct ref **matched_ref)
850 int patlen = strlen(pattern);
851 struct ref *matched_weak = NULL;
852 struct ref *matched = NULL;
856 for (weak_match = match = 0; refs; refs = refs->next) {
857 char *name = refs->name;
858 int namelen = strlen(name);
860 if (!refname_match(pattern, name))
863 /* A match is "weak" if it is with refs outside
864 * heads or tags, and did not specify the pattern
865 * in full (e.g. "refs/remotes/origin/master") or at
866 * least from the toplevel (e.g. "remotes/origin/master");
867 * otherwise "git push $URL master" would result in
868 * ambiguity between remotes/origin/master and heads/master
869 * at the remote site.
871 if (namelen != patlen &&
872 patlen != namelen - 5 &&
873 !starts_with(name, "refs/heads/") &&
874 !starts_with(name, "refs/tags/")) {
875 /* We want to catch the case where only weak
876 * matches are found and there are multiple
877 * matches, and where more than one strong
878 * matches are found, as ambiguous. One
879 * strong match with zero or more weak matches
880 * are acceptable as a unique match.
892 *matched_ref = matched_weak;
897 *matched_ref = matched;
902 static void tail_link_ref(struct ref *ref, struct ref ***tail)
910 static struct ref *alloc_delete_ref(void)
912 struct ref *ref = alloc_ref("(delete)");
913 oidclr(&ref->new_oid);
917 static int try_explicit_object_name(const char *name,
920 struct object_id oid;
924 *match = alloc_delete_ref();
928 if (get_oid(name, &oid))
932 *match = alloc_ref(name);
933 oidcpy(&(*match)->new_oid, &oid);
938 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
940 struct ref *ret = alloc_ref(name);
941 tail_link_ref(ret, tail);
945 static char *guess_ref(const char *name, struct ref *peer)
947 struct strbuf buf = STRBUF_INIT;
949 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
954 if (starts_with(r, "refs/heads/")) {
955 strbuf_addstr(&buf, "refs/heads/");
956 } else if (starts_with(r, "refs/tags/")) {
957 strbuf_addstr(&buf, "refs/tags/");
962 strbuf_addstr(&buf, name);
963 return strbuf_detach(&buf, NULL);
966 static int match_explicit_lhs(struct ref *src,
967 struct refspec_item *rs,
969 int *allocated_match)
971 switch (count_refspec_match(rs->src, src, match)) {
974 *allocated_match = 0;
977 /* The source could be in the get_sha1() format
978 * not a reference name. :refs/other is a
979 * way to delete 'other' ref at the remote end.
981 if (try_explicit_object_name(rs->src, match) < 0)
982 return error(_("src refspec %s does not match any"), rs->src);
984 *allocated_match = 1;
987 return error(_("src refspec %s matches more than one"), rs->src);
991 static void show_push_unqualified_ref_name_error(const char *dst_value,
992 const char *matched_src_name)
994 struct object_id oid;
995 enum object_type type;
998 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
999 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1002 error(_("The destination you provided is not a full refname (i.e.,\n"
1003 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1005 "- Looking for a ref that matches '%s' on the remote side.\n"
1006 "- Checking if the <src> being pushed ('%s')\n"
1007 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1008 " refs/{heads,tags}/ prefix on the remote side.\n"
1010 "Neither worked, so we gave up. You must fully qualify the ref."),
1011 dst_value, matched_src_name);
1013 if (!advice_push_unqualified_ref_name)
1016 if (get_oid(matched_src_name, &oid))
1017 BUG("'%s' is not a valid object, "
1018 "match_explicit_lhs() should catch this!",
1020 type = oid_object_info(the_repository, &oid, NULL);
1021 if (type == OBJ_COMMIT) {
1022 advise(_("The <src> part of the refspec is a commit object.\n"
1023 "Did you mean to create a new branch by pushing to\n"
1024 "'%s:refs/heads/%s'?"),
1025 matched_src_name, dst_value);
1026 } else if (type == OBJ_TAG) {
1027 advise(_("The <src> part of the refspec is a tag object.\n"
1028 "Did you mean to create a new tag by pushing to\n"
1029 "'%s:refs/tags/%s'?"),
1030 matched_src_name, dst_value);
1031 } else if (type == OBJ_TREE) {
1032 advise(_("The <src> part of the refspec is a tree object.\n"
1033 "Did you mean to tag a new tree by pushing to\n"
1034 "'%s:refs/tags/%s'?"),
1035 matched_src_name, dst_value);
1036 } else if (type == OBJ_BLOB) {
1037 advise(_("The <src> part of the refspec is a blob object.\n"
1038 "Did you mean to tag a new blob by pushing to\n"
1039 "'%s:refs/tags/%s'?"),
1040 matched_src_name, dst_value);
1042 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1043 matched_src_name, type);
1047 static int match_explicit(struct ref *src, struct ref *dst,
1048 struct ref ***dst_tail,
1049 struct refspec_item *rs)
1051 struct ref *matched_src, *matched_dst;
1054 const char *dst_value = rs->dst;
1057 if (rs->pattern || rs->matching)
1060 matched_src = matched_dst = NULL;
1061 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1067 dst_value = resolve_ref_unsafe(matched_src->name,
1068 RESOLVE_REF_READING,
1071 ((flag & REF_ISSYMREF) &&
1072 !starts_with(dst_value, "refs/heads/")))
1073 die(_("%s cannot be resolved to branch"),
1077 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1081 if (starts_with(dst_value, "refs/")) {
1082 matched_dst = make_linked_ref(dst_value, dst_tail);
1083 } else if (is_null_oid(&matched_src->new_oid)) {
1084 error(_("unable to delete '%s': remote ref does not exist"),
1086 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1087 matched_dst = make_linked_ref(dst_guess, dst_tail);
1090 show_push_unqualified_ref_name_error(dst_value,
1096 error(_("dst refspec %s matches more than one"),
1102 if (matched_dst->peer_ref)
1103 return error(_("dst ref %s receives from more than one src"),
1106 matched_dst->peer_ref = allocated_src ?
1108 copy_ref(matched_src);
1109 matched_dst->force = rs->force;
1114 static int match_explicit_refs(struct ref *src, struct ref *dst,
1115 struct ref ***dst_tail, struct refspec *rs)
1118 for (i = errs = 0; i < rs->nr; i++)
1119 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1123 static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1124 int send_mirror, int direction,
1125 const struct refspec_item **ret_pat)
1127 const struct refspec_item *pat;
1130 int matching_refs = -1;
1131 for (i = 0; i < rs->nr; i++) {
1132 const struct refspec_item *item = &rs->items[i];
1133 if (item->matching &&
1134 (matching_refs == -1 || item->force)) {
1139 if (item->pattern) {
1140 const char *dst_side = item->dst ? item->dst : item->src;
1142 if (direction == FROM_SRC)
1143 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
1145 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
1152 if (matching_refs == -1)
1155 pat = &rs->items[matching_refs];
1156 if (pat->matching) {
1158 * "matching refs"; traditionally we pushed everything
1159 * including refs outside refs/heads/ hierarchy, but
1160 * that does not make much sense these days.
1162 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1164 name = xstrdup(ref->name);
1171 static struct ref **tail_ref(struct ref **head)
1173 struct ref **tail = head;
1175 tail = &((*tail)->next);
1180 struct commit **tip;
1184 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1186 struct commit *commit;
1188 if (is_null_oid(oid))
1190 commit = lookup_commit_reference_gently(the_repository, oid, 1);
1191 if (!commit || (commit->object.flags & TMP_MARK))
1193 commit->object.flags |= TMP_MARK;
1194 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1195 tips->tip[tips->nr++] = commit;
1198 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1200 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1201 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1202 struct string_list_item *item;
1204 struct tips sent_tips;
1207 * Collect everything we know they would have at the end of
1208 * this push, and collect all tags they have.
1210 memset(&sent_tips, 0, sizeof(sent_tips));
1211 for (ref = *dst; ref; ref = ref->next) {
1212 if (ref->peer_ref &&
1213 !is_null_oid(&ref->peer_ref->new_oid))
1214 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1216 add_to_tips(&sent_tips, &ref->old_oid);
1217 if (starts_with(ref->name, "refs/tags/"))
1218 string_list_append(&dst_tag, ref->name);
1220 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1222 string_list_sort(&dst_tag);
1224 /* Collect tags they do not have. */
1225 for (ref = src; ref; ref = ref->next) {
1226 if (!starts_with(ref->name, "refs/tags/"))
1227 continue; /* not a tag */
1228 if (string_list_has_string(&dst_tag, ref->name))
1229 continue; /* they already have it */
1230 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
1231 continue; /* be conservative */
1232 item = string_list_append(&src_tag, ref->name);
1235 string_list_clear(&dst_tag, 0);
1238 * At this point, src_tag lists tags that are missing from
1239 * dst, and sent_tips lists the tips we are pushing or those
1240 * that we know they already have. An element in the src_tag
1241 * that is an ancestor of any of the sent_tips needs to be
1242 * sent to the other side.
1245 const int reachable_flag = 1;
1246 struct commit_list *found_commits;
1247 struct commit **src_commits;
1248 int nr_src_commits = 0, alloc_src_commits = 16;
1249 ALLOC_ARRAY(src_commits, alloc_src_commits);
1251 for_each_string_list_item(item, &src_tag) {
1252 struct ref *ref = item->util;
1253 struct commit *commit;
1255 if (is_null_oid(&ref->new_oid))
1257 commit = lookup_commit_reference_gently(the_repository,
1261 /* not pushing a commit, which is not an error */
1264 ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
1265 src_commits[nr_src_commits++] = commit;
1268 found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
1269 src_commits, nr_src_commits,
1272 for_each_string_list_item(item, &src_tag) {
1273 struct ref *dst_ref;
1274 struct ref *ref = item->util;
1275 struct commit *commit;
1277 if (is_null_oid(&ref->new_oid))
1279 commit = lookup_commit_reference_gently(the_repository,
1283 /* not pushing a commit, which is not an error */
1287 * Is this tag, which they do not have, reachable from
1288 * any of the commits we are sending?
1290 if (!(commit->object.flags & reachable_flag))
1294 dst_ref = make_linked_ref(ref->name, dst_tail);
1295 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1296 dst_ref->peer_ref = copy_ref(ref);
1299 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1301 free_commit_list(found_commits);
1304 string_list_clear(&src_tag, 0);
1305 free(sent_tips.tip);
1308 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1310 for ( ; list; list = list->next)
1311 if (!strcmp(list->name, name))
1312 return (struct ref *)list;
1316 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1318 for ( ; ref; ref = ref->next)
1319 string_list_append_nodup(ref_index, ref->name)->util = ref;
1321 string_list_sort(ref_index);
1325 * Given only the set of local refs, sanity-check the set of push
1326 * refspecs. We can't catch all errors that match_push_refs would,
1327 * but we can catch some errors early before even talking to the
1330 int check_push_refs(struct ref *src, struct refspec *rs)
1335 for (i = 0; i < rs->nr; i++) {
1336 struct refspec_item *item = &rs->items[i];
1338 if (item->pattern || item->matching)
1341 ret |= match_explicit_lhs(src, item, NULL, NULL);
1348 * Given the set of refs the local repository has, the set of refs the
1349 * remote repository has, and the refspec used for push, determine
1350 * what remote refs we will update and with what value by setting
1351 * peer_ref (which object is being pushed) and force (if the push is
1352 * forced) in elements of "dst". The function may add new elements to
1353 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1355 int match_push_refs(struct ref *src, struct ref **dst,
1356 struct refspec *rs, int flags)
1358 int send_all = flags & MATCH_REFS_ALL;
1359 int send_mirror = flags & MATCH_REFS_MIRROR;
1360 int send_prune = flags & MATCH_REFS_PRUNE;
1362 struct ref *ref, **dst_tail = tail_ref(dst);
1363 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1365 /* If no refspec is provided, use the default ":" */
1367 refspec_append(rs, ":");
1369 errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1371 /* pick the remainder */
1372 for (ref = src; ref; ref = ref->next) {
1373 struct string_list_item *dst_item;
1374 struct ref *dst_peer;
1375 const struct refspec_item *pat = NULL;
1378 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1382 if (!dst_ref_index.nr)
1383 prepare_ref_index(&dst_ref_index, *dst);
1385 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1386 dst_peer = dst_item ? dst_item->util : NULL;
1388 if (dst_peer->peer_ref)
1389 /* We're already sending something to this ref. */
1392 if (pat->matching && !(send_all || send_mirror))
1394 * Remote doesn't have it, and we have no
1395 * explicit pattern, and we don't have
1396 * --all or --mirror.
1400 /* Create a new one and link it */
1401 dst_peer = make_linked_ref(dst_name, &dst_tail);
1402 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1403 string_list_insert(&dst_ref_index,
1404 dst_peer->name)->util = dst_peer;
1406 dst_peer->peer_ref = copy_ref(ref);
1407 dst_peer->force = pat->force;
1412 string_list_clear(&dst_ref_index, 0);
1414 if (flags & MATCH_REFS_FOLLOW_TAGS)
1415 add_missing_tags(src, dst, &dst_tail);
1418 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1419 /* check for missing refs on the remote */
1420 for (ref = *dst; ref; ref = ref->next) {
1424 /* We're already sending something to this ref. */
1427 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
1429 if (!src_ref_index.nr)
1430 prepare_ref_index(&src_ref_index, src);
1431 if (!string_list_has_string(&src_ref_index,
1433 ref->peer_ref = alloc_delete_ref();
1437 string_list_clear(&src_ref_index, 0);
1445 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1450 for (ref = remote_refs; ref; ref = ref->next) {
1451 int force_ref_update = ref->force || force_update;
1452 int reject_reason = 0;
1455 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1456 else if (!send_mirror)
1459 ref->deletion = is_null_oid(&ref->new_oid);
1460 if (!ref->deletion &&
1461 oideq(&ref->old_oid, &ref->new_oid)) {
1462 ref->status = REF_STATUS_UPTODATE;
1467 * If the remote ref has moved and is now different
1468 * from what we expect, reject any push.
1470 * It also is an error if the user told us to check
1471 * with the remote-tracking branch to find the value
1472 * to expect, but we did not have such a tracking
1475 if (ref->expect_old_sha1) {
1476 if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1477 reject_reason = REF_STATUS_REJECT_STALE;
1479 /* If the ref isn't stale then force the update. */
1480 force_ref_update = 1;
1484 * If the update isn't already rejected then check
1485 * the usual "must fast-forward" rules.
1487 * Decide whether an individual refspec A:B can be
1488 * pushed. The push will succeed if any of the
1489 * following are true:
1491 * (1) the remote reference B does not exist
1493 * (2) the remote reference B is being removed (i.e.,
1494 * pushing :B where no source is specified)
1496 * (3) the destination is not under refs/tags/, and
1497 * if the old and new value is a commit, the new
1498 * is a descendant of the old.
1500 * (4) it is forced using the +A:B notation, or by
1501 * passing the --force argument
1504 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1505 if (starts_with(ref->name, "refs/tags/"))
1506 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1507 else if (!has_object_file(&ref->old_oid))
1508 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1509 else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
1510 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1511 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1512 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1513 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1517 * "--force" will defeat any rejection implemented
1518 * by the rules above.
1520 if (!force_ref_update)
1521 ref->status = reject_reason;
1522 else if (reject_reason)
1523 ref->forced_update = 1;
1527 static void set_merge(struct branch *ret)
1529 struct remote *remote;
1531 struct object_id oid;
1535 return; /* no branch */
1537 return; /* already run */
1538 if (!ret->remote_name || !ret->merge_nr) {
1540 * no merge config; let's make sure we don't confuse callers
1541 * with a non-zero merge_nr but a NULL merge
1547 remote = remote_get(ret->remote_name);
1549 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1550 for (i = 0; i < ret->merge_nr; i++) {
1551 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1552 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1553 if (!remote_find_tracking(remote, ret->merge[i]) ||
1554 strcmp(ret->remote_name, "."))
1556 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1557 &oid, &ref, 0) == 1)
1558 ret->merge[i]->dst = ref;
1560 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1564 struct branch *branch_get(const char *name)
1569 if (!name || !*name || !strcmp(name, "HEAD"))
1570 ret = current_branch;
1572 ret = make_branch(name, strlen(name));
1577 int branch_has_merge_config(struct branch *branch)
1579 return branch && !!branch->merge;
1582 int branch_merge_matches(struct branch *branch,
1584 const char *refname)
1586 if (!branch || i < 0 || i >= branch->merge_nr)
1588 return refname_match(branch->merge[i]->src, refname);
1591 __attribute__((format (printf,2,3)))
1592 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1597 strbuf_vaddf(err, fmt, ap);
1603 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1606 return error_buf(err, _("HEAD does not point to a branch"));
1608 if (!branch->merge || !branch->merge[0]) {
1610 * no merge config; is it because the user didn't define any,
1611 * or because it is not a real branch, and get_branch
1614 if (!ref_exists(branch->refname))
1615 return error_buf(err, _("no such branch: '%s'"),
1617 return error_buf(err,
1618 _("no upstream configured for branch '%s'"),
1622 if (!branch->merge[0]->dst)
1623 return error_buf(err,
1624 _("upstream branch '%s' not stored as a remote-tracking branch"),
1625 branch->merge[0]->src);
1627 return branch->merge[0]->dst;
1630 static const char *tracking_for_push_dest(struct remote *remote,
1631 const char *refname,
1636 ret = apply_refspecs(&remote->fetch, refname);
1638 return error_buf(err,
1639 _("push destination '%s' on remote '%s' has no local tracking branch"),
1640 refname, remote->name);
1644 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1646 struct remote *remote;
1648 remote = remote_get(pushremote_for_branch(branch, NULL));
1650 return error_buf(err,
1651 _("branch '%s' has no remote for pushing"),
1654 if (remote->push.nr) {
1658 dst = apply_refspecs(&remote->push, branch->refname);
1660 return error_buf(err,
1661 _("push refspecs for '%s' do not include '%s'"),
1662 remote->name, branch->name);
1664 ret = tracking_for_push_dest(remote, dst, err);
1670 return tracking_for_push_dest(remote, branch->refname, err);
1672 switch (push_default) {
1673 case PUSH_DEFAULT_NOTHING:
1674 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1676 case PUSH_DEFAULT_MATCHING:
1677 case PUSH_DEFAULT_CURRENT:
1678 return tracking_for_push_dest(remote, branch->refname, err);
1680 case PUSH_DEFAULT_UPSTREAM:
1681 return branch_get_upstream(branch, err);
1683 case PUSH_DEFAULT_UNSPECIFIED:
1684 case PUSH_DEFAULT_SIMPLE:
1686 const char *up, *cur;
1688 up = branch_get_upstream(branch, err);
1691 cur = tracking_for_push_dest(remote, branch->refname, err);
1694 if (strcmp(cur, up))
1695 return error_buf(err,
1696 _("cannot resolve 'simple' push to a single destination"));
1701 BUG("unhandled push situation");
1704 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1707 return error_buf(err, _("HEAD does not point to a branch"));
1709 if (!branch->push_tracking_ref)
1710 branch->push_tracking_ref = branch_get_push_1(branch, err);
1711 return branch->push_tracking_ref;
1714 static int ignore_symref_update(const char *refname)
1718 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1719 return 0; /* non-existing refs are OK */
1720 return (flag & REF_ISSYMREF);
1724 * Create and return a list of (struct ref) consisting of copies of
1725 * each remote_ref that matches refspec. refspec must be a pattern.
1726 * Fill in the copies' peer_ref to describe the local tracking refs to
1727 * which they map. Omit any references that would map to an existing
1728 * local symbolic ref.
1730 static struct ref *get_expanded_map(const struct ref *remote_refs,
1731 const struct refspec_item *refspec)
1733 const struct ref *ref;
1734 struct ref *ret = NULL;
1735 struct ref **tail = &ret;
1737 for (ref = remote_refs; ref; ref = ref->next) {
1738 char *expn_name = NULL;
1740 if (strchr(ref->name, '^'))
1741 continue; /* a dereference item */
1742 if (match_name_with_pattern(refspec->src, ref->name,
1743 refspec->dst, &expn_name) &&
1744 !ignore_symref_update(expn_name)) {
1745 struct ref *cpy = copy_ref(ref);
1747 cpy->peer_ref = alloc_ref(expn_name);
1749 cpy->peer_ref->force = 1;
1759 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1761 const struct ref *ref;
1762 const struct ref *best_match = NULL;
1765 for (ref = refs; ref; ref = ref->next) {
1766 int score = refname_match(name, ref->name);
1768 if (best_score < score) {
1776 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1778 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1783 return copy_ref(ref);
1786 static struct ref *get_local_ref(const char *name)
1788 if (!name || name[0] == '\0')
1791 if (starts_with(name, "refs/"))
1792 return alloc_ref(name);
1794 if (starts_with(name, "heads/") ||
1795 starts_with(name, "tags/") ||
1796 starts_with(name, "remotes/"))
1797 return alloc_ref_with_prefix("refs/", 5, name);
1799 return alloc_ref_with_prefix("refs/heads/", 11, name);
1802 int get_fetch_map(const struct ref *remote_refs,
1803 const struct refspec_item *refspec,
1807 struct ref *ref_map, **rmp;
1809 if (refspec->pattern) {
1810 ref_map = get_expanded_map(remote_refs, refspec);
1812 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1814 if (refspec->exact_sha1) {
1815 ref_map = alloc_ref(name);
1816 get_oid_hex(name, &ref_map->old_oid);
1817 ref_map->exact_oid = 1;
1819 ref_map = get_remote_ref(remote_refs, name);
1821 if (!missing_ok && !ref_map)
1822 die(_("couldn't find remote ref %s"), name);
1824 ref_map->peer_ref = get_local_ref(refspec->dst);
1825 if (ref_map->peer_ref && refspec->force)
1826 ref_map->peer_ref->force = 1;
1830 for (rmp = &ref_map; *rmp; ) {
1831 if ((*rmp)->peer_ref) {
1832 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1833 check_refname_format((*rmp)->peer_ref->name, 0)) {
1834 struct ref *ignore = *rmp;
1835 error(_("* Ignoring funny ref '%s' locally"),
1836 (*rmp)->peer_ref->name);
1837 *rmp = (*rmp)->next;
1838 free(ignore->peer_ref);
1843 rmp = &((*rmp)->next);
1847 tail_link_ref(ref_map, tail);
1852 int resolve_remote_symref(struct ref *ref, struct ref *list)
1856 for (; list; list = list->next)
1857 if (!strcmp(ref->symref, list->name)) {
1858 oidcpy(&ref->old_oid, &list->old_oid);
1865 * Compute the commit ahead/behind values for the pair branch_name, base.
1867 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1868 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1869 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1872 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1873 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1874 * commits are different.
1877 static int stat_branch_pair(const char *branch_name, const char *base,
1878 int *num_ours, int *num_theirs,
1879 enum ahead_behind_flags abf)
1881 struct object_id oid;
1882 struct commit *ours, *theirs;
1883 struct rev_info revs;
1884 struct strvec argv = STRVEC_INIT;
1886 /* Cannot stat if what we used to build on no longer exists */
1887 if (read_ref(base, &oid))
1889 theirs = lookup_commit_reference(the_repository, &oid);
1893 if (read_ref(branch_name, &oid))
1895 ours = lookup_commit_reference(the_repository, &oid);
1899 *num_theirs = *num_ours = 0;
1901 /* are we the same? */
1904 if (abf == AHEAD_BEHIND_QUICK)
1906 if (abf != AHEAD_BEHIND_FULL)
1907 BUG("stat_branch_pair: invalid abf '%d'", abf);
1909 /* Run "rev-list --left-right ours...theirs" internally... */
1910 strvec_push(&argv, ""); /* ignored */
1911 strvec_push(&argv, "--left-right");
1912 strvec_pushf(&argv, "%s...%s",
1913 oid_to_hex(&ours->object.oid),
1914 oid_to_hex(&theirs->object.oid));
1915 strvec_push(&argv, "--");
1917 repo_init_revisions(the_repository, &revs, NULL);
1918 setup_revisions(argv.nr, argv.v, &revs, NULL);
1919 if (prepare_revision_walk(&revs))
1920 die(_("revision walk setup failed"));
1922 /* ... and count the commits on each side. */
1924 struct commit *c = get_revision(&revs);
1927 if (c->object.flags & SYMMETRIC_LEFT)
1933 /* clear object flags smudged by the above traversal */
1934 clear_commit_marks(ours, ALL_REV_FLAGS);
1935 clear_commit_marks(theirs, ALL_REV_FLAGS);
1937 strvec_clear(&argv);
1942 * Lookup the tracking branch for the given branch and if present, optionally
1943 * compute the commit ahead/behind values for the pair.
1945 * If for_push is true, the tracking branch refers to the push branch,
1946 * otherwise it refers to the upstream branch.
1948 * The name of the tracking branch (or NULL if it is not defined) is
1949 * returned via *tracking_name, if it is not itself NULL.
1951 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1952 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1953 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1956 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1957 * upstream defined, or ref does not exist). Returns 0 if the commits are
1958 * identical. Returns 1 if commits are different.
1960 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1961 const char **tracking_name, int for_push,
1962 enum ahead_behind_flags abf)
1966 /* Cannot stat unless we are marked to build on top of somebody else. */
1967 base = for_push ? branch_get_push(branch, NULL) :
1968 branch_get_upstream(branch, NULL);
1970 *tracking_name = base;
1974 return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
1978 * Return true when there is anything to report, otherwise false.
1980 int format_tracking_info(struct branch *branch, struct strbuf *sb,
1981 enum ahead_behind_flags abf)
1983 int ours, theirs, sti;
1984 const char *full_base;
1986 int upstream_is_gone = 0;
1988 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
1992 upstream_is_gone = 1;
1995 base = shorten_unambiguous_ref(full_base, 0);
1996 if (upstream_is_gone) {
1998 _("Your branch is based on '%s', but the upstream is gone.\n"),
2000 if (advice_status_hints)
2002 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2005 _("Your branch is up to date with '%s'.\n"),
2007 } else if (abf == AHEAD_BEHIND_QUICK) {
2009 _("Your branch and '%s' refer to different commits.\n"),
2011 if (advice_status_hints)
2012 strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
2013 "git status --ahead-behind");
2014 } else if (!theirs) {
2016 Q_("Your branch is ahead of '%s' by %d commit.\n",
2017 "Your branch is ahead of '%s' by %d commits.\n",
2020 if (advice_status_hints)
2022 _(" (use \"git push\" to publish your local commits)\n"));
2025 Q_("Your branch is behind '%s' by %d commit, "
2026 "and can be fast-forwarded.\n",
2027 "Your branch is behind '%s' by %d commits, "
2028 "and can be fast-forwarded.\n",
2031 if (advice_status_hints)
2033 _(" (use \"git pull\" to update your local branch)\n"));
2036 Q_("Your branch and '%s' have diverged,\n"
2037 "and have %d and %d different commit each, "
2039 "Your branch and '%s' have diverged,\n"
2040 "and have %d and %d different commits each, "
2043 base, ours, theirs);
2044 if (advice_status_hints)
2046 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2052 static int one_local_ref(const char *refname, const struct object_id *oid,
2053 int flag, void *cb_data)
2055 struct ref ***local_tail = cb_data;
2058 /* we already know it starts with refs/ to get here */
2059 if (check_refname_format(refname + 5, 0))
2062 ref = alloc_ref(refname);
2063 oidcpy(&ref->new_oid, oid);
2065 *local_tail = &ref->next;
2069 struct ref *get_local_heads(void)
2071 struct ref *local_refs = NULL, **local_tail = &local_refs;
2073 for_each_ref(one_local_ref, &local_tail);
2077 struct ref *guess_remote_head(const struct ref *head,
2078 const struct ref *refs,
2081 const struct ref *r;
2082 struct ref *list = NULL;
2083 struct ref **tail = &list;
2089 * Some transports support directly peeking at
2090 * where HEAD points; if that is the case, then
2091 * we don't have to guess.
2094 return copy_ref(find_ref_by_name(refs, head->symref));
2096 /* If a remote branch exists with the default branch name, let's use it. */
2098 char *ref = xstrfmt("refs/heads/%s", git_default_branch_name());
2100 r = find_ref_by_name(refs, ref);
2102 if (r && oideq(&r->old_oid, &head->old_oid))
2105 /* Fall back to the hard-coded historical default */
2106 r = find_ref_by_name(refs, "refs/heads/master");
2107 if (r && oideq(&r->old_oid, &head->old_oid))
2111 /* Look for another ref that points there */
2112 for (r = refs; r; r = r->next) {
2114 starts_with(r->name, "refs/heads/") &&
2115 oideq(&r->old_oid, &head->old_oid)) {
2116 *tail = copy_ref(r);
2117 tail = &((*tail)->next);
2126 struct stale_heads_info {
2127 struct string_list *ref_names;
2128 struct ref **stale_refs_tail;
2132 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2133 int flags, void *cb_data)
2135 struct stale_heads_info *info = cb_data;
2136 struct string_list matches = STRING_LIST_INIT_DUP;
2137 struct refspec_item query;
2139 memset(&query, 0, sizeof(struct refspec_item));
2140 query.dst = (char *)refname;
2142 query_refspecs_multiple(info->rs, &query, &matches);
2143 if (matches.nr == 0)
2144 goto clean_exit; /* No matches */
2147 * If we did find a suitable refspec and it's not a symref and
2148 * it's not in the list of refs that currently exist in that
2149 * remote, we consider it to be stale. In order to deal with
2150 * overlapping refspecs, we need to go over all of the
2153 if (flags & REF_ISSYMREF)
2156 for (i = 0; stale && i < matches.nr; i++)
2157 if (string_list_has_string(info->ref_names, matches.items[i].string))
2161 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2162 oidcpy(&ref->new_oid, oid);
2166 string_list_clear(&matches, 0);
2170 struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2172 struct ref *ref, *stale_refs = NULL;
2173 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2174 struct stale_heads_info info;
2176 info.ref_names = &ref_names;
2177 info.stale_refs_tail = &stale_refs;
2179 for (ref = fetch_map; ref; ref = ref->next)
2180 string_list_append(&ref_names, ref->name);
2181 string_list_sort(&ref_names);
2182 for_each_ref(get_stale_heads_cb, &info);
2183 string_list_clear(&ref_names, 0);
2190 static void clear_cas_option(struct push_cas_option *cas)
2194 for (i = 0; i < cas->nr; i++)
2195 free(cas->entry[i].refname);
2197 memset(cas, 0, sizeof(*cas));
2200 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2201 const char *refname,
2204 struct push_cas *entry;
2205 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2206 entry = &cas->entry[cas->nr++];
2207 memset(entry, 0, sizeof(*entry));
2208 entry->refname = xmemdupz(refname, refnamelen);
2212 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2215 struct push_cas *entry;
2218 /* "--no-<option>" */
2219 clear_cas_option(cas);
2224 /* just "--<option>" */
2225 cas->use_tracking_for_rest = 1;
2229 /* "--<option>=refname" or "--<option>=refname:value" */
2230 colon = strchrnul(arg, ':');
2231 entry = add_cas_entry(cas, arg, colon - arg);
2233 entry->use_tracking = 1;
2235 oidclr(&entry->expect);
2236 else if (get_oid(colon + 1, &entry->expect))
2237 return error(_("cannot parse expected object name '%s'"),
2242 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2244 return parse_push_cas_option(opt->value, arg, unset);
2247 int is_empty_cas(const struct push_cas_option *cas)
2249 return !cas->use_tracking_for_rest && !cas->nr;
2253 * Look at remote.fetch refspec and see if we have a remote
2254 * tracking branch for the refname there. Fill its current
2256 * If we cannot do so, return negative to signal an error.
2258 static int remote_tracking(struct remote *remote, const char *refname,
2259 struct object_id *oid)
2263 dst = apply_refspecs(&remote->fetch, refname);
2265 return -1; /* no tracking ref for refname at remote */
2266 if (read_ref(dst, oid))
2267 return -1; /* we know what the tracking ref is but we cannot read it */
2271 static void apply_cas(struct push_cas_option *cas,
2272 struct remote *remote,
2277 /* Find an explicit --<option>=<name>[:<value>] entry */
2278 for (i = 0; i < cas->nr; i++) {
2279 struct push_cas *entry = &cas->entry[i];
2280 if (!refname_match(entry->refname, ref->name))
2282 ref->expect_old_sha1 = 1;
2283 if (!entry->use_tracking)
2284 oidcpy(&ref->old_oid_expect, &entry->expect);
2285 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2286 oidclr(&ref->old_oid_expect);
2290 /* Are we using "--<option>" to cover all? */
2291 if (!cas->use_tracking_for_rest)
2294 ref->expect_old_sha1 = 1;
2295 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2296 oidclr(&ref->old_oid_expect);
2299 void apply_push_cas(struct push_cas_option *cas,
2300 struct remote *remote,
2301 struct ref *remote_refs)
2304 for (ref = remote_refs; ref; ref = ref->next)
2305 apply_cas(cas, remote, ref);