9 #include "string-list.h"
10 #include "mergesort.h"
12 enum map_direction { FROM_SRC, FROM_DST };
14 static struct refspec s_tag_refspec = {
23 const struct refspec *tag_refspec = &s_tag_refspec;
25 struct counted_string {
32 struct counted_string *instead_of;
37 struct rewrite **rewrite;
42 static struct remote **remotes;
43 static int remotes_alloc;
44 static int remotes_nr;
46 static struct branch **branches;
47 static int branches_alloc;
48 static int branches_nr;
50 static struct branch *current_branch;
51 static const char *default_remote_name;
52 static const char *branch_pushremote_name;
53 static const char *pushremote_name;
54 static int explicit_default_remote_name;
56 static struct rewrites rewrites;
57 static struct rewrites rewrites_push;
59 #define BUF_SIZE (2048)
60 static char buffer[BUF_SIZE];
62 static int valid_remote(const struct remote *remote)
64 return (!!remote->url) || (!!remote->foreign_vcs);
67 static const char *alias_url(const char *url, struct rewrites *r)
71 struct counted_string *longest;
76 for (i = 0; i < r->rewrite_nr; i++) {
79 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
80 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
82 longest->len < r->rewrite[i]->instead_of[j].len)) {
83 longest = &(r->rewrite[i]->instead_of[j]);
91 ret = xmalloc(r->rewrite[longest_i]->baselen +
92 (strlen(url) - longest->len) + 1);
93 strcpy(ret, r->rewrite[longest_i]->base);
94 strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
98 static void add_push_refspec(struct remote *remote, const char *ref)
100 ALLOC_GROW(remote->push_refspec,
101 remote->push_refspec_nr + 1,
102 remote->push_refspec_alloc);
103 remote->push_refspec[remote->push_refspec_nr++] = ref;
106 static void add_fetch_refspec(struct remote *remote, const char *ref)
108 ALLOC_GROW(remote->fetch_refspec,
109 remote->fetch_refspec_nr + 1,
110 remote->fetch_refspec_alloc);
111 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
114 static void add_url(struct remote *remote, const char *url)
116 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
117 remote->url[remote->url_nr++] = url;
120 static void add_pushurl(struct remote *remote, const char *pushurl)
122 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
123 remote->pushurl[remote->pushurl_nr++] = pushurl;
126 static void add_pushurl_alias(struct remote *remote, const char *url)
128 const char *pushurl = alias_url(url, &rewrites_push);
130 add_pushurl(remote, pushurl);
133 static void add_url_alias(struct remote *remote, const char *url)
135 add_url(remote, alias_url(url, &rewrites));
136 add_pushurl_alias(remote, url);
139 static struct remote *make_remote(const char *name, int len)
144 for (i = 0; i < remotes_nr; i++) {
145 if (len ? (!strncmp(name, remotes[i]->name, len) &&
146 !remotes[i]->name[len]) :
147 !strcmp(name, remotes[i]->name))
151 ret = xcalloc(1, sizeof(struct remote));
152 ret->prune = -1; /* unspecified */
153 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
154 remotes[remotes_nr++] = ret;
156 ret->name = xstrndup(name, len);
158 ret->name = xstrdup(name);
162 static void add_merge(struct branch *branch, const char *name)
164 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
165 branch->merge_alloc);
166 branch->merge_name[branch->merge_nr++] = name;
169 static struct branch *make_branch(const char *name, int len)
175 for (i = 0; i < branches_nr; i++) {
176 if (len ? (!strncmp(name, branches[i]->name, len) &&
177 !branches[i]->name[len]) :
178 !strcmp(name, branches[i]->name))
182 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
183 ret = xcalloc(1, sizeof(struct branch));
184 branches[branches_nr++] = ret;
186 ret->name = xstrndup(name, len);
188 ret->name = xstrdup(name);
189 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
190 strcpy(refname, "refs/heads/");
191 strcpy(refname + strlen("refs/heads/"), ret->name);
192 ret->refname = refname;
197 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
202 for (i = 0; i < r->rewrite_nr; i++) {
204 ? (len == r->rewrite[i]->baselen &&
205 !strncmp(base, r->rewrite[i]->base, len))
206 : !strcmp(base, r->rewrite[i]->base))
207 return r->rewrite[i];
210 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
211 ret = xcalloc(1, sizeof(struct rewrite));
212 r->rewrite[r->rewrite_nr++] = ret;
214 ret->base = xstrndup(base, len);
218 ret->base = xstrdup(base);
219 ret->baselen = strlen(base);
224 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
226 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
227 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
228 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
229 rewrite->instead_of_nr++;
232 static void read_remotes_file(struct remote *remote)
234 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
238 remote->origin = REMOTE_REMOTES;
239 while (fgets(buffer, BUF_SIZE, f)) {
243 if (starts_with(buffer, "URL:")) {
246 } else if (starts_with(buffer, "Push:")) {
249 } else if (starts_with(buffer, "Pull:")) {
261 while (isspace(p[-1]))
264 switch (value_list) {
266 add_url_alias(remote, xstrdup(s));
269 add_push_refspec(remote, xstrdup(s));
272 add_fetch_refspec(remote, xstrdup(s));
279 static void read_branches_file(struct remote *remote)
282 struct strbuf branch = STRBUF_INIT;
284 FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
290 s = fgets(buffer, BUF_SIZE, f);
298 remote->origin = REMOTE_BRANCHES;
300 while (isspace(p[-1]))
303 p = xmalloc(len + 1);
307 * The branches file would have URL and optionally
308 * #branch specified. The "master" (or specified) branch is
309 * fetched and stored in the local branch of the same name.
311 frag = strchr(p, '#');
314 strbuf_addf(&branch, "refs/heads/%s", frag);
316 strbuf_addstr(&branch, "refs/heads/master");
318 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
319 add_url_alias(remote, p);
320 add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
322 * Cogito compatible push: push current HEAD to remote #branch
323 * (master if missing)
325 strbuf_init(&branch, 0);
326 strbuf_addstr(&branch, "HEAD");
328 strbuf_addf(&branch, ":refs/heads/%s", frag);
330 strbuf_addstr(&branch, ":refs/heads/master");
331 add_push_refspec(remote, strbuf_detach(&branch, NULL));
332 remote->fetch_tags = 1; /* always auto-follow */
335 static int handle_config(const char *key, const char *value, void *cb)
339 struct remote *remote;
340 struct branch *branch;
341 if (starts_with(key, "branch.")) {
343 subkey = strrchr(name, '.');
346 branch = make_branch(name, subkey - name);
347 if (!strcmp(subkey, ".remote")) {
348 if (git_config_string(&branch->remote_name, key, value))
350 if (branch == current_branch) {
351 default_remote_name = branch->remote_name;
352 explicit_default_remote_name = 1;
354 } else if (!strcmp(subkey, ".pushremote")) {
355 if (git_config_string(&branch->pushremote_name, key, value))
357 if (branch == current_branch)
358 branch_pushremote_name = xstrdup(branch->pushremote_name);
359 } else if (!strcmp(subkey, ".merge")) {
361 return config_error_nonbool(key);
362 add_merge(branch, xstrdup(value));
363 } else if (!strcmp(subkey, ".push")) {
364 if (git_config_string(&branch->push_name, key, value))
369 if (starts_with(key, "url.")) {
370 struct rewrite *rewrite;
372 subkey = strrchr(name, '.');
375 if (!strcmp(subkey, ".insteadof")) {
376 rewrite = make_rewrite(&rewrites, name, subkey - name);
378 return config_error_nonbool(key);
379 add_instead_of(rewrite, xstrdup(value));
380 } else if (!strcmp(subkey, ".pushinsteadof")) {
381 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
383 return config_error_nonbool(key);
384 add_instead_of(rewrite, xstrdup(value));
388 if (!starts_with(key, "remote."))
392 /* Handle remote.* variables */
393 if (!strcmp(name, "pushdefault"))
394 return git_config_string(&pushremote_name, key, value);
396 /* Handle remote.<name>.* variables */
398 warning("Config remote shorthand cannot begin with '/': %s",
402 subkey = strrchr(name, '.');
405 remote = make_remote(name, subkey - name);
406 remote->origin = REMOTE_CONFIG;
407 if (!strcmp(subkey, ".mirror"))
408 remote->mirror = git_config_bool(key, value);
409 else if (!strcmp(subkey, ".skipdefaultupdate"))
410 remote->skip_default_update = git_config_bool(key, value);
411 else if (!strcmp(subkey, ".skipfetchall"))
412 remote->skip_default_update = git_config_bool(key, value);
413 else if (!strcmp(subkey, ".prune"))
414 remote->prune = git_config_bool(key, value);
415 else if (!strcmp(subkey, ".url")) {
417 if (git_config_string(&v, key, value))
420 } else if (!strcmp(subkey, ".pushurl")) {
422 if (git_config_string(&v, key, value))
424 add_pushurl(remote, v);
425 } else if (!strcmp(subkey, ".push")) {
427 if (git_config_string(&v, key, value))
429 add_push_refspec(remote, v);
430 } else if (!strcmp(subkey, ".fetch")) {
432 if (git_config_string(&v, key, value))
434 add_fetch_refspec(remote, v);
435 } else if (!strcmp(subkey, ".receivepack")) {
437 if (git_config_string(&v, key, value))
439 if (!remote->receivepack)
440 remote->receivepack = v;
442 error("more than one receivepack given, using the first");
443 } else if (!strcmp(subkey, ".uploadpack")) {
445 if (git_config_string(&v, key, value))
447 if (!remote->uploadpack)
448 remote->uploadpack = v;
450 error("more than one uploadpack given, using the first");
451 } else if (!strcmp(subkey, ".tagopt")) {
452 if (!strcmp(value, "--no-tags"))
453 remote->fetch_tags = -1;
454 else if (!strcmp(value, "--tags"))
455 remote->fetch_tags = 2;
456 } else if (!strcmp(subkey, ".proxy")) {
457 return git_config_string((const char **)&remote->http_proxy,
459 } else if (!strcmp(subkey, ".vcs")) {
460 return git_config_string(&remote->foreign_vcs, key, value);
465 static void alias_all_urls(void)
468 for (i = 0; i < remotes_nr; i++) {
469 int add_pushurl_aliases;
472 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
473 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
475 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
476 for (j = 0; j < remotes[i]->url_nr; j++) {
477 if (add_pushurl_aliases)
478 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
479 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
484 static void read_config(void)
486 unsigned char sha1[20];
487 const char *head_ref;
489 if (default_remote_name) /* did this already */
491 default_remote_name = "origin";
492 current_branch = NULL;
493 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
494 if (head_ref && (flag & REF_ISSYMREF) &&
495 starts_with(head_ref, "refs/heads/")) {
497 make_branch(head_ref + strlen("refs/heads/"), 0);
499 git_config(handle_config, NULL);
500 if (branch_pushremote_name) {
501 free((char *)pushremote_name);
502 pushremote_name = branch_pushremote_name;
508 * This function frees a refspec array.
509 * Warning: code paths should be checked to ensure that the src
510 * and dst pointers are always freeable pointers as well
511 * as the refspec pointer itself.
513 static void free_refspecs(struct refspec *refspec, int nr_refspec)
520 for (i = 0; i < nr_refspec; i++) {
521 free(refspec[i].src);
522 free(refspec[i].dst);
527 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
530 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
532 for (i = 0; i < nr_refspec; i++) {
535 const char *lhs, *rhs;
546 rhs = strrchr(lhs, ':');
549 * Before going on, special case ":" (or "+:") as a refspec
550 * for pushing matching refs.
552 if (!fetch && rhs == lhs && rhs[1] == '\0') {
558 size_t rlen = strlen(++rhs);
559 is_glob = (1 <= rlen && strchr(rhs, '*'));
560 rs[i].dst = xstrndup(rhs, rlen);
563 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
564 if (1 <= llen && memchr(lhs, '*', llen)) {
565 if ((rhs && !is_glob) || (!rhs && fetch))
568 } else if (rhs && is_glob) {
572 rs[i].pattern = is_glob;
573 rs[i].src = xstrndup(lhs, llen);
574 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
577 unsigned char unused[40];
581 ; /* empty is ok; it means "HEAD" */
582 else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
583 rs[i].exact_sha1 = 1; /* ok */
584 else if (!check_refname_format(rs[i].src, flags))
585 ; /* valid looking ref is ok */
590 ; /* missing is ok; it is the same as empty */
591 else if (!*rs[i].dst)
592 ; /* empty is ok; it means "do not store" */
593 else if (!check_refname_format(rs[i].dst, flags))
594 ; /* valid looking ref is ok */
600 * - empty is allowed; it means delete.
601 * - when wildcarded, it must be a valid looking ref.
602 * - otherwise, it must be an extended SHA-1, but
603 * there is no existing way to validate this.
608 if (check_refname_format(rs[i].src, flags))
612 ; /* anything goes, for now */
615 * - missing is allowed, but LHS then must be a
617 * - empty is not allowed.
618 * - otherwise it must be a valid looking ref.
621 if (check_refname_format(rs[i].src, flags))
623 } else if (!*rs[i].dst) {
626 if (check_refname_format(rs[i].dst, flags))
636 * nr_refspec must be greater than zero and i must be valid
637 * since it is only possible to reach this point from within
638 * the for loop above.
640 free_refspecs(rs, i+1);
643 die("Invalid refspec '%s'", refspec[i]);
646 int valid_fetch_refspec(const char *fetch_refspec_str)
648 struct refspec *refspec;
650 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
651 free_refspecs(refspec, 1);
655 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
657 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
660 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
662 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
665 void free_refspec(int nr_refspec, struct refspec *refspec)
668 for (i = 0; i < nr_refspec; i++) {
669 free(refspec[i].src);
670 free(refspec[i].dst);
675 static int valid_remote_nick(const char *name)
677 if (!name[0] || is_dot_or_dotdot(name))
679 return !strchr(name, '/'); /* no slash */
682 static struct remote *remote_get_1(const char *name, const char *pushremote_name)
690 if (pushremote_name) {
691 name = pushremote_name;
694 name = default_remote_name;
695 name_given = explicit_default_remote_name;
699 ret = make_remote(name, 0);
700 if (valid_remote_nick(name)) {
701 if (!valid_remote(ret))
702 read_remotes_file(ret);
703 if (!valid_remote(ret))
704 read_branches_file(ret);
706 if (name_given && !valid_remote(ret))
707 add_url_alias(ret, name);
708 if (!valid_remote(ret))
710 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
711 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
715 struct remote *remote_get(const char *name)
718 return remote_get_1(name, NULL);
721 struct remote *pushremote_get(const char *name)
724 return remote_get_1(name, pushremote_name);
727 int remote_is_configured(const char *name)
732 for (i = 0; i < remotes_nr; i++)
733 if (!strcmp(name, remotes[i]->name))
738 int for_each_remote(each_remote_fn fn, void *priv)
742 for (i = 0; i < remotes_nr && !result; i++) {
743 struct remote *r = remotes[i];
747 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
750 r->push = parse_push_refspec(r->push_refspec_nr,
752 result = fn(r, priv);
757 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
759 if (strcmp(ref1->name, ref2->name)) {
760 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
761 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
762 die(_("Cannot fetch both %s and %s to %s"),
763 ref1->name, ref2->name, ref2->peer_ref->name);
764 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
765 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
766 warning(_("%s usually tracks %s, not %s"),
767 ref2->peer_ref->name, ref2->name, ref1->name);
768 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
769 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
770 die(_("%s tracks both %s and %s"),
771 ref2->peer_ref->name, ref1->name, ref2->name);
774 * This last possibility doesn't occur because
775 * FETCH_HEAD_IGNORE entries always appear at
776 * the end of the list.
778 die(_("Internal error"));
781 free(ref2->peer_ref);
785 struct ref *ref_remove_duplicates(struct ref *ref_map)
787 struct string_list refs = STRING_LIST_INIT_NODUP;
788 struct ref *retval = NULL;
789 struct ref **p = &retval;
792 struct ref *ref = ref_map;
794 ref_map = ref_map->next;
797 if (!ref->peer_ref) {
801 struct string_list_item *item =
802 string_list_insert(&refs, ref->peer_ref->name);
805 /* Entry already existed */
806 handle_duplicate((struct ref *)item->util, ref);
815 string_list_clear(&refs, 0);
819 int remote_has_url(struct remote *remote, const char *url)
822 for (i = 0; i < remote->url_nr; i++) {
823 if (!strcmp(remote->url[i], url))
829 static int match_name_with_pattern(const char *key, const char *name,
830 const char *value, char **result)
832 const char *kstar = strchr(key, '*');
838 die("Key '%s' of pattern had no '*'", key);
840 ksuffixlen = strlen(kstar + 1);
841 namelen = strlen(name);
842 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
843 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
845 const char *vstar = strchr(value, '*');
849 die("Value '%s' of pattern has no '*'", value);
850 vlen = vstar - value;
851 vsuffixlen = strlen(vstar + 1);
852 *result = xmalloc(vlen + vsuffixlen +
854 klen - ksuffixlen + 1);
855 strncpy(*result, value, vlen);
856 strncpy(*result + vlen,
857 name + klen, namelen - klen - ksuffixlen);
858 strcpy(*result + vlen + namelen - klen - ksuffixlen,
864 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
867 int find_src = !query->src;
869 if (find_src && !query->dst)
870 error("query_refspecs_multiple: need either src or dst");
872 for (i = 0; i < ref_count; i++) {
873 struct refspec *refspec = &refs[i];
874 const char *key = find_src ? refspec->dst : refspec->src;
875 const char *value = find_src ? refspec->src : refspec->dst;
876 const char *needle = find_src ? query->dst : query->src;
877 char **result = find_src ? &query->src : &query->dst;
881 if (refspec->pattern) {
882 if (match_name_with_pattern(key, needle, value, result))
883 string_list_append_nodup(results, *result);
884 } else if (!strcmp(needle, key)) {
885 string_list_append(results, value);
890 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
893 int find_src = !query->src;
894 const char *needle = find_src ? query->dst : query->src;
895 char **result = find_src ? &query->src : &query->dst;
897 if (find_src && !query->dst)
898 return error("query_refspecs: need either src or dst");
900 for (i = 0; i < ref_count; i++) {
901 struct refspec *refspec = &refs[i];
902 const char *key = find_src ? refspec->dst : refspec->src;
903 const char *value = find_src ? refspec->src : refspec->dst;
907 if (refspec->pattern) {
908 if (match_name_with_pattern(key, needle, value, result)) {
909 query->force = refspec->force;
912 } else if (!strcmp(needle, key)) {
913 *result = xstrdup(value);
914 query->force = refspec->force;
921 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
924 struct refspec query;
926 memset(&query, 0, sizeof(struct refspec));
927 query.src = (char *)name;
929 if (query_refspecs(refspecs, nr_refspec, &query))
935 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
937 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
940 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
943 size_t len = strlen(name);
944 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
945 memcpy(ref->name, prefix, prefixlen);
946 memcpy(ref->name + prefixlen, name, len);
950 struct ref *alloc_ref(const char *name)
952 return alloc_ref_with_prefix("", 0, name);
955 struct ref *copy_ref(const struct ref *ref)
961 len = strlen(ref->name);
962 cpy = xmalloc(sizeof(struct ref) + len + 1);
963 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
965 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
966 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
967 cpy->peer_ref = copy_ref(ref->peer_ref);
971 struct ref *copy_ref_list(const struct ref *ref)
973 struct ref *ret = NULL;
974 struct ref **tail = &ret;
976 *tail = copy_ref(ref);
978 tail = &((*tail)->next);
983 static void free_ref(struct ref *ref)
987 free_ref(ref->peer_ref);
988 free(ref->remote_status);
993 void free_refs(struct ref *ref)
1003 int ref_compare_name(const void *va, const void *vb)
1005 const struct ref *a = va, *b = vb;
1006 return strcmp(a->name, b->name);
1009 static void *ref_list_get_next(const void *a)
1011 return ((const struct ref *)a)->next;
1014 static void ref_list_set_next(void *a, void *next)
1016 ((struct ref *)a)->next = next;
1019 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
1021 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1024 int count_refspec_match(const char *pattern,
1026 struct ref **matched_ref)
1028 int patlen = strlen(pattern);
1029 struct ref *matched_weak = NULL;
1030 struct ref *matched = NULL;
1034 for (weak_match = match = 0; refs; refs = refs->next) {
1035 char *name = refs->name;
1036 int namelen = strlen(name);
1038 if (!refname_match(pattern, name))
1041 /* A match is "weak" if it is with refs outside
1042 * heads or tags, and did not specify the pattern
1043 * in full (e.g. "refs/remotes/origin/master") or at
1044 * least from the toplevel (e.g. "remotes/origin/master");
1045 * otherwise "git push $URL master" would result in
1046 * ambiguity between remotes/origin/master and heads/master
1047 * at the remote site.
1049 if (namelen != patlen &&
1050 patlen != namelen - 5 &&
1051 !starts_with(name, "refs/heads/") &&
1052 !starts_with(name, "refs/tags/")) {
1053 /* We want to catch the case where only weak
1054 * matches are found and there are multiple
1055 * matches, and where more than one strong
1056 * matches are found, as ambiguous. One
1057 * strong match with zero or more weak matches
1058 * are acceptable as a unique match.
1060 matched_weak = refs;
1069 *matched_ref = matched_weak;
1073 *matched_ref = matched;
1078 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1086 static struct ref *alloc_delete_ref(void)
1088 struct ref *ref = alloc_ref("(delete)");
1089 hashclr(ref->new_sha1);
1093 static struct ref *try_explicit_object_name(const char *name)
1095 unsigned char sha1[20];
1099 return alloc_delete_ref();
1100 if (get_sha1(name, sha1))
1102 ref = alloc_ref(name);
1103 hashcpy(ref->new_sha1, sha1);
1107 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1109 struct ref *ret = alloc_ref(name);
1110 tail_link_ref(ret, tail);
1114 static char *guess_ref(const char *name, struct ref *peer)
1116 struct strbuf buf = STRBUF_INIT;
1117 unsigned char sha1[20];
1119 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1123 if (starts_with(r, "refs/heads/"))
1124 strbuf_addstr(&buf, "refs/heads/");
1125 else if (starts_with(r, "refs/tags/"))
1126 strbuf_addstr(&buf, "refs/tags/");
1130 strbuf_addstr(&buf, name);
1131 return strbuf_detach(&buf, NULL);
1134 static int match_explicit(struct ref *src, struct ref *dst,
1135 struct ref ***dst_tail,
1138 struct ref *matched_src, *matched_dst;
1141 const char *dst_value = rs->dst;
1144 if (rs->pattern || rs->matching)
1147 matched_src = matched_dst = NULL;
1148 switch (count_refspec_match(rs->src, src, &matched_src)) {
1153 /* The source could be in the get_sha1() format
1154 * not a reference name. :refs/other is a
1155 * way to delete 'other' ref at the remote end.
1157 matched_src = try_explicit_object_name(rs->src);
1159 return error("src refspec %s does not match any.", rs->src);
1163 return error("src refspec %s matches more than one.", rs->src);
1167 unsigned char sha1[20];
1170 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1172 ((flag & REF_ISSYMREF) &&
1173 !starts_with(dst_value, "refs/heads/")))
1174 die("%s cannot be resolved to branch.",
1178 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1182 if (!memcmp(dst_value, "refs/", 5))
1183 matched_dst = make_linked_ref(dst_value, dst_tail);
1184 else if (is_null_sha1(matched_src->new_sha1))
1185 error("unable to delete '%s': remote ref does not exist",
1187 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1188 matched_dst = make_linked_ref(dst_guess, dst_tail);
1190 error("unable to push to unqualified destination: %s\n"
1191 "The destination refspec neither matches an "
1192 "existing ref on the remote nor\n"
1193 "begins with refs/, and we are unable to "
1194 "guess a prefix based on the source ref.",
1199 error("dst refspec %s matches more than one.",
1205 if (matched_dst->peer_ref)
1206 return error("dst ref %s receives from more than one src.",
1209 matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1210 matched_dst->force = rs->force;
1215 static int match_explicit_refs(struct ref *src, struct ref *dst,
1216 struct ref ***dst_tail, struct refspec *rs,
1220 for (i = errs = 0; i < rs_nr; i++)
1221 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1225 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1226 int send_mirror, int direction, const struct refspec **ret_pat)
1228 const struct refspec *pat;
1231 int matching_refs = -1;
1232 for (i = 0; i < rs_nr; i++) {
1233 if (rs[i].matching &&
1234 (matching_refs == -1 || rs[i].force)) {
1239 if (rs[i].pattern) {
1240 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1242 if (direction == FROM_SRC)
1243 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1245 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1252 if (matching_refs == -1)
1255 pat = rs + matching_refs;
1256 if (pat->matching) {
1258 * "matching refs"; traditionally we pushed everything
1259 * including refs outside refs/heads/ hierarchy, but
1260 * that does not make much sense these days.
1262 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1264 name = xstrdup(ref->name);
1271 static struct ref **tail_ref(struct ref **head)
1273 struct ref **tail = head;
1275 tail = &((*tail)->next);
1280 struct commit **tip;
1284 static void add_to_tips(struct tips *tips, const unsigned char *sha1)
1286 struct commit *commit;
1288 if (is_null_sha1(sha1))
1290 commit = lookup_commit_reference_gently(sha1, 1);
1291 if (!commit || (commit->object.flags & TMP_MARK))
1293 commit->object.flags |= TMP_MARK;
1294 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1295 tips->tip[tips->nr++] = commit;
1298 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1300 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1301 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1302 struct string_list_item *item;
1304 struct tips sent_tips;
1307 * Collect everything we know they would have at the end of
1308 * this push, and collect all tags they have.
1310 memset(&sent_tips, 0, sizeof(sent_tips));
1311 for (ref = *dst; ref; ref = ref->next) {
1312 if (ref->peer_ref &&
1313 !is_null_sha1(ref->peer_ref->new_sha1))
1314 add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
1316 add_to_tips(&sent_tips, ref->old_sha1);
1317 if (starts_with(ref->name, "refs/tags/"))
1318 string_list_append(&dst_tag, ref->name);
1320 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1322 sort_string_list(&dst_tag);
1324 /* Collect tags they do not have. */
1325 for (ref = src; ref; ref = ref->next) {
1326 if (!starts_with(ref->name, "refs/tags/"))
1327 continue; /* not a tag */
1328 if (string_list_has_string(&dst_tag, ref->name))
1329 continue; /* they already have it */
1330 if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
1331 continue; /* be conservative */
1332 item = string_list_append(&src_tag, ref->name);
1335 string_list_clear(&dst_tag, 0);
1338 * At this point, src_tag lists tags that are missing from
1339 * dst, and sent_tips lists the tips we are pushing or those
1340 * that we know they already have. An element in the src_tag
1341 * that is an ancestor of any of the sent_tips needs to be
1342 * sent to the other side.
1345 for_each_string_list_item(item, &src_tag) {
1346 struct ref *ref = item->util;
1347 struct ref *dst_ref;
1348 struct commit *commit;
1350 if (is_null_sha1(ref->new_sha1))
1352 commit = lookup_commit_reference_gently(ref->new_sha1, 1);
1354 /* not pushing a commit, which is not an error */
1358 * Is this tag, which they do not have, reachable from
1359 * any of the commits we are sending?
1361 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1365 dst_ref = make_linked_ref(ref->name, dst_tail);
1366 hashcpy(dst_ref->new_sha1, ref->new_sha1);
1367 dst_ref->peer_ref = copy_ref(ref);
1370 string_list_clear(&src_tag, 0);
1371 free(sent_tips.tip);
1374 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1376 for ( ; list; list = list->next)
1377 if (!strcmp(list->name, name))
1378 return (struct ref *)list;
1382 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1384 for ( ; ref; ref = ref->next)
1385 string_list_append_nodup(ref_index, ref->name)->util = ref;
1387 sort_string_list(ref_index);
1391 * Given the set of refs the local repository has, the set of refs the
1392 * remote repository has, and the refspec used for push, determine
1393 * what remote refs we will update and with what value by setting
1394 * peer_ref (which object is being pushed) and force (if the push is
1395 * forced) in elements of "dst". The function may add new elements to
1396 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1398 int match_push_refs(struct ref *src, struct ref **dst,
1399 int nr_refspec, const char **refspec, int flags)
1402 int send_all = flags & MATCH_REFS_ALL;
1403 int send_mirror = flags & MATCH_REFS_MIRROR;
1404 int send_prune = flags & MATCH_REFS_PRUNE;
1406 static const char *default_refspec[] = { ":", NULL };
1407 struct ref *ref, **dst_tail = tail_ref(dst);
1408 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1412 refspec = default_refspec;
1414 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1415 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1417 /* pick the remainder */
1418 for (ref = src; ref; ref = ref->next) {
1419 struct string_list_item *dst_item;
1420 struct ref *dst_peer;
1421 const struct refspec *pat = NULL;
1424 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1428 if (!dst_ref_index.nr)
1429 prepare_ref_index(&dst_ref_index, *dst);
1431 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1432 dst_peer = dst_item ? dst_item->util : NULL;
1434 if (dst_peer->peer_ref)
1435 /* We're already sending something to this ref. */
1438 if (pat->matching && !(send_all || send_mirror))
1440 * Remote doesn't have it, and we have no
1441 * explicit pattern, and we don't have
1442 * --all or --mirror.
1446 /* Create a new one and link it */
1447 dst_peer = make_linked_ref(dst_name, &dst_tail);
1448 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1449 string_list_insert(&dst_ref_index,
1450 dst_peer->name)->util = dst_peer;
1452 dst_peer->peer_ref = copy_ref(ref);
1453 dst_peer->force = pat->force;
1458 string_list_clear(&dst_ref_index, 0);
1460 if (flags & MATCH_REFS_FOLLOW_TAGS)
1461 add_missing_tags(src, dst, &dst_tail);
1464 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1465 /* check for missing refs on the remote */
1466 for (ref = *dst; ref; ref = ref->next) {
1470 /* We're already sending something to this ref. */
1473 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1475 if (!src_ref_index.nr)
1476 prepare_ref_index(&src_ref_index, src);
1477 if (!string_list_has_string(&src_ref_index,
1479 ref->peer_ref = alloc_delete_ref();
1483 string_list_clear(&src_ref_index, 0);
1490 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1495 for (ref = remote_refs; ref; ref = ref->next) {
1496 int force_ref_update = ref->force || force_update;
1497 int reject_reason = 0;
1500 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1501 else if (!send_mirror)
1504 ref->deletion = is_null_sha1(ref->new_sha1);
1505 if (!ref->deletion &&
1506 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1507 ref->status = REF_STATUS_UPTODATE;
1512 * Bypass the usual "must fast-forward" check but
1513 * replace it with a weaker "the old value must be
1514 * this value we observed". If the remote ref has
1515 * moved and is now different from what we expect,
1518 * It also is an error if the user told us to check
1519 * with the remote-tracking branch to find the value
1520 * to expect, but we did not have such a tracking
1523 if (ref->expect_old_sha1) {
1524 if (ref->expect_old_no_trackback ||
1525 hashcmp(ref->old_sha1, ref->old_sha1_expect))
1526 reject_reason = REF_STATUS_REJECT_STALE;
1530 * The usual "must fast-forward" rules.
1532 * Decide whether an individual refspec A:B can be
1533 * pushed. The push will succeed if any of the
1534 * following are true:
1536 * (1) the remote reference B does not exist
1538 * (2) the remote reference B is being removed (i.e.,
1539 * pushing :B where no source is specified)
1541 * (3) the destination is not under refs/tags/, and
1542 * if the old and new value is a commit, the new
1543 * is a descendant of the old.
1545 * (4) it is forced using the +A:B notation, or by
1546 * passing the --force argument
1549 else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1550 if (starts_with(ref->name, "refs/tags/"))
1551 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1552 else if (!has_sha1_file(ref->old_sha1))
1553 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1554 else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
1555 !lookup_commit_reference_gently(ref->new_sha1, 1))
1556 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1557 else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1558 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1562 * "--force" will defeat any rejection implemented
1563 * by the rules above.
1565 if (!force_ref_update)
1566 ref->status = reject_reason;
1567 else if (reject_reason)
1568 ref->forced_update = 1;
1572 struct branch *branch_get(const char *name)
1577 if (!name || !*name || !strcmp(name, "HEAD"))
1578 ret = current_branch;
1580 ret = make_branch(name, 0);
1581 if (ret && ret->remote_name) {
1582 ret->remote = remote_get(ret->remote_name);
1583 if (ret->merge_nr) {
1585 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1586 for (i = 0; i < ret->merge_nr; i++) {
1587 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1588 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1589 if (remote_find_tracking(ret->remote, ret->merge[i])
1590 && !strcmp(ret->remote_name, "."))
1591 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1595 if (ret && ret->pushremote_name && ret->push_name) {
1596 struct remote *pushremote;
1597 pushremote = pushremote_get(ret->pushremote_name);
1598 ret->push.src = xstrdup(ret->push_name);
1599 if (remote_find_tracking(pushremote, &ret->push)
1600 && !strcmp(ret->pushremote_name, "."))
1601 ret->push.dst = xstrdup(ret->push_name);
1606 int branch_has_merge_config(struct branch *branch)
1608 return branch && !!branch->merge;
1611 int branch_merge_matches(struct branch *branch,
1613 const char *refname)
1615 if (!branch || i < 0 || i >= branch->merge_nr)
1617 return refname_match(branch->merge[i]->src, refname);
1620 static int ignore_symref_update(const char *refname)
1622 unsigned char sha1[20];
1625 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1626 return 0; /* non-existing refs are OK */
1627 return (flag & REF_ISSYMREF);
1631 * Create and return a list of (struct ref) consisting of copies of
1632 * each remote_ref that matches refspec. refspec must be a pattern.
1633 * Fill in the copies' peer_ref to describe the local tracking refs to
1634 * which they map. Omit any references that would map to an existing
1635 * local symbolic ref.
1637 static struct ref *get_expanded_map(const struct ref *remote_refs,
1638 const struct refspec *refspec)
1640 const struct ref *ref;
1641 struct ref *ret = NULL;
1642 struct ref **tail = &ret;
1644 for (ref = remote_refs; ref; ref = ref->next) {
1645 char *expn_name = NULL;
1647 if (strchr(ref->name, '^'))
1648 continue; /* a dereference item */
1649 if (match_name_with_pattern(refspec->src, ref->name,
1650 refspec->dst, &expn_name) &&
1651 !ignore_symref_update(expn_name)) {
1652 struct ref *cpy = copy_ref(ref);
1654 cpy->peer_ref = alloc_ref(expn_name);
1656 cpy->peer_ref->force = 1;
1666 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1668 const struct ref *ref;
1669 for (ref = refs; ref; ref = ref->next) {
1670 if (refname_match(name, ref->name))
1676 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1678 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1683 return copy_ref(ref);
1686 static struct ref *get_local_ref(const char *name)
1688 if (!name || name[0] == '\0')
1691 if (starts_with(name, "refs/"))
1692 return alloc_ref(name);
1694 if (starts_with(name, "heads/") ||
1695 starts_with(name, "tags/") ||
1696 starts_with(name, "remotes/"))
1697 return alloc_ref_with_prefix("refs/", 5, name);
1699 return alloc_ref_with_prefix("refs/heads/", 11, name);
1702 int get_fetch_map(const struct ref *remote_refs,
1703 const struct refspec *refspec,
1707 struct ref *ref_map, **rmp;
1709 if (refspec->pattern) {
1710 ref_map = get_expanded_map(remote_refs, refspec);
1712 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1714 if (refspec->exact_sha1) {
1715 ref_map = alloc_ref(name);
1716 get_sha1_hex(name, ref_map->old_sha1);
1718 ref_map = get_remote_ref(remote_refs, name);
1720 if (!missing_ok && !ref_map)
1721 die("Couldn't find remote ref %s", name);
1723 ref_map->peer_ref = get_local_ref(refspec->dst);
1724 if (ref_map->peer_ref && refspec->force)
1725 ref_map->peer_ref->force = 1;
1729 for (rmp = &ref_map; *rmp; ) {
1730 if ((*rmp)->peer_ref) {
1731 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1732 check_refname_format((*rmp)->peer_ref->name, 0)) {
1733 struct ref *ignore = *rmp;
1734 error("* Ignoring funny ref '%s' locally",
1735 (*rmp)->peer_ref->name);
1736 *rmp = (*rmp)->next;
1737 free(ignore->peer_ref);
1742 rmp = &((*rmp)->next);
1746 tail_link_ref(ref_map, tail);
1751 int resolve_remote_symref(struct ref *ref, struct ref *list)
1755 for (; list; list = list->next)
1756 if (!strcmp(ref->symref, list->name)) {
1757 hashcpy(ref->old_sha1, list->old_sha1);
1763 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1766 struct commit_list *temp = list;
1767 temp->item->object.flags &= ~mark;
1773 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1776 struct commit *old, *new;
1777 struct commit_list *list, *used;
1781 * Both new and old must be commit-ish and new is descendant of
1782 * old. Otherwise we require --force.
1784 o = deref_tag(parse_object(old_sha1), NULL, 0);
1785 if (!o || o->type != OBJ_COMMIT)
1787 old = (struct commit *) o;
1789 o = deref_tag(parse_object(new_sha1), NULL, 0);
1790 if (!o || o->type != OBJ_COMMIT)
1792 new = (struct commit *) o;
1794 if (parse_commit(new) < 0)
1798 commit_list_insert(new, &list);
1800 new = pop_most_recent_commit(&list, TMP_MARK);
1801 commit_list_insert(new, &used);
1807 unmark_and_free(list, TMP_MARK);
1808 unmark_and_free(used, TMP_MARK);
1813 * Compare a branch with its upstream, and save their differences (number
1814 * of commits) in *num_ours and *num_theirs.
1816 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1817 * (with "gone" base), otherwise 1 (with base).
1819 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1821 unsigned char sha1[20];
1822 struct commit *ours, *theirs;
1824 struct rev_info revs;
1825 const char *rev_argv[10], *base;
1828 /* Cannot stat unless we are marked to build on top of somebody else. */
1830 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1833 /* Cannot stat if what we used to build on no longer exists */
1834 base = branch->merge[0]->dst;
1835 if (read_ref(base, sha1))
1837 theirs = lookup_commit_reference(sha1);
1841 if (read_ref(branch->refname, sha1))
1843 ours = lookup_commit_reference(sha1);
1847 /* are we the same? */
1848 if (theirs == ours) {
1849 *num_theirs = *num_ours = 0;
1853 /* Run "rev-list --left-right ours...theirs" internally... */
1855 rev_argv[rev_argc++] = NULL;
1856 rev_argv[rev_argc++] = "--left-right";
1857 rev_argv[rev_argc++] = symmetric;
1858 rev_argv[rev_argc++] = "--";
1859 rev_argv[rev_argc] = NULL;
1861 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1862 strcpy(symmetric + 40, "...");
1863 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1865 init_revisions(&revs, NULL);
1866 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1867 prepare_revision_walk(&revs);
1869 /* ... and count the commits on each side. */
1873 struct commit *c = get_revision(&revs);
1876 if (c->object.flags & SYMMETRIC_LEFT)
1882 /* clear object flags smudged by the above traversal */
1883 clear_commit_marks(ours, ALL_REV_FLAGS);
1884 clear_commit_marks(theirs, ALL_REV_FLAGS);
1889 * Return true when there is anything to report, otherwise false.
1891 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1895 int upstream_is_gone = 0;
1897 switch (stat_tracking_info(branch, &ours, &theirs)) {
1902 /* with "gone" base */
1903 upstream_is_gone = 1;
1910 base = branch->merge[0]->dst;
1911 base = shorten_unambiguous_ref(base, 0);
1912 if (upstream_is_gone) {
1914 _("Your branch is based on '%s', but the upstream is gone.\n"),
1916 if (advice_status_hints)
1918 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1919 } else if (!ours && !theirs) {
1921 _("Your branch is up-to-date with '%s'.\n"),
1923 } else if (!theirs) {
1925 Q_("Your branch is ahead of '%s' by %d commit.\n",
1926 "Your branch is ahead of '%s' by %d commits.\n",
1929 if (advice_status_hints && !branch->push.dst)
1931 _(" (use \"git push\" to publish your local commits)\n"));
1934 Q_("Your branch is behind '%s' by %d commit, "
1935 "and can be fast-forwarded.\n",
1936 "Your branch is behind '%s' by %d commits, "
1937 "and can be fast-forwarded.\n",
1940 if (advice_status_hints)
1942 _(" (use \"git pull\" to update your local branch)\n"));
1945 Q_("Your branch and '%s' have diverged,\n"
1946 "and have %d and %d different commit each, "
1948 "Your branch and '%s' have diverged,\n"
1949 "and have %d and %d different commits each, "
1952 base, ours, theirs);
1953 if (advice_status_hints)
1955 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1957 if (branch->push.dst) {
1958 unsigned char local_sha1[20];
1959 unsigned char remote_sha1[20];
1962 pub = shorten_unambiguous_ref(branch->push.dst, 0);
1964 /* Is it published? */
1965 if (!read_ref(branch->refname, local_sha1) &&
1966 !read_ref(branch->push.dst, remote_sha1)) {
1967 if (hashcmp(local_sha1, remote_sha1)) {
1968 strbuf_addf(sb, _("Some commits haven't been published to '%s'.\n"), pub);
1969 if (advice_status_hints)
1970 strbuf_addf(sb, _(" (use \"git push\" to publish your local commits)\n"));
1977 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1979 struct ref ***local_tail = cb_data;
1983 /* we already know it starts with refs/ to get here */
1984 if (check_refname_format(refname + 5, 0))
1987 len = strlen(refname) + 1;
1988 ref = xcalloc(1, sizeof(*ref) + len);
1989 hashcpy(ref->new_sha1, sha1);
1990 memcpy(ref->name, refname, len);
1992 *local_tail = &ref->next;
1996 struct ref *get_local_heads(void)
1998 struct ref *local_refs = NULL, **local_tail = &local_refs;
1999 for_each_ref(one_local_ref, &local_tail);
2003 struct ref *guess_remote_head(const struct ref *head,
2004 const struct ref *refs,
2007 const struct ref *r;
2008 struct ref *list = NULL;
2009 struct ref **tail = &list;
2015 * Some transports support directly peeking at
2016 * where HEAD points; if that is the case, then
2017 * we don't have to guess.
2020 return copy_ref(find_ref_by_name(refs, head->symref));
2022 /* If refs/heads/master could be right, it is. */
2024 r = find_ref_by_name(refs, "refs/heads/master");
2025 if (r && !hashcmp(r->old_sha1, head->old_sha1))
2029 /* Look for another ref that points there */
2030 for (r = refs; r; r = r->next) {
2032 starts_with(r->name, "refs/heads/") &&
2033 !hashcmp(r->old_sha1, head->old_sha1)) {
2034 *tail = copy_ref(r);
2035 tail = &((*tail)->next);
2044 struct stale_heads_info {
2045 struct string_list *ref_names;
2046 struct ref **stale_refs_tail;
2047 struct refspec *refs;
2051 static int get_stale_heads_cb(const char *refname,
2052 const unsigned char *sha1, int flags, void *cb_data)
2054 struct stale_heads_info *info = cb_data;
2055 struct string_list matches = STRING_LIST_INIT_DUP;
2056 struct refspec query;
2058 memset(&query, 0, sizeof(struct refspec));
2059 query.dst = (char *)refname;
2061 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2062 if (matches.nr == 0)
2063 goto clean_exit; /* No matches */
2066 * If we did find a suitable refspec and it's not a symref and
2067 * it's not in the list of refs that currently exist in that
2068 * remote, we consider it to be stale. In order to deal with
2069 * overlapping refspecs, we need to go over all of the
2072 if (flags & REF_ISSYMREF)
2075 for (i = 0; stale && i < matches.nr; i++)
2076 if (string_list_has_string(info->ref_names, matches.items[i].string))
2080 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2081 hashcpy(ref->new_sha1, sha1);
2085 string_list_clear(&matches, 0);
2089 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2091 struct ref *ref, *stale_refs = NULL;
2092 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2093 struct stale_heads_info info;
2094 info.ref_names = &ref_names;
2095 info.stale_refs_tail = &stale_refs;
2097 info.ref_count = ref_count;
2098 for (ref = fetch_map; ref; ref = ref->next)
2099 string_list_append(&ref_names, ref->name);
2100 sort_string_list(&ref_names);
2101 for_each_ref(get_stale_heads_cb, &info);
2102 string_list_clear(&ref_names, 0);
2109 void clear_cas_option(struct push_cas_option *cas)
2113 for (i = 0; i < cas->nr; i++)
2114 free(cas->entry[i].refname);
2116 memset(cas, 0, sizeof(*cas));
2119 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2120 const char *refname,
2123 struct push_cas *entry;
2124 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2125 entry = &cas->entry[cas->nr++];
2126 memset(entry, 0, sizeof(*entry));
2127 entry->refname = xmemdupz(refname, refnamelen);
2131 int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2134 struct push_cas *entry;
2137 /* "--no-<option>" */
2138 clear_cas_option(cas);
2143 /* just "--<option>" */
2144 cas->use_tracking_for_rest = 1;
2148 /* "--<option>=refname" or "--<option>=refname:value" */
2149 colon = strchrnul(arg, ':');
2150 entry = add_cas_entry(cas, arg, colon - arg);
2152 entry->use_tracking = 1;
2153 else if (get_sha1(colon + 1, entry->expect))
2154 return error("cannot parse expected object name '%s'", colon + 1);
2158 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2160 return parse_push_cas_option(opt->value, arg, unset);
2163 int is_empty_cas(const struct push_cas_option *cas)
2165 return !cas->use_tracking_for_rest && !cas->nr;
2169 * Look at remote.fetch refspec and see if we have a remote
2170 * tracking branch for the refname there. Fill its current
2172 * If we cannot do so, return negative to signal an error.
2174 static int remote_tracking(struct remote *remote, const char *refname,
2175 unsigned char sha1[20])
2179 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2181 return -1; /* no tracking ref for refname at remote */
2182 if (read_ref(dst, sha1))
2183 return -1; /* we know what the tracking ref is but we cannot read it */
2187 static void apply_cas(struct push_cas_option *cas,
2188 struct remote *remote,
2193 /* Find an explicit --<option>=<name>[:<value>] entry */
2194 for (i = 0; i < cas->nr; i++) {
2195 struct push_cas *entry = &cas->entry[i];
2196 if (!refname_match(entry->refname, ref->name))
2198 ref->expect_old_sha1 = 1;
2199 if (!entry->use_tracking)
2200 hashcpy(ref->old_sha1_expect, cas->entry[i].expect);
2201 else if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2202 ref->expect_old_no_trackback = 1;
2206 /* Are we using "--<option>" to cover all? */
2207 if (!cas->use_tracking_for_rest)
2210 ref->expect_old_sha1 = 1;
2211 if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2212 ref->expect_old_no_trackback = 1;
2215 void apply_push_cas(struct push_cas_option *cas,
2216 struct remote *remote,
2217 struct ref *remote_refs)
2220 for (ref = remote_refs; ref; ref = ref->next)
2221 apply_cas(cas, remote, ref);