9 #include "string-list.h"
10 #include "mergesort.h"
12 enum map_direction
{ FROM_SRC
, FROM_DST
};
14 static struct refspec s_tag_refspec
= {
22 const struct refspec
*tag_refspec
= &s_tag_refspec
;
24 struct counted_string
{
31 struct counted_string
*instead_of
;
36 struct rewrite
**rewrite
;
41 static struct remote
**remotes
;
42 static int remotes_alloc
;
43 static int remotes_nr
;
45 static struct branch
**branches
;
46 static int branches_alloc
;
47 static int branches_nr
;
49 static struct branch
*current_branch
;
50 static const char *default_remote_name
;
51 static int explicit_default_remote_name
;
53 static struct rewrites rewrites
;
54 static struct rewrites rewrites_push
;
56 #define BUF_SIZE (2048)
57 static char buffer
[BUF_SIZE
];
59 static int valid_remote(const struct remote
*remote
)
61 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
64 static const char *alias_url(const char *url
, struct rewrites
*r
)
68 struct counted_string
*longest
;
73 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
76 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
77 if (!prefixcmp(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
79 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
80 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
88 ret
= xmalloc(r
->rewrite
[longest_i
]->baselen
+
89 (strlen(url
) - longest
->len
) + 1);
90 strcpy(ret
, r
->rewrite
[longest_i
]->base
);
91 strcpy(ret
+ r
->rewrite
[longest_i
]->baselen
, url
+ longest
->len
);
95 static void add_push_refspec(struct remote
*remote
, const char *ref
)
97 ALLOC_GROW(remote
->push_refspec
,
98 remote
->push_refspec_nr
+ 1,
99 remote
->push_refspec_alloc
);
100 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
103 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
105 ALLOC_GROW(remote
->fetch_refspec
,
106 remote
->fetch_refspec_nr
+ 1,
107 remote
->fetch_refspec_alloc
);
108 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
111 static void add_url(struct remote
*remote
, const char *url
)
113 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
114 remote
->url
[remote
->url_nr
++] = url
;
117 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
119 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
120 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
123 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
125 const char *pushurl
= alias_url(url
, &rewrites_push
);
127 add_pushurl(remote
, pushurl
);
130 static void add_url_alias(struct remote
*remote
, const char *url
)
132 add_url(remote
, alias_url(url
, &rewrites
));
133 add_pushurl_alias(remote
, url
);
136 static struct remote
*make_remote(const char *name
, int len
)
141 for (i
= 0; i
< remotes_nr
; i
++) {
142 if (len
? (!strncmp(name
, remotes
[i
]->name
, len
) &&
143 !remotes
[i
]->name
[len
]) :
144 !strcmp(name
, remotes
[i
]->name
))
148 ret
= xcalloc(1, sizeof(struct remote
));
149 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
150 remotes
[remotes_nr
++] = ret
;
152 ret
->name
= xstrndup(name
, len
);
154 ret
->name
= xstrdup(name
);
158 static void add_merge(struct branch
*branch
, const char *name
)
160 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
161 branch
->merge_alloc
);
162 branch
->merge_name
[branch
->merge_nr
++] = name
;
165 static struct branch
*make_branch(const char *name
, int len
)
171 for (i
= 0; i
< branches_nr
; i
++) {
172 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
173 !branches
[i
]->name
[len
]) :
174 !strcmp(name
, branches
[i
]->name
))
178 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
179 ret
= xcalloc(1, sizeof(struct branch
));
180 branches
[branches_nr
++] = ret
;
182 ret
->name
= xstrndup(name
, len
);
184 ret
->name
= xstrdup(name
);
185 refname
= xmalloc(strlen(name
) + strlen("refs/heads/") + 1);
186 strcpy(refname
, "refs/heads/");
187 strcpy(refname
+ strlen("refs/heads/"), ret
->name
);
188 ret
->refname
= refname
;
193 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
198 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
200 ? (len
== r
->rewrite
[i
]->baselen
&&
201 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
202 : !strcmp(base
, r
->rewrite
[i
]->base
))
203 return r
->rewrite
[i
];
206 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
207 ret
= xcalloc(1, sizeof(struct rewrite
));
208 r
->rewrite
[r
->rewrite_nr
++] = ret
;
210 ret
->base
= xstrndup(base
, len
);
214 ret
->base
= xstrdup(base
);
215 ret
->baselen
= strlen(base
);
220 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
222 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
223 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
224 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
225 rewrite
->instead_of_nr
++;
228 static void read_remotes_file(struct remote
*remote
)
230 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
234 remote
->origin
= REMOTE_REMOTES
;
235 while (fgets(buffer
, BUF_SIZE
, f
)) {
239 if (!prefixcmp(buffer
, "URL:")) {
242 } else if (!prefixcmp(buffer
, "Push:")) {
245 } else if (!prefixcmp(buffer
, "Pull:")) {
257 while (isspace(p
[-1]))
260 switch (value_list
) {
262 add_url_alias(remote
, xstrdup(s
));
265 add_push_refspec(remote
, xstrdup(s
));
268 add_fetch_refspec(remote
, xstrdup(s
));
275 static void read_branches_file(struct remote
*remote
)
277 const char *slash
= strchr(remote
->name
, '/');
279 struct strbuf branch
= STRBUF_INIT
;
280 int n
= slash
? slash
- remote
->name
: 1000;
281 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
287 s
= fgets(buffer
, BUF_SIZE
, f
);
295 remote
->origin
= REMOTE_BRANCHES
;
297 while (isspace(p
[-1]))
301 len
+= strlen(slash
);
302 p
= xmalloc(len
+ 1);
308 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
309 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
310 * the partial URL obtained from the branches file plus
311 * "/netdev-2.6" and does not store it in any tracking ref.
312 * #branch specifier in the file is ignored.
314 * Otherwise, the branches file would have URL and optionally
315 * #branch specified. The "master" (or specified) branch is
316 * fetched and stored in the local branch of the same name.
318 frag
= strchr(p
, '#');
321 strbuf_addf(&branch
, "refs/heads/%s", frag
);
323 strbuf_addstr(&branch
, "refs/heads/master");
325 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
327 strbuf_reset(&branch
);
328 strbuf_addstr(&branch
, "HEAD:");
330 add_url_alias(remote
, p
);
331 add_fetch_refspec(remote
, strbuf_detach(&branch
, NULL
));
333 * Cogito compatible push: push current HEAD to remote #branch
334 * (master if missing)
336 strbuf_init(&branch
, 0);
337 strbuf_addstr(&branch
, "HEAD");
339 strbuf_addf(&branch
, ":refs/heads/%s", frag
);
341 strbuf_addstr(&branch
, ":refs/heads/master");
342 add_push_refspec(remote
, strbuf_detach(&branch
, NULL
));
343 remote
->fetch_tags
= 1; /* always auto-follow */
346 static int handle_config(const char *key
, const char *value
, void *cb
)
350 struct remote
*remote
;
351 struct branch
*branch
;
352 if (!prefixcmp(key
, "branch.")) {
354 subkey
= strrchr(name
, '.');
357 branch
= make_branch(name
, subkey
- name
);
358 if (!strcmp(subkey
, ".remote")) {
360 return config_error_nonbool(key
);
361 branch
->remote_name
= xstrdup(value
);
362 if (branch
== current_branch
) {
363 default_remote_name
= branch
->remote_name
;
364 explicit_default_remote_name
= 1;
366 } else if (!strcmp(subkey
, ".merge")) {
368 return config_error_nonbool(key
);
369 add_merge(branch
, xstrdup(value
));
373 if (!prefixcmp(key
, "url.")) {
374 struct rewrite
*rewrite
;
376 subkey
= strrchr(name
, '.');
379 if (!strcmp(subkey
, ".insteadof")) {
380 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
382 return config_error_nonbool(key
);
383 add_instead_of(rewrite
, xstrdup(value
));
384 } else if (!strcmp(subkey
, ".pushinsteadof")) {
385 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
387 return config_error_nonbool(key
);
388 add_instead_of(rewrite
, xstrdup(value
));
391 if (prefixcmp(key
, "remote."))
395 warning("Config remote shorthand cannot begin with '/': %s",
399 subkey
= strrchr(name
, '.');
402 remote
= make_remote(name
, subkey
- name
);
403 remote
->origin
= REMOTE_CONFIG
;
404 if (!strcmp(subkey
, ".mirror"))
405 remote
->mirror
= git_config_bool(key
, value
);
406 else if (!strcmp(subkey
, ".skipdefaultupdate"))
407 remote
->skip_default_update
= git_config_bool(key
, value
);
408 else if (!strcmp(subkey
, ".skipfetchall"))
409 remote
->skip_default_update
= git_config_bool(key
, value
);
410 else if (!strcmp(subkey
, ".url")) {
412 if (git_config_string(&v
, key
, value
))
415 } else if (!strcmp(subkey
, ".pushurl")) {
417 if (git_config_string(&v
, key
, value
))
419 add_pushurl(remote
, v
);
420 } else if (!strcmp(subkey
, ".push")) {
422 if (git_config_string(&v
, key
, value
))
424 add_push_refspec(remote
, v
);
425 } else if (!strcmp(subkey
, ".fetch")) {
427 if (git_config_string(&v
, key
, value
))
429 add_fetch_refspec(remote
, v
);
430 } else if (!strcmp(subkey
, ".receivepack")) {
432 if (git_config_string(&v
, key
, value
))
434 if (!remote
->receivepack
)
435 remote
->receivepack
= v
;
437 error("more than one receivepack given, using the first");
438 } else if (!strcmp(subkey
, ".uploadpack")) {
440 if (git_config_string(&v
, key
, value
))
442 if (!remote
->uploadpack
)
443 remote
->uploadpack
= v
;
445 error("more than one uploadpack given, using the first");
446 } else if (!strcmp(subkey
, ".tagopt")) {
447 if (!strcmp(value
, "--no-tags"))
448 remote
->fetch_tags
= -1;
449 else if (!strcmp(value
, "--tags"))
450 remote
->fetch_tags
= 2;
451 } else if (!strcmp(subkey
, ".proxy")) {
452 return git_config_string((const char **)&remote
->http_proxy
,
454 } else if (!strcmp(subkey
, ".vcs")) {
455 return git_config_string(&remote
->foreign_vcs
, key
, value
);
460 static void alias_all_urls(void)
463 for (i
= 0; i
< remotes_nr
; i
++) {
464 int add_pushurl_aliases
;
467 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
468 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
470 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
471 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
472 if (add_pushurl_aliases
)
473 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
474 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
479 static void read_config(void)
481 unsigned char sha1
[20];
482 const char *head_ref
;
484 if (default_remote_name
) /* did this already */
486 default_remote_name
= xstrdup("origin");
487 current_branch
= NULL
;
488 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
489 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
490 !prefixcmp(head_ref
, "refs/heads/")) {
492 make_branch(head_ref
+ strlen("refs/heads/"), 0);
494 git_config(handle_config
, NULL
);
499 * This function frees a refspec array.
500 * Warning: code paths should be checked to ensure that the src
501 * and dst pointers are always freeable pointers as well
502 * as the refspec pointer itself.
504 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
511 for (i
= 0; i
< nr_refspec
; i
++) {
512 free(refspec
[i
].src
);
513 free(refspec
[i
].dst
);
518 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
521 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
523 for (i
= 0; i
< nr_refspec
; i
++) {
526 const char *lhs
, *rhs
;
537 rhs
= strrchr(lhs
, ':');
540 * Before going on, special case ":" (or "+:") as a refspec
543 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
549 size_t rlen
= strlen(++rhs
);
550 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
551 rs
[i
].dst
= xstrndup(rhs
, rlen
);
554 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
555 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
556 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
559 } else if (rhs
&& is_glob
) {
563 rs
[i
].pattern
= is_glob
;
564 rs
[i
].src
= xstrndup(lhs
, llen
);
565 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
570 * - empty is allowed; it means HEAD.
571 * - otherwise it must be a valid looking ref.
575 else if (check_refname_format(rs
[i
].src
, flags
))
579 * - missing is ok, and is same as empty.
580 * - empty is ok; it means not to store.
581 * - otherwise it must be a valid looking ref.
585 else if (!*rs
[i
].dst
)
587 else if (check_refname_format(rs
[i
].dst
, flags
))
592 * - empty is allowed; it means delete.
593 * - when wildcarded, it must be a valid looking ref.
594 * - otherwise, it must be an extended SHA-1, but
595 * there is no existing way to validate this.
600 if (check_refname_format(rs
[i
].src
, flags
))
604 ; /* anything goes, for now */
607 * - missing is allowed, but LHS then must be a
609 * - empty is not allowed.
610 * - otherwise it must be a valid looking ref.
613 if (check_refname_format(rs
[i
].src
, flags
))
615 } else if (!*rs
[i
].dst
) {
618 if (check_refname_format(rs
[i
].dst
, flags
))
628 * nr_refspec must be greater than zero and i must be valid
629 * since it is only possible to reach this point from within
630 * the for loop above.
632 free_refspecs(rs
, i
+1);
635 die("Invalid refspec '%s'", refspec
[i
]);
638 int valid_fetch_refspec(const char *fetch_refspec_str
)
640 struct refspec
*refspec
;
642 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
643 free_refspecs(refspec
, 1);
647 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
649 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
652 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
654 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
657 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
660 for (i
= 0; i
< nr_refspec
; i
++) {
661 free(refspec
[i
].src
);
662 free(refspec
[i
].dst
);
667 static int valid_remote_nick(const char *name
)
669 if (!name
[0] || is_dot_or_dotdot(name
))
671 return !strchr(name
, '/'); /* no slash */
674 struct remote
*remote_get(const char *name
)
683 name
= default_remote_name
;
684 name_given
= explicit_default_remote_name
;
687 ret
= make_remote(name
, 0);
688 if (valid_remote_nick(name
)) {
689 if (!valid_remote(ret
))
690 read_remotes_file(ret
);
691 if (!valid_remote(ret
))
692 read_branches_file(ret
);
694 if (name_given
&& !valid_remote(ret
))
695 add_url_alias(ret
, name
);
696 if (!valid_remote(ret
))
698 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
699 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
703 int remote_is_configured(const char *name
)
708 for (i
= 0; i
< remotes_nr
; i
++)
709 if (!strcmp(name
, remotes
[i
]->name
))
714 int for_each_remote(each_remote_fn fn
, void *priv
)
718 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
719 struct remote
*r
= remotes
[i
];
723 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
726 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
728 result
= fn(r
, priv
);
733 void ref_remove_duplicates(struct ref
*ref_map
)
735 struct string_list refs
= STRING_LIST_INIT_NODUP
;
736 struct string_list_item
*item
= NULL
;
737 struct ref
*prev
= NULL
, *next
= NULL
;
738 for (; ref_map
; prev
= ref_map
, ref_map
= next
) {
739 next
= ref_map
->next
;
740 if (!ref_map
->peer_ref
)
743 item
= string_list_lookup(&refs
, ref_map
->peer_ref
->name
);
745 if (strcmp(((struct ref
*)item
->util
)->name
,
747 die("%s tracks both %s and %s",
748 ref_map
->peer_ref
->name
,
749 ((struct ref
*)item
->util
)->name
,
751 prev
->next
= ref_map
->next
;
752 free(ref_map
->peer_ref
);
754 ref_map
= prev
; /* skip this; we freed it */
758 item
= string_list_insert(&refs
, ref_map
->peer_ref
->name
);
759 item
->util
= ref_map
;
761 string_list_clear(&refs
, 0);
764 int remote_has_url(struct remote
*remote
, const char *url
)
767 for (i
= 0; i
< remote
->url_nr
; i
++) {
768 if (!strcmp(remote
->url
[i
], url
))
774 static int match_name_with_pattern(const char *key
, const char *name
,
775 const char *value
, char **result
)
777 const char *kstar
= strchr(key
, '*');
783 die("Key '%s' of pattern had no '*'", key
);
785 ksuffixlen
= strlen(kstar
+ 1);
786 namelen
= strlen(name
);
787 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
788 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
790 const char *vstar
= strchr(value
, '*');
794 die("Value '%s' of pattern has no '*'", value
);
795 vlen
= vstar
- value
;
796 vsuffixlen
= strlen(vstar
+ 1);
797 *result
= xmalloc(vlen
+ vsuffixlen
+
799 klen
- ksuffixlen
+ 1);
800 strncpy(*result
, value
, vlen
);
801 strncpy(*result
+ vlen
,
802 name
+ klen
, namelen
- klen
- ksuffixlen
);
803 strcpy(*result
+ vlen
+ namelen
- klen
- ksuffixlen
,
809 static int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
812 int find_src
= !query
->src
;
814 if (find_src
&& !query
->dst
)
815 return error("query_refspecs: need either src or dst");
817 for (i
= 0; i
< ref_count
; i
++) {
818 struct refspec
*refspec
= &refs
[i
];
819 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
820 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
821 const char *needle
= find_src
? query
->dst
: query
->src
;
822 char **result
= find_src
? &query
->src
: &query
->dst
;
826 if (refspec
->pattern
) {
827 if (match_name_with_pattern(key
, needle
, value
, result
)) {
828 query
->force
= refspec
->force
;
831 } else if (!strcmp(needle
, key
)) {
832 *result
= xstrdup(value
);
833 query
->force
= refspec
->force
;
840 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
843 struct refspec query
;
845 memset(&query
, 0, sizeof(struct refspec
));
846 query
.src
= (char *)name
;
848 if (query_refspecs(refspecs
, nr_refspec
, &query
))
854 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
856 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
859 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
862 size_t len
= strlen(name
);
863 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
864 memcpy(ref
->name
, prefix
, prefixlen
);
865 memcpy(ref
->name
+ prefixlen
, name
, len
);
869 struct ref
*alloc_ref(const char *name
)
871 return alloc_ref_with_prefix("", 0, name
);
874 struct ref
*copy_ref(const struct ref
*ref
)
880 len
= strlen(ref
->name
);
881 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
882 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
884 cpy
->symref
= ref
->symref
? xstrdup(ref
->symref
) : NULL
;
885 cpy
->remote_status
= ref
->remote_status
? xstrdup(ref
->remote_status
) : NULL
;
886 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
890 struct ref
*copy_ref_list(const struct ref
*ref
)
892 struct ref
*ret
= NULL
;
893 struct ref
**tail
= &ret
;
895 *tail
= copy_ref(ref
);
897 tail
= &((*tail
)->next
);
902 static void free_ref(struct ref
*ref
)
906 free_ref(ref
->peer_ref
);
907 free(ref
->remote_status
);
912 void free_refs(struct ref
*ref
)
922 int ref_compare_name(const void *va
, const void *vb
)
924 const struct ref
*a
= va
, *b
= vb
;
925 return strcmp(a
->name
, b
->name
);
928 static void *ref_list_get_next(const void *a
)
930 return ((const struct ref
*)a
)->next
;
933 static void ref_list_set_next(void *a
, void *next
)
935 ((struct ref
*)a
)->next
= next
;
938 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
940 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
943 static int count_refspec_match(const char *pattern
,
945 struct ref
**matched_ref
)
947 int patlen
= strlen(pattern
);
948 struct ref
*matched_weak
= NULL
;
949 struct ref
*matched
= NULL
;
953 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
954 char *name
= refs
->name
;
955 int namelen
= strlen(name
);
957 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
960 /* A match is "weak" if it is with refs outside
961 * heads or tags, and did not specify the pattern
962 * in full (e.g. "refs/remotes/origin/master") or at
963 * least from the toplevel (e.g. "remotes/origin/master");
964 * otherwise "git push $URL master" would result in
965 * ambiguity between remotes/origin/master and heads/master
966 * at the remote site.
968 if (namelen
!= patlen
&&
969 patlen
!= namelen
- 5 &&
970 prefixcmp(name
, "refs/heads/") &&
971 prefixcmp(name
, "refs/tags/")) {
972 /* We want to catch the case where only weak
973 * matches are found and there are multiple
974 * matches, and where more than one strong
975 * matches are found, as ambiguous. One
976 * strong match with zero or more weak matches
977 * are acceptable as a unique match.
988 *matched_ref
= matched_weak
;
992 *matched_ref
= matched
;
997 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1005 static struct ref
*alloc_delete_ref(void)
1007 struct ref
*ref
= alloc_ref("(delete)");
1008 hashclr(ref
->new_sha1
);
1012 static struct ref
*try_explicit_object_name(const char *name
)
1014 unsigned char sha1
[20];
1018 return alloc_delete_ref();
1019 if (get_sha1(name
, sha1
))
1021 ref
= alloc_ref(name
);
1022 hashcpy(ref
->new_sha1
, sha1
);
1026 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1028 struct ref
*ret
= alloc_ref(name
);
1029 tail_link_ref(ret
, tail
);
1033 static char *guess_ref(const char *name
, struct ref
*peer
)
1035 struct strbuf buf
= STRBUF_INIT
;
1036 unsigned char sha1
[20];
1038 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1042 if (!prefixcmp(r
, "refs/heads/"))
1043 strbuf_addstr(&buf
, "refs/heads/");
1044 else if (!prefixcmp(r
, "refs/tags/"))
1045 strbuf_addstr(&buf
, "refs/tags/");
1049 strbuf_addstr(&buf
, name
);
1050 return strbuf_detach(&buf
, NULL
);
1053 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1054 struct ref
***dst_tail
,
1057 struct ref
*matched_src
, *matched_dst
;
1060 const char *dst_value
= rs
->dst
;
1063 if (rs
->pattern
|| rs
->matching
)
1066 matched_src
= matched_dst
= NULL
;
1067 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
1072 /* The source could be in the get_sha1() format
1073 * not a reference name. :refs/other is a
1074 * way to delete 'other' ref at the remote end.
1076 matched_src
= try_explicit_object_name(rs
->src
);
1078 return error("src refspec %s does not match any.", rs
->src
);
1082 return error("src refspec %s matches more than one.", rs
->src
);
1086 unsigned char sha1
[20];
1089 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1091 ((flag
& REF_ISSYMREF
) &&
1092 prefixcmp(dst_value
, "refs/heads/")))
1093 die("%s cannot be resolved to branch.",
1097 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1101 if (!memcmp(dst_value
, "refs/", 5))
1102 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1103 else if (is_null_sha1(matched_src
->new_sha1
))
1104 error("unable to delete '%s': remote ref does not exist",
1106 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1107 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1109 error("unable to push to unqualified destination: %s\n"
1110 "The destination refspec neither matches an "
1111 "existing ref on the remote nor\n"
1112 "begins with refs/, and we are unable to "
1113 "guess a prefix based on the source ref.",
1118 error("dst refspec %s matches more than one.",
1124 if (matched_dst
->peer_ref
)
1125 return error("dst ref %s receives from more than one src.",
1128 matched_dst
->peer_ref
= copy_src
? copy_ref(matched_src
) : matched_src
;
1129 matched_dst
->force
= rs
->force
;
1134 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1135 struct ref
***dst_tail
, struct refspec
*rs
,
1139 for (i
= errs
= 0; i
< rs_nr
; i
++)
1140 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1144 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1145 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1147 const struct refspec
*pat
;
1150 int matching_refs
= -1;
1151 for (i
= 0; i
< rs_nr
; i
++) {
1152 if (rs
[i
].matching
&&
1153 (matching_refs
== -1 || rs
[i
].force
)) {
1158 if (rs
[i
].pattern
) {
1159 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1161 if (direction
== FROM_SRC
)
1162 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1164 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1171 if (matching_refs
== -1)
1174 pat
= rs
+ matching_refs
;
1175 if (pat
->matching
) {
1177 * "matching refs"; traditionally we pushed everything
1178 * including refs outside refs/heads/ hierarchy, but
1179 * that does not make much sense these days.
1181 if (!send_mirror
&& prefixcmp(ref
->name
, "refs/heads/"))
1183 name
= xstrdup(ref
->name
);
1190 static struct ref
**tail_ref(struct ref
**head
)
1192 struct ref
**tail
= head
;
1194 tail
= &((*tail
)->next
);
1199 * Given the set of refs the local repository has, the set of refs the
1200 * remote repository has, and the refspec used for push, determine
1201 * what remote refs we will update and with what value by setting
1202 * peer_ref (which object is being pushed) and force (if the push is
1203 * forced) in elements of "dst". The function may add new elements to
1204 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1206 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1207 int nr_refspec
, const char **refspec
, int flags
)
1210 int send_all
= flags
& MATCH_REFS_ALL
;
1211 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1212 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1214 static const char *default_refspec
[] = { ":", NULL
};
1215 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1219 refspec
= default_refspec
;
1221 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1222 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1224 /* pick the remainder */
1225 for (ref
= src
; ref
; ref
= ref
->next
) {
1226 struct ref
*dst_peer
;
1227 const struct refspec
*pat
= NULL
;
1233 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1237 dst_peer
= find_ref_by_name(*dst
, dst_name
);
1239 if (dst_peer
->peer_ref
)
1240 /* We're already sending something to this ref. */
1243 if (pat
->matching
&& !(send_all
|| send_mirror
))
1245 * Remote doesn't have it, and we have no
1246 * explicit pattern, and we don't have
1247 * --all nor --mirror.
1251 /* Create a new one and link it */
1252 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1253 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1255 dst_peer
->peer_ref
= copy_ref(ref
);
1256 dst_peer
->force
= pat
->force
;
1261 /* check for missing refs on the remote */
1262 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1266 /* We're already sending something to this ref. */
1269 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1271 if (!find_ref_by_name(src
, src_name
))
1272 ref
->peer_ref
= alloc_delete_ref();
1282 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1287 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1289 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1290 else if (!send_mirror
)
1293 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1294 if (!ref
->deletion
&&
1295 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1296 ref
->status
= REF_STATUS_UPTODATE
;
1300 /* This part determines what can overwrite what.
1303 * (0) you can always use --force or +A:B notation to
1304 * selectively force individual ref pairs.
1306 * (1) if the old thing does not exist, it is OK.
1308 * (2) if you do not have the old thing, you are not allowed
1309 * to overwrite it; you would not know what you are losing
1312 * (3) if both new and old are commit-ish, and new is a
1313 * descendant of old, it is OK.
1315 * (4) regardless of all of the above, removing :B is
1319 ref
->nonfastforward
=
1321 !is_null_sha1(ref
->old_sha1
) &&
1322 (!has_sha1_file(ref
->old_sha1
)
1323 || !ref_newer(ref
->new_sha1
, ref
->old_sha1
));
1325 if (ref
->nonfastforward
&& !ref
->force
&& !force_update
) {
1326 ref
->status
= REF_STATUS_REJECT_NONFASTFORWARD
;
1332 struct branch
*branch_get(const char *name
)
1337 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1338 ret
= current_branch
;
1340 ret
= make_branch(name
, 0);
1341 if (ret
&& ret
->remote_name
) {
1342 ret
->remote
= remote_get(ret
->remote_name
);
1343 if (ret
->merge_nr
) {
1345 ret
->merge
= xcalloc(sizeof(*ret
->merge
),
1347 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1348 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1349 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1350 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1351 && !strcmp(ret
->remote_name
, "."))
1352 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1359 int branch_has_merge_config(struct branch
*branch
)
1361 return branch
&& !!branch
->merge
;
1364 int branch_merge_matches(struct branch
*branch
,
1366 const char *refname
)
1368 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1370 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1373 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1374 const struct refspec
*refspec
)
1376 const struct ref
*ref
;
1377 struct ref
*ret
= NULL
;
1378 struct ref
**tail
= &ret
;
1382 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1383 if (strchr(ref
->name
, '^'))
1384 continue; /* a dereference item */
1385 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1386 refspec
->dst
, &expn_name
)) {
1387 struct ref
*cpy
= copy_ref(ref
);
1389 cpy
->peer_ref
= alloc_ref(expn_name
);
1392 cpy
->peer_ref
->force
= 1;
1401 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1403 const struct ref
*ref
;
1404 for (ref
= refs
; ref
; ref
= ref
->next
) {
1405 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1411 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1413 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1418 return copy_ref(ref
);
1421 static struct ref
*get_local_ref(const char *name
)
1423 if (!name
|| name
[0] == '\0')
1426 if (!prefixcmp(name
, "refs/"))
1427 return alloc_ref(name
);
1429 if (!prefixcmp(name
, "heads/") ||
1430 !prefixcmp(name
, "tags/") ||
1431 !prefixcmp(name
, "remotes/"))
1432 return alloc_ref_with_prefix("refs/", 5, name
);
1434 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1437 int get_fetch_map(const struct ref
*remote_refs
,
1438 const struct refspec
*refspec
,
1442 struct ref
*ref_map
, **rmp
;
1444 if (refspec
->pattern
) {
1445 ref_map
= get_expanded_map(remote_refs
, refspec
);
1447 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1449 ref_map
= get_remote_ref(remote_refs
, name
);
1450 if (!missing_ok
&& !ref_map
)
1451 die("Couldn't find remote ref %s", name
);
1453 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1454 if (ref_map
->peer_ref
&& refspec
->force
)
1455 ref_map
->peer_ref
->force
= 1;
1459 for (rmp
= &ref_map
; *rmp
; ) {
1460 if ((*rmp
)->peer_ref
) {
1461 if (prefixcmp((*rmp
)->peer_ref
->name
, "refs/") ||
1462 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1463 struct ref
*ignore
= *rmp
;
1464 error("* Ignoring funny ref '%s' locally",
1465 (*rmp
)->peer_ref
->name
);
1466 *rmp
= (*rmp
)->next
;
1467 free(ignore
->peer_ref
);
1472 rmp
= &((*rmp
)->next
);
1476 tail_link_ref(ref_map
, tail
);
1481 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1485 for (; list
; list
= list
->next
)
1486 if (!strcmp(ref
->symref
, list
->name
)) {
1487 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1493 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1496 struct commit_list
*temp
= list
;
1497 temp
->item
->object
.flags
&= ~mark
;
1503 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1506 struct commit
*old
, *new;
1507 struct commit_list
*list
, *used
;
1510 /* Both new and old must be commit-ish and new is descendant of
1511 * old. Otherwise we require --force.
1513 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1514 if (!o
|| o
->type
!= OBJ_COMMIT
)
1516 old
= (struct commit
*) o
;
1518 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1519 if (!o
|| o
->type
!= OBJ_COMMIT
)
1521 new = (struct commit
*) o
;
1523 if (parse_commit(new) < 0)
1527 commit_list_insert(new, &list
);
1529 new = pop_most_recent_commit(&list
, TMP_MARK
);
1530 commit_list_insert(new, &used
);
1536 unmark_and_free(list
, TMP_MARK
);
1537 unmark_and_free(used
, TMP_MARK
);
1542 * Return true if there is anything to report, otherwise false.
1544 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1546 unsigned char sha1
[20];
1547 struct commit
*ours
, *theirs
;
1549 struct rev_info revs
;
1550 const char *rev_argv
[10], *base
;
1554 * Nothing to report unless we are marked to build on top of
1558 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1562 * If what we used to build on no longer exists, there is
1563 * nothing to report.
1565 base
= branch
->merge
[0]->dst
;
1566 if (read_ref(base
, sha1
))
1568 theirs
= lookup_commit_reference(sha1
);
1572 if (read_ref(branch
->refname
, sha1
))
1574 ours
= lookup_commit_reference(sha1
);
1578 /* are we the same? */
1582 /* Run "rev-list --left-right ours...theirs" internally... */
1584 rev_argv
[rev_argc
++] = NULL
;
1585 rev_argv
[rev_argc
++] = "--left-right";
1586 rev_argv
[rev_argc
++] = symmetric
;
1587 rev_argv
[rev_argc
++] = "--";
1588 rev_argv
[rev_argc
] = NULL
;
1590 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1591 strcpy(symmetric
+ 40, "...");
1592 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1594 init_revisions(&revs
, NULL
);
1595 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1596 prepare_revision_walk(&revs
);
1598 /* ... and count the commits on each side. */
1602 struct commit
*c
= get_revision(&revs
);
1605 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1611 /* clear object flags smudged by the above traversal */
1612 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1613 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1618 * Return true when there is anything to report, otherwise false.
1620 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1622 int num_ours
, num_theirs
;
1625 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
))
1628 base
= branch
->merge
[0]->dst
;
1629 base
= shorten_unambiguous_ref(base
, 0);
1632 Q_("Your branch is ahead of '%s' by %d commit.\n",
1633 "Your branch is ahead of '%s' by %d commits.\n",
1637 _(" (use \"git push\" to publish your local commits)\n"));
1638 } else if (!num_ours
) {
1640 Q_("Your branch is behind '%s' by %d commit, "
1641 "and can be fast-forwarded.\n",
1642 "Your branch is behind '%s' by %d commits, "
1643 "and can be fast-forwarded.\n",
1647 _(" (use \"git pull\" to update your local branch)\n"));
1650 Q_("Your branch and '%s' have diverged,\n"
1651 "and have %d and %d different commit each, "
1653 "Your branch and '%s' have diverged,\n"
1654 "and have %d and %d different commits each, "
1657 base
, num_ours
, num_theirs
);
1659 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1664 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1666 struct ref
***local_tail
= cb_data
;
1670 /* we already know it starts with refs/ to get here */
1671 if (check_refname_format(refname
+ 5, 0))
1674 len
= strlen(refname
) + 1;
1675 ref
= xcalloc(1, sizeof(*ref
) + len
);
1676 hashcpy(ref
->new_sha1
, sha1
);
1677 memcpy(ref
->name
, refname
, len
);
1679 *local_tail
= &ref
->next
;
1683 struct ref
*get_local_heads(void)
1685 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
1686 for_each_ref(one_local_ref
, &local_tail
);
1690 struct ref
*guess_remote_head(const struct ref
*head
,
1691 const struct ref
*refs
,
1694 const struct ref
*r
;
1695 struct ref
*list
= NULL
;
1696 struct ref
**tail
= &list
;
1702 * Some transports support directly peeking at
1703 * where HEAD points; if that is the case, then
1704 * we don't have to guess.
1707 return copy_ref(find_ref_by_name(refs
, head
->symref
));
1709 /* If refs/heads/master could be right, it is. */
1711 r
= find_ref_by_name(refs
, "refs/heads/master");
1712 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
1716 /* Look for another ref that points there */
1717 for (r
= refs
; r
; r
= r
->next
) {
1719 !prefixcmp(r
->name
, "refs/heads/") &&
1720 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
1721 *tail
= copy_ref(r
);
1722 tail
= &((*tail
)->next
);
1731 struct stale_heads_info
{
1732 struct string_list
*ref_names
;
1733 struct ref
**stale_refs_tail
;
1734 struct refspec
*refs
;
1738 static int get_stale_heads_cb(const char *refname
,
1739 const unsigned char *sha1
, int flags
, void *cb_data
)
1741 struct stale_heads_info
*info
= cb_data
;
1742 struct refspec query
;
1743 memset(&query
, 0, sizeof(struct refspec
));
1744 query
.dst
= (char *)refname
;
1746 if (query_refspecs(info
->refs
, info
->ref_count
, &query
))
1747 return 0; /* No matches */
1750 * If we did find a suitable refspec and it's not a symref and
1751 * it's not in the list of refs that currently exist in that
1752 * remote we consider it to be stale.
1754 if (!((flags
& REF_ISSYMREF
) ||
1755 string_list_has_string(info
->ref_names
, query
.src
))) {
1756 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
1757 hashcpy(ref
->new_sha1
, sha1
);
1764 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
1766 struct ref
*ref
, *stale_refs
= NULL
;
1767 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
1768 struct stale_heads_info info
;
1769 info
.ref_names
= &ref_names
;
1770 info
.stale_refs_tail
= &stale_refs
;
1772 info
.ref_count
= ref_count
;
1773 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
1774 string_list_append(&ref_names
, ref
->name
);
1775 sort_string_list(&ref_names
);
1776 for_each_ref(get_stale_heads_cb
, &info
);
1777 string_list_clear(&ref_names
, 0);