8 static struct refspec s_tag_refspec
= {
16 const struct refspec
*tag_refspec
= &s_tag_refspec
;
18 struct counted_string
{
25 struct counted_string
*instead_of
;
30 static struct remote
**remotes
;
31 static int remotes_alloc
;
32 static int remotes_nr
;
34 static struct branch
**branches
;
35 static int branches_alloc
;
36 static int branches_nr
;
38 static struct branch
*current_branch
;
39 static const char *default_remote_name
;
41 static struct rewrite
**rewrite
;
42 static int rewrite_alloc
;
43 static int rewrite_nr
;
45 #define BUF_SIZE (2048)
46 static char buffer
[BUF_SIZE
];
48 static const char *alias_url(const char *url
)
52 struct counted_string
*longest
;
57 for (i
= 0; i
< rewrite_nr
; i
++) {
60 for (j
= 0; j
< rewrite
[i
]->instead_of_nr
; j
++) {
61 if (!prefixcmp(url
, rewrite
[i
]->instead_of
[j
].s
) &&
63 longest
->len
< rewrite
[i
]->instead_of
[j
].len
)) {
64 longest
= &(rewrite
[i
]->instead_of
[j
]);
72 ret
= xmalloc(rewrite
[longest_i
]->baselen
+
73 (strlen(url
) - longest
->len
) + 1);
74 strcpy(ret
, rewrite
[longest_i
]->base
);
75 strcpy(ret
+ rewrite
[longest_i
]->baselen
, url
+ longest
->len
);
79 static void add_push_refspec(struct remote
*remote
, const char *ref
)
81 ALLOC_GROW(remote
->push_refspec
,
82 remote
->push_refspec_nr
+ 1,
83 remote
->push_refspec_alloc
);
84 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
87 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
89 ALLOC_GROW(remote
->fetch_refspec
,
90 remote
->fetch_refspec_nr
+ 1,
91 remote
->fetch_refspec_alloc
);
92 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
95 static void add_url(struct remote
*remote
, const char *url
)
97 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
98 remote
->url
[remote
->url_nr
++] = url
;
101 static void add_url_alias(struct remote
*remote
, const char *url
)
103 add_url(remote
, alias_url(url
));
106 static struct remote
*make_remote(const char *name
, int len
)
111 for (i
= 0; i
< remotes_nr
; i
++) {
112 if (len
? (!strncmp(name
, remotes
[i
]->name
, len
) &&
113 !remotes
[i
]->name
[len
]) :
114 !strcmp(name
, remotes
[i
]->name
))
118 ret
= xcalloc(1, sizeof(struct remote
));
119 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
120 remotes
[remotes_nr
++] = ret
;
122 ret
->name
= xstrndup(name
, len
);
124 ret
->name
= xstrdup(name
);
128 static void add_merge(struct branch
*branch
, const char *name
)
130 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
131 branch
->merge_alloc
);
132 branch
->merge_name
[branch
->merge_nr
++] = name
;
135 static struct branch
*make_branch(const char *name
, int len
)
141 for (i
= 0; i
< branches_nr
; i
++) {
142 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
143 !branches
[i
]->name
[len
]) :
144 !strcmp(name
, branches
[i
]->name
))
148 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
149 ret
= xcalloc(1, sizeof(struct branch
));
150 branches
[branches_nr
++] = ret
;
152 ret
->name
= xstrndup(name
, len
);
154 ret
->name
= xstrdup(name
);
155 refname
= xmalloc(strlen(name
) + strlen("refs/heads/") + 1);
156 strcpy(refname
, "refs/heads/");
157 strcpy(refname
+ strlen("refs/heads/"), ret
->name
);
158 ret
->refname
= refname
;
163 static struct rewrite
*make_rewrite(const char *base
, int len
)
168 for (i
= 0; i
< rewrite_nr
; i
++) {
170 ? (len
== rewrite
[i
]->baselen
&&
171 !strncmp(base
, rewrite
[i
]->base
, len
))
172 : !strcmp(base
, rewrite
[i
]->base
))
176 ALLOC_GROW(rewrite
, rewrite_nr
+ 1, rewrite_alloc
);
177 ret
= xcalloc(1, sizeof(struct rewrite
));
178 rewrite
[rewrite_nr
++] = ret
;
180 ret
->base
= xstrndup(base
, len
);
184 ret
->base
= xstrdup(base
);
185 ret
->baselen
= strlen(base
);
190 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
192 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
193 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
194 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
195 rewrite
->instead_of_nr
++;
198 static void read_remotes_file(struct remote
*remote
)
200 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
204 remote
->origin
= REMOTE_REMOTES
;
205 while (fgets(buffer
, BUF_SIZE
, f
)) {
209 if (!prefixcmp(buffer
, "URL:")) {
212 } else if (!prefixcmp(buffer
, "Push:")) {
215 } else if (!prefixcmp(buffer
, "Pull:")) {
227 while (isspace(p
[-1]))
230 switch (value_list
) {
232 add_url_alias(remote
, xstrdup(s
));
235 add_push_refspec(remote
, xstrdup(s
));
238 add_fetch_refspec(remote
, xstrdup(s
));
245 static void read_branches_file(struct remote
*remote
)
247 const char *slash
= strchr(remote
->name
, '/');
249 struct strbuf branch
= STRBUF_INIT
;
250 int n
= slash
? slash
- remote
->name
: 1000;
251 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
257 s
= fgets(buffer
, BUF_SIZE
, f
);
265 remote
->origin
= REMOTE_BRANCHES
;
267 while (isspace(p
[-1]))
271 len
+= strlen(slash
);
272 p
= xmalloc(len
+ 1);
278 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
279 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
280 * the partial URL obtained from the branches file plus
281 * "/netdev-2.6" and does not store it in any tracking ref.
282 * #branch specifier in the file is ignored.
284 * Otherwise, the branches file would have URL and optionally
285 * #branch specified. The "master" (or specified) branch is
286 * fetched and stored in the local branch of the same name.
288 frag
= strchr(p
, '#');
291 strbuf_addf(&branch
, "refs/heads/%s", frag
);
293 strbuf_addstr(&branch
, "refs/heads/master");
295 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
297 strbuf_reset(&branch
);
298 strbuf_addstr(&branch
, "HEAD:");
300 add_url_alias(remote
, p
);
301 add_fetch_refspec(remote
, strbuf_detach(&branch
, 0));
302 remote
->fetch_tags
= 1; /* always auto-follow */
305 static int handle_config(const char *key
, const char *value
, void *cb
)
309 struct remote
*remote
;
310 struct branch
*branch
;
311 if (!prefixcmp(key
, "branch.")) {
313 subkey
= strrchr(name
, '.');
316 branch
= make_branch(name
, subkey
- name
);
317 if (!strcmp(subkey
, ".remote")) {
319 return config_error_nonbool(key
);
320 branch
->remote_name
= xstrdup(value
);
321 if (branch
== current_branch
)
322 default_remote_name
= branch
->remote_name
;
323 } else if (!strcmp(subkey
, ".merge")) {
325 return config_error_nonbool(key
);
326 add_merge(branch
, xstrdup(value
));
330 if (!prefixcmp(key
, "url.")) {
331 struct rewrite
*rewrite
;
333 subkey
= strrchr(name
, '.');
336 rewrite
= make_rewrite(name
, subkey
- name
);
337 if (!strcmp(subkey
, ".insteadof")) {
339 return config_error_nonbool(key
);
340 add_instead_of(rewrite
, xstrdup(value
));
343 if (prefixcmp(key
, "remote."))
347 warning("Config remote shorthand cannot begin with '/': %s",
351 subkey
= strrchr(name
, '.');
353 return error("Config with no key for remote %s", name
);
354 remote
= make_remote(name
, subkey
- name
);
355 remote
->origin
= REMOTE_CONFIG
;
356 if (!strcmp(subkey
, ".mirror"))
357 remote
->mirror
= git_config_bool(key
, value
);
358 else if (!strcmp(subkey
, ".skipdefaultupdate"))
359 remote
->skip_default_update
= git_config_bool(key
, value
);
361 else if (!strcmp(subkey
, ".url")) {
363 if (git_config_string(&v
, key
, value
))
366 } else if (!strcmp(subkey
, ".push")) {
368 if (git_config_string(&v
, key
, value
))
370 add_push_refspec(remote
, v
);
371 } else if (!strcmp(subkey
, ".fetch")) {
373 if (git_config_string(&v
, key
, value
))
375 add_fetch_refspec(remote
, v
);
376 } else if (!strcmp(subkey
, ".receivepack")) {
378 if (git_config_string(&v
, key
, value
))
380 if (!remote
->receivepack
)
381 remote
->receivepack
= v
;
383 error("more than one receivepack given, using the first");
384 } else if (!strcmp(subkey
, ".uploadpack")) {
386 if (git_config_string(&v
, key
, value
))
388 if (!remote
->uploadpack
)
389 remote
->uploadpack
= v
;
391 error("more than one uploadpack given, using the first");
392 } else if (!strcmp(subkey
, ".tagopt")) {
393 if (!strcmp(value
, "--no-tags"))
394 remote
->fetch_tags
= -1;
395 } else if (!strcmp(subkey
, ".proxy")) {
396 return git_config_string((const char **)&remote
->http_proxy
,
402 static void alias_all_urls(void)
405 for (i
= 0; i
< remotes_nr
; i
++) {
408 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
409 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
]);
414 static void read_config(void)
416 unsigned char sha1
[20];
417 const char *head_ref
;
419 if (default_remote_name
) // did this already
421 default_remote_name
= xstrdup("origin");
422 current_branch
= NULL
;
423 head_ref
= resolve_ref("HEAD", sha1
, 0, &flag
);
424 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
425 !prefixcmp(head_ref
, "refs/heads/")) {
427 make_branch(head_ref
+ strlen("refs/heads/"), 0);
429 git_config(handle_config
, NULL
);
434 * We need to make sure the tracking branches are well formed, but a
435 * wildcard refspec in "struct refspec" must have a trailing slash. We
436 * temporarily drop the trailing '/' while calling check_ref_format(),
437 * and put it back. The caller knows that a CHECK_REF_FORMAT_ONELEVEL
438 * error return is Ok for a wildcard refspec.
440 static int verify_refname(char *name
, int is_glob
)
442 int result
, len
= -1;
446 assert(name
[len
- 1] == '/');
447 name
[len
- 1] = '\0';
449 result
= check_ref_format(name
);
456 * This function frees a refspec array.
457 * Warning: code paths should be checked to ensure that the src
458 * and dst pointers are always freeable pointers as well
459 * as the refspec pointer itself.
461 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
468 for (i
= 0; i
< nr_refspec
; i
++) {
469 free(refspec
[i
].src
);
470 free(refspec
[i
].dst
);
475 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
479 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
481 for (i
= 0; i
< nr_refspec
; i
++) {
484 const char *lhs
, *rhs
;
494 rhs
= strrchr(lhs
, ':');
497 * Before going on, special case ":" (or "+:") as a refspec
500 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
506 size_t rlen
= strlen(++rhs
);
507 is_glob
= (2 <= rlen
&& !strcmp(rhs
+ rlen
- 2, "/*"));
508 rs
[i
].dst
= xstrndup(rhs
, rlen
- is_glob
);
511 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
512 if (2 <= llen
&& !memcmp(lhs
+ llen
- 2, "/*", 2)) {
513 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
517 } else if (rhs
&& is_glob
) {
521 rs
[i
].pattern
= is_glob
;
522 rs
[i
].src
= xstrndup(lhs
, llen
);
527 * - empty is allowed; it means HEAD.
528 * - otherwise it must be a valid looking ref.
533 st
= verify_refname(rs
[i
].src
, is_glob
);
534 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
539 * - missing is ok, and is same as empty.
540 * - empty is ok; it means not to store.
541 * - otherwise it must be a valid looking ref.
545 } else if (!*rs
[i
].dst
) {
548 st
= verify_refname(rs
[i
].dst
, is_glob
);
549 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
555 * - empty is allowed; it means delete.
556 * - when wildcarded, it must be a valid looking ref.
557 * - otherwise, it must be an extended SHA-1, but
558 * there is no existing way to validate this.
563 st
= verify_refname(rs
[i
].src
, is_glob
);
564 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
568 ; /* anything goes, for now */
571 * - missing is allowed, but LHS then must be a
573 * - empty is not allowed.
574 * - otherwise it must be a valid looking ref.
577 st
= verify_refname(rs
[i
].src
, is_glob
);
578 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
580 } else if (!*rs
[i
].dst
) {
583 st
= verify_refname(rs
[i
].dst
, is_glob
);
584 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
594 * nr_refspec must be greater than zero and i must be valid
595 * since it is only possible to reach this point from within
596 * the for loop above.
598 free_refspecs(rs
, i
+1);
601 die("Invalid refspec '%s'", refspec
[i
]);
604 int valid_fetch_refspec(const char *fetch_refspec_str
)
606 const char *fetch_refspec
[] = { fetch_refspec_str
};
607 struct refspec
*refspec
;
609 refspec
= parse_refspec_internal(1, fetch_refspec
, 1, 1);
610 free_refspecs(refspec
, 1);
614 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
616 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
619 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
621 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
624 static int valid_remote_nick(const char *name
)
626 if (!name
[0] || /* not empty */
627 (name
[0] == '.' && /* not "." */
628 (!name
[1] || /* not ".." */
629 (name
[1] == '.' && !name
[2]))))
631 return !strchr(name
, '/'); /* no slash */
634 struct remote
*remote_get(const char *name
)
640 name
= default_remote_name
;
641 ret
= make_remote(name
, 0);
642 if (valid_remote_nick(name
)) {
644 read_remotes_file(ret
);
646 read_branches_file(ret
);
649 add_url_alias(ret
, name
);
652 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
653 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
657 int for_each_remote(each_remote_fn fn
, void *priv
)
661 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
662 struct remote
*r
= remotes
[i
];
666 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
669 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
671 result
= fn(r
, priv
);
676 void ref_remove_duplicates(struct ref
*ref_map
)
680 for (; ref_map
; ref_map
= ref_map
->next
) {
681 if (!ref_map
->peer_ref
)
683 posn
= &ref_map
->next
;
685 if ((*posn
)->peer_ref
&&
686 !strcmp((*posn
)->peer_ref
->name
,
687 ref_map
->peer_ref
->name
)) {
688 if (strcmp((*posn
)->name
, ref_map
->name
))
689 die("%s tracks both %s and %s",
690 ref_map
->peer_ref
->name
,
691 (*posn
)->name
, ref_map
->name
);
692 next
= (*posn
)->next
;
693 free((*posn
)->peer_ref
);
697 posn
= &(*posn
)->next
;
703 int remote_has_url(struct remote
*remote
, const char *url
)
706 for (i
= 0; i
< remote
->url_nr
; i
++) {
707 if (!strcmp(remote
->url
[i
], url
))
713 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
715 int find_src
= refspec
->src
== NULL
;
716 char *needle
, **result
;
721 return error("find_tracking: need either src or dst");
722 needle
= refspec
->dst
;
723 result
= &refspec
->src
;
725 needle
= refspec
->src
;
726 result
= &refspec
->dst
;
729 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++) {
730 struct refspec
*fetch
= &remote
->fetch
[i
];
731 const char *key
= find_src
? fetch
->dst
: fetch
->src
;
732 const char *value
= find_src
? fetch
->src
: fetch
->dst
;
735 if (fetch
->pattern
) {
736 if (!prefixcmp(needle
, key
)) {
737 *result
= xmalloc(strlen(value
) +
740 strcpy(*result
, value
);
741 strcpy(*result
+ strlen(value
),
742 needle
+ strlen(key
));
743 refspec
->force
= fetch
->force
;
746 } else if (!strcmp(needle
, key
)) {
747 *result
= xstrdup(value
);
748 refspec
->force
= fetch
->force
;
755 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
758 size_t len
= strlen(name
);
759 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
760 memcpy(ref
->name
, prefix
, prefixlen
);
761 memcpy(ref
->name
+ prefixlen
, name
, len
);
765 struct ref
*alloc_ref(const char *name
)
767 return alloc_ref_with_prefix("", 0, name
);
770 static struct ref
*copy_ref(const struct ref
*ref
)
772 struct ref
*ret
= xmalloc(sizeof(struct ref
) + strlen(ref
->name
) + 1);
773 memcpy(ret
, ref
, sizeof(struct ref
) + strlen(ref
->name
) + 1);
778 struct ref
*copy_ref_list(const struct ref
*ref
)
780 struct ref
*ret
= NULL
;
781 struct ref
**tail
= &ret
;
783 *tail
= copy_ref(ref
);
785 tail
= &((*tail
)->next
);
790 static void free_ref(struct ref
*ref
)
794 free(ref
->remote_status
);
799 void free_refs(struct ref
*ref
)
810 static int count_refspec_match(const char *pattern
,
812 struct ref
**matched_ref
)
814 int patlen
= strlen(pattern
);
815 struct ref
*matched_weak
= NULL
;
816 struct ref
*matched
= NULL
;
820 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
821 char *name
= refs
->name
;
822 int namelen
= strlen(name
);
824 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
827 /* A match is "weak" if it is with refs outside
828 * heads or tags, and did not specify the pattern
829 * in full (e.g. "refs/remotes/origin/master") or at
830 * least from the toplevel (e.g. "remotes/origin/master");
831 * otherwise "git push $URL master" would result in
832 * ambiguity between remotes/origin/master and heads/master
833 * at the remote site.
835 if (namelen
!= patlen
&&
836 patlen
!= namelen
- 5 &&
837 prefixcmp(name
, "refs/heads/") &&
838 prefixcmp(name
, "refs/tags/")) {
839 /* We want to catch the case where only weak
840 * matches are found and there are multiple
841 * matches, and where more than one strong
842 * matches are found, as ambiguous. One
843 * strong match with zero or more weak matches
844 * are acceptable as a unique match.
855 *matched_ref
= matched_weak
;
859 *matched_ref
= matched
;
864 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
872 static struct ref
*try_explicit_object_name(const char *name
)
874 unsigned char sha1
[20];
878 ref
= alloc_ref("(delete)");
879 hashclr(ref
->new_sha1
);
882 if (get_sha1(name
, sha1
))
884 ref
= alloc_ref(name
);
885 hashcpy(ref
->new_sha1
, sha1
);
889 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
891 struct ref
*ret
= alloc_ref(name
);
892 tail_link_ref(ret
, tail
);
896 static char *guess_ref(const char *name
, struct ref
*peer
)
898 struct strbuf buf
= STRBUF_INIT
;
899 unsigned char sha1
[20];
901 const char *r
= resolve_ref(peer
->name
, sha1
, 1, NULL
);
905 if (!prefixcmp(r
, "refs/heads/"))
906 strbuf_addstr(&buf
, "refs/heads/");
907 else if (!prefixcmp(r
, "refs/tags/"))
908 strbuf_addstr(&buf
, "refs/tags/");
912 strbuf_addstr(&buf
, name
);
913 return strbuf_detach(&buf
, NULL
);
916 static int match_explicit(struct ref
*src
, struct ref
*dst
,
917 struct ref
***dst_tail
,
920 struct ref
*matched_src
, *matched_dst
;
922 const char *dst_value
= rs
->dst
;
925 if (rs
->pattern
|| rs
->matching
)
928 matched_src
= matched_dst
= NULL
;
929 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
933 /* The source could be in the get_sha1() format
934 * not a reference name. :refs/other is a
935 * way to delete 'other' ref at the remote end.
937 matched_src
= try_explicit_object_name(rs
->src
);
939 return error("src refspec %s does not match any.", rs
->src
);
942 return error("src refspec %s matches more than one.", rs
->src
);
946 unsigned char sha1
[20];
949 dst_value
= resolve_ref(matched_src
->name
, sha1
, 1, &flag
);
951 ((flag
& REF_ISSYMREF
) &&
952 prefixcmp(dst_value
, "refs/heads/")))
953 die("%s cannot be resolved to branch.",
957 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
961 if (!memcmp(dst_value
, "refs/", 5))
962 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
963 else if((dst_guess
= guess_ref(dst_value
, matched_src
)))
964 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
966 error("unable to push to unqualified destination: %s\n"
967 "The destination refspec neither matches an "
968 "existing ref on the remote nor\n"
969 "begins with refs/, and we are unable to "
970 "guess a prefix based on the source ref.",
975 error("dst refspec %s matches more than one.",
981 if (matched_dst
->peer_ref
)
982 return error("dst ref %s receives from more than one src.",
985 matched_dst
->peer_ref
= matched_src
;
986 matched_dst
->force
= rs
->force
;
991 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
992 struct ref
***dst_tail
, struct refspec
*rs
,
996 for (i
= errs
= 0; i
< rs_nr
; i
++)
997 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1001 static const struct refspec
*check_pattern_match(const struct refspec
*rs
,
1003 const struct ref
*src
)
1006 int matching_refs
= -1;
1007 for (i
= 0; i
< rs_nr
; i
++) {
1008 if (rs
[i
].matching
&&
1009 (matching_refs
== -1 || rs
[i
].force
)) {
1014 if (rs
[i
].pattern
&& !prefixcmp(src
->name
, rs
[i
].src
))
1017 if (matching_refs
!= -1)
1018 return rs
+ matching_refs
;
1024 * Note. This is used only by "push"; refspec matching rules for
1025 * push and fetch are subtly different, so do not try to reuse it
1028 int match_refs(struct ref
*src
, struct ref
*dst
, struct ref
***dst_tail
,
1029 int nr_refspec
, const char **refspec
, int flags
)
1032 int send_all
= flags
& MATCH_REFS_ALL
;
1033 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1034 static const char *default_refspec
[] = { ":", 0 };
1038 refspec
= default_refspec
;
1040 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1041 if (match_explicit_refs(src
, dst
, dst_tail
, rs
, nr_refspec
))
1044 /* pick the remainder */
1045 for ( ; src
; src
= src
->next
) {
1046 struct ref
*dst_peer
;
1047 const struct refspec
*pat
= NULL
;
1052 pat
= check_pattern_match(rs
, nr_refspec
, src
);
1056 if (pat
->matching
) {
1058 * "matching refs"; traditionally we pushed everything
1059 * including refs outside refs/heads/ hierarchy, but
1060 * that does not make much sense these days.
1062 if (!send_mirror
&& prefixcmp(src
->name
, "refs/heads/"))
1064 dst_name
= xstrdup(src
->name
);
1067 const char *dst_side
= pat
->dst
? pat
->dst
: pat
->src
;
1068 dst_name
= xmalloc(strlen(dst_side
) +
1070 strlen(pat
->src
) + 2);
1071 strcpy(dst_name
, dst_side
);
1072 strcat(dst_name
, src
->name
+ strlen(pat
->src
));
1074 dst_peer
= find_ref_by_name(dst
, dst_name
);
1076 if (dst_peer
->peer_ref
)
1077 /* We're already sending something to this ref. */
1081 if (pat
->matching
&& !(send_all
|| send_mirror
))
1083 * Remote doesn't have it, and we have no
1084 * explicit pattern, and we don't have
1085 * --all nor --mirror.
1089 /* Create a new one and link it */
1090 dst_peer
= make_linked_ref(dst_name
, dst_tail
);
1091 hashcpy(dst_peer
->new_sha1
, src
->new_sha1
);
1093 dst_peer
->peer_ref
= src
;
1094 dst_peer
->force
= pat
->force
;
1101 struct branch
*branch_get(const char *name
)
1106 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1107 ret
= current_branch
;
1109 ret
= make_branch(name
, 0);
1110 if (ret
&& ret
->remote_name
) {
1111 ret
->remote
= remote_get(ret
->remote_name
);
1112 if (ret
->merge_nr
) {
1114 ret
->merge
= xcalloc(sizeof(*ret
->merge
),
1116 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1117 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1118 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1119 remote_find_tracking(ret
->remote
,
1127 int branch_has_merge_config(struct branch
*branch
)
1129 return branch
&& !!branch
->merge
;
1132 int branch_merge_matches(struct branch
*branch
,
1134 const char *refname
)
1136 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1138 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1141 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1142 const struct refspec
*refspec
)
1144 const struct ref
*ref
;
1145 struct ref
*ret
= NULL
;
1146 struct ref
**tail
= &ret
;
1148 int remote_prefix_len
= strlen(refspec
->src
);
1149 int local_prefix_len
= strlen(refspec
->dst
);
1151 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1152 if (strchr(ref
->name
, '^'))
1153 continue; /* a dereference item */
1154 if (!prefixcmp(ref
->name
, refspec
->src
)) {
1156 struct ref
*cpy
= copy_ref(ref
);
1157 match
= ref
->name
+ remote_prefix_len
;
1159 cpy
->peer_ref
= alloc_ref_with_prefix(refspec
->dst
,
1160 local_prefix_len
, match
);
1162 cpy
->peer_ref
->force
= 1;
1171 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1173 const struct ref
*ref
;
1174 for (ref
= refs
; ref
; ref
= ref
->next
) {
1175 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1181 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1183 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1188 return copy_ref(ref
);
1191 static struct ref
*get_local_ref(const char *name
)
1196 if (!prefixcmp(name
, "refs/"))
1197 return alloc_ref(name
);
1199 if (!prefixcmp(name
, "heads/") ||
1200 !prefixcmp(name
, "tags/") ||
1201 !prefixcmp(name
, "remotes/"))
1202 return alloc_ref_with_prefix("refs/", 5, name
);
1204 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1207 int get_fetch_map(const struct ref
*remote_refs
,
1208 const struct refspec
*refspec
,
1212 struct ref
*ref_map
, **rmp
;
1214 if (refspec
->pattern
) {
1215 ref_map
= get_expanded_map(remote_refs
, refspec
);
1217 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1219 ref_map
= get_remote_ref(remote_refs
, name
);
1220 if (!missing_ok
&& !ref_map
)
1221 die("Couldn't find remote ref %s", name
);
1223 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1224 if (ref_map
->peer_ref
&& refspec
->force
)
1225 ref_map
->peer_ref
->force
= 1;
1229 for (rmp
= &ref_map
; *rmp
; ) {
1230 if ((*rmp
)->peer_ref
) {
1231 int st
= check_ref_format((*rmp
)->peer_ref
->name
+ 5);
1232 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
) {
1233 struct ref
*ignore
= *rmp
;
1234 error("* Ignoring funny ref '%s' locally",
1235 (*rmp
)->peer_ref
->name
);
1236 *rmp
= (*rmp
)->next
;
1237 free(ignore
->peer_ref
);
1242 rmp
= &((*rmp
)->next
);
1246 tail_link_ref(ref_map
, tail
);
1251 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1255 for (; list
; list
= list
->next
)
1256 if (!strcmp(ref
->symref
, list
->name
)) {
1257 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1264 * Return true if there is anything to report, otherwise false.
1266 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1268 unsigned char sha1
[20];
1269 struct commit
*ours
, *theirs
;
1271 struct rev_info revs
;
1272 const char *rev_argv
[10], *base
;
1276 * Nothing to report unless we are marked to build on top of
1280 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1284 * If what we used to build on no longer exists, there is
1285 * nothing to report.
1287 base
= branch
->merge
[0]->dst
;
1288 if (!resolve_ref(base
, sha1
, 1, NULL
))
1290 theirs
= lookup_commit(sha1
);
1294 if (!resolve_ref(branch
->refname
, sha1
, 1, NULL
))
1296 ours
= lookup_commit(sha1
);
1300 /* are we the same? */
1304 /* Run "rev-list --left-right ours...theirs" internally... */
1306 rev_argv
[rev_argc
++] = NULL
;
1307 rev_argv
[rev_argc
++] = "--left-right";
1308 rev_argv
[rev_argc
++] = symmetric
;
1309 rev_argv
[rev_argc
++] = "--";
1310 rev_argv
[rev_argc
] = NULL
;
1312 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1313 strcpy(symmetric
+ 40, "...");
1314 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1316 init_revisions(&revs
, NULL
);
1317 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1318 prepare_revision_walk(&revs
);
1320 /* ... and count the commits on each side. */
1324 struct commit
*c
= get_revision(&revs
);
1327 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1333 /* clear object flags smudged by the above traversal */
1334 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1335 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1340 * Return true when there is anything to report, otherwise false.
1342 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1344 int num_ours
, num_theirs
;
1347 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
))
1350 base
= branch
->merge
[0]->dst
;
1351 if (!prefixcmp(base
, "refs/remotes/")) {
1352 base
+= strlen("refs/remotes/");
1355 strbuf_addf(sb
, "Your branch is ahead of '%s' "
1356 "by %d commit%s.\n",
1357 base
, num_ours
, (num_ours
== 1) ? "" : "s");
1359 strbuf_addf(sb
, "Your branch is behind '%s' "
1361 "and can be fast-forwarded.\n",
1362 base
, num_theirs
, (num_theirs
== 1) ? "" : "s");
1364 strbuf_addf(sb
, "Your branch and '%s' have diverged,\n"
1365 "and have %d and %d different commit(s) each, "
1367 base
, num_ours
, num_theirs
);