push: detect local refspec errors early
[git/mingw.git] / remote.c
blob9bf498af1b4c266c92585cbf3e95ad09db64fd0d
1 #include "cache.h"
2 #include "remote.h"
3 #include "refs.h"
4 #include "commit.h"
5 #include "diff.h"
6 #include "revision.h"
7 #include "dir.h"
8 #include "tag.h"
9 #include "string-list.h"
10 #include "mergesort.h"
12 enum map_direction { FROM_SRC, FROM_DST };
14 static struct refspec s_tag_refspec = {
19 "refs/tags/*",
20 "refs/tags/*"
23 const struct refspec *tag_refspec = &s_tag_refspec;
25 struct counted_string {
26 size_t len;
27 const char *s;
29 struct rewrite {
30 const char *base;
31 size_t baselen;
32 struct counted_string *instead_of;
33 int instead_of_nr;
34 int instead_of_alloc;
36 struct rewrites {
37 struct rewrite **rewrite;
38 int rewrite_alloc;
39 int rewrite_nr;
42 static struct remote **remotes;
43 static int remotes_alloc;
44 static int remotes_nr;
46 static struct branch **branches;
47 static int branches_alloc;
48 static int branches_nr;
50 static struct branch *current_branch;
51 static const char *default_remote_name;
52 static const char *pushremote_name;
53 static int explicit_default_remote_name;
55 static struct rewrites rewrites;
56 static struct rewrites rewrites_push;
58 #define BUF_SIZE (2048)
59 static char buffer[BUF_SIZE];
61 static int valid_remote(const struct remote *remote)
63 return (!!remote->url) || (!!remote->foreign_vcs);
66 static const char *alias_url(const char *url, struct rewrites *r)
68 int i, j;
69 char *ret;
70 struct counted_string *longest;
71 int longest_i;
73 longest = NULL;
74 longest_i = -1;
75 for (i = 0; i < r->rewrite_nr; i++) {
76 if (!r->rewrite[i])
77 continue;
78 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
79 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
80 (!longest ||
81 longest->len < r->rewrite[i]->instead_of[j].len)) {
82 longest = &(r->rewrite[i]->instead_of[j]);
83 longest_i = i;
87 if (!longest)
88 return url;
90 ret = xmalloc(r->rewrite[longest_i]->baselen +
91 (strlen(url) - longest->len) + 1);
92 strcpy(ret, r->rewrite[longest_i]->base);
93 strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
94 return ret;
97 static void add_push_refspec(struct remote *remote, const char *ref)
99 ALLOC_GROW(remote->push_refspec,
100 remote->push_refspec_nr + 1,
101 remote->push_refspec_alloc);
102 remote->push_refspec[remote->push_refspec_nr++] = ref;
105 static void add_fetch_refspec(struct remote *remote, const char *ref)
107 ALLOC_GROW(remote->fetch_refspec,
108 remote->fetch_refspec_nr + 1,
109 remote->fetch_refspec_alloc);
110 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
113 static void add_url(struct remote *remote, const char *url)
115 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
116 remote->url[remote->url_nr++] = url;
119 static void add_pushurl(struct remote *remote, const char *pushurl)
121 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
122 remote->pushurl[remote->pushurl_nr++] = pushurl;
125 static void add_pushurl_alias(struct remote *remote, const char *url)
127 const char *pushurl = alias_url(url, &rewrites_push);
128 if (pushurl != url)
129 add_pushurl(remote, pushurl);
132 static void add_url_alias(struct remote *remote, const char *url)
134 add_url(remote, alias_url(url, &rewrites));
135 add_pushurl_alias(remote, url);
138 static struct remote *make_remote(const char *name, int len)
140 struct remote *ret;
141 int i;
143 for (i = 0; i < remotes_nr; i++) {
144 if (len ? (!strncmp(name, remotes[i]->name, len) &&
145 !remotes[i]->name[len]) :
146 !strcmp(name, remotes[i]->name))
147 return remotes[i];
150 ret = xcalloc(1, sizeof(struct remote));
151 ret->prune = -1; /* unspecified */
152 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
153 remotes[remotes_nr++] = ret;
154 if (len)
155 ret->name = xstrndup(name, len);
156 else
157 ret->name = xstrdup(name);
158 return ret;
161 static void add_merge(struct branch *branch, const char *name)
163 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
164 branch->merge_alloc);
165 branch->merge_name[branch->merge_nr++] = name;
168 static struct branch *make_branch(const char *name, int len)
170 struct branch *ret;
171 int i;
172 char *refname;
174 for (i = 0; i < branches_nr; i++) {
175 if (len ? (!strncmp(name, branches[i]->name, len) &&
176 !branches[i]->name[len]) :
177 !strcmp(name, branches[i]->name))
178 return branches[i];
181 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
182 ret = xcalloc(1, sizeof(struct branch));
183 branches[branches_nr++] = ret;
184 if (len)
185 ret->name = xstrndup(name, len);
186 else
187 ret->name = xstrdup(name);
188 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
189 strcpy(refname, "refs/heads/");
190 strcpy(refname + strlen("refs/heads/"), ret->name);
191 ret->refname = refname;
193 return ret;
196 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
198 struct rewrite *ret;
199 int i;
201 for (i = 0; i < r->rewrite_nr; i++) {
202 if (len
203 ? (len == r->rewrite[i]->baselen &&
204 !strncmp(base, r->rewrite[i]->base, len))
205 : !strcmp(base, r->rewrite[i]->base))
206 return r->rewrite[i];
209 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
210 ret = xcalloc(1, sizeof(struct rewrite));
211 r->rewrite[r->rewrite_nr++] = ret;
212 if (len) {
213 ret->base = xstrndup(base, len);
214 ret->baselen = len;
216 else {
217 ret->base = xstrdup(base);
218 ret->baselen = strlen(base);
220 return ret;
223 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
225 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
226 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
227 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
228 rewrite->instead_of_nr++;
231 static void read_remotes_file(struct remote *remote)
233 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
235 if (!f)
236 return;
237 remote->origin = REMOTE_REMOTES;
238 while (fgets(buffer, BUF_SIZE, f)) {
239 int value_list;
240 char *s, *p;
242 if (starts_with(buffer, "URL:")) {
243 value_list = 0;
244 s = buffer + 4;
245 } else if (starts_with(buffer, "Push:")) {
246 value_list = 1;
247 s = buffer + 5;
248 } else if (starts_with(buffer, "Pull:")) {
249 value_list = 2;
250 s = buffer + 5;
251 } else
252 continue;
254 while (isspace(*s))
255 s++;
256 if (!*s)
257 continue;
259 p = s + strlen(s);
260 while (isspace(p[-1]))
261 *--p = 0;
263 switch (value_list) {
264 case 0:
265 add_url_alias(remote, xstrdup(s));
266 break;
267 case 1:
268 add_push_refspec(remote, xstrdup(s));
269 break;
270 case 2:
271 add_fetch_refspec(remote, xstrdup(s));
272 break;
275 fclose(f);
278 static void read_branches_file(struct remote *remote)
280 char *frag;
281 struct strbuf branch = STRBUF_INIT;
282 int n = 1000;
283 FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
284 char *s, *p;
285 int len;
287 if (!f)
288 return;
289 s = fgets(buffer, BUF_SIZE, f);
290 fclose(f);
291 if (!s)
292 return;
293 while (isspace(*s))
294 s++;
295 if (!*s)
296 return;
297 remote->origin = REMOTE_BRANCHES;
298 p = s + strlen(s);
299 while (isspace(p[-1]))
300 *--p = 0;
301 len = p - s;
302 p = xmalloc(len + 1);
303 strcpy(p, s);
306 * The branches file would have URL and optionally
307 * #branch specified. The "master" (or specified) branch is
308 * fetched and stored in the local branch of the same name.
310 frag = strchr(p, '#');
311 if (frag) {
312 *(frag++) = '\0';
313 strbuf_addf(&branch, "refs/heads/%s", frag);
314 } else
315 strbuf_addstr(&branch, "refs/heads/master");
317 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
318 add_url_alias(remote, p);
319 add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
321 * Cogito compatible push: push current HEAD to remote #branch
322 * (master if missing)
324 strbuf_init(&branch, 0);
325 strbuf_addstr(&branch, "HEAD");
326 if (frag)
327 strbuf_addf(&branch, ":refs/heads/%s", frag);
328 else
329 strbuf_addstr(&branch, ":refs/heads/master");
330 add_push_refspec(remote, strbuf_detach(&branch, NULL));
331 remote->fetch_tags = 1; /* always auto-follow */
334 static int handle_config(const char *key, const char *value, void *cb)
336 const char *name;
337 const char *subkey;
338 struct remote *remote;
339 struct branch *branch;
340 if (starts_with(key, "branch.")) {
341 name = key + 7;
342 subkey = strrchr(name, '.');
343 if (!subkey)
344 return 0;
345 branch = make_branch(name, subkey - name);
346 if (!strcmp(subkey, ".remote")) {
347 if (git_config_string(&branch->remote_name, key, value))
348 return -1;
349 if (branch == current_branch) {
350 default_remote_name = branch->remote_name;
351 explicit_default_remote_name = 1;
353 } else if (!strcmp(subkey, ".pushremote")) {
354 if (branch == current_branch)
355 if (git_config_string(&pushremote_name, key, value))
356 return -1;
357 } else if (!strcmp(subkey, ".merge")) {
358 if (!value)
359 return config_error_nonbool(key);
360 add_merge(branch, xstrdup(value));
362 return 0;
364 if (starts_with(key, "url.")) {
365 struct rewrite *rewrite;
366 name = key + 4;
367 subkey = strrchr(name, '.');
368 if (!subkey)
369 return 0;
370 if (!strcmp(subkey, ".insteadof")) {
371 rewrite = make_rewrite(&rewrites, name, subkey - name);
372 if (!value)
373 return config_error_nonbool(key);
374 add_instead_of(rewrite, xstrdup(value));
375 } else if (!strcmp(subkey, ".pushinsteadof")) {
376 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
377 if (!value)
378 return config_error_nonbool(key);
379 add_instead_of(rewrite, xstrdup(value));
383 if (!starts_with(key, "remote."))
384 return 0;
385 name = key + 7;
387 /* Handle remote.* variables */
388 if (!strcmp(name, "pushdefault"))
389 return git_config_string(&pushremote_name, key, value);
391 /* Handle remote.<name>.* variables */
392 if (*name == '/') {
393 warning("Config remote shorthand cannot begin with '/': %s",
394 name);
395 return 0;
397 subkey = strrchr(name, '.');
398 if (!subkey)
399 return 0;
400 remote = make_remote(name, subkey - name);
401 remote->origin = REMOTE_CONFIG;
402 if (!strcmp(subkey, ".mirror"))
403 remote->mirror = git_config_bool(key, value);
404 else if (!strcmp(subkey, ".skipdefaultupdate"))
405 remote->skip_default_update = git_config_bool(key, value);
406 else if (!strcmp(subkey, ".skipfetchall"))
407 remote->skip_default_update = git_config_bool(key, value);
408 else if (!strcmp(subkey, ".prune"))
409 remote->prune = git_config_bool(key, value);
410 else if (!strcmp(subkey, ".url")) {
411 const char *v;
412 if (git_config_string(&v, key, value))
413 return -1;
414 add_url(remote, v);
415 } else if (!strcmp(subkey, ".pushurl")) {
416 const char *v;
417 if (git_config_string(&v, key, value))
418 return -1;
419 add_pushurl(remote, v);
420 } else if (!strcmp(subkey, ".push")) {
421 const char *v;
422 if (git_config_string(&v, key, value))
423 return -1;
424 add_push_refspec(remote, v);
425 } else if (!strcmp(subkey, ".fetch")) {
426 const char *v;
427 if (git_config_string(&v, key, value))
428 return -1;
429 add_fetch_refspec(remote, v);
430 } else if (!strcmp(subkey, ".receivepack")) {
431 const char *v;
432 if (git_config_string(&v, key, value))
433 return -1;
434 if (!remote->receivepack)
435 remote->receivepack = v;
436 else
437 error("more than one receivepack given, using the first");
438 } else if (!strcmp(subkey, ".uploadpack")) {
439 const char *v;
440 if (git_config_string(&v, key, value))
441 return -1;
442 if (!remote->uploadpack)
443 remote->uploadpack = v;
444 else
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,
453 key, value);
454 } else if (!strcmp(subkey, ".vcs")) {
455 return git_config_string(&remote->foreign_vcs, key, value);
457 return 0;
460 static void alias_all_urls(void)
462 int i, j;
463 for (i = 0; i < remotes_nr; i++) {
464 int add_pushurl_aliases;
465 if (!remotes[i])
466 continue;
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;
483 int flag;
484 if (default_remote_name) /* did this already */
485 return;
486 default_remote_name = "origin";
487 current_branch = NULL;
488 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
489 if (head_ref && (flag & REF_ISSYMREF) &&
490 starts_with(head_ref, "refs/heads/")) {
491 current_branch =
492 make_branch(head_ref + strlen("refs/heads/"), 0);
494 git_config(handle_config, NULL);
495 alias_all_urls();
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)
506 int i;
508 if (!refspec)
509 return;
511 for (i = 0; i < nr_refspec; i++) {
512 free(refspec[i].src);
513 free(refspec[i].dst);
515 free(refspec);
518 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
520 int i;
521 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
523 for (i = 0; i < nr_refspec; i++) {
524 size_t llen;
525 int is_glob;
526 const char *lhs, *rhs;
527 int flags;
529 is_glob = 0;
531 lhs = refspec[i];
532 if (*lhs == '+') {
533 rs[i].force = 1;
534 lhs++;
537 rhs = strrchr(lhs, ':');
540 * Before going on, special case ":" (or "+:") as a refspec
541 * for pushing matching refs.
543 if (!fetch && rhs == lhs && rhs[1] == '\0') {
544 rs[i].matching = 1;
545 continue;
548 if (rhs) {
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))
557 goto invalid;
558 is_glob = 1;
559 } else if (rhs && is_glob) {
560 goto invalid;
563 rs[i].pattern = is_glob;
564 rs[i].src = xstrndup(lhs, llen);
565 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
567 if (fetch) {
568 unsigned char unused[40];
570 /* LHS */
571 if (!*rs[i].src)
572 ; /* empty is ok; it means "HEAD" */
573 else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
574 rs[i].exact_sha1 = 1; /* ok */
575 else if (!check_refname_format(rs[i].src, flags))
576 ; /* valid looking ref is ok */
577 else
578 goto invalid;
579 /* RHS */
580 if (!rs[i].dst)
581 ; /* missing is ok; it is the same as empty */
582 else if (!*rs[i].dst)
583 ; /* empty is ok; it means "do not store" */
584 else if (!check_refname_format(rs[i].dst, flags))
585 ; /* valid looking ref is ok */
586 else
587 goto invalid;
588 } else {
590 * LHS
591 * - empty is allowed; it means delete.
592 * - when wildcarded, it must be a valid looking ref.
593 * - otherwise, it must be an extended SHA-1, but
594 * there is no existing way to validate this.
596 if (!*rs[i].src)
597 ; /* empty is ok */
598 else if (is_glob) {
599 if (check_refname_format(rs[i].src, flags))
600 goto invalid;
602 else
603 ; /* anything goes, for now */
605 * RHS
606 * - missing is allowed, but LHS then must be a
607 * valid looking ref.
608 * - empty is not allowed.
609 * - otherwise it must be a valid looking ref.
611 if (!rs[i].dst) {
612 if (check_refname_format(rs[i].src, flags))
613 goto invalid;
614 } else if (!*rs[i].dst) {
615 goto invalid;
616 } else {
617 if (check_refname_format(rs[i].dst, flags))
618 goto invalid;
622 return rs;
624 invalid:
625 if (verify) {
627 * nr_refspec must be greater than zero and i must be valid
628 * since it is only possible to reach this point from within
629 * the for loop above.
631 free_refspecs(rs, i+1);
632 return NULL;
634 die("Invalid refspec '%s'", refspec[i]);
637 int valid_fetch_refspec(const char *fetch_refspec_str)
639 struct refspec *refspec;
641 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
642 free_refspecs(refspec, 1);
643 return !!refspec;
646 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
648 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
651 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
653 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
656 void free_refspec(int nr_refspec, struct refspec *refspec)
658 int i;
659 for (i = 0; i < nr_refspec; i++) {
660 free(refspec[i].src);
661 free(refspec[i].dst);
663 free(refspec);
666 static int valid_remote_nick(const char *name)
668 if (!name[0] || is_dot_or_dotdot(name))
669 return 0;
670 return !strchr(name, '/'); /* no slash */
673 static struct remote *remote_get_1(const char *name, const char *pushremote_name)
675 struct remote *ret;
676 int name_given = 0;
678 if (name)
679 name_given = 1;
680 else {
681 if (pushremote_name) {
682 name = pushremote_name;
683 name_given = 1;
684 } else {
685 name = default_remote_name;
686 name_given = explicit_default_remote_name;
690 ret = make_remote(name, 0);
691 if (valid_remote_nick(name)) {
692 if (!valid_remote(ret))
693 read_remotes_file(ret);
694 if (!valid_remote(ret))
695 read_branches_file(ret);
697 if (name_given && !valid_remote(ret))
698 add_url_alias(ret, name);
699 if (!valid_remote(ret))
700 return NULL;
701 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
702 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
703 return ret;
706 struct remote *remote_get(const char *name)
708 read_config();
709 return remote_get_1(name, NULL);
712 struct remote *pushremote_get(const char *name)
714 read_config();
715 return remote_get_1(name, pushremote_name);
718 int remote_is_configured(const char *name)
720 int i;
721 read_config();
723 for (i = 0; i < remotes_nr; i++)
724 if (!strcmp(name, remotes[i]->name))
725 return 1;
726 return 0;
729 int for_each_remote(each_remote_fn fn, void *priv)
731 int i, result = 0;
732 read_config();
733 for (i = 0; i < remotes_nr && !result; i++) {
734 struct remote *r = remotes[i];
735 if (!r)
736 continue;
737 if (!r->fetch)
738 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
739 r->fetch_refspec);
740 if (!r->push)
741 r->push = parse_push_refspec(r->push_refspec_nr,
742 r->push_refspec);
743 result = fn(r, priv);
745 return result;
748 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
750 if (strcmp(ref1->name, ref2->name)) {
751 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
752 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
753 die(_("Cannot fetch both %s and %s to %s"),
754 ref1->name, ref2->name, ref2->peer_ref->name);
755 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
756 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
757 warning(_("%s usually tracks %s, not %s"),
758 ref2->peer_ref->name, ref2->name, ref1->name);
759 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
760 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
761 die(_("%s tracks both %s and %s"),
762 ref2->peer_ref->name, ref1->name, ref2->name);
763 } else {
765 * This last possibility doesn't occur because
766 * FETCH_HEAD_IGNORE entries always appear at
767 * the end of the list.
769 die(_("Internal error"));
772 free(ref2->peer_ref);
773 free(ref2);
776 struct ref *ref_remove_duplicates(struct ref *ref_map)
778 struct string_list refs = STRING_LIST_INIT_NODUP;
779 struct ref *retval = NULL;
780 struct ref **p = &retval;
782 while (ref_map) {
783 struct ref *ref = ref_map;
785 ref_map = ref_map->next;
786 ref->next = NULL;
788 if (!ref->peer_ref) {
789 *p = ref;
790 p = &ref->next;
791 } else {
792 struct string_list_item *item =
793 string_list_insert(&refs, ref->peer_ref->name);
795 if (item->util) {
796 /* Entry already existed */
797 handle_duplicate((struct ref *)item->util, ref);
798 } else {
799 *p = ref;
800 p = &ref->next;
801 item->util = ref;
806 string_list_clear(&refs, 0);
807 return retval;
810 int remote_has_url(struct remote *remote, const char *url)
812 int i;
813 for (i = 0; i < remote->url_nr; i++) {
814 if (!strcmp(remote->url[i], url))
815 return 1;
817 return 0;
820 static int match_name_with_pattern(const char *key, const char *name,
821 const char *value, char **result)
823 const char *kstar = strchr(key, '*');
824 size_t klen;
825 size_t ksuffixlen;
826 size_t namelen;
827 int ret;
828 if (!kstar)
829 die("Key '%s' of pattern had no '*'", key);
830 klen = kstar - key;
831 ksuffixlen = strlen(kstar + 1);
832 namelen = strlen(name);
833 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
834 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
835 if (ret && value) {
836 const char *vstar = strchr(value, '*');
837 size_t vlen;
838 size_t vsuffixlen;
839 if (!vstar)
840 die("Value '%s' of pattern has no '*'", value);
841 vlen = vstar - value;
842 vsuffixlen = strlen(vstar + 1);
843 *result = xmalloc(vlen + vsuffixlen +
844 strlen(name) -
845 klen - ksuffixlen + 1);
846 strncpy(*result, value, vlen);
847 strncpy(*result + vlen,
848 name + klen, namelen - klen - ksuffixlen);
849 strcpy(*result + vlen + namelen - klen - ksuffixlen,
850 vstar + 1);
852 return ret;
855 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
857 int i;
858 int find_src = !query->src;
859 const char *needle = find_src ? query->dst : query->src;
860 char **result = find_src ? &query->src : &query->dst;
862 if (find_src && !query->dst)
863 return error("query_refspecs: need either src or dst");
865 for (i = 0; i < ref_count; i++) {
866 struct refspec *refspec = &refs[i];
867 const char *key = find_src ? refspec->dst : refspec->src;
868 const char *value = find_src ? refspec->src : refspec->dst;
870 if (!refspec->dst)
871 continue;
872 if (refspec->pattern) {
873 if (match_name_with_pattern(key, needle, value, result)) {
874 query->force = refspec->force;
875 return 0;
877 } else if (!strcmp(needle, key)) {
878 *result = xstrdup(value);
879 query->force = refspec->force;
880 return 0;
883 return -1;
886 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
887 const char *name)
889 struct refspec query;
891 memset(&query, 0, sizeof(struct refspec));
892 query.src = (char *)name;
894 if (query_refspecs(refspecs, nr_refspec, &query))
895 return NULL;
897 return query.dst;
900 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
902 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
905 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
906 const char *name)
908 size_t len = strlen(name);
909 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
910 memcpy(ref->name, prefix, prefixlen);
911 memcpy(ref->name + prefixlen, name, len);
912 return ref;
915 struct ref *alloc_ref(const char *name)
917 return alloc_ref_with_prefix("", 0, name);
920 struct ref *copy_ref(const struct ref *ref)
922 struct ref *cpy;
923 size_t len;
924 if (!ref)
925 return NULL;
926 len = strlen(ref->name);
927 cpy = xmalloc(sizeof(struct ref) + len + 1);
928 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
929 cpy->next = NULL;
930 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
931 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
932 cpy->peer_ref = copy_ref(ref->peer_ref);
933 return cpy;
936 struct ref *copy_ref_list(const struct ref *ref)
938 struct ref *ret = NULL;
939 struct ref **tail = &ret;
940 while (ref) {
941 *tail = copy_ref(ref);
942 ref = ref->next;
943 tail = &((*tail)->next);
945 return ret;
948 static void free_ref(struct ref *ref)
950 if (!ref)
951 return;
952 free_ref(ref->peer_ref);
953 free(ref->remote_status);
954 free(ref->symref);
955 free(ref);
958 void free_refs(struct ref *ref)
960 struct ref *next;
961 while (ref) {
962 next = ref->next;
963 free_ref(ref);
964 ref = next;
968 int ref_compare_name(const void *va, const void *vb)
970 const struct ref *a = va, *b = vb;
971 return strcmp(a->name, b->name);
974 static void *ref_list_get_next(const void *a)
976 return ((const struct ref *)a)->next;
979 static void ref_list_set_next(void *a, void *next)
981 ((struct ref *)a)->next = next;
984 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
986 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
989 int count_refspec_match(const char *pattern,
990 struct ref *refs,
991 struct ref **matched_ref)
993 int patlen = strlen(pattern);
994 struct ref *matched_weak = NULL;
995 struct ref *matched = NULL;
996 int weak_match = 0;
997 int match = 0;
999 for (weak_match = match = 0; refs; refs = refs->next) {
1000 char *name = refs->name;
1001 int namelen = strlen(name);
1003 if (!refname_match(pattern, name))
1004 continue;
1006 /* A match is "weak" if it is with refs outside
1007 * heads or tags, and did not specify the pattern
1008 * in full (e.g. "refs/remotes/origin/master") or at
1009 * least from the toplevel (e.g. "remotes/origin/master");
1010 * otherwise "git push $URL master" would result in
1011 * ambiguity between remotes/origin/master and heads/master
1012 * at the remote site.
1014 if (namelen != patlen &&
1015 patlen != namelen - 5 &&
1016 !starts_with(name, "refs/heads/") &&
1017 !starts_with(name, "refs/tags/")) {
1018 /* We want to catch the case where only weak
1019 * matches are found and there are multiple
1020 * matches, and where more than one strong
1021 * matches are found, as ambiguous. One
1022 * strong match with zero or more weak matches
1023 * are acceptable as a unique match.
1025 matched_weak = refs;
1026 weak_match++;
1028 else {
1029 matched = refs;
1030 match++;
1033 if (!matched) {
1034 if (matched_ref)
1035 *matched_ref = matched_weak;
1036 return weak_match;
1038 else {
1039 if (matched_ref)
1040 *matched_ref = matched;
1041 return match;
1045 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1047 **tail = ref;
1048 while (ref->next)
1049 ref = ref->next;
1050 *tail = &ref->next;
1053 static struct ref *alloc_delete_ref(void)
1055 struct ref *ref = alloc_ref("(delete)");
1056 hashclr(ref->new_sha1);
1057 return ref;
1060 static int try_explicit_object_name(const char *name,
1061 struct ref **match)
1063 unsigned char sha1[20];
1065 if (!*name) {
1066 if (match)
1067 *match = alloc_delete_ref();
1068 return 0;
1071 if (get_sha1(name, sha1))
1072 return -1;
1074 if (match) {
1075 *match = alloc_ref(name);
1076 hashcpy((*match)->new_sha1, sha1);
1078 return 0;
1081 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1083 struct ref *ret = alloc_ref(name);
1084 tail_link_ref(ret, tail);
1085 return ret;
1088 static char *guess_ref(const char *name, struct ref *peer)
1090 struct strbuf buf = STRBUF_INIT;
1091 unsigned char sha1[20];
1093 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1094 if (!r)
1095 return NULL;
1097 if (starts_with(r, "refs/heads/"))
1098 strbuf_addstr(&buf, "refs/heads/");
1099 else if (starts_with(r, "refs/tags/"))
1100 strbuf_addstr(&buf, "refs/tags/");
1101 else
1102 return NULL;
1104 strbuf_addstr(&buf, name);
1105 return strbuf_detach(&buf, NULL);
1108 static int match_explicit_lhs(struct ref *src,
1109 struct refspec *rs,
1110 struct ref **match,
1111 int *allocated_match)
1113 switch (count_refspec_match(rs->src, src, match)) {
1114 case 1:
1115 if (allocated_match)
1116 *allocated_match = 0;
1117 return 0;
1118 case 0:
1119 /* The source could be in the get_sha1() format
1120 * not a reference name. :refs/other is a
1121 * way to delete 'other' ref at the remote end.
1123 if (try_explicit_object_name(rs->src, match) < 0)
1124 return error("src refspec %s does not match any.", rs->src);
1125 if (allocated_match)
1126 *allocated_match = 1;
1127 return 0;
1128 default:
1129 return error("src refspec %s matches more than one.", rs->src);
1133 static int match_explicit(struct ref *src, struct ref *dst,
1134 struct ref ***dst_tail,
1135 struct refspec *rs)
1137 struct ref *matched_src, *matched_dst;
1138 int allocated_src;
1140 const char *dst_value = rs->dst;
1141 char *dst_guess;
1143 if (rs->pattern || rs->matching)
1144 return 0;
1146 matched_src = matched_dst = NULL;
1147 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1148 return -1;
1150 if (!dst_value) {
1151 unsigned char sha1[20];
1152 int flag;
1154 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1155 if (!dst_value ||
1156 ((flag & REF_ISSYMREF) &&
1157 !starts_with(dst_value, "refs/heads/")))
1158 die("%s cannot be resolved to branch.",
1159 matched_src->name);
1162 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1163 case 1:
1164 break;
1165 case 0:
1166 if (!memcmp(dst_value, "refs/", 5))
1167 matched_dst = make_linked_ref(dst_value, dst_tail);
1168 else if (is_null_sha1(matched_src->new_sha1))
1169 error("unable to delete '%s': remote ref does not exist",
1170 dst_value);
1171 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1172 matched_dst = make_linked_ref(dst_guess, dst_tail);
1173 else
1174 error("unable to push to unqualified destination: %s\n"
1175 "The destination refspec neither matches an "
1176 "existing ref on the remote nor\n"
1177 "begins with refs/, and we are unable to "
1178 "guess a prefix based on the source ref.",
1179 dst_value);
1180 break;
1181 default:
1182 matched_dst = NULL;
1183 error("dst refspec %s matches more than one.",
1184 dst_value);
1185 break;
1187 if (!matched_dst)
1188 return -1;
1189 if (matched_dst->peer_ref)
1190 return error("dst ref %s receives from more than one src.",
1191 matched_dst->name);
1192 else {
1193 matched_dst->peer_ref = allocated_src ?
1194 matched_src :
1195 copy_ref(matched_src);
1196 matched_dst->force = rs->force;
1198 return 0;
1201 static int match_explicit_refs(struct ref *src, struct ref *dst,
1202 struct ref ***dst_tail, struct refspec *rs,
1203 int rs_nr)
1205 int i, errs;
1206 for (i = errs = 0; i < rs_nr; i++)
1207 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1208 return errs;
1211 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1212 int send_mirror, int direction, const struct refspec **ret_pat)
1214 const struct refspec *pat;
1215 char *name;
1216 int i;
1217 int matching_refs = -1;
1218 for (i = 0; i < rs_nr; i++) {
1219 if (rs[i].matching &&
1220 (matching_refs == -1 || rs[i].force)) {
1221 matching_refs = i;
1222 continue;
1225 if (rs[i].pattern) {
1226 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1227 int match;
1228 if (direction == FROM_SRC)
1229 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1230 else
1231 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1232 if (match) {
1233 matching_refs = i;
1234 break;
1238 if (matching_refs == -1)
1239 return NULL;
1241 pat = rs + matching_refs;
1242 if (pat->matching) {
1244 * "matching refs"; traditionally we pushed everything
1245 * including refs outside refs/heads/ hierarchy, but
1246 * that does not make much sense these days.
1248 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1249 return NULL;
1250 name = xstrdup(ref->name);
1252 if (ret_pat)
1253 *ret_pat = pat;
1254 return name;
1257 static struct ref **tail_ref(struct ref **head)
1259 struct ref **tail = head;
1260 while (*tail)
1261 tail = &((*tail)->next);
1262 return tail;
1265 struct tips {
1266 struct commit **tip;
1267 int nr, alloc;
1270 static void add_to_tips(struct tips *tips, const unsigned char *sha1)
1272 struct commit *commit;
1274 if (is_null_sha1(sha1))
1275 return;
1276 commit = lookup_commit_reference_gently(sha1, 1);
1277 if (!commit || (commit->object.flags & TMP_MARK))
1278 return;
1279 commit->object.flags |= TMP_MARK;
1280 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1281 tips->tip[tips->nr++] = commit;
1284 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1286 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1287 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1288 struct string_list_item *item;
1289 struct ref *ref;
1290 struct tips sent_tips;
1293 * Collect everything we know they would have at the end of
1294 * this push, and collect all tags they have.
1296 memset(&sent_tips, 0, sizeof(sent_tips));
1297 for (ref = *dst; ref; ref = ref->next) {
1298 if (ref->peer_ref &&
1299 !is_null_sha1(ref->peer_ref->new_sha1))
1300 add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
1301 else
1302 add_to_tips(&sent_tips, ref->old_sha1);
1303 if (starts_with(ref->name, "refs/tags/"))
1304 string_list_append(&dst_tag, ref->name);
1306 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1308 sort_string_list(&dst_tag);
1310 /* Collect tags they do not have. */
1311 for (ref = src; ref; ref = ref->next) {
1312 if (!starts_with(ref->name, "refs/tags/"))
1313 continue; /* not a tag */
1314 if (string_list_has_string(&dst_tag, ref->name))
1315 continue; /* they already have it */
1316 if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
1317 continue; /* be conservative */
1318 item = string_list_append(&src_tag, ref->name);
1319 item->util = ref;
1321 string_list_clear(&dst_tag, 0);
1324 * At this point, src_tag lists tags that are missing from
1325 * dst, and sent_tips lists the tips we are pushing or those
1326 * that we know they already have. An element in the src_tag
1327 * that is an ancestor of any of the sent_tips needs to be
1328 * sent to the other side.
1330 if (sent_tips.nr) {
1331 for_each_string_list_item(item, &src_tag) {
1332 struct ref *ref = item->util;
1333 struct ref *dst_ref;
1334 struct commit *commit;
1336 if (is_null_sha1(ref->new_sha1))
1337 continue;
1338 commit = lookup_commit_reference_gently(ref->new_sha1, 1);
1339 if (!commit)
1340 /* not pushing a commit, which is not an error */
1341 continue;
1344 * Is this tag, which they do not have, reachable from
1345 * any of the commits we are sending?
1347 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1348 continue;
1350 /* Add it in */
1351 dst_ref = make_linked_ref(ref->name, dst_tail);
1352 hashcpy(dst_ref->new_sha1, ref->new_sha1);
1353 dst_ref->peer_ref = copy_ref(ref);
1356 string_list_clear(&src_tag, 0);
1357 free(sent_tips.tip);
1360 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1362 for ( ; list; list = list->next)
1363 if (!strcmp(list->name, name))
1364 return (struct ref *)list;
1365 return NULL;
1368 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1370 for ( ; ref; ref = ref->next)
1371 string_list_append_nodup(ref_index, ref->name)->util = ref;
1373 sort_string_list(ref_index);
1377 * Given only the set of local refs, sanity-check the set of push
1378 * refspecs. We can't catch all errors that match_push_refs would,
1379 * but we can catch some errors early before even talking to the
1380 * remote side.
1382 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1384 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1385 int ret = 0;
1386 int i;
1388 for (i = 0; i < nr_refspec; i++) {
1389 struct refspec *rs = refspec + i;
1391 if (rs->pattern || rs->matching)
1392 continue;
1394 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1397 free_refspec(nr_refspec, refspec);
1398 return ret;
1402 * Given the set of refs the local repository has, the set of refs the
1403 * remote repository has, and the refspec used for push, determine
1404 * what remote refs we will update and with what value by setting
1405 * peer_ref (which object is being pushed) and force (if the push is
1406 * forced) in elements of "dst". The function may add new elements to
1407 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1409 int match_push_refs(struct ref *src, struct ref **dst,
1410 int nr_refspec, const char **refspec, int flags)
1412 struct refspec *rs;
1413 int send_all = flags & MATCH_REFS_ALL;
1414 int send_mirror = flags & MATCH_REFS_MIRROR;
1415 int send_prune = flags & MATCH_REFS_PRUNE;
1416 int errs;
1417 static const char *default_refspec[] = { ":", NULL };
1418 struct ref *ref, **dst_tail = tail_ref(dst);
1419 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1421 if (!nr_refspec) {
1422 nr_refspec = 1;
1423 refspec = default_refspec;
1425 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1426 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1428 /* pick the remainder */
1429 for (ref = src; ref; ref = ref->next) {
1430 struct string_list_item *dst_item;
1431 struct ref *dst_peer;
1432 const struct refspec *pat = NULL;
1433 char *dst_name;
1435 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1436 if (!dst_name)
1437 continue;
1439 if (!dst_ref_index.nr)
1440 prepare_ref_index(&dst_ref_index, *dst);
1442 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1443 dst_peer = dst_item ? dst_item->util : NULL;
1444 if (dst_peer) {
1445 if (dst_peer->peer_ref)
1446 /* We're already sending something to this ref. */
1447 goto free_name;
1448 } else {
1449 if (pat->matching && !(send_all || send_mirror))
1451 * Remote doesn't have it, and we have no
1452 * explicit pattern, and we don't have
1453 * --all nor --mirror.
1455 goto free_name;
1457 /* Create a new one and link it */
1458 dst_peer = make_linked_ref(dst_name, &dst_tail);
1459 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1460 string_list_insert(&dst_ref_index,
1461 dst_peer->name)->util = dst_peer;
1463 dst_peer->peer_ref = copy_ref(ref);
1464 dst_peer->force = pat->force;
1465 free_name:
1466 free(dst_name);
1469 string_list_clear(&dst_ref_index, 0);
1471 if (flags & MATCH_REFS_FOLLOW_TAGS)
1472 add_missing_tags(src, dst, &dst_tail);
1474 if (send_prune) {
1475 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1476 /* check for missing refs on the remote */
1477 for (ref = *dst; ref; ref = ref->next) {
1478 char *src_name;
1480 if (ref->peer_ref)
1481 /* We're already sending something to this ref. */
1482 continue;
1484 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1485 if (src_name) {
1486 if (!src_ref_index.nr)
1487 prepare_ref_index(&src_ref_index, src);
1488 if (!string_list_has_string(&src_ref_index,
1489 src_name))
1490 ref->peer_ref = alloc_delete_ref();
1491 free(src_name);
1494 string_list_clear(&src_ref_index, 0);
1496 if (errs)
1497 return -1;
1498 return 0;
1501 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1502 int force_update)
1504 struct ref *ref;
1506 for (ref = remote_refs; ref; ref = ref->next) {
1507 int force_ref_update = ref->force || force_update;
1508 int reject_reason = 0;
1510 if (ref->peer_ref)
1511 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1512 else if (!send_mirror)
1513 continue;
1515 ref->deletion = is_null_sha1(ref->new_sha1);
1516 if (!ref->deletion &&
1517 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1518 ref->status = REF_STATUS_UPTODATE;
1519 continue;
1523 * Bypass the usual "must fast-forward" check but
1524 * replace it with a weaker "the old value must be
1525 * this value we observed". If the remote ref has
1526 * moved and is now different from what we expect,
1527 * reject any push.
1529 * It also is an error if the user told us to check
1530 * with the remote-tracking branch to find the value
1531 * to expect, but we did not have such a tracking
1532 * branch.
1534 if (ref->expect_old_sha1) {
1535 if (ref->expect_old_no_trackback ||
1536 hashcmp(ref->old_sha1, ref->old_sha1_expect))
1537 reject_reason = REF_STATUS_REJECT_STALE;
1541 * The usual "must fast-forward" rules.
1543 * Decide whether an individual refspec A:B can be
1544 * pushed. The push will succeed if any of the
1545 * following are true:
1547 * (1) the remote reference B does not exist
1549 * (2) the remote reference B is being removed (i.e.,
1550 * pushing :B where no source is specified)
1552 * (3) the destination is not under refs/tags/, and
1553 * if the old and new value is a commit, the new
1554 * is a descendant of the old.
1556 * (4) it is forced using the +A:B notation, or by
1557 * passing the --force argument
1560 else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1561 if (starts_with(ref->name, "refs/tags/"))
1562 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1563 else if (!has_sha1_file(ref->old_sha1))
1564 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1565 else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
1566 !lookup_commit_reference_gently(ref->new_sha1, 1))
1567 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1568 else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1569 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1573 * "--force" will defeat any rejection implemented
1574 * by the rules above.
1576 if (!force_ref_update)
1577 ref->status = reject_reason;
1578 else if (reject_reason)
1579 ref->forced_update = 1;
1583 struct branch *branch_get(const char *name)
1585 struct branch *ret;
1587 read_config();
1588 if (!name || !*name || !strcmp(name, "HEAD"))
1589 ret = current_branch;
1590 else
1591 ret = make_branch(name, 0);
1592 if (ret && ret->remote_name) {
1593 ret->remote = remote_get(ret->remote_name);
1594 if (ret->merge_nr) {
1595 int i;
1596 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1597 for (i = 0; i < ret->merge_nr; i++) {
1598 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1599 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1600 if (remote_find_tracking(ret->remote, ret->merge[i])
1601 && !strcmp(ret->remote_name, "."))
1602 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1606 return ret;
1609 int branch_has_merge_config(struct branch *branch)
1611 return branch && !!branch->merge;
1614 int branch_merge_matches(struct branch *branch,
1615 int i,
1616 const char *refname)
1618 if (!branch || i < 0 || i >= branch->merge_nr)
1619 return 0;
1620 return refname_match(branch->merge[i]->src, refname);
1623 static int ignore_symref_update(const char *refname)
1625 unsigned char sha1[20];
1626 int flag;
1628 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1629 return 0; /* non-existing refs are OK */
1630 return (flag & REF_ISSYMREF);
1634 * Create and return a list of (struct ref) consisting of copies of
1635 * each remote_ref that matches refspec. refspec must be a pattern.
1636 * Fill in the copies' peer_ref to describe the local tracking refs to
1637 * which they map. Omit any references that would map to an existing
1638 * local symbolic ref.
1640 static struct ref *get_expanded_map(const struct ref *remote_refs,
1641 const struct refspec *refspec)
1643 const struct ref *ref;
1644 struct ref *ret = NULL;
1645 struct ref **tail = &ret;
1647 for (ref = remote_refs; ref; ref = ref->next) {
1648 char *expn_name = NULL;
1650 if (strchr(ref->name, '^'))
1651 continue; /* a dereference item */
1652 if (match_name_with_pattern(refspec->src, ref->name,
1653 refspec->dst, &expn_name) &&
1654 !ignore_symref_update(expn_name)) {
1655 struct ref *cpy = copy_ref(ref);
1657 cpy->peer_ref = alloc_ref(expn_name);
1658 if (refspec->force)
1659 cpy->peer_ref->force = 1;
1660 *tail = cpy;
1661 tail = &cpy->next;
1663 free(expn_name);
1666 return ret;
1669 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1671 const struct ref *ref;
1672 for (ref = refs; ref; ref = ref->next) {
1673 if (refname_match(name, ref->name))
1674 return ref;
1676 return NULL;
1679 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1681 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1683 if (!ref)
1684 return NULL;
1686 return copy_ref(ref);
1689 static struct ref *get_local_ref(const char *name)
1691 if (!name || name[0] == '\0')
1692 return NULL;
1694 if (starts_with(name, "refs/"))
1695 return alloc_ref(name);
1697 if (starts_with(name, "heads/") ||
1698 starts_with(name, "tags/") ||
1699 starts_with(name, "remotes/"))
1700 return alloc_ref_with_prefix("refs/", 5, name);
1702 return alloc_ref_with_prefix("refs/heads/", 11, name);
1705 int get_fetch_map(const struct ref *remote_refs,
1706 const struct refspec *refspec,
1707 struct ref ***tail,
1708 int missing_ok)
1710 struct ref *ref_map, **rmp;
1712 if (refspec->pattern) {
1713 ref_map = get_expanded_map(remote_refs, refspec);
1714 } else {
1715 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1717 if (refspec->exact_sha1) {
1718 ref_map = alloc_ref(name);
1719 get_sha1_hex(name, ref_map->old_sha1);
1720 } else {
1721 ref_map = get_remote_ref(remote_refs, name);
1723 if (!missing_ok && !ref_map)
1724 die("Couldn't find remote ref %s", name);
1725 if (ref_map) {
1726 ref_map->peer_ref = get_local_ref(refspec->dst);
1727 if (ref_map->peer_ref && refspec->force)
1728 ref_map->peer_ref->force = 1;
1732 for (rmp = &ref_map; *rmp; ) {
1733 if ((*rmp)->peer_ref) {
1734 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1735 check_refname_format((*rmp)->peer_ref->name, 0)) {
1736 struct ref *ignore = *rmp;
1737 error("* Ignoring funny ref '%s' locally",
1738 (*rmp)->peer_ref->name);
1739 *rmp = (*rmp)->next;
1740 free(ignore->peer_ref);
1741 free(ignore);
1742 continue;
1745 rmp = &((*rmp)->next);
1748 if (ref_map)
1749 tail_link_ref(ref_map, tail);
1751 return 0;
1754 int resolve_remote_symref(struct ref *ref, struct ref *list)
1756 if (!ref->symref)
1757 return 0;
1758 for (; list; list = list->next)
1759 if (!strcmp(ref->symref, list->name)) {
1760 hashcpy(ref->old_sha1, list->old_sha1);
1761 return 0;
1763 return 1;
1766 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1768 while (list) {
1769 struct commit_list *temp = list;
1770 temp->item->object.flags &= ~mark;
1771 list = temp->next;
1772 free(temp);
1776 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1778 struct object *o;
1779 struct commit *old, *new;
1780 struct commit_list *list, *used;
1781 int found = 0;
1784 * Both new and old must be commit-ish and new is descendant of
1785 * old. Otherwise we require --force.
1787 o = deref_tag(parse_object(old_sha1), NULL, 0);
1788 if (!o || o->type != OBJ_COMMIT)
1789 return 0;
1790 old = (struct commit *) o;
1792 o = deref_tag(parse_object(new_sha1), NULL, 0);
1793 if (!o || o->type != OBJ_COMMIT)
1794 return 0;
1795 new = (struct commit *) o;
1797 if (parse_commit(new) < 0)
1798 return 0;
1800 used = list = NULL;
1801 commit_list_insert(new, &list);
1802 while (list) {
1803 new = pop_most_recent_commit(&list, TMP_MARK);
1804 commit_list_insert(new, &used);
1805 if (new == old) {
1806 found = 1;
1807 break;
1810 unmark_and_free(list, TMP_MARK);
1811 unmark_and_free(used, TMP_MARK);
1812 return found;
1816 * Compare a branch with its upstream, and save their differences (number
1817 * of commits) in *num_ours and *num_theirs.
1819 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1820 * (with "gone" base), otherwise 1 (with base).
1822 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1824 unsigned char sha1[20];
1825 struct commit *ours, *theirs;
1826 char symmetric[84];
1827 struct rev_info revs;
1828 const char *rev_argv[10], *base;
1829 int rev_argc;
1831 /* Cannot stat unless we are marked to build on top of somebody else. */
1832 if (!branch ||
1833 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1834 return 0;
1836 /* Cannot stat if what we used to build on no longer exists */
1837 base = branch->merge[0]->dst;
1838 if (read_ref(base, sha1))
1839 return -1;
1840 theirs = lookup_commit_reference(sha1);
1841 if (!theirs)
1842 return -1;
1844 if (read_ref(branch->refname, sha1))
1845 return -1;
1846 ours = lookup_commit_reference(sha1);
1847 if (!ours)
1848 return -1;
1850 /* are we the same? */
1851 if (theirs == ours) {
1852 *num_theirs = *num_ours = 0;
1853 return 1;
1856 /* Run "rev-list --left-right ours...theirs" internally... */
1857 rev_argc = 0;
1858 rev_argv[rev_argc++] = NULL;
1859 rev_argv[rev_argc++] = "--left-right";
1860 rev_argv[rev_argc++] = symmetric;
1861 rev_argv[rev_argc++] = "--";
1862 rev_argv[rev_argc] = NULL;
1864 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1865 strcpy(symmetric + 40, "...");
1866 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1868 init_revisions(&revs, NULL);
1869 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1870 prepare_revision_walk(&revs);
1872 /* ... and count the commits on each side. */
1873 *num_ours = 0;
1874 *num_theirs = 0;
1875 while (1) {
1876 struct commit *c = get_revision(&revs);
1877 if (!c)
1878 break;
1879 if (c->object.flags & SYMMETRIC_LEFT)
1880 (*num_ours)++;
1881 else
1882 (*num_theirs)++;
1885 /* clear object flags smudged by the above traversal */
1886 clear_commit_marks(ours, ALL_REV_FLAGS);
1887 clear_commit_marks(theirs, ALL_REV_FLAGS);
1888 return 1;
1892 * Return true when there is anything to report, otherwise false.
1894 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1896 int ours, theirs;
1897 const char *base;
1898 int upstream_is_gone = 0;
1900 switch (stat_tracking_info(branch, &ours, &theirs)) {
1901 case 0:
1902 /* no base */
1903 return 0;
1904 case -1:
1905 /* with "gone" base */
1906 upstream_is_gone = 1;
1907 break;
1908 default:
1909 /* with base */
1910 break;
1913 base = branch->merge[0]->dst;
1914 base = shorten_unambiguous_ref(base, 0);
1915 if (upstream_is_gone) {
1916 strbuf_addf(sb,
1917 _("Your branch is based on '%s', but the upstream is gone.\n"),
1918 base);
1919 if (advice_status_hints)
1920 strbuf_addf(sb,
1921 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1922 } else if (!ours && !theirs) {
1923 strbuf_addf(sb,
1924 _("Your branch is up-to-date with '%s'.\n"),
1925 base);
1926 } else if (!theirs) {
1927 strbuf_addf(sb,
1928 Q_("Your branch is ahead of '%s' by %d commit.\n",
1929 "Your branch is ahead of '%s' by %d commits.\n",
1930 ours),
1931 base, ours);
1932 if (advice_status_hints)
1933 strbuf_addf(sb,
1934 _(" (use \"git push\" to publish your local commits)\n"));
1935 } else if (!ours) {
1936 strbuf_addf(sb,
1937 Q_("Your branch is behind '%s' by %d commit, "
1938 "and can be fast-forwarded.\n",
1939 "Your branch is behind '%s' by %d commits, "
1940 "and can be fast-forwarded.\n",
1941 theirs),
1942 base, theirs);
1943 if (advice_status_hints)
1944 strbuf_addf(sb,
1945 _(" (use \"git pull\" to update your local branch)\n"));
1946 } else {
1947 strbuf_addf(sb,
1948 Q_("Your branch and '%s' have diverged,\n"
1949 "and have %d and %d different commit each, "
1950 "respectively.\n",
1951 "Your branch and '%s' have diverged,\n"
1952 "and have %d and %d different commits each, "
1953 "respectively.\n",
1954 theirs),
1955 base, ours, theirs);
1956 if (advice_status_hints)
1957 strbuf_addf(sb,
1958 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1960 return 1;
1963 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1965 struct ref ***local_tail = cb_data;
1966 struct ref *ref;
1967 int len;
1969 /* we already know it starts with refs/ to get here */
1970 if (check_refname_format(refname + 5, 0))
1971 return 0;
1973 len = strlen(refname) + 1;
1974 ref = xcalloc(1, sizeof(*ref) + len);
1975 hashcpy(ref->new_sha1, sha1);
1976 memcpy(ref->name, refname, len);
1977 **local_tail = ref;
1978 *local_tail = &ref->next;
1979 return 0;
1982 struct ref *get_local_heads(void)
1984 struct ref *local_refs = NULL, **local_tail = &local_refs;
1985 for_each_ref(one_local_ref, &local_tail);
1986 return local_refs;
1989 struct ref *guess_remote_head(const struct ref *head,
1990 const struct ref *refs,
1991 int all)
1993 const struct ref *r;
1994 struct ref *list = NULL;
1995 struct ref **tail = &list;
1997 if (!head)
1998 return NULL;
2001 * Some transports support directly peeking at
2002 * where HEAD points; if that is the case, then
2003 * we don't have to guess.
2005 if (head->symref)
2006 return copy_ref(find_ref_by_name(refs, head->symref));
2008 /* If refs/heads/master could be right, it is. */
2009 if (!all) {
2010 r = find_ref_by_name(refs, "refs/heads/master");
2011 if (r && !hashcmp(r->old_sha1, head->old_sha1))
2012 return copy_ref(r);
2015 /* Look for another ref that points there */
2016 for (r = refs; r; r = r->next) {
2017 if (r != head &&
2018 starts_with(r->name, "refs/heads/") &&
2019 !hashcmp(r->old_sha1, head->old_sha1)) {
2020 *tail = copy_ref(r);
2021 tail = &((*tail)->next);
2022 if (!all)
2023 break;
2027 return list;
2030 struct stale_heads_info {
2031 struct string_list *ref_names;
2032 struct ref **stale_refs_tail;
2033 struct refspec *refs;
2034 int ref_count;
2037 static int get_stale_heads_cb(const char *refname,
2038 const unsigned char *sha1, int flags, void *cb_data)
2040 struct stale_heads_info *info = cb_data;
2041 struct refspec query;
2042 memset(&query, 0, sizeof(struct refspec));
2043 query.dst = (char *)refname;
2045 if (query_refspecs(info->refs, info->ref_count, &query))
2046 return 0; /* No matches */
2049 * If we did find a suitable refspec and it's not a symref and
2050 * it's not in the list of refs that currently exist in that
2051 * remote we consider it to be stale.
2053 if (!((flags & REF_ISSYMREF) ||
2054 string_list_has_string(info->ref_names, query.src))) {
2055 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2056 hashcpy(ref->new_sha1, sha1);
2059 free(query.src);
2060 return 0;
2063 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2065 struct ref *ref, *stale_refs = NULL;
2066 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2067 struct stale_heads_info info;
2068 info.ref_names = &ref_names;
2069 info.stale_refs_tail = &stale_refs;
2070 info.refs = refs;
2071 info.ref_count = ref_count;
2072 for (ref = fetch_map; ref; ref = ref->next)
2073 string_list_append(&ref_names, ref->name);
2074 sort_string_list(&ref_names);
2075 for_each_ref(get_stale_heads_cb, &info);
2076 string_list_clear(&ref_names, 0);
2077 return stale_refs;
2081 * Compare-and-swap
2083 void clear_cas_option(struct push_cas_option *cas)
2085 int i;
2087 for (i = 0; i < cas->nr; i++)
2088 free(cas->entry[i].refname);
2089 free(cas->entry);
2090 memset(cas, 0, sizeof(*cas));
2093 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2094 const char *refname,
2095 size_t refnamelen)
2097 struct push_cas *entry;
2098 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2099 entry = &cas->entry[cas->nr++];
2100 memset(entry, 0, sizeof(*entry));
2101 entry->refname = xmemdupz(refname, refnamelen);
2102 return entry;
2105 int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2107 const char *colon;
2108 struct push_cas *entry;
2110 if (unset) {
2111 /* "--no-<option>" */
2112 clear_cas_option(cas);
2113 return 0;
2116 if (!arg) {
2117 /* just "--<option>" */
2118 cas->use_tracking_for_rest = 1;
2119 return 0;
2122 /* "--<option>=refname" or "--<option>=refname:value" */
2123 colon = strchrnul(arg, ':');
2124 entry = add_cas_entry(cas, arg, colon - arg);
2125 if (!*colon)
2126 entry->use_tracking = 1;
2127 else if (get_sha1(colon + 1, entry->expect))
2128 return error("cannot parse expected object name '%s'", colon + 1);
2129 return 0;
2132 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2134 return parse_push_cas_option(opt->value, arg, unset);
2137 int is_empty_cas(const struct push_cas_option *cas)
2139 return !cas->use_tracking_for_rest && !cas->nr;
2143 * Look at remote.fetch refspec and see if we have a remote
2144 * tracking branch for the refname there. Fill its current
2145 * value in sha1[].
2146 * If we cannot do so, return negative to signal an error.
2148 static int remote_tracking(struct remote *remote, const char *refname,
2149 unsigned char sha1[20])
2151 char *dst;
2153 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2154 if (!dst)
2155 return -1; /* no tracking ref for refname at remote */
2156 if (read_ref(dst, sha1))
2157 return -1; /* we know what the tracking ref is but we cannot read it */
2158 return 0;
2161 static void apply_cas(struct push_cas_option *cas,
2162 struct remote *remote,
2163 struct ref *ref)
2165 int i;
2167 /* Find an explicit --<option>=<name>[:<value>] entry */
2168 for (i = 0; i < cas->nr; i++) {
2169 struct push_cas *entry = &cas->entry[i];
2170 if (!refname_match(entry->refname, ref->name))
2171 continue;
2172 ref->expect_old_sha1 = 1;
2173 if (!entry->use_tracking)
2174 hashcpy(ref->old_sha1_expect, cas->entry[i].expect);
2175 else if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2176 ref->expect_old_no_trackback = 1;
2177 return;
2180 /* Are we using "--<option>" to cover all? */
2181 if (!cas->use_tracking_for_rest)
2182 return;
2184 ref->expect_old_sha1 = 1;
2185 if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
2186 ref->expect_old_no_trackback = 1;
2189 void apply_push_cas(struct push_cas_option *cas,
2190 struct remote *remote,
2191 struct ref *remote_refs)
2193 struct ref *ref;
2194 for (ref = remote_refs; ref; ref = ref->next)
2195 apply_cas(cas, remote, ref);