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 while (fgets(buffer
, BUF_SIZE
, f
)) {
208 if (!prefixcmp(buffer
, "URL:")) {
211 } else if (!prefixcmp(buffer
, "Push:")) {
214 } else if (!prefixcmp(buffer
, "Pull:")) {
226 while (isspace(p
[-1]))
229 switch (value_list
) {
231 add_url_alias(remote
, xstrdup(s
));
234 add_push_refspec(remote
, xstrdup(s
));
237 add_fetch_refspec(remote
, xstrdup(s
));
244 static void read_branches_file(struct remote
*remote
)
246 const char *slash
= strchr(remote
->name
, '/');
248 struct strbuf branch
= STRBUF_INIT
;
249 int n
= slash
? slash
- remote
->name
: 1000;
250 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
256 s
= fgets(buffer
, BUF_SIZE
, f
);
265 while (isspace(p
[-1]))
269 len
+= strlen(slash
);
270 p
= xmalloc(len
+ 1);
276 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
277 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
278 * the partial URL obtained from the branches file plus
279 * "/netdev-2.6" and does not store it in any tracking ref.
280 * #branch specifier in the file is ignored.
282 * Otherwise, the branches file would have URL and optionally
283 * #branch specified. The "master" (or specified) branch is
284 * fetched and stored in the local branch of the same name.
286 frag
= strchr(p
, '#');
289 strbuf_addf(&branch
, "refs/heads/%s", frag
);
291 strbuf_addstr(&branch
, "refs/heads/master");
293 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
295 strbuf_reset(&branch
);
296 strbuf_addstr(&branch
, "HEAD:");
298 add_url_alias(remote
, p
);
299 add_fetch_refspec(remote
, strbuf_detach(&branch
, 0));
300 remote
->fetch_tags
= 1; /* always auto-follow */
303 static int handle_config(const char *key
, const char *value
, void *cb
)
307 struct remote
*remote
;
308 struct branch
*branch
;
309 if (!prefixcmp(key
, "branch.")) {
311 subkey
= strrchr(name
, '.');
314 branch
= make_branch(name
, subkey
- name
);
315 if (!strcmp(subkey
, ".remote")) {
317 return config_error_nonbool(key
);
318 branch
->remote_name
= xstrdup(value
);
319 if (branch
== current_branch
)
320 default_remote_name
= branch
->remote_name
;
321 } else if (!strcmp(subkey
, ".merge")) {
323 return config_error_nonbool(key
);
324 add_merge(branch
, xstrdup(value
));
328 if (!prefixcmp(key
, "url.")) {
329 struct rewrite
*rewrite
;
331 subkey
= strrchr(name
, '.');
334 rewrite
= make_rewrite(name
, subkey
- name
);
335 if (!strcmp(subkey
, ".insteadof")) {
337 return config_error_nonbool(key
);
338 add_instead_of(rewrite
, xstrdup(value
));
341 if (prefixcmp(key
, "remote."))
345 warning("Config remote shorthand cannot begin with '/': %s",
349 subkey
= strrchr(name
, '.');
351 return error("Config with no key for remote %s", name
);
352 remote
= make_remote(name
, subkey
- name
);
353 if (!strcmp(subkey
, ".mirror"))
354 remote
->mirror
= git_config_bool(key
, value
);
355 else if (!strcmp(subkey
, ".skipdefaultupdate"))
356 remote
->skip_default_update
= git_config_bool(key
, value
);
358 else if (!strcmp(subkey
, ".url")) {
360 if (git_config_string(&v
, key
, value
))
363 } else if (!strcmp(subkey
, ".push")) {
365 if (git_config_string(&v
, key
, value
))
367 add_push_refspec(remote
, v
);
368 } else if (!strcmp(subkey
, ".fetch")) {
370 if (git_config_string(&v
, key
, value
))
372 add_fetch_refspec(remote
, v
);
373 } else if (!strcmp(subkey
, ".receivepack")) {
375 if (git_config_string(&v
, key
, value
))
377 if (!remote
->receivepack
)
378 remote
->receivepack
= v
;
380 error("more than one receivepack given, using the first");
381 } else if (!strcmp(subkey
, ".uploadpack")) {
383 if (git_config_string(&v
, key
, value
))
385 if (!remote
->uploadpack
)
386 remote
->uploadpack
= v
;
388 error("more than one uploadpack given, using the first");
389 } else if (!strcmp(subkey
, ".tagopt")) {
390 if (!strcmp(value
, "--no-tags"))
391 remote
->fetch_tags
= -1;
392 } else if (!strcmp(subkey
, ".proxy")) {
393 return git_config_string((const char **)&remote
->http_proxy
,
399 static void alias_all_urls(void)
402 for (i
= 0; i
< remotes_nr
; i
++) {
405 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
406 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
]);
411 static void read_config(void)
413 unsigned char sha1
[20];
414 const char *head_ref
;
416 if (default_remote_name
) // did this already
418 default_remote_name
= xstrdup("origin");
419 current_branch
= NULL
;
420 head_ref
= resolve_ref("HEAD", sha1
, 0, &flag
);
421 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
422 !prefixcmp(head_ref
, "refs/heads/")) {
424 make_branch(head_ref
+ strlen("refs/heads/"), 0);
426 git_config(handle_config
, NULL
);
431 * We need to make sure the tracking branches are well formed, but a
432 * wildcard refspec in "struct refspec" must have a trailing slash. We
433 * temporarily drop the trailing '/' while calling check_ref_format(),
434 * and put it back. The caller knows that a CHECK_REF_FORMAT_ONELEVEL
435 * error return is Ok for a wildcard refspec.
437 static int verify_refname(char *name
, int is_glob
)
439 int result
, len
= -1;
443 assert(name
[len
- 1] == '/');
444 name
[len
- 1] = '\0';
446 result
= check_ref_format(name
);
453 * This function frees a refspec array.
454 * Warning: code paths should be checked to ensure that the src
455 * and dst pointers are always freeable pointers as well
456 * as the refspec pointer itself.
458 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
465 for (i
= 0; i
< nr_refspec
; i
++) {
466 free(refspec
[i
].src
);
467 free(refspec
[i
].dst
);
472 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
476 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
478 for (i
= 0; i
< nr_refspec
; i
++) {
481 const char *lhs
, *rhs
;
491 rhs
= strrchr(lhs
, ':');
494 * Before going on, special case ":" (or "+:") as a refspec
497 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
503 size_t rlen
= strlen(++rhs
);
504 is_glob
= (2 <= rlen
&& !strcmp(rhs
+ rlen
- 2, "/*"));
505 rs
[i
].dst
= xstrndup(rhs
, rlen
- is_glob
);
508 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
509 if (2 <= llen
&& !memcmp(lhs
+ llen
- 2, "/*", 2)) {
510 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
514 } else if (rhs
&& is_glob
) {
518 rs
[i
].pattern
= is_glob
;
519 rs
[i
].src
= xstrndup(lhs
, llen
);
524 * - empty is allowed; it means HEAD.
525 * - otherwise it must be a valid looking ref.
530 st
= verify_refname(rs
[i
].src
, is_glob
);
531 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
536 * - missing is ok, and is same as empty.
537 * - empty is ok; it means not to store.
538 * - otherwise it must be a valid looking ref.
542 } else if (!*rs
[i
].dst
) {
545 st
= verify_refname(rs
[i
].dst
, is_glob
);
546 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
552 * - empty is allowed; it means delete.
553 * - when wildcarded, it must be a valid looking ref.
554 * - otherwise, it must be an extended SHA-1, but
555 * there is no existing way to validate this.
560 st
= verify_refname(rs
[i
].src
, is_glob
);
561 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
565 ; /* anything goes, for now */
568 * - missing is allowed, but LHS then must be a
570 * - empty is not allowed.
571 * - otherwise it must be a valid looking ref.
574 st
= verify_refname(rs
[i
].src
, is_glob
);
575 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
577 } else if (!*rs
[i
].dst
) {
580 st
= verify_refname(rs
[i
].dst
, is_glob
);
581 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
)
591 * nr_refspec must be greater than zero and i must be valid
592 * since it is only possible to reach this point from within
593 * the for loop above.
595 free_refspecs(rs
, i
+1);
598 die("Invalid refspec '%s'", refspec
[i
]);
601 int valid_fetch_refspec(const char *fetch_refspec_str
)
603 const char *fetch_refspec
[] = { fetch_refspec_str
};
604 struct refspec
*refspec
;
606 refspec
= parse_refspec_internal(1, fetch_refspec
, 1, 1);
607 free_refspecs(refspec
, 1);
611 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
613 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
616 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
618 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
621 static int valid_remote_nick(const char *name
)
623 if (!name
[0] || /* not empty */
624 (name
[0] == '.' && /* not "." */
625 (!name
[1] || /* not ".." */
626 (name
[1] == '.' && !name
[2]))))
628 return !strchr(name
, '/'); /* no slash */
631 struct remote
*remote_get(const char *name
)
637 name
= default_remote_name
;
638 ret
= make_remote(name
, 0);
639 if (valid_remote_nick(name
)) {
641 read_remotes_file(ret
);
643 read_branches_file(ret
);
646 add_url_alias(ret
, name
);
649 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
650 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
654 int for_each_remote(each_remote_fn fn
, void *priv
)
658 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
659 struct remote
*r
= remotes
[i
];
663 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
666 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
668 result
= fn(r
, priv
);
673 void ref_remove_duplicates(struct ref
*ref_map
)
677 for (; ref_map
; ref_map
= ref_map
->next
) {
678 if (!ref_map
->peer_ref
)
680 posn
= &ref_map
->next
;
682 if ((*posn
)->peer_ref
&&
683 !strcmp((*posn
)->peer_ref
->name
,
684 ref_map
->peer_ref
->name
)) {
685 if (strcmp((*posn
)->name
, ref_map
->name
))
686 die("%s tracks both %s and %s",
687 ref_map
->peer_ref
->name
,
688 (*posn
)->name
, ref_map
->name
);
689 next
= (*posn
)->next
;
690 free((*posn
)->peer_ref
);
694 posn
= &(*posn
)->next
;
700 int remote_has_url(struct remote
*remote
, const char *url
)
703 for (i
= 0; i
< remote
->url_nr
; i
++) {
704 if (!strcmp(remote
->url
[i
], url
))
710 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
712 int find_src
= refspec
->src
== NULL
;
713 char *needle
, **result
;
718 return error("find_tracking: need either src or dst");
719 needle
= refspec
->dst
;
720 result
= &refspec
->src
;
722 needle
= refspec
->src
;
723 result
= &refspec
->dst
;
726 for (i
= 0; i
< remote
->fetch_refspec_nr
; i
++) {
727 struct refspec
*fetch
= &remote
->fetch
[i
];
728 const char *key
= find_src
? fetch
->dst
: fetch
->src
;
729 const char *value
= find_src
? fetch
->src
: fetch
->dst
;
732 if (fetch
->pattern
) {
733 if (!prefixcmp(needle
, key
)) {
734 *result
= xmalloc(strlen(value
) +
737 strcpy(*result
, value
);
738 strcpy(*result
+ strlen(value
),
739 needle
+ strlen(key
));
740 refspec
->force
= fetch
->force
;
743 } else if (!strcmp(needle
, key
)) {
744 *result
= xstrdup(value
);
745 refspec
->force
= fetch
->force
;
752 struct ref
*alloc_ref(unsigned namelen
)
754 struct ref
*ret
= xcalloc(1, sizeof(struct ref
) + namelen
);
758 struct ref
*alloc_ref_from_str(const char* str
)
760 struct ref
*ret
= alloc_ref(strlen(str
) + 1);
761 strcpy(ret
->name
, str
);
765 static struct ref
*copy_ref(const struct ref
*ref
)
767 struct ref
*ret
= xmalloc(sizeof(struct ref
) + strlen(ref
->name
) + 1);
768 memcpy(ret
, ref
, sizeof(struct ref
) + strlen(ref
->name
) + 1);
773 struct ref
*copy_ref_list(const struct ref
*ref
)
775 struct ref
*ret
= NULL
;
776 struct ref
**tail
= &ret
;
778 *tail
= copy_ref(ref
);
780 tail
= &((*tail
)->next
);
785 static void free_ref(struct ref
*ref
)
789 free(ref
->remote_status
);
794 void free_refs(struct ref
*ref
)
805 static int count_refspec_match(const char *pattern
,
807 struct ref
**matched_ref
)
809 int patlen
= strlen(pattern
);
810 struct ref
*matched_weak
= NULL
;
811 struct ref
*matched
= NULL
;
815 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
816 char *name
= refs
->name
;
817 int namelen
= strlen(name
);
819 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
822 /* A match is "weak" if it is with refs outside
823 * heads or tags, and did not specify the pattern
824 * in full (e.g. "refs/remotes/origin/master") or at
825 * least from the toplevel (e.g. "remotes/origin/master");
826 * otherwise "git push $URL master" would result in
827 * ambiguity between remotes/origin/master and heads/master
828 * at the remote site.
830 if (namelen
!= patlen
&&
831 patlen
!= namelen
- 5 &&
832 prefixcmp(name
, "refs/heads/") &&
833 prefixcmp(name
, "refs/tags/")) {
834 /* We want to catch the case where only weak
835 * matches are found and there are multiple
836 * matches, and where more than one strong
837 * matches are found, as ambiguous. One
838 * strong match with zero or more weak matches
839 * are acceptable as a unique match.
850 *matched_ref
= matched_weak
;
854 *matched_ref
= matched
;
859 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
867 static struct ref
*try_explicit_object_name(const char *name
)
869 unsigned char sha1
[20];
874 strcpy(ref
->name
, "(delete)");
875 hashclr(ref
->new_sha1
);
878 if (get_sha1(name
, sha1
))
880 ref
= alloc_ref_from_str(name
);
881 hashcpy(ref
->new_sha1
, sha1
);
885 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
887 struct ref
*ret
= alloc_ref_from_str(name
);
888 tail_link_ref(ret
, tail
);
892 static char *guess_ref(const char *name
, struct ref
*peer
)
894 struct strbuf buf
= STRBUF_INIT
;
895 unsigned char sha1
[20];
897 const char *r
= resolve_ref(peer
->name
, sha1
, 1, NULL
);
901 if (!prefixcmp(r
, "refs/heads/"))
902 strbuf_addstr(&buf
, "refs/heads/");
903 else if (!prefixcmp(r
, "refs/tags/"))
904 strbuf_addstr(&buf
, "refs/tags/");
908 strbuf_addstr(&buf
, name
);
909 return strbuf_detach(&buf
, NULL
);
912 static int match_explicit(struct ref
*src
, struct ref
*dst
,
913 struct ref
***dst_tail
,
916 struct ref
*matched_src
, *matched_dst
;
918 const char *dst_value
= rs
->dst
;
921 if (rs
->pattern
|| rs
->matching
)
924 matched_src
= matched_dst
= NULL
;
925 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
929 /* The source could be in the get_sha1() format
930 * not a reference name. :refs/other is a
931 * way to delete 'other' ref at the remote end.
933 matched_src
= try_explicit_object_name(rs
->src
);
935 return error("src refspec %s does not match any.", rs
->src
);
938 return error("src refspec %s matches more than one.", rs
->src
);
942 unsigned char sha1
[20];
945 dst_value
= resolve_ref(matched_src
->name
, sha1
, 1, &flag
);
947 ((flag
& REF_ISSYMREF
) &&
948 prefixcmp(dst_value
, "refs/heads/")))
949 die("%s cannot be resolved to branch.",
953 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
957 if (!memcmp(dst_value
, "refs/", 5))
958 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
959 else if((dst_guess
= guess_ref(dst_value
, matched_src
)))
960 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
962 error("unable to push to unqualified destination: %s\n"
963 "The destination refspec neither matches an "
964 "existing ref on the remote nor\n"
965 "begins with refs/, and we are unable to "
966 "guess a prefix based on the source ref.",
971 error("dst refspec %s matches more than one.",
977 if (matched_dst
->peer_ref
)
978 return error("dst ref %s receives from more than one src.",
981 matched_dst
->peer_ref
= matched_src
;
982 matched_dst
->force
= rs
->force
;
987 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
988 struct ref
***dst_tail
, struct refspec
*rs
,
992 for (i
= errs
= 0; i
< rs_nr
; i
++)
993 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
997 static const struct refspec
*check_pattern_match(const struct refspec
*rs
,
999 const struct ref
*src
)
1002 int matching_refs
= -1;
1003 for (i
= 0; i
< rs_nr
; i
++) {
1004 if (rs
[i
].matching
&&
1005 (matching_refs
== -1 || rs
[i
].force
)) {
1010 if (rs
[i
].pattern
&& !prefixcmp(src
->name
, rs
[i
].src
))
1013 if (matching_refs
!= -1)
1014 return rs
+ matching_refs
;
1020 * Note. This is used only by "push"; refspec matching rules for
1021 * push and fetch are subtly different, so do not try to reuse it
1024 int match_refs(struct ref
*src
, struct ref
*dst
, struct ref
***dst_tail
,
1025 int nr_refspec
, const char **refspec
, int flags
)
1028 int send_all
= flags
& MATCH_REFS_ALL
;
1029 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1030 static const char *default_refspec
[] = { ":", 0 };
1034 refspec
= default_refspec
;
1036 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1037 if (match_explicit_refs(src
, dst
, dst_tail
, rs
, nr_refspec
))
1040 /* pick the remainder */
1041 for ( ; src
; src
= src
->next
) {
1042 struct ref
*dst_peer
;
1043 const struct refspec
*pat
= NULL
;
1048 pat
= check_pattern_match(rs
, nr_refspec
, src
);
1052 if (pat
->matching
) {
1054 * "matching refs"; traditionally we pushed everything
1055 * including refs outside refs/heads/ hierarchy, but
1056 * that does not make much sense these days.
1058 if (!send_mirror
&& prefixcmp(src
->name
, "refs/heads/"))
1060 dst_name
= xstrdup(src
->name
);
1063 const char *dst_side
= pat
->dst
? pat
->dst
: pat
->src
;
1064 dst_name
= xmalloc(strlen(dst_side
) +
1066 strlen(pat
->src
) + 2);
1067 strcpy(dst_name
, dst_side
);
1068 strcat(dst_name
, src
->name
+ strlen(pat
->src
));
1070 dst_peer
= find_ref_by_name(dst
, dst_name
);
1072 if (dst_peer
->peer_ref
)
1073 /* We're already sending something to this ref. */
1077 if (pat
->matching
&& !(send_all
|| send_mirror
))
1079 * Remote doesn't have it, and we have no
1080 * explicit pattern, and we don't have
1081 * --all nor --mirror.
1085 /* Create a new one and link it */
1086 dst_peer
= make_linked_ref(dst_name
, dst_tail
);
1087 hashcpy(dst_peer
->new_sha1
, src
->new_sha1
);
1089 dst_peer
->peer_ref
= src
;
1090 dst_peer
->force
= pat
->force
;
1097 struct branch
*branch_get(const char *name
)
1102 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1103 ret
= current_branch
;
1105 ret
= make_branch(name
, 0);
1106 if (ret
&& ret
->remote_name
) {
1107 ret
->remote
= remote_get(ret
->remote_name
);
1108 if (ret
->merge_nr
) {
1110 ret
->merge
= xcalloc(sizeof(*ret
->merge
),
1112 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1113 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1114 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1115 remote_find_tracking(ret
->remote
,
1123 int branch_has_merge_config(struct branch
*branch
)
1125 return branch
&& !!branch
->merge
;
1128 int branch_merge_matches(struct branch
*branch
,
1130 const char *refname
)
1132 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1134 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1137 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1138 const struct refspec
*refspec
)
1140 const struct ref
*ref
;
1141 struct ref
*ret
= NULL
;
1142 struct ref
**tail
= &ret
;
1144 int remote_prefix_len
= strlen(refspec
->src
);
1145 int local_prefix_len
= strlen(refspec
->dst
);
1147 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1148 if (strchr(ref
->name
, '^'))
1149 continue; /* a dereference item */
1150 if (!prefixcmp(ref
->name
, refspec
->src
)) {
1152 struct ref
*cpy
= copy_ref(ref
);
1153 match
= ref
->name
+ remote_prefix_len
;
1155 cpy
->peer_ref
= alloc_ref(local_prefix_len
+
1157 sprintf(cpy
->peer_ref
->name
, "%s%s",
1158 refspec
->dst
, match
);
1160 cpy
->peer_ref
->force
= 1;
1169 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1171 const struct ref
*ref
;
1172 for (ref
= refs
; ref
; ref
= ref
->next
) {
1173 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1179 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1181 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1186 return copy_ref(ref
);
1189 static struct ref
*get_local_ref(const char *name
)
1195 if (!prefixcmp(name
, "refs/")) {
1196 return alloc_ref_from_str(name
);
1199 if (!prefixcmp(name
, "heads/") ||
1200 !prefixcmp(name
, "tags/") ||
1201 !prefixcmp(name
, "remotes/")) {
1202 ret
= alloc_ref(strlen(name
) + 6);
1203 sprintf(ret
->name
, "refs/%s", name
);
1207 ret
= alloc_ref(strlen(name
) + 12);
1208 sprintf(ret
->name
, "refs/heads/%s", name
);
1212 int get_fetch_map(const struct ref
*remote_refs
,
1213 const struct refspec
*refspec
,
1217 struct ref
*ref_map
, **rmp
;
1219 if (refspec
->pattern
) {
1220 ref_map
= get_expanded_map(remote_refs
, refspec
);
1222 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1224 ref_map
= get_remote_ref(remote_refs
, name
);
1225 if (!missing_ok
&& !ref_map
)
1226 die("Couldn't find remote ref %s", name
);
1228 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1229 if (ref_map
->peer_ref
&& refspec
->force
)
1230 ref_map
->peer_ref
->force
= 1;
1234 for (rmp
= &ref_map
; *rmp
; ) {
1235 if ((*rmp
)->peer_ref
) {
1236 int st
= check_ref_format((*rmp
)->peer_ref
->name
+ 5);
1237 if (st
&& st
!= CHECK_REF_FORMAT_ONELEVEL
) {
1238 struct ref
*ignore
= *rmp
;
1239 error("* Ignoring funny ref '%s' locally",
1240 (*rmp
)->peer_ref
->name
);
1241 *rmp
= (*rmp
)->next
;
1242 free(ignore
->peer_ref
);
1247 rmp
= &((*rmp
)->next
);
1251 tail_link_ref(ref_map
, tail
);
1256 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1260 for (; list
; list
= list
->next
)
1261 if (!strcmp(ref
->symref
, list
->name
)) {
1262 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1269 * Return true if there is anything to report, otherwise false.
1271 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1273 unsigned char sha1
[20];
1274 struct commit
*ours
, *theirs
;
1276 struct rev_info revs
;
1277 const char *rev_argv
[10], *base
;
1281 * Nothing to report unless we are marked to build on top of
1285 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1289 * If what we used to build on no longer exists, there is
1290 * nothing to report.
1292 base
= branch
->merge
[0]->dst
;
1293 if (!resolve_ref(base
, sha1
, 1, NULL
))
1295 theirs
= lookup_commit(sha1
);
1299 if (!resolve_ref(branch
->refname
, sha1
, 1, NULL
))
1301 ours
= lookup_commit(sha1
);
1305 /* are we the same? */
1309 /* Run "rev-list --left-right ours...theirs" internally... */
1311 rev_argv
[rev_argc
++] = NULL
;
1312 rev_argv
[rev_argc
++] = "--left-right";
1313 rev_argv
[rev_argc
++] = symmetric
;
1314 rev_argv
[rev_argc
++] = "--";
1315 rev_argv
[rev_argc
] = NULL
;
1317 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1318 strcpy(symmetric
+ 40, "...");
1319 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1321 init_revisions(&revs
, NULL
);
1322 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1323 prepare_revision_walk(&revs
);
1325 /* ... and count the commits on each side. */
1329 struct commit
*c
= get_revision(&revs
);
1332 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1338 /* clear object flags smudged by the above traversal */
1339 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1340 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1345 * Return true when there is anything to report, otherwise false.
1347 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1349 int num_ours
, num_theirs
;
1352 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
))
1355 base
= branch
->merge
[0]->dst
;
1356 if (!prefixcmp(base
, "refs/remotes/")) {
1357 base
+= strlen("refs/remotes/");
1360 strbuf_addf(sb
, "Your branch is ahead of '%s' "
1361 "by %d commit%s.\n",
1362 base
, num_ours
, (num_ours
== 1) ? "" : "s");
1364 strbuf_addf(sb
, "Your branch is behind '%s' "
1366 "and can be fast-forwarded.\n",
1367 base
, num_theirs
, (num_theirs
== 1) ? "" : "s");
1369 strbuf_addf(sb
, "Your branch and '%s' have diverged,\n"
1370 "and have %d and %d different commit(s) each, "
1372 base
, num_ours
, num_theirs
);