9 static struct refspec s_tag_refspec = {
17 const struct refspec *tag_refspec = &s_tag_refspec;
19 struct counted_string {
26 struct counted_string *instead_of;
31 static struct remote **remotes;
32 static int remotes_alloc;
33 static int remotes_nr;
35 static struct branch **branches;
36 static int branches_alloc;
37 static int branches_nr;
39 static struct branch *current_branch;
40 static const char *default_remote_name;
42 static struct rewrite **rewrite;
43 static int rewrite_alloc;
44 static int rewrite_nr;
46 #define BUF_SIZE (2048)
47 static char buffer[BUF_SIZE];
49 static const char *alias_url(const char *url)
53 struct counted_string *longest;
58 for (i = 0; i < rewrite_nr; i++) {
61 for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
62 if (!prefixcmp(url, rewrite[i]->instead_of[j].s) &&
64 longest->len < rewrite[i]->instead_of[j].len)) {
65 longest = &(rewrite[i]->instead_of[j]);
73 ret = xmalloc(rewrite[longest_i]->baselen +
74 (strlen(url) - longest->len) + 1);
75 strcpy(ret, rewrite[longest_i]->base);
76 strcpy(ret + rewrite[longest_i]->baselen, url + longest->len);
80 static void add_push_refspec(struct remote *remote, const char *ref)
82 ALLOC_GROW(remote->push_refspec,
83 remote->push_refspec_nr + 1,
84 remote->push_refspec_alloc);
85 remote->push_refspec[remote->push_refspec_nr++] = ref;
88 static void add_fetch_refspec(struct remote *remote, const char *ref)
90 ALLOC_GROW(remote->fetch_refspec,
91 remote->fetch_refspec_nr + 1,
92 remote->fetch_refspec_alloc);
93 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
96 static void add_url(struct remote *remote, const char *url)
98 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
99 remote->url[remote->url_nr++] = url;
102 static void add_url_alias(struct remote *remote, const char *url)
104 add_url(remote, alias_url(url));
107 static struct remote *make_remote(const char *name, int len)
112 for (i = 0; i < remotes_nr; i++) {
113 if (len ? (!strncmp(name, remotes[i]->name, len) &&
114 !remotes[i]->name[len]) :
115 !strcmp(name, remotes[i]->name))
119 ret = xcalloc(1, sizeof(struct remote));
120 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
121 remotes[remotes_nr++] = ret;
123 ret->name = xstrndup(name, len);
125 ret->name = xstrdup(name);
129 static void add_merge(struct branch *branch, const char *name)
131 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
132 branch->merge_alloc);
133 branch->merge_name[branch->merge_nr++] = name;
136 static struct branch *make_branch(const char *name, int len)
142 for (i = 0; i < branches_nr; i++) {
143 if (len ? (!strncmp(name, branches[i]->name, len) &&
144 !branches[i]->name[len]) :
145 !strcmp(name, branches[i]->name))
149 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
150 ret = xcalloc(1, sizeof(struct branch));
151 branches[branches_nr++] = ret;
153 ret->name = xstrndup(name, len);
155 ret->name = xstrdup(name);
156 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
157 strcpy(refname, "refs/heads/");
158 strcpy(refname + strlen("refs/heads/"), ret->name);
159 ret->refname = refname;
164 static struct rewrite *make_rewrite(const char *base, int len)
169 for (i = 0; i < rewrite_nr; i++) {
171 ? (len == rewrite[i]->baselen &&
172 !strncmp(base, rewrite[i]->base, len))
173 : !strcmp(base, rewrite[i]->base))
177 ALLOC_GROW(rewrite, rewrite_nr + 1, rewrite_alloc);
178 ret = xcalloc(1, sizeof(struct rewrite));
179 rewrite[rewrite_nr++] = ret;
181 ret->base = xstrndup(base, len);
185 ret->base = xstrdup(base);
186 ret->baselen = strlen(base);
191 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
193 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
194 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
195 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
196 rewrite->instead_of_nr++;
199 static void read_remotes_file(struct remote *remote)
201 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
205 remote->origin = REMOTE_REMOTES;
206 while (fgets(buffer, BUF_SIZE, f)) {
210 if (!prefixcmp(buffer, "URL:")) {
213 } else if (!prefixcmp(buffer, "Push:")) {
216 } else if (!prefixcmp(buffer, "Pull:")) {
228 while (isspace(p[-1]))
231 switch (value_list) {
233 add_url_alias(remote, xstrdup(s));
236 add_push_refspec(remote, xstrdup(s));
239 add_fetch_refspec(remote, xstrdup(s));
246 static void read_branches_file(struct remote *remote)
248 const char *slash = strchr(remote->name, '/');
250 struct strbuf branch = STRBUF_INIT;
251 int n = slash ? slash - remote->name : 1000;
252 FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
258 s = fgets(buffer, BUF_SIZE, f);
266 remote->origin = REMOTE_BRANCHES;
268 while (isspace(p[-1]))
272 len += strlen(slash);
273 p = xmalloc(len + 1);
279 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
280 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
281 * the partial URL obtained from the branches file plus
282 * "/netdev-2.6" and does not store it in any tracking ref.
283 * #branch specifier in the file is ignored.
285 * Otherwise, the branches file would have URL and optionally
286 * #branch specified. The "master" (or specified) branch is
287 * fetched and stored in the local branch of the same name.
289 frag = strchr(p, '#');
292 strbuf_addf(&branch, "refs/heads/%s", frag);
294 strbuf_addstr(&branch, "refs/heads/master");
296 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
298 strbuf_reset(&branch);
299 strbuf_addstr(&branch, "HEAD:");
301 add_url_alias(remote, p);
302 add_fetch_refspec(remote, strbuf_detach(&branch, 0));
304 * Cogito compatible push: push current HEAD to remote #branch
305 * (master if missing)
307 strbuf_init(&branch, 0);
308 strbuf_addstr(&branch, "HEAD");
310 strbuf_addf(&branch, ":refs/heads/%s", frag);
312 strbuf_addstr(&branch, ":refs/heads/master");
313 add_push_refspec(remote, strbuf_detach(&branch, 0));
314 remote->fetch_tags = 1; /* always auto-follow */
317 static int handle_config(const char *key, const char *value, void *cb)
321 struct remote *remote;
322 struct branch *branch;
323 if (!prefixcmp(key, "branch.")) {
325 subkey = strrchr(name, '.');
328 branch = make_branch(name, subkey - name);
329 if (!strcmp(subkey, ".remote")) {
331 return config_error_nonbool(key);
332 branch->remote_name = xstrdup(value);
333 if (branch == current_branch)
334 default_remote_name = branch->remote_name;
335 } else if (!strcmp(subkey, ".merge")) {
337 return config_error_nonbool(key);
338 add_merge(branch, xstrdup(value));
342 if (!prefixcmp(key, "url.")) {
343 struct rewrite *rewrite;
345 subkey = strrchr(name, '.');
348 rewrite = make_rewrite(name, subkey - name);
349 if (!strcmp(subkey, ".insteadof")) {
351 return config_error_nonbool(key);
352 add_instead_of(rewrite, xstrdup(value));
355 if (prefixcmp(key, "remote."))
359 warning("Config remote shorthand cannot begin with '/': %s",
363 subkey = strrchr(name, '.');
365 return error("Config with no key for remote %s", name);
366 remote = make_remote(name, subkey - name);
367 remote->origin = REMOTE_CONFIG;
368 if (!strcmp(subkey, ".mirror"))
369 remote->mirror = git_config_bool(key, value);
370 else if (!strcmp(subkey, ".skipdefaultupdate"))
371 remote->skip_default_update = git_config_bool(key, value);
373 else if (!strcmp(subkey, ".url")) {
375 if (git_config_string(&v, key, value))
378 } else if (!strcmp(subkey, ".push")) {
380 if (git_config_string(&v, key, value))
382 add_push_refspec(remote, v);
383 } else if (!strcmp(subkey, ".fetch")) {
385 if (git_config_string(&v, key, value))
387 add_fetch_refspec(remote, v);
388 } else if (!strcmp(subkey, ".receivepack")) {
390 if (git_config_string(&v, key, value))
392 if (!remote->receivepack)
393 remote->receivepack = v;
395 error("more than one receivepack given, using the first");
396 } else if (!strcmp(subkey, ".uploadpack")) {
398 if (git_config_string(&v, key, value))
400 if (!remote->uploadpack)
401 remote->uploadpack = v;
403 error("more than one uploadpack given, using the first");
404 } else if (!strcmp(subkey, ".tagopt")) {
405 if (!strcmp(value, "--no-tags"))
406 remote->fetch_tags = -1;
407 } else if (!strcmp(subkey, ".proxy")) {
408 return git_config_string((const char **)&remote->http_proxy,
414 static void alias_all_urls(void)
417 for (i = 0; i < remotes_nr; i++) {
420 for (j = 0; j < remotes[i]->url_nr; j++) {
421 remotes[i]->url[j] = alias_url(remotes[i]->url[j]);
426 static void read_config(void)
428 unsigned char sha1[20];
429 const char *head_ref;
431 if (default_remote_name) // did this already
433 default_remote_name = xstrdup("origin");
434 current_branch = NULL;
435 head_ref = resolve_ref("HEAD", sha1, 0, &flag);
436 if (head_ref && (flag & REF_ISSYMREF) &&
437 !prefixcmp(head_ref, "refs/heads/")) {
439 make_branch(head_ref + strlen("refs/heads/"), 0);
441 git_config(handle_config, NULL);
446 * We need to make sure the tracking branches are well formed, but a
447 * wildcard refspec in "struct refspec" must have a trailing slash. We
448 * temporarily drop the trailing '/' while calling check_ref_format(),
449 * and put it back. The caller knows that a CHECK_REF_FORMAT_ONELEVEL
450 * error return is Ok for a wildcard refspec.
452 static int verify_refname(char *name, int is_glob)
454 int result, len = -1;
458 assert(name[len - 1] == '/');
459 name[len - 1] = '\0';
461 result = check_ref_format(name);
468 * This function frees a refspec array.
469 * Warning: code paths should be checked to ensure that the src
470 * and dst pointers are always freeable pointers as well
471 * as the refspec pointer itself.
473 static void free_refspecs(struct refspec *refspec, int nr_refspec)
480 for (i = 0; i < nr_refspec; i++) {
481 free(refspec[i].src);
482 free(refspec[i].dst);
487 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
491 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
493 for (i = 0; i < nr_refspec; i++) {
496 const char *lhs, *rhs;
506 rhs = strrchr(lhs, ':');
509 * Before going on, special case ":" (or "+:") as a refspec
512 if (!fetch && rhs == lhs && rhs[1] == '\0') {
518 size_t rlen = strlen(++rhs);
519 is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
520 rs[i].dst = xstrndup(rhs, rlen - is_glob);
523 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
524 if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
525 if ((rhs && !is_glob) || (!rhs && fetch))
529 } else if (rhs && is_glob) {
533 rs[i].pattern = is_glob;
534 rs[i].src = xstrndup(lhs, llen);
539 * - empty is allowed; it means HEAD.
540 * - otherwise it must be a valid looking ref.
545 st = verify_refname(rs[i].src, is_glob);
546 if (st && st != CHECK_REF_FORMAT_ONELEVEL)
551 * - missing is ok, and is same as empty.
552 * - empty is ok; it means not to store.
553 * - otherwise it must be a valid looking ref.
557 } else if (!*rs[i].dst) {
560 st = verify_refname(rs[i].dst, is_glob);
561 if (st && st != CHECK_REF_FORMAT_ONELEVEL)
567 * - empty is allowed; it means delete.
568 * - when wildcarded, it must be a valid looking ref.
569 * - otherwise, it must be an extended SHA-1, but
570 * there is no existing way to validate this.
575 st = verify_refname(rs[i].src, is_glob);
576 if (st && st != CHECK_REF_FORMAT_ONELEVEL)
580 ; /* anything goes, for now */
583 * - missing is allowed, but LHS then must be a
585 * - empty is not allowed.
586 * - otherwise it must be a valid looking ref.
589 st = verify_refname(rs[i].src, is_glob);
590 if (st && st != CHECK_REF_FORMAT_ONELEVEL)
592 } else if (!*rs[i].dst) {
595 st = verify_refname(rs[i].dst, is_glob);
596 if (st && st != CHECK_REF_FORMAT_ONELEVEL)
606 * nr_refspec must be greater than zero and i must be valid
607 * since it is only possible to reach this point from within
608 * the for loop above.
610 free_refspecs(rs, i+1);
613 die("Invalid refspec '%s'", refspec[i]);
616 int valid_fetch_refspec(const char *fetch_refspec_str)
618 const char *fetch_refspec[] = { fetch_refspec_str };
619 struct refspec *refspec;
621 refspec = parse_refspec_internal(1, fetch_refspec, 1, 1);
622 free_refspecs(refspec, 1);
626 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
628 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
631 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
633 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
636 static int valid_remote_nick(const char *name)
638 if (!name[0] || is_dot_or_dotdot(name))
640 return !strchr(name, '/'); /* no slash */
643 struct remote *remote_get(const char *name)
649 name = default_remote_name;
650 ret = make_remote(name, 0);
651 if (valid_remote_nick(name)) {
653 read_remotes_file(ret);
655 read_branches_file(ret);
658 add_url_alias(ret, name);
661 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
662 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
666 int for_each_remote(each_remote_fn fn, void *priv)
670 for (i = 0; i < remotes_nr && !result; i++) {
671 struct remote *r = remotes[i];
675 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
678 r->push = parse_push_refspec(r->push_refspec_nr,
680 result = fn(r, priv);
685 void ref_remove_duplicates(struct ref *ref_map)
689 for (; ref_map; ref_map = ref_map->next) {
690 if (!ref_map->peer_ref)
692 posn = &ref_map->next;
694 if ((*posn)->peer_ref &&
695 !strcmp((*posn)->peer_ref->name,
696 ref_map->peer_ref->name)) {
697 if (strcmp((*posn)->name, ref_map->name))
698 die("%s tracks both %s and %s",
699 ref_map->peer_ref->name,
700 (*posn)->name, ref_map->name);
701 next = (*posn)->next;
702 free((*posn)->peer_ref);
706 posn = &(*posn)->next;
712 int remote_has_url(struct remote *remote, const char *url)
715 for (i = 0; i < remote->url_nr; i++) {
716 if (!strcmp(remote->url[i], url))
722 static int match_name_with_pattern(const char *key, const char *name)
724 int ret = !prefixcmp(key, name);
728 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
730 int find_src = refspec->src == NULL;
731 char *needle, **result;
736 return error("find_tracking: need either src or dst");
737 needle = refspec->dst;
738 result = &refspec->src;
740 needle = refspec->src;
741 result = &refspec->dst;
744 for (i = 0; i < remote->fetch_refspec_nr; i++) {
745 struct refspec *fetch = &remote->fetch[i];
746 const char *key = find_src ? fetch->dst : fetch->src;
747 const char *value = find_src ? fetch->src : fetch->dst;
750 if (fetch->pattern) {
751 if (match_name_with_pattern(key, needle)) {
752 *result = xmalloc(strlen(value) +
755 strcpy(*result, value);
756 strcpy(*result + strlen(value),
757 needle + strlen(key));
758 refspec->force = fetch->force;
761 } else if (!strcmp(needle, key)) {
762 *result = xstrdup(value);
763 refspec->force = fetch->force;
770 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
773 size_t len = strlen(name);
774 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
775 memcpy(ref->name, prefix, prefixlen);
776 memcpy(ref->name + prefixlen, name, len);
780 struct ref *alloc_ref(const char *name)
782 return alloc_ref_with_prefix("", 0, name);
785 static struct ref *copy_ref(const struct ref *ref)
787 struct ref *ret = xmalloc(sizeof(struct ref) + strlen(ref->name) + 1);
788 memcpy(ret, ref, sizeof(struct ref) + strlen(ref->name) + 1);
793 struct ref *copy_ref_list(const struct ref *ref)
795 struct ref *ret = NULL;
796 struct ref **tail = &ret;
798 *tail = copy_ref(ref);
800 tail = &((*tail)->next);
805 static void free_ref(struct ref *ref)
809 free(ref->remote_status);
814 void free_refs(struct ref *ref)
825 static int count_refspec_match(const char *pattern,
827 struct ref **matched_ref)
829 int patlen = strlen(pattern);
830 struct ref *matched_weak = NULL;
831 struct ref *matched = NULL;
835 for (weak_match = match = 0; refs; refs = refs->next) {
836 char *name = refs->name;
837 int namelen = strlen(name);
839 if (!refname_match(pattern, name, ref_rev_parse_rules))
842 /* A match is "weak" if it is with refs outside
843 * heads or tags, and did not specify the pattern
844 * in full (e.g. "refs/remotes/origin/master") or at
845 * least from the toplevel (e.g. "remotes/origin/master");
846 * otherwise "git push $URL master" would result in
847 * ambiguity between remotes/origin/master and heads/master
848 * at the remote site.
850 if (namelen != patlen &&
851 patlen != namelen - 5 &&
852 prefixcmp(name, "refs/heads/") &&
853 prefixcmp(name, "refs/tags/")) {
854 /* We want to catch the case where only weak
855 * matches are found and there are multiple
856 * matches, and where more than one strong
857 * matches are found, as ambiguous. One
858 * strong match with zero or more weak matches
859 * are acceptable as a unique match.
870 *matched_ref = matched_weak;
874 *matched_ref = matched;
879 static void tail_link_ref(struct ref *ref, struct ref ***tail)
887 static struct ref *try_explicit_object_name(const char *name)
889 unsigned char sha1[20];
893 ref = alloc_ref("(delete)");
894 hashclr(ref->new_sha1);
897 if (get_sha1(name, sha1))
899 ref = alloc_ref(name);
900 hashcpy(ref->new_sha1, sha1);
904 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
906 struct ref *ret = alloc_ref(name);
907 tail_link_ref(ret, tail);
911 static char *guess_ref(const char *name, struct ref *peer)
913 struct strbuf buf = STRBUF_INIT;
914 unsigned char sha1[20];
916 const char *r = resolve_ref(peer->name, sha1, 1, NULL);
920 if (!prefixcmp(r, "refs/heads/"))
921 strbuf_addstr(&buf, "refs/heads/");
922 else if (!prefixcmp(r, "refs/tags/"))
923 strbuf_addstr(&buf, "refs/tags/");
927 strbuf_addstr(&buf, name);
928 return strbuf_detach(&buf, NULL);
931 static int match_explicit(struct ref *src, struct ref *dst,
932 struct ref ***dst_tail,
935 struct ref *matched_src, *matched_dst;
937 const char *dst_value = rs->dst;
940 if (rs->pattern || rs->matching)
943 matched_src = matched_dst = NULL;
944 switch (count_refspec_match(rs->src, src, &matched_src)) {
948 /* The source could be in the get_sha1() format
949 * not a reference name. :refs/other is a
950 * way to delete 'other' ref at the remote end.
952 matched_src = try_explicit_object_name(rs->src);
954 return error("src refspec %s does not match any.", rs->src);
957 return error("src refspec %s matches more than one.", rs->src);
961 unsigned char sha1[20];
964 dst_value = resolve_ref(matched_src->name, sha1, 1, &flag);
966 ((flag & REF_ISSYMREF) &&
967 prefixcmp(dst_value, "refs/heads/")))
968 die("%s cannot be resolved to branch.",
972 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
976 if (!memcmp(dst_value, "refs/", 5))
977 matched_dst = make_linked_ref(dst_value, dst_tail);
978 else if((dst_guess = guess_ref(dst_value, matched_src)))
979 matched_dst = make_linked_ref(dst_guess, dst_tail);
981 error("unable to push to unqualified destination: %s\n"
982 "The destination refspec neither matches an "
983 "existing ref on the remote nor\n"
984 "begins with refs/, and we are unable to "
985 "guess a prefix based on the source ref.",
990 error("dst refspec %s matches more than one.",
996 if (matched_dst->peer_ref)
997 return error("dst ref %s receives from more than one src.",
1000 matched_dst->peer_ref = matched_src;
1001 matched_dst->force = rs->force;
1006 static int match_explicit_refs(struct ref *src, struct ref *dst,
1007 struct ref ***dst_tail, struct refspec *rs,
1011 for (i = errs = 0; i < rs_nr; i++)
1012 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1016 static const struct refspec *check_pattern_match(const struct refspec *rs,
1018 const struct ref *src)
1021 int matching_refs = -1;
1022 for (i = 0; i < rs_nr; i++) {
1023 if (rs[i].matching &&
1024 (matching_refs == -1 || rs[i].force)) {
1029 if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name))
1032 if (matching_refs != -1)
1033 return rs + matching_refs;
1039 * Note. This is used only by "push"; refspec matching rules for
1040 * push and fetch are subtly different, so do not try to reuse it
1043 int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
1044 int nr_refspec, const char **refspec, int flags)
1047 int send_all = flags & MATCH_REFS_ALL;
1048 int send_mirror = flags & MATCH_REFS_MIRROR;
1049 static const char *default_refspec[] = { ":", 0 };
1053 refspec = default_refspec;
1055 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1056 if (match_explicit_refs(src, dst, dst_tail, rs, nr_refspec))
1059 /* pick the remainder */
1060 for ( ; src; src = src->next) {
1061 struct ref *dst_peer;
1062 const struct refspec *pat = NULL;
1067 pat = check_pattern_match(rs, nr_refspec, src);
1071 if (pat->matching) {
1073 * "matching refs"; traditionally we pushed everything
1074 * including refs outside refs/heads/ hierarchy, but
1075 * that does not make much sense these days.
1077 if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
1079 dst_name = xstrdup(src->name);
1082 const char *dst_side = pat->dst ? pat->dst : pat->src;
1083 dst_name = xmalloc(strlen(dst_side) +
1085 strlen(pat->src) + 2);
1086 strcpy(dst_name, dst_side);
1087 strcat(dst_name, src->name + strlen(pat->src));
1089 dst_peer = find_ref_by_name(dst, dst_name);
1091 if (dst_peer->peer_ref)
1092 /* We're already sending something to this ref. */
1096 if (pat->matching && !(send_all || send_mirror))
1098 * Remote doesn't have it, and we have no
1099 * explicit pattern, and we don't have
1100 * --all nor --mirror.
1104 /* Create a new one and link it */
1105 dst_peer = make_linked_ref(dst_name, dst_tail);
1106 hashcpy(dst_peer->new_sha1, src->new_sha1);
1108 dst_peer->peer_ref = src;
1109 dst_peer->force = pat->force;
1116 struct branch *branch_get(const char *name)
1121 if (!name || !*name || !strcmp(name, "HEAD"))
1122 ret = current_branch;
1124 ret = make_branch(name, 0);
1125 if (ret && ret->remote_name) {
1126 ret->remote = remote_get(ret->remote_name);
1127 if (ret->merge_nr) {
1129 ret->merge = xcalloc(sizeof(*ret->merge),
1131 for (i = 0; i < ret->merge_nr; i++) {
1132 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1133 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1134 remote_find_tracking(ret->remote,
1142 int branch_has_merge_config(struct branch *branch)
1144 return branch && !!branch->merge;
1147 int branch_merge_matches(struct branch *branch,
1149 const char *refname)
1151 if (!branch || i < 0 || i >= branch->merge_nr)
1153 return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1156 static struct ref *get_expanded_map(const struct ref *remote_refs,
1157 const struct refspec *refspec)
1159 const struct ref *ref;
1160 struct ref *ret = NULL;
1161 struct ref **tail = &ret;
1163 int remote_prefix_len = strlen(refspec->src);
1164 int local_prefix_len = strlen(refspec->dst);
1166 for (ref = remote_refs; ref; ref = ref->next) {
1167 if (strchr(ref->name, '^'))
1168 continue; /* a dereference item */
1169 if (match_name_with_pattern(refspec->src, ref->name)) {
1171 struct ref *cpy = copy_ref(ref);
1172 match = ref->name + remote_prefix_len;
1174 cpy->peer_ref = alloc_ref_with_prefix(refspec->dst,
1175 local_prefix_len, match);
1177 cpy->peer_ref->force = 1;
1186 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1188 const struct ref *ref;
1189 for (ref = refs; ref; ref = ref->next) {
1190 if (refname_match(name, ref->name, ref_fetch_rules))
1196 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1198 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1203 return copy_ref(ref);
1206 static struct ref *get_local_ref(const char *name)
1211 if (!prefixcmp(name, "refs/"))
1212 return alloc_ref(name);
1214 if (!prefixcmp(name, "heads/") ||
1215 !prefixcmp(name, "tags/") ||
1216 !prefixcmp(name, "remotes/"))
1217 return alloc_ref_with_prefix("refs/", 5, name);
1219 return alloc_ref_with_prefix("refs/heads/", 11, name);
1222 int get_fetch_map(const struct ref *remote_refs,
1223 const struct refspec *refspec,
1227 struct ref *ref_map, **rmp;
1229 if (refspec->pattern) {
1230 ref_map = get_expanded_map(remote_refs, refspec);
1232 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1234 ref_map = get_remote_ref(remote_refs, name);
1235 if (!missing_ok && !ref_map)
1236 die("Couldn't find remote ref %s", name);
1238 ref_map->peer_ref = get_local_ref(refspec->dst);
1239 if (ref_map->peer_ref && refspec->force)
1240 ref_map->peer_ref->force = 1;
1244 for (rmp = &ref_map; *rmp; ) {
1245 if ((*rmp)->peer_ref) {
1246 int st = check_ref_format((*rmp)->peer_ref->name + 5);
1247 if (st && st != CHECK_REF_FORMAT_ONELEVEL) {
1248 struct ref *ignore = *rmp;
1249 error("* Ignoring funny ref '%s' locally",
1250 (*rmp)->peer_ref->name);
1251 *rmp = (*rmp)->next;
1252 free(ignore->peer_ref);
1257 rmp = &((*rmp)->next);
1261 tail_link_ref(ref_map, tail);
1266 int resolve_remote_symref(struct ref *ref, struct ref *list)
1270 for (; list; list = list->next)
1271 if (!strcmp(ref->symref, list->name)) {
1272 hashcpy(ref->old_sha1, list->old_sha1);
1279 * Return true if there is anything to report, otherwise false.
1281 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1283 unsigned char sha1[20];
1284 struct commit *ours, *theirs;
1286 struct rev_info revs;
1287 const char *rev_argv[10], *base;
1291 * Nothing to report unless we are marked to build on top of
1295 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1299 * If what we used to build on no longer exists, there is
1300 * nothing to report.
1302 base = branch->merge[0]->dst;
1303 if (!resolve_ref(base, sha1, 1, NULL))
1305 theirs = lookup_commit(sha1);
1309 if (!resolve_ref(branch->refname, sha1, 1, NULL))
1311 ours = lookup_commit(sha1);
1315 /* are we the same? */
1319 /* Run "rev-list --left-right ours...theirs" internally... */
1321 rev_argv[rev_argc++] = NULL;
1322 rev_argv[rev_argc++] = "--left-right";
1323 rev_argv[rev_argc++] = symmetric;
1324 rev_argv[rev_argc++] = "--";
1325 rev_argv[rev_argc] = NULL;
1327 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1328 strcpy(symmetric + 40, "...");
1329 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1331 init_revisions(&revs, NULL);
1332 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1333 prepare_revision_walk(&revs);
1335 /* ... and count the commits on each side. */
1339 struct commit *c = get_revision(&revs);
1342 if (c->object.flags & SYMMETRIC_LEFT)
1348 /* clear object flags smudged by the above traversal */
1349 clear_commit_marks(ours, ALL_REV_FLAGS);
1350 clear_commit_marks(theirs, ALL_REV_FLAGS);
1355 * Return true when there is anything to report, otherwise false.
1357 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1359 int num_ours, num_theirs;
1362 if (!stat_tracking_info(branch, &num_ours, &num_theirs))
1365 base = branch->merge[0]->dst;
1366 if (!prefixcmp(base, "refs/remotes/")) {
1367 base += strlen("refs/remotes/");
1370 strbuf_addf(sb, "Your branch is ahead of '%s' "
1371 "by %d commit%s.\n",
1372 base, num_ours, (num_ours == 1) ? "" : "s");
1374 strbuf_addf(sb, "Your branch is behind '%s' "
1376 "and can be fast-forwarded.\n",
1377 base, num_theirs, (num_theirs == 1) ? "" : "s");
1379 strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
1380 "and have %d and %d different commit(s) each, "
1382 base, num_ours, num_theirs);