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 (branch == current_branch)
356 if (git_config_string(&branch_pushremote_name, key, value))
358 } else if (!strcmp(subkey, ".merge")) {
360 return config_error_nonbool(key);
361 add_merge(branch, xstrdup(value));
365 if (starts_with(key, "url.")) {
366 struct rewrite *rewrite;
368 subkey = strrchr(name, '.');
371 if (!strcmp(subkey, ".insteadof")) {
372 rewrite = make_rewrite(&rewrites, name, subkey - name);
374 return config_error_nonbool(key);
375 add_instead_of(rewrite, xstrdup(value));
376 } else if (!strcmp(subkey, ".pushinsteadof")) {
377 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
379 return config_error_nonbool(key);
380 add_instead_of(rewrite, xstrdup(value));
384 if (!starts_with(key, "remote."))
388 /* Handle remote.* variables */
389 if (!strcmp(name, "pushdefault"))
390 return git_config_string(&pushremote_name, key, value);
392 /* Handle remote.<name>.* variables */
394 warning("Config remote shorthand cannot begin with '/': %s",
398 subkey = strrchr(name, '.');
401 remote = make_remote(name, subkey - name);
402 remote->origin = REMOTE_CONFIG;
403 if (!strcmp(subkey, ".mirror"))
404 remote->mirror = git_config_bool(key, value);
405 else if (!strcmp(subkey, ".skipdefaultupdate"))
406 remote->skip_default_update = git_config_bool(key, value);
407 else if (!strcmp(subkey, ".skipfetchall"))
408 remote->skip_default_update = git_config_bool(key, value);
409 else if (!strcmp(subkey, ".prune"))
410 remote->prune = git_config_bool(key, value);
411 else if (!strcmp(subkey, ".url")) {
413 if (git_config_string(&v, key, value))
416 } else if (!strcmp(subkey, ".pushurl")) {
418 if (git_config_string(&v, key, value))
420 add_pushurl(remote, v);
421 } else if (!strcmp(subkey, ".push")) {
423 if (git_config_string(&v, key, value))
425 add_push_refspec(remote, v);
426 } else if (!strcmp(subkey, ".fetch")) {
428 if (git_config_string(&v, key, value))
430 add_fetch_refspec(remote, v);
431 } else if (!strcmp(subkey, ".receivepack")) {
433 if (git_config_string(&v, key, value))
435 if (!remote->receivepack)
436 remote->receivepack = v;
438 error("more than one receivepack given, using the first");
439 } else if (!strcmp(subkey, ".uploadpack")) {
441 if (git_config_string(&v, key, value))
443 if (!remote->uploadpack)
444 remote->uploadpack = v;
446 error("more than one uploadpack given, using the first");
447 } else if (!strcmp(subkey, ".tagopt")) {
448 if (!strcmp(value, "--no-tags"))
449 remote->fetch_tags = -1;
450 else if (!strcmp(value, "--tags"))
451 remote->fetch_tags = 2;
452 } else if (!strcmp(subkey, ".proxy")) {
453 return git_config_string((const char **)&remote->http_proxy,
455 } else if (!strcmp(subkey, ".vcs")) {
456 return git_config_string(&remote->foreign_vcs, key, value);
461 static void alias_all_urls(void)
464 for (i = 0; i < remotes_nr; i++) {
465 int add_pushurl_aliases;
468 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
469 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
471 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
472 for (j = 0; j < remotes[i]->url_nr; j++) {
473 if (add_pushurl_aliases)
474 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
475 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
480 static void read_config(void)
482 unsigned char sha1[20];
483 const char *head_ref;
485 if (default_remote_name) /* did this already */
487 default_remote_name = "origin";
488 current_branch = NULL;
489 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
490 if (head_ref && (flag & REF_ISSYMREF) &&
491 starts_with(head_ref, "refs/heads/")) {
493 make_branch(head_ref + strlen("refs/heads/"), 0);
495 git_config(handle_config, NULL);
496 if (branch_pushremote_name) {
497 free((char *)pushremote_name);
498 pushremote_name = branch_pushremote_name;
504 * This function frees a refspec array.
505 * Warning: code paths should be checked to ensure that the src
506 * and dst pointers are always freeable pointers as well
507 * as the refspec pointer itself.
509 static void free_refspecs(struct refspec *refspec, int nr_refspec)
516 for (i = 0; i < nr_refspec; i++) {
517 free(refspec[i].src);
518 free(refspec[i].dst);
523 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
526 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
528 for (i = 0; i < nr_refspec; i++) {
531 const char *lhs, *rhs;
542 rhs = strrchr(lhs, ':');
545 * Before going on, special case ":" (or "+:") as a refspec
546 * for pushing matching refs.
548 if (!fetch && rhs == lhs && rhs[1] == '\0') {
554 size_t rlen = strlen(++rhs);
555 is_glob = (1 <= rlen && strchr(rhs, '*'));
556 rs[i].dst = xstrndup(rhs, rlen);
559 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
560 if (1 <= llen && memchr(lhs, '*', llen)) {
561 if ((rhs && !is_glob) || (!rhs && fetch))
564 } else if (rhs && is_glob) {
568 rs[i].pattern = is_glob;
569 rs[i].src = xstrndup(lhs, llen);
570 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
573 unsigned char unused[40];
577 ; /* empty is ok; it means "HEAD" */
578 else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
579 rs[i].exact_sha1 = 1; /* ok */
580 else if (!check_refname_format(rs[i].src, flags))
581 ; /* valid looking ref is ok */
586 ; /* missing is ok; it is the same as empty */
587 else if (!*rs[i].dst)
588 ; /* empty is ok; it means "do not store" */
589 else if (!check_refname_format(rs[i].dst, flags))
590 ; /* valid looking ref is ok */
596 * - empty is allowed; it means delete.
597 * - when wildcarded, it must be a valid looking ref.
598 * - otherwise, it must be an extended SHA-1, but
599 * there is no existing way to validate this.
604 if (check_refname_format(rs[i].src, flags))
608 ; /* anything goes, for now */
611 * - missing is allowed, but LHS then must be a
613 * - empty is not allowed.
614 * - otherwise it must be a valid looking ref.
617 if (check_refname_format(rs[i].src, flags))
619 } else if (!*rs[i].dst) {
622 if (check_refname_format(rs[i].dst, flags))
632 * nr_refspec must be greater than zero and i must be valid
633 * since it is only possible to reach this point from within
634 * the for loop above.
636 free_refspecs(rs, i+1);
639 die("Invalid refspec '%s'", refspec[i]);
642 int valid_fetch_refspec(const char *fetch_refspec_str)
644 struct refspec *refspec;
646 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
647 free_refspecs(refspec, 1);
651 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
653 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
656 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
658 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
661 void free_refspec(int nr_refspec, struct refspec *refspec)
664 for (i = 0; i < nr_refspec; i++) {
665 free(refspec[i].src);
666 free(refspec[i].dst);
671 static int valid_remote_nick(const char *name)
673 if (!name[0] || is_dot_or_dotdot(name))
675 return !strchr(name, '/'); /* no slash */
678 static struct remote *remote_get_1(const char *name, const char *pushremote_name)
686 if (pushremote_name) {
687 name = pushremote_name;
690 name = default_remote_name;
691 name_given = explicit_default_remote_name;
695 ret = make_remote(name, 0);
696 if (valid_remote_nick(name)) {
697 if (!valid_remote(ret))
698 read_remotes_file(ret);
699 if (!valid_remote(ret))
700 read_branches_file(ret);
702 if (name_given && !valid_remote(ret))
703 add_url_alias(ret, name);
704 if (!valid_remote(ret))
706 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
707 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
711 struct remote *remote_get(const char *name)
714 return remote_get_1(name, NULL);
717 struct remote *pushremote_get(const char *name)
720 return remote_get_1(name, pushremote_name);
723 int remote_is_configured(const char *name)
728 for (i = 0; i < remotes_nr; i++)
729 if (!strcmp(name, remotes[i]->name))
734 int for_each_remote(each_remote_fn fn, void *priv)
738 for (i = 0; i < remotes_nr && !result; i++) {
739 struct remote *r = remotes[i];
743 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
746 r->push = parse_push_refspec(r->push_refspec_nr,
748 result = fn(r, priv);
753 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
755 if (strcmp(ref1->name, ref2->name)) {
756 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
757 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
758 die(_("Cannot fetch both %s and %s to %s"),
759 ref1->name, ref2->name, ref2->peer_ref->name);
760 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
761 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
762 warning(_("%s usually tracks %s, not %s"),
763 ref2->peer_ref->name, ref2->name, ref1->name);
764 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
765 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
766 die(_("%s tracks both %s and %s"),
767 ref2->peer_ref->name, ref1->name, ref2->name);
770 * This last possibility doesn't occur because
771 * FETCH_HEAD_IGNORE entries always appear at
772 * the end of the list.
774 die(_("Internal error"));
777 free(ref2->peer_ref);
781 struct ref *ref_remove_duplicates(struct ref *ref_map)
783 struct string_list refs = STRING_LIST_INIT_NODUP;
784 struct ref *retval = NULL;
785 struct ref **p = &retval;
788 struct ref *ref = ref_map;
790 ref_map = ref_map->next;
793 if (!ref->peer_ref) {
797 struct string_list_item *item =
798 string_list_insert(&refs, ref->peer_ref->name);
801 /* Entry already existed */
802 handle_duplicate((struct ref *)item->util, ref);
811 string_list_clear(&refs, 0);
815 int remote_has_url(struct remote *remote, const char *url)
818 for (i = 0; i < remote->url_nr; i++) {
819 if (!strcmp(remote->url[i], url))
825 static int match_name_with_pattern(const char *key, const char *name,
826 const char *value, char **result)
828 const char *kstar = strchr(key, '*');
834 die("Key '%s' of pattern had no '*'", key);
836 ksuffixlen = strlen(kstar + 1);
837 namelen = strlen(name);
838 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
839 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
841 const char *vstar = strchr(value, '*');
845 die("Value '%s' of pattern has no '*'", value);
846 vlen = vstar - value;
847 vsuffixlen = strlen(vstar + 1);
848 *result = xmalloc(vlen + vsuffixlen +
850 klen - ksuffixlen + 1);
851 strncpy(*result, value, vlen);
852 strncpy(*result + vlen,
853 name + klen, namelen - klen - ksuffixlen);
854 strcpy(*result + vlen + namelen - klen - ksuffixlen,
860 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
863 int find_src = !query->src;
865 if (find_src && !query->dst)
866 error("query_refspecs_multiple: need either src or dst");
868 for (i = 0; i < ref_count; i++) {
869 struct refspec *refspec = &refs[i];
870 const char *key = find_src ? refspec->dst : refspec->src;
871 const char *value = find_src ? refspec->src : refspec->dst;
872 const char *needle = find_src ? query->dst : query->src;
873 char **result = find_src ? &query->src : &query->dst;
877 if (refspec->pattern) {
878 if (match_name_with_pattern(key, needle, value, result))
879 string_list_append_nodup(results, *result);
880 } else if (!strcmp(needle, key)) {
881 string_list_append(results, value);
886 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
889 int find_src = !query->src;
890 const char *needle = find_src ? query->dst : query->src;
891 char **result = find_src ? &query->src : &query->dst;
893 if (find_src && !query->dst)
894 return error("query_refspecs: need either src or dst");
896 for (i = 0; i < ref_count; i++) {
897 struct refspec *refspec = &refs[i];
898 const char *key = find_src ? refspec->dst : refspec->src;
899 const char *value = find_src ? refspec->src : refspec->dst;
903 if (refspec->pattern) {
904 if (match_name_with_pattern(key, needle, value, result)) {
905 query->force = refspec->force;
908 } else if (!strcmp(needle, key)) {
909 *result = xstrdup(value);
910 query->force = refspec->force;
917 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
920 struct refspec query;
922 memset(&query, 0, sizeof(struct refspec));
923 query.src = (char *)name;
925 if (query_refspecs(refspecs, nr_refspec, &query))
931 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
933 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
936 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
939 size_t len = strlen(name);
940 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
941 memcpy(ref->name, prefix, prefixlen);
942 memcpy(ref->name + prefixlen, name, len);
946 struct ref *alloc_ref(const char *name)
948 return alloc_ref_with_prefix("", 0, name);
951 struct ref *copy_ref(const struct ref *ref)
957 len = strlen(ref->name);
958 cpy = xmalloc(sizeof(struct ref) + len + 1);
959 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
961 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
962 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
963 cpy->peer_ref = copy_ref(ref->peer_ref);
967 struct ref *copy_ref_list(const struct ref *ref)
969 struct ref *ret = NULL;
970 struct ref **tail = &ret;
972 *tail = copy_ref(ref);
974 tail = &((*tail)->next);
979 static void free_ref(struct ref *ref)
983 free_ref(ref->peer_ref);
984 free(ref->remote_status);
989 void free_refs(struct ref *ref)
999 int ref_compare_name(const void *va, const void *vb)
1001 const struct ref *a = va, *b = vb;
1002 return strcmp(a->name, b->name);
1005 static void *ref_list_get_next(const void *a)
1007 return ((const struct ref *)a)->next;
1010 static void ref_list_set_next(void *a, void *next)
1012 ((struct ref *)a)->next = next;
1015 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
1017 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1020 int count_refspec_match(const char *pattern,
1022 struct ref **matched_ref)
1024 int patlen = strlen(pattern);
1025 struct ref *matched_weak = NULL;
1026 struct ref *matched = NULL;
1030 for (weak_match = match = 0; refs; refs = refs->next) {
1031 char *name = refs->name;
1032 int namelen = strlen(name);
1034 if (!refname_match(pattern, name))
1037 /* A match is "weak" if it is with refs outside
1038 * heads or tags, and did not specify the pattern
1039 * in full (e.g. "refs/remotes/origin/master") or at
1040 * least from the toplevel (e.g. "remotes/origin/master");
1041 * otherwise "git push $URL master" would result in
1042 * ambiguity between remotes/origin/master and heads/master
1043 * at the remote site.
1045 if (namelen != patlen &&
1046 patlen != namelen - 5 &&
1047 !starts_with(name, "refs/heads/") &&
1048 !starts_with(name, "refs/tags/")) {
1049 /* We want to catch the case where only weak
1050 * matches are found and there are multiple
1051 * matches, and where more than one strong
1052 * matches are found, as ambiguous. One
1053 * strong match with zero or more weak matches
1054 * are acceptable as a unique match.
1056 matched_weak = refs;
1066 *matched_ref = matched_weak;
1071 *matched_ref = matched;
1076 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1084 static struct ref *alloc_delete_ref(void)
1086 struct ref *ref = alloc_ref("(delete)");
1087 hashclr(ref->new_sha1);
1091 static int try_explicit_object_name(const char *name,
1094 unsigned char sha1[20];
1098 *match = alloc_delete_ref();
1102 if (get_sha1(name, sha1))
1106 *match = alloc_ref(name);
1107 hashcpy((*match)->new_sha1, sha1);
1112 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1114 struct ref *ret = alloc_ref(name);
1115 tail_link_ref(ret, tail);
1119 static char *guess_ref(const char *name, struct ref *peer)
1121 struct strbuf buf = STRBUF_INIT;
1122 unsigned char sha1[20];
1124 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1128 if (starts_with(r, "refs/heads/"))
1129 strbuf_addstr(&buf, "refs/heads/");
1130 else if (starts_with(r, "refs/tags/"))
1131 strbuf_addstr(&buf, "refs/tags/");
1135 strbuf_addstr(&buf, name);
1136 return strbuf_detach(&buf, NULL);
1139 static int match_explicit_lhs(struct ref *src,
1142 int *allocated_match)
1144 switch (count_refspec_match(rs->src, src, match)) {
1146 if (allocated_match)
1147 *allocated_match = 0;
1150 /* The source could be in the get_sha1() format
1151 * not a reference name. :refs/other is a
1152 * way to delete 'other' ref at the remote end.
1154 if (try_explicit_object_name(rs->src, match) < 0)
1155 return error("src refspec %s does not match any.", rs->src);
1156 if (allocated_match)
1157 *allocated_match = 1;
1160 return error("src refspec %s matches more than one.", rs->src);
1164 static int match_explicit(struct ref *src, struct ref *dst,
1165 struct ref ***dst_tail,
1168 struct ref *matched_src, *matched_dst;
1171 const char *dst_value = rs->dst;
1174 if (rs->pattern || rs->matching)
1177 matched_src = matched_dst = NULL;
1178 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1182 unsigned char sha1[20];
1185 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1187 ((flag & REF_ISSYMREF) &&
1188 !starts_with(dst_value, "refs/heads/")))
1189 die("%s cannot be resolved to branch.",
1193 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1197 if (!memcmp(dst_value, "refs/", 5))
1198 matched_dst = make_linked_ref(dst_value, dst_tail);
1199 else if (is_null_sha1(matched_src->new_sha1))
1200 error("unable to delete '%s': remote ref does not exist",
1202 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1203 matched_dst = make_linked_ref(dst_guess, dst_tail);
1205 error("unable to push to unqualified destination: %s\n"
1206 "The destination refspec neither matches an "
1207 "existing ref on the remote nor\n"
1208 "begins with refs/, and we are unable to "
1209 "guess a prefix based on the source ref.",
1214 error("dst refspec %s matches more than one.",
1220 if (matched_dst->peer_ref)
1221 return error("dst ref %s receives from more than one src.",
1224 matched_dst->peer_ref = allocated_src ?
1226 copy_ref(matched_src);
1227 matched_dst->force = rs->force;
1232 static int match_explicit_refs(struct ref *src, struct ref *dst,
1233 struct ref ***dst_tail, struct refspec *rs,
1237 for (i = errs = 0; i < rs_nr; i++)
1238 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1242 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1243 int send_mirror, int direction, const struct refspec **ret_pat)
1245 const struct refspec *pat;
1248 int matching_refs = -1;
1249 for (i = 0; i < rs_nr; i++) {
1250 if (rs[i].matching &&
1251 (matching_refs == -1 || rs[i].force)) {
1256 if (rs[i].pattern) {
1257 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1259 if (direction == FROM_SRC)
1260 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1262 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1269 if (matching_refs == -1)
1272 pat = rs + matching_refs;
1273 if (pat->matching) {
1275 * "matching refs"; traditionally we pushed everything
1276 * including refs outside refs/heads/ hierarchy, but
1277 * that does not make much sense these days.
1279 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1281 name = xstrdup(ref->name);
1288 static struct ref **tail_ref(struct ref **head)
1290 struct ref **tail = head;
1292 tail = &((*tail)->next);
1297 struct commit **tip;
1301 static void add_to_tips(struct tips *tips, const unsigned char *sha1)
1303 struct commit *commit;
1305 if (is_null_sha1(sha1))
1307 commit = lookup_commit_reference_gently(sha1, 1);
1308 if (!commit || (commit->object.flags & TMP_MARK))
1310 commit->object.flags |= TMP_MARK;
1311 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1312 tips->tip[tips->nr++] = commit;
1315 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1317 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1318 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1319 struct string_list_item *item;
1321 struct tips sent_tips;
1324 * Collect everything we know they would have at the end of
1325 * this push, and collect all tags they have.
1327 memset(&sent_tips, 0, sizeof(sent_tips));
1328 for (ref = *dst; ref; ref = ref->next) {
1329 if (ref->peer_ref &&
1330 !is_null_sha1(ref->peer_ref->new_sha1))
1331 add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
1333 add_to_tips(&sent_tips, ref->old_sha1);
1334 if (starts_with(ref->name, "refs/tags/"))
1335 string_list_append(&dst_tag, ref->name);
1337 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1339 sort_string_list(&dst_tag);
1341 /* Collect tags they do not have. */
1342 for (ref = src; ref; ref = ref->next) {
1343 if (!starts_with(ref->name, "refs/tags/"))
1344 continue; /* not a tag */
1345 if (string_list_has_string(&dst_tag, ref->name))
1346 continue; /* they already have it */
1347 if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
1348 continue; /* be conservative */
1349 item = string_list_append(&src_tag, ref->name);
1352 string_list_clear(&dst_tag, 0);
1355 * At this point, src_tag lists tags that are missing from
1356 * dst, and sent_tips lists the tips we are pushing or those
1357 * that we know they already have. An element in the src_tag
1358 * that is an ancestor of any of the sent_tips needs to be
1359 * sent to the other side.
1362 for_each_string_list_item(item, &src_tag) {
1363 struct ref *ref = item->util;
1364 struct ref *dst_ref;
1365 struct commit *commit;
1367 if (is_null_sha1(ref->new_sha1))
1369 commit = lookup_commit_reference_gently(ref->new_sha1, 1);
1371 /* not pushing a commit, which is not an error */
1375 * Is this tag, which they do not have, reachable from
1376 * any of the commits we are sending?
1378 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1382 dst_ref = make_linked_ref(ref->name, dst_tail);
1383 hashcpy(dst_ref->new_sha1, ref->new_sha1);
1384 dst_ref->peer_ref = copy_ref(ref);
1387 string_list_clear(&src_tag, 0);
1388 free(sent_tips.tip);
1391 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1393 for ( ; list; list = list->next)
1394 if (!strcmp(list->name, name))
1395 return (struct ref *)list;
1399 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1401 for ( ; ref; ref = ref->next)
1402 string_list_append_nodup(ref_index, ref->name)->util = ref;
1404 sort_string_list(ref_index);
1408 * Given only the set of local refs, sanity-check the set of push
1409 * refspecs. We can't catch all errors that match_push_refs would,
1410 * but we can catch some errors early before even talking to the
1413 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1415 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1419 for (i = 0; i < nr_refspec; i++) {
1420 struct refspec *rs = refspec + i;
1422 if (rs->pattern || rs->matching)
1425 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1428 free_refspec(nr_refspec, refspec);
1433 * Given the set of refs the local repository has, the set of refs the
1434 * remote repository has, and the refspec used for push, determine
1435 * what remote refs we will update and with what value by setting
1436 * peer_ref (which object is being pushed) and force (if the push is
1437 * forced) in elements of "dst". The function may add new elements to
1438 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1440 int match_push_refs(struct ref *src, struct ref **dst,
1441 int nr_refspec, const char **refspec, int flags)
1444 int send_all = flags & MATCH_REFS_ALL;
1445 int send_mirror = flags & MATCH_REFS_MIRROR;
1446 int send_prune = flags & MATCH_REFS_PRUNE;
1448 static const char *default_refspec[] = { ":", NULL };
1449 struct ref *ref, **dst_tail = tail_ref(dst);
1450 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1454 refspec = default_refspec;
1456 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1457 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1459 /* pick the remainder */
1460 for (ref = src; ref; ref = ref->next) {
1461 struct string_list_item *dst_item;
1462 struct ref *dst_peer;
1463 const struct refspec *pat = NULL;
1466 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1470 if (!dst_ref_index.nr)
1471 prepare_ref_index(&dst_ref_index, *dst);
1473 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1474 dst_peer = dst_item ? dst_item->util : NULL;
1476 if (dst_peer->peer_ref)
1477 /* We're already sending something to this ref. */
1480 if (pat->matching && !(send_all || send_mirror))
1482 * Remote doesn't have it, and we have no
1483 * explicit pattern, and we don't have
1484 * --all or --mirror.
1488 /* Create a new one and link it */
1489 dst_peer = make_linked_ref(dst_name, &dst_tail);
1490 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1491 string_list_insert(&dst_ref_index,
1492 dst_peer->name)->util = dst_peer;
1494 dst_peer->peer_ref = copy_ref(ref);
1495 dst_peer->force = pat->force;
1500 string_list_clear(&dst_ref_index, 0);
1502 if (flags & MATCH_REFS_FOLLOW_TAGS)
1503 add_missing_tags(src, dst, &dst_tail);
1506 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1507 /* check for missing refs on the remote */
1508 for (ref = *dst; ref; ref = ref->next) {
1512 /* We're already sending something to this ref. */
1515 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1517 if (!src_ref_index.nr)
1518 prepare_ref_index(&src_ref_index, src);
1519 if (!string_list_has_string(&src_ref_index,
1521 ref->peer_ref = alloc_delete_ref();
1525 string_list_clear(&src_ref_index, 0);
1532 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1537 for (ref = remote_refs; ref; ref = ref->next) {
1538 int force_ref_update = ref->force || force_update;
1539 int reject_reason = 0;
1542 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1543 else if (!send_mirror)
1546 ref->deletion = is_null_sha1(ref->new_sha1);
1547 if (!ref->deletion &&
1548 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1549 ref->status = REF_STATUS_UPTODATE;
1554 * Bypass the usual "must fast-forward" check but
1555 * replace it with a weaker "the old value must be
1556 * this value we observed". If the remote ref has
1557 * moved and is now different from what we expect,
1560 * It also is an error if the user told us to check
1561 * with the remote-tracking branch to find the value
1562 * to expect, but we did not have such a tracking
1565 if (ref->expect_old_sha1) {
1566 if (ref->expect_old_no_trackback ||
1567 hashcmp(ref->old_sha1, ref->old_sha1_expect))
1568 reject_reason = REF_STATUS_REJECT_STALE;
1572 * The usual "must fast-forward" rules.
1574 * Decide whether an individual refspec A:B can be
1575 * pushed. The push will succeed if any of the
1576 * following are true:
1578 * (1) the remote reference B does not exist
1580 * (2) the remote reference B is being removed (i.e.,
1581 * pushing :B where no source is specified)
1583 * (3) the destination is not under refs/tags/, and
1584 * if the old and new value is a commit, the new
1585 * is a descendant of the old.
1587 * (4) it is forced using the +A:B notation, or by
1588 * passing the --force argument
1591 else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1592 if (starts_with(ref->name, "refs/tags/"))
1593 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1594 else if (!has_sha1_file(ref->old_sha1))
1595 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1596 else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
1597 !lookup_commit_reference_gently(ref->new_sha1, 1))
1598 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1599 else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1600 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1604 * "--force" will defeat any rejection implemented
1605 * by the rules above.
1607 if (!force_ref_update)
1608 ref->status = reject_reason;
1609 else if (reject_reason)
1610 ref->forced_update = 1;
1614 struct branch *branch_get(const char *name)
1619 if (!name || !*name || !strcmp(name, "HEAD"))
1620 ret = current_branch;
1622 ret = make_branch(name, 0);
1623 if (ret && ret->remote_name) {
1624 ret->remote = remote_get(ret->remote_name);
1625 if (ret->merge_nr) {
1627 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1628 for (i = 0; i < ret->merge_nr; i++) {
1629 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1630 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1631 if (remote_find_tracking(ret->remote, ret->merge[i])
1632 && !strcmp(ret->remote_name, "."))
1633 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1640 int branch_has_merge_config(struct branch *branch)
1642 return branch && !!branch->merge;
1645 int branch_merge_matches(struct branch *branch,
1647 const char *refname)
1649 if (!branch || i < 0 || i >= branch->merge_nr)
1651 return refname_match(branch->merge[i]->src, refname);
1654 static int ignore_symref_update(const char *refname)
1656 unsigned char sha1[20];
1659 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1660 return 0; /* non-existing refs are OK */
1661 return (flag & REF_ISSYMREF);
1665 * Create and return a list of (struct ref) consisting of copies of
1666 * each remote_ref that matches refspec. refspec must be a pattern.
1667 * Fill in the copies' peer_ref to describe the local tracking refs to
1668 * which they map. Omit any references that would map to an existing
1669 * local symbolic ref.
1671 static struct ref *get_expanded_map(const struct ref *remote_refs,
1672 const struct refspec *refspec)
1674 const struct ref *ref;
1675 struct ref *ret = NULL;
1676 struct ref **tail = &ret;
1678 for (ref = remote_refs; ref; ref = ref->next) {
1679 char *expn_name = NULL;
1681 if (strchr(ref->name, '^'))
1682 continue; /* a dereference item */
1683 if (match_name_with_pattern(refspec->src, ref->name,
1684 refspec->dst, &expn_name) &&
1685 !ignore_symref_update(expn_name)) {
1686 struct ref *cpy = copy_ref(ref);
1688 cpy->peer_ref = alloc_ref(expn_name);
1690 cpy->peer_ref->force = 1;
1700 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1702 const struct ref *ref;
1703 for (ref = refs; ref; ref = ref->next) {
1704 if (refname_match(name, ref->name))
1710 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1712 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1717 return copy_ref(ref);
1720 static struct ref *get_local_ref(const char *name)
1722 if (!name || name[0] == '\0')
1725 if (starts_with(name, "refs/"))
1726 return alloc_ref(name);
1728 if (starts_with(name, "heads/") ||
1729 starts_with(name, "tags/") ||
1730 starts_with(name, "remotes/"))
1731 return alloc_ref_with_prefix("refs/", 5, name);
1733 return alloc_ref_with_prefix("refs/heads/", 11, name);
1736 int get_fetch_map(const struct ref *remote_refs,
1737 const struct refspec *refspec,
1741 struct ref *ref_map, **rmp;
1743 if (refspec->pattern) {
1744 ref_map = get_expanded_map(remote_refs, refspec);
1746 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1748 if (refspec->exact_sha1) {
1749 ref_map = alloc_ref(name);
1750 get_sha1_hex(name, ref_map->old_sha1);
1752 ref_map = get_remote_ref(remote_refs, name);
1754 if (!missing_ok && !ref_map)
1755 die("Couldn't find remote ref %s", name);
1757 ref_map->peer_ref = get_local_ref(refspec->dst);
1758 if (ref_map->peer_ref && refspec->force)
1759 ref_map->peer_ref->force = 1;
1763 for (rmp = &ref_map; *rmp; ) {
1764 if ((*rmp)->peer_ref) {
1765 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1766 check_refname_format((*rmp)->peer_ref->name, 0)) {
1767 struct ref *ignore = *rmp;
1768 error("* Ignoring funny ref '%s' locally",
1769 (*rmp)->peer_ref->name);
1770 *rmp = (*rmp)->next;
1771 free(ignore->peer_ref);
1776 rmp = &((*rmp)->next);
1780 tail_link_ref(ref_map, tail);
1785 int resolve_remote_symref(struct ref *ref, struct ref *list)
1789 for (; list; list = list->next)
1790 if (!strcmp(ref->symref, list->name)) {
1791 hashcpy(ref->old_sha1, list->old_sha1);
1797 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1800 struct commit_list *temp = list;
1801 temp->item->object.flags &= ~mark;
1807 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1810 struct commit *old, *new;
1811 struct commit_list *list, *used;
1815 * Both new and old must be commit-ish and new is descendant of
1816 * old. Otherwise we require --force.
1818 o = deref_tag(parse_object(old_sha1), NULL, 0);
1819 if (!o || o->type != OBJ_COMMIT)
1821 old = (struct commit *) o;
1823 o = deref_tag(parse_object(new_sha1), NULL, 0);
1824 if (!o || o->type != OBJ_COMMIT)
1826 new = (struct commit *) o;
1828 if (parse_commit(new) < 0)
1832 commit_list_insert(new, &list);
1834 new = pop_most_recent_commit(&list, TMP_MARK);
1835 commit_list_insert(new, &used);
1841 unmark_and_free(list, TMP_MARK);
1842 unmark_and_free(used, TMP_MARK);
1847 * Compare a branch with its upstream, and save their differences (number
1848 * of commits) in *num_ours and *num_theirs.
1850 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1851 * (with "gone" base), otherwise 1 (with base).
1853 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1855 unsigned char sha1[20];
1856 struct commit *ours, *theirs;
1858 struct rev_info revs;
1859 const char *rev_argv[10], *base;
1862 /* Cannot stat unless we are marked to build on top of somebody else. */
1864 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1867 /* Cannot stat if what we used to build on no longer exists */
1868 base = branch->merge[0]->dst;
1869 if (read_ref(base, sha1))
1871 theirs = lookup_commit_reference(sha1);
1875 if (read_ref(branch->refname, sha1))
1877 ours = lookup_commit_reference(sha1);
1881 /* are we the same? */
1882 if (theirs == ours) {
1883 *num_theirs = *num_ours = 0;
1887 /* Run "rev-list --left-right ours...theirs" internally... */
1889 rev_argv[rev_argc++] = NULL;
1890 rev_argv[rev_argc++] = "--left-right";
1891 rev_argv[rev_argc++] = symmetric;
1892 rev_argv[rev_argc++] = "--";
1893 rev_argv[rev_argc] = NULL;
1895 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1896 strcpy(symmetric + 40, "...");
1897 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1899 init_revisions(&revs, NULL);
1900 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1901 prepare_revision_walk(&revs);
1903 /* ... and count the commits on each side. */
1907 struct commit *c = get_revision(&revs);
1910 if (c->object.flags & SYMMETRIC_LEFT)
1916 /* clear object flags smudged by the above traversal */
1917 clear_commit_marks(ours, ALL_REV_FLAGS);
1918 clear_commit_marks(theirs, ALL_REV_FLAGS);
1923 * Return true when there is anything to report, otherwise false.
1925 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1929 int upstream_is_gone = 0;
1931 switch (stat_tracking_info(branch, &ours, &theirs)) {
1936 /* with "gone" base */
1937 upstream_is_gone = 1;
1944 base = branch->merge[0]->dst;
1945 base = shorten_unambiguous_ref(base, 0);
1946 if (upstream_is_gone) {
1948 _("Your branch is based on '%s', but the upstream is gone.\n"),
1950 if (advice_status_hints)
1952 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1953 } else if (!ours && !theirs) {
1955 _("Your branch is up-to-date with '%s'.\n"),
1957 } else if (!theirs) {
1959 Q_("Your branch is ahead of '%s' by %d commit.\n",
1960 "Your branch is ahead of '%s' by %d commits.\n",
1963 if (advice_status_hints)
1965 _(" (use \"git push\" to publish your local commits)\n"));
1968 Q_("Your branch is behind '%s' by %d commit, "
1969 "and can be fast-forwarded.\n",
1970 "Your branch is behind '%s' by %d commits, "
1971 "and can be fast-forwarded.\n",
1974 if (advice_status_hints)
1976 _(" (use \"git pull\" to update your local branch)\n"));
1979 Q_("Your branch and '%s' have diverged,\n"
1980 "and have %d and %d different commit each, "
1982 "Your branch and '%s' have diverged,\n"
1983 "and have %d and %d different commits each, "
1986 base, ours, theirs);
1987 if (advice_status_hints)
1989 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1994 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1996 struct ref ***local_tail = cb_data;
2000 /* we already know it starts with refs/ to get here */
2001 if (check_refname_format(refname + 5, 0))
2004 len = strlen(refname) + 1;
2005 ref = xcalloc(1, sizeof(*ref) + len);
2006 hashcpy(ref->new_sha1, sha1);
2007 memcpy(ref->name, refname, len);
2009 *local_tail = &ref->next;
2013 struct ref *get_local_heads(void)
2015 struct ref *local_refs = NULL, **local_tail = &local_refs;
2016 for_each_ref(one_local_ref, &local_tail);
2020 struct ref *guess_remote_head(const struct ref *head,
2021 const struct ref *refs,
2024 const struct ref *r;
2025 struct ref *list = NULL;
2026 struct ref **tail = &list;
2032 * Some transports support directly peeking at
2033 * where HEAD points; if that is the case, then
2034 * we don't have to guess.
2037 return copy_ref(find_ref_by_name(refs, head->symref));
2039 /* If refs/heads/master could be right, it is. */
2041 r = find_ref_by_name(refs, "refs/heads/master");
2042 if (r && !hashcmp(r->old_sha1, head->old_sha1))
2046 /* Look for another ref that points there */
2047 for (r = refs; r; r = r->next) {
2049 starts_with(r->name, "refs/heads/") &&
2050 !hashcmp(r->old_sha1, head->old_sha1)) {
2051 *tail = copy_ref(r);
2052 tail = &((*tail)->next);
2061 struct stale_heads_info {
2062 struct string_list *ref_names;
2063 struct ref **stale_refs_tail;
2064 struct refspec *refs;
2068 static int get_stale_heads_cb(const char *refname,
2069 const unsigned char *sha1, int flags, void *cb_data)
2071 struct stale_heads_info *info = cb_data;
2072 struct string_list matches = STRING_LIST_INIT_DUP;
2073 struct refspec query;
2075 memset(&query, 0, sizeof(struct refspec));
2076 query.dst = (char *)refname;
2078 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2079 if (matches.nr == 0)
2080 goto clean_exit; /* No matches */
2083 * If we did find a suitable refspec and it's not a symref and
2084 * it's not in the list of refs that currently exist in that
2085 * remote, we consider it to be stale. In order to deal with
2086 * overlapping refspecs, we need to go over all of the
2089 if (flags & REF_ISSYMREF)
2092 for (i = 0; stale && i < matches.nr; i++)
2093 if (string_list_has_string(info->ref_names, matches.items[i].string))
2097 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2098 hashcpy(ref->new_sha1, sha1);
2102 string_list_clear(&matches, 0);
2106 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2108 struct ref *ref, *stale_refs = NULL;
2109 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2110 struct stale_heads_info info;
2111 info.ref_names = &ref_names;
2112 info.stale_refs_tail = &stale_refs;
2114 info.ref_count = ref_count;
2115 for (ref = fetch_map; ref; ref = ref->next)
2116 string_list_append(&ref_names, ref->name);
2117 sort_string_list(&ref_names);
2118 for_each_ref(get_stale_heads_cb, &info);
2119 string_list_clear(&ref_names, 0);
2126 void clear_cas_option(struct push_cas_option *cas)
2130 for (i = 0; i < cas->nr; i++)
2131 free(cas->entry[i].refname);
2133 memset(cas, 0, sizeof(*cas));
2136 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2137 const char *refname,
2140 struct push_cas *entry;
2141 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2142 entry = &cas->entry[cas->nr++];
2143 memset(entry, 0, sizeof(*entry));
2144 entry->refname = xmemdupz(refname, refnamelen);
2148 int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2151 struct push_cas *entry;
2154 /* "--no-<option>" */
2155 clear_cas_option(cas);
2160 /* just "--<option>" */
2161 cas->use_tracking_for_rest = 1;
2165 /* "--<option>=refname" or "--<option>=refname:value" */
2166 colon = strchrnul(arg, ':');
2167 entry = add_cas_entry(cas, arg, colon - arg);
2169 entry->use_tracking = 1;
2170 else if (get_sha1(colon + 1, entry->expect))
2171 return error("cannot parse expected object name '%s'", colon + 1);
2175 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2177 return parse_push_cas_option(opt->value, arg, unset);
2180 int is_empty_cas(const struct push_cas_option *cas)
2182 return !cas->use_tracking_for_rest && !cas->nr;
2186 * Look at remote.fetch refspec and see if we have a remote
2187 * tracking branch for the refname there. Fill its current
2189 * If we cannot do so, return negative to signal an error.
2191 static int remote_tracking(struct remote *remote, const char *refname,
2192 unsigned char sha1[20])
2196 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2198 return -1; /* no tracking ref for refname at remote */
2199 if (read_ref(dst, sha1))
2200 return -1; /* we know what the tracking ref is but we cannot read it */
2204 static void apply_cas(struct push_cas_option *cas,
2205 struct remote *remote,
2210 /* Find an explicit --<option>=<name>[:<value>] entry */
2211 for (i = 0; i < cas->nr; i++) {
2212 struct push_cas *entry = &cas->entry[i];
2213 if (!refname_match(entry->refname, ref->name))
2215 ref->expect_old_sha1 = 1;
2216 if (!entry->use_tracking)
2217 hashcpy(ref->old_sha1_expect, cas->entry[i].expect);
2218 else if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2219 ref->expect_old_no_trackback = 1;
2223 /* Are we using "--<option>" to cover all? */
2224 if (!cas->use_tracking_for_rest)
2227 ref->expect_old_sha1 = 1;
2228 if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2229 ref->expect_old_no_trackback = 1;
2232 void apply_push_cas(struct push_cas_option *cas,
2233 struct remote *remote,
2234 struct ref *remote_refs)
2237 for (ref = remote_refs; ref; ref = ref->next)
2238 apply_cas(cas, remote, ref);