Merge branch 'jc/diff-filter-negation'
[git.git] / remote.c
blob8f0f2dd10e13ea8bd75e622af89acb02fe494440
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 (!prefixcmp(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 (!prefixcmp(buffer, "URL:")) {
243 value_list = 0;
244 s = buffer + 4;
245 } else if (!prefixcmp(buffer, "Push:")) {
246 value_list = 1;
247 s = buffer + 5;
248 } else if (!prefixcmp(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 (!prefixcmp(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 (!prefixcmp(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 (prefixcmp(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 = 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/")) {
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 void ref_remove_duplicates(struct ref *ref_map)
750 struct string_list refs = STRING_LIST_INIT_NODUP;
751 struct string_list_item *item = NULL;
752 struct ref *prev = NULL, *next = NULL;
753 for (; ref_map; prev = ref_map, ref_map = next) {
754 next = ref_map->next;
755 if (!ref_map->peer_ref)
756 continue;
758 item = string_list_lookup(&refs, ref_map->peer_ref->name);
759 if (item) {
760 if (strcmp(((struct ref *)item->util)->name,
761 ref_map->name))
762 die("%s tracks both %s and %s",
763 ref_map->peer_ref->name,
764 ((struct ref *)item->util)->name,
765 ref_map->name);
766 prev->next = ref_map->next;
767 free(ref_map->peer_ref);
768 free(ref_map);
769 ref_map = prev; /* skip this; we freed it */
770 continue;
773 item = string_list_insert(&refs, ref_map->peer_ref->name);
774 item->util = ref_map;
776 string_list_clear(&refs, 0);
779 int remote_has_url(struct remote *remote, const char *url)
781 int i;
782 for (i = 0; i < remote->url_nr; i++) {
783 if (!strcmp(remote->url[i], url))
784 return 1;
786 return 0;
789 static int match_name_with_pattern(const char *key, const char *name,
790 const char *value, char **result)
792 const char *kstar = strchr(key, '*');
793 size_t klen;
794 size_t ksuffixlen;
795 size_t namelen;
796 int ret;
797 if (!kstar)
798 die("Key '%s' of pattern had no '*'", key);
799 klen = kstar - key;
800 ksuffixlen = strlen(kstar + 1);
801 namelen = strlen(name);
802 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
803 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
804 if (ret && value) {
805 const char *vstar = strchr(value, '*');
806 size_t vlen;
807 size_t vsuffixlen;
808 if (!vstar)
809 die("Value '%s' of pattern has no '*'", value);
810 vlen = vstar - value;
811 vsuffixlen = strlen(vstar + 1);
812 *result = xmalloc(vlen + vsuffixlen +
813 strlen(name) -
814 klen - ksuffixlen + 1);
815 strncpy(*result, value, vlen);
816 strncpy(*result + vlen,
817 name + klen, namelen - klen - ksuffixlen);
818 strcpy(*result + vlen + namelen - klen - ksuffixlen,
819 vstar + 1);
821 return ret;
824 static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
826 int i;
827 int find_src = !query->src;
829 if (find_src && !query->dst)
830 return error("query_refspecs: need either src or dst");
832 for (i = 0; i < ref_count; i++) {
833 struct refspec *refspec = &refs[i];
834 const char *key = find_src ? refspec->dst : refspec->src;
835 const char *value = find_src ? refspec->src : refspec->dst;
836 const char *needle = find_src ? query->dst : query->src;
837 char **result = find_src ? &query->src : &query->dst;
839 if (!refspec->dst)
840 continue;
841 if (refspec->pattern) {
842 if (match_name_with_pattern(key, needle, value, result)) {
843 query->force = refspec->force;
844 return 0;
846 } else if (!strcmp(needle, key)) {
847 *result = xstrdup(value);
848 query->force = refspec->force;
849 return 0;
852 return -1;
855 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
856 const char *name)
858 struct refspec query;
860 memset(&query, 0, sizeof(struct refspec));
861 query.src = (char *)name;
863 if (query_refspecs(refspecs, nr_refspec, &query))
864 return NULL;
866 return query.dst;
869 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
871 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
874 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
875 const char *name)
877 size_t len = strlen(name);
878 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
879 memcpy(ref->name, prefix, prefixlen);
880 memcpy(ref->name + prefixlen, name, len);
881 return ref;
884 struct ref *alloc_ref(const char *name)
886 return alloc_ref_with_prefix("", 0, name);
889 struct ref *copy_ref(const struct ref *ref)
891 struct ref *cpy;
892 size_t len;
893 if (!ref)
894 return NULL;
895 len = strlen(ref->name);
896 cpy = xmalloc(sizeof(struct ref) + len + 1);
897 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
898 cpy->next = NULL;
899 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
900 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
901 cpy->peer_ref = copy_ref(ref->peer_ref);
902 return cpy;
905 struct ref *copy_ref_list(const struct ref *ref)
907 struct ref *ret = NULL;
908 struct ref **tail = &ret;
909 while (ref) {
910 *tail = copy_ref(ref);
911 ref = ref->next;
912 tail = &((*tail)->next);
914 return ret;
917 static void free_ref(struct ref *ref)
919 if (!ref)
920 return;
921 free_ref(ref->peer_ref);
922 free(ref->remote_status);
923 free(ref->symref);
924 free(ref);
927 void free_refs(struct ref *ref)
929 struct ref *next;
930 while (ref) {
931 next = ref->next;
932 free_ref(ref);
933 ref = next;
937 int ref_compare_name(const void *va, const void *vb)
939 const struct ref *a = va, *b = vb;
940 return strcmp(a->name, b->name);
943 static void *ref_list_get_next(const void *a)
945 return ((const struct ref *)a)->next;
948 static void ref_list_set_next(void *a, void *next)
950 ((struct ref *)a)->next = next;
953 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
955 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
958 static int count_refspec_match(const char *pattern,
959 struct ref *refs,
960 struct ref **matched_ref)
962 int patlen = strlen(pattern);
963 struct ref *matched_weak = NULL;
964 struct ref *matched = NULL;
965 int weak_match = 0;
966 int match = 0;
968 for (weak_match = match = 0; refs; refs = refs->next) {
969 char *name = refs->name;
970 int namelen = strlen(name);
972 if (!refname_match(pattern, name, ref_rev_parse_rules))
973 continue;
975 /* A match is "weak" if it is with refs outside
976 * heads or tags, and did not specify the pattern
977 * in full (e.g. "refs/remotes/origin/master") or at
978 * least from the toplevel (e.g. "remotes/origin/master");
979 * otherwise "git push $URL master" would result in
980 * ambiguity between remotes/origin/master and heads/master
981 * at the remote site.
983 if (namelen != patlen &&
984 patlen != namelen - 5 &&
985 prefixcmp(name, "refs/heads/") &&
986 prefixcmp(name, "refs/tags/")) {
987 /* We want to catch the case where only weak
988 * matches are found and there are multiple
989 * matches, and where more than one strong
990 * matches are found, as ambiguous. One
991 * strong match with zero or more weak matches
992 * are acceptable as a unique match.
994 matched_weak = refs;
995 weak_match++;
997 else {
998 matched = refs;
999 match++;
1002 if (!matched) {
1003 *matched_ref = matched_weak;
1004 return weak_match;
1006 else {
1007 *matched_ref = matched;
1008 return match;
1012 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1014 **tail = ref;
1015 while (ref->next)
1016 ref = ref->next;
1017 *tail = &ref->next;
1020 static struct ref *alloc_delete_ref(void)
1022 struct ref *ref = alloc_ref("(delete)");
1023 hashclr(ref->new_sha1);
1024 return ref;
1027 static struct ref *try_explicit_object_name(const char *name)
1029 unsigned char sha1[20];
1030 struct ref *ref;
1032 if (!*name)
1033 return alloc_delete_ref();
1034 if (get_sha1(name, sha1))
1035 return NULL;
1036 ref = alloc_ref(name);
1037 hashcpy(ref->new_sha1, sha1);
1038 return ref;
1041 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1043 struct ref *ret = alloc_ref(name);
1044 tail_link_ref(ret, tail);
1045 return ret;
1048 static char *guess_ref(const char *name, struct ref *peer)
1050 struct strbuf buf = STRBUF_INIT;
1051 unsigned char sha1[20];
1053 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1054 if (!r)
1055 return NULL;
1057 if (!prefixcmp(r, "refs/heads/"))
1058 strbuf_addstr(&buf, "refs/heads/");
1059 else if (!prefixcmp(r, "refs/tags/"))
1060 strbuf_addstr(&buf, "refs/tags/");
1061 else
1062 return NULL;
1064 strbuf_addstr(&buf, name);
1065 return strbuf_detach(&buf, NULL);
1068 static int match_explicit(struct ref *src, struct ref *dst,
1069 struct ref ***dst_tail,
1070 struct refspec *rs)
1072 struct ref *matched_src, *matched_dst;
1073 int copy_src;
1075 const char *dst_value = rs->dst;
1076 char *dst_guess;
1078 if (rs->pattern || rs->matching)
1079 return 0;
1081 matched_src = matched_dst = NULL;
1082 switch (count_refspec_match(rs->src, src, &matched_src)) {
1083 case 1:
1084 copy_src = 1;
1085 break;
1086 case 0:
1087 /* The source could be in the get_sha1() format
1088 * not a reference name. :refs/other is a
1089 * way to delete 'other' ref at the remote end.
1091 matched_src = try_explicit_object_name(rs->src);
1092 if (!matched_src)
1093 return error("src refspec %s does not match any.", rs->src);
1094 copy_src = 0;
1095 break;
1096 default:
1097 return error("src refspec %s matches more than one.", rs->src);
1100 if (!dst_value) {
1101 unsigned char sha1[20];
1102 int flag;
1104 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1105 if (!dst_value ||
1106 ((flag & REF_ISSYMREF) &&
1107 prefixcmp(dst_value, "refs/heads/")))
1108 die("%s cannot be resolved to branch.",
1109 matched_src->name);
1112 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1113 case 1:
1114 break;
1115 case 0:
1116 if (!memcmp(dst_value, "refs/", 5))
1117 matched_dst = make_linked_ref(dst_value, dst_tail);
1118 else if (is_null_sha1(matched_src->new_sha1))
1119 error("unable to delete '%s': remote ref does not exist",
1120 dst_value);
1121 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1122 matched_dst = make_linked_ref(dst_guess, dst_tail);
1123 else
1124 error("unable to push to unqualified destination: %s\n"
1125 "The destination refspec neither matches an "
1126 "existing ref on the remote nor\n"
1127 "begins with refs/, and we are unable to "
1128 "guess a prefix based on the source ref.",
1129 dst_value);
1130 break;
1131 default:
1132 matched_dst = NULL;
1133 error("dst refspec %s matches more than one.",
1134 dst_value);
1135 break;
1137 if (!matched_dst)
1138 return -1;
1139 if (matched_dst->peer_ref)
1140 return error("dst ref %s receives from more than one src.",
1141 matched_dst->name);
1142 else {
1143 matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1144 matched_dst->force = rs->force;
1146 return 0;
1149 static int match_explicit_refs(struct ref *src, struct ref *dst,
1150 struct ref ***dst_tail, struct refspec *rs,
1151 int rs_nr)
1153 int i, errs;
1154 for (i = errs = 0; i < rs_nr; i++)
1155 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1156 return errs;
1159 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1160 int send_mirror, int direction, const struct refspec **ret_pat)
1162 const struct refspec *pat;
1163 char *name;
1164 int i;
1165 int matching_refs = -1;
1166 for (i = 0; i < rs_nr; i++) {
1167 if (rs[i].matching &&
1168 (matching_refs == -1 || rs[i].force)) {
1169 matching_refs = i;
1170 continue;
1173 if (rs[i].pattern) {
1174 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1175 int match;
1176 if (direction == FROM_SRC)
1177 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1178 else
1179 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1180 if (match) {
1181 matching_refs = i;
1182 break;
1186 if (matching_refs == -1)
1187 return NULL;
1189 pat = rs + matching_refs;
1190 if (pat->matching) {
1192 * "matching refs"; traditionally we pushed everything
1193 * including refs outside refs/heads/ hierarchy, but
1194 * that does not make much sense these days.
1196 if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
1197 return NULL;
1198 name = xstrdup(ref->name);
1200 if (ret_pat)
1201 *ret_pat = pat;
1202 return name;
1205 static struct ref **tail_ref(struct ref **head)
1207 struct ref **tail = head;
1208 while (*tail)
1209 tail = &((*tail)->next);
1210 return tail;
1213 struct tips {
1214 struct commit **tip;
1215 int nr, alloc;
1218 static void add_to_tips(struct tips *tips, const unsigned char *sha1)
1220 struct commit *commit;
1222 if (is_null_sha1(sha1))
1223 return;
1224 commit = lookup_commit_reference_gently(sha1, 1);
1225 if (!commit || (commit->object.flags & TMP_MARK))
1226 return;
1227 commit->object.flags |= TMP_MARK;
1228 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1229 tips->tip[tips->nr++] = commit;
1232 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1234 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1235 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1236 struct string_list_item *item;
1237 struct ref *ref;
1238 struct tips sent_tips;
1241 * Collect everything we know they would have at the end of
1242 * this push, and collect all tags they have.
1244 memset(&sent_tips, 0, sizeof(sent_tips));
1245 for (ref = *dst; ref; ref = ref->next) {
1246 if (ref->peer_ref &&
1247 !is_null_sha1(ref->peer_ref->new_sha1))
1248 add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
1249 else
1250 add_to_tips(&sent_tips, ref->old_sha1);
1251 if (!prefixcmp(ref->name, "refs/tags/"))
1252 string_list_append(&dst_tag, ref->name);
1254 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1256 sort_string_list(&dst_tag);
1258 /* Collect tags they do not have. */
1259 for (ref = src; ref; ref = ref->next) {
1260 if (prefixcmp(ref->name, "refs/tags/"))
1261 continue; /* not a tag */
1262 if (string_list_has_string(&dst_tag, ref->name))
1263 continue; /* they already have it */
1264 if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
1265 continue; /* be conservative */
1266 item = string_list_append(&src_tag, ref->name);
1267 item->util = ref;
1269 string_list_clear(&dst_tag, 0);
1272 * At this point, src_tag lists tags that are missing from
1273 * dst, and sent_tips lists the tips we are pushing or those
1274 * that we know they already have. An element in the src_tag
1275 * that is an ancestor of any of the sent_tips needs to be
1276 * sent to the other side.
1278 if (sent_tips.nr) {
1279 for_each_string_list_item(item, &src_tag) {
1280 struct ref *ref = item->util;
1281 struct ref *dst_ref;
1282 struct commit *commit;
1284 if (is_null_sha1(ref->new_sha1))
1285 continue;
1286 commit = lookup_commit_reference_gently(ref->new_sha1, 1);
1287 if (!commit)
1288 /* not pushing a commit, which is not an error */
1289 continue;
1292 * Is this tag, which they do not have, reachable from
1293 * any of the commits we are sending?
1295 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1296 continue;
1298 /* Add it in */
1299 dst_ref = make_linked_ref(ref->name, dst_tail);
1300 hashcpy(dst_ref->new_sha1, ref->new_sha1);
1301 dst_ref->peer_ref = copy_ref(ref);
1304 string_list_clear(&src_tag, 0);
1305 free(sent_tips.tip);
1308 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1310 for ( ; ref; ref = ref->next)
1311 string_list_append_nodup(ref_index, ref->name)->util = ref;
1313 sort_string_list(ref_index);
1317 * Given the set of refs the local repository has, the set of refs the
1318 * remote repository has, and the refspec used for push, determine
1319 * what remote refs we will update and with what value by setting
1320 * peer_ref (which object is being pushed) and force (if the push is
1321 * forced) in elements of "dst". The function may add new elements to
1322 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1324 int match_push_refs(struct ref *src, struct ref **dst,
1325 int nr_refspec, const char **refspec, int flags)
1327 struct refspec *rs;
1328 int send_all = flags & MATCH_REFS_ALL;
1329 int send_mirror = flags & MATCH_REFS_MIRROR;
1330 int send_prune = flags & MATCH_REFS_PRUNE;
1331 int errs;
1332 static const char *default_refspec[] = { ":", NULL };
1333 struct ref *ref, **dst_tail = tail_ref(dst);
1334 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1336 if (!nr_refspec) {
1337 nr_refspec = 1;
1338 refspec = default_refspec;
1340 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1341 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1343 /* pick the remainder */
1344 for (ref = src; ref; ref = ref->next) {
1345 struct string_list_item *dst_item;
1346 struct ref *dst_peer;
1347 const struct refspec *pat = NULL;
1348 char *dst_name;
1350 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1351 if (!dst_name)
1352 continue;
1354 if (!dst_ref_index.nr)
1355 prepare_ref_index(&dst_ref_index, *dst);
1357 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1358 dst_peer = dst_item ? dst_item->util : NULL;
1359 if (dst_peer) {
1360 if (dst_peer->peer_ref)
1361 /* We're already sending something to this ref. */
1362 goto free_name;
1363 } else {
1364 if (pat->matching && !(send_all || send_mirror))
1366 * Remote doesn't have it, and we have no
1367 * explicit pattern, and we don't have
1368 * --all nor --mirror.
1370 goto free_name;
1372 /* Create a new one and link it */
1373 dst_peer = make_linked_ref(dst_name, &dst_tail);
1374 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1375 string_list_insert(&dst_ref_index,
1376 dst_peer->name)->util = dst_peer;
1378 dst_peer->peer_ref = copy_ref(ref);
1379 dst_peer->force = pat->force;
1380 free_name:
1381 free(dst_name);
1384 string_list_clear(&dst_ref_index, 0);
1386 if (flags & MATCH_REFS_FOLLOW_TAGS)
1387 add_missing_tags(src, dst, &dst_tail);
1389 if (send_prune) {
1390 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1391 /* check for missing refs on the remote */
1392 for (ref = *dst; ref; ref = ref->next) {
1393 char *src_name;
1395 if (ref->peer_ref)
1396 /* We're already sending something to this ref. */
1397 continue;
1399 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1400 if (src_name) {
1401 if (!src_ref_index.nr)
1402 prepare_ref_index(&src_ref_index, src);
1403 if (!string_list_has_string(&src_ref_index,
1404 src_name))
1405 ref->peer_ref = alloc_delete_ref();
1406 free(src_name);
1409 string_list_clear(&src_ref_index, 0);
1411 if (errs)
1412 return -1;
1413 return 0;
1416 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1417 int force_update)
1419 struct ref *ref;
1421 for (ref = remote_refs; ref; ref = ref->next) {
1422 int force_ref_update = ref->force || force_update;
1424 if (ref->peer_ref)
1425 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1426 else if (!send_mirror)
1427 continue;
1429 ref->deletion = is_null_sha1(ref->new_sha1);
1430 if (!ref->deletion &&
1431 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1432 ref->status = REF_STATUS_UPTODATE;
1433 continue;
1437 * Decide whether an individual refspec A:B can be
1438 * pushed. The push will succeed if any of the
1439 * following are true:
1441 * (1) the remote reference B does not exist
1443 * (2) the remote reference B is being removed (i.e.,
1444 * pushing :B where no source is specified)
1446 * (3) the destination is not under refs/tags/, and
1447 * if the old and new value is a commit, the new
1448 * is a descendant of the old.
1450 * (4) it is forced using the +A:B notation, or by
1451 * passing the --force argument
1454 if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1455 int why = 0; /* why would this push require --force? */
1457 if (!prefixcmp(ref->name, "refs/tags/"))
1458 why = REF_STATUS_REJECT_ALREADY_EXISTS;
1459 else if (!has_sha1_file(ref->old_sha1))
1460 why = REF_STATUS_REJECT_FETCH_FIRST;
1461 else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
1462 !lookup_commit_reference_gently(ref->new_sha1, 1))
1463 why = REF_STATUS_REJECT_NEEDS_FORCE;
1464 else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1465 why = REF_STATUS_REJECT_NONFASTFORWARD;
1467 if (!force_ref_update)
1468 ref->status = why;
1469 else if (why)
1470 ref->forced_update = 1;
1475 struct branch *branch_get(const char *name)
1477 struct branch *ret;
1479 read_config();
1480 if (!name || !*name || !strcmp(name, "HEAD"))
1481 ret = current_branch;
1482 else
1483 ret = make_branch(name, 0);
1484 if (ret && ret->remote_name) {
1485 ret->remote = remote_get(ret->remote_name);
1486 if (ret->merge_nr) {
1487 int i;
1488 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1489 for (i = 0; i < ret->merge_nr; i++) {
1490 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1491 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1492 if (remote_find_tracking(ret->remote, ret->merge[i])
1493 && !strcmp(ret->remote_name, "."))
1494 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1498 return ret;
1501 int branch_has_merge_config(struct branch *branch)
1503 return branch && !!branch->merge;
1506 int branch_merge_matches(struct branch *branch,
1507 int i,
1508 const char *refname)
1510 if (!branch || i < 0 || i >= branch->merge_nr)
1511 return 0;
1512 return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1515 static int ignore_symref_update(const char *refname)
1517 unsigned char sha1[20];
1518 int flag;
1520 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1521 return 0; /* non-existing refs are OK */
1522 return (flag & REF_ISSYMREF);
1525 static struct ref *get_expanded_map(const struct ref *remote_refs,
1526 const struct refspec *refspec)
1528 const struct ref *ref;
1529 struct ref *ret = NULL;
1530 struct ref **tail = &ret;
1532 char *expn_name;
1534 for (ref = remote_refs; ref; ref = ref->next) {
1535 if (strchr(ref->name, '^'))
1536 continue; /* a dereference item */
1537 if (match_name_with_pattern(refspec->src, ref->name,
1538 refspec->dst, &expn_name) &&
1539 !ignore_symref_update(expn_name)) {
1540 struct ref *cpy = copy_ref(ref);
1542 cpy->peer_ref = alloc_ref(expn_name);
1543 free(expn_name);
1544 if (refspec->force)
1545 cpy->peer_ref->force = 1;
1546 *tail = cpy;
1547 tail = &cpy->next;
1551 return ret;
1554 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1556 const struct ref *ref;
1557 for (ref = refs; ref; ref = ref->next) {
1558 if (refname_match(name, ref->name, ref_fetch_rules))
1559 return ref;
1561 return NULL;
1564 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1566 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1568 if (!ref)
1569 return NULL;
1571 return copy_ref(ref);
1574 static struct ref *get_local_ref(const char *name)
1576 if (!name || name[0] == '\0')
1577 return NULL;
1579 if (!prefixcmp(name, "refs/"))
1580 return alloc_ref(name);
1582 if (!prefixcmp(name, "heads/") ||
1583 !prefixcmp(name, "tags/") ||
1584 !prefixcmp(name, "remotes/"))
1585 return alloc_ref_with_prefix("refs/", 5, name);
1587 return alloc_ref_with_prefix("refs/heads/", 11, name);
1590 int get_fetch_map(const struct ref *remote_refs,
1591 const struct refspec *refspec,
1592 struct ref ***tail,
1593 int missing_ok)
1595 struct ref *ref_map, **rmp;
1597 if (refspec->pattern) {
1598 ref_map = get_expanded_map(remote_refs, refspec);
1599 } else {
1600 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1602 if (refspec->exact_sha1) {
1603 ref_map = alloc_ref(name);
1604 get_sha1_hex(name, ref_map->old_sha1);
1605 } else {
1606 ref_map = get_remote_ref(remote_refs, name);
1608 if (!missing_ok && !ref_map)
1609 die("Couldn't find remote ref %s", name);
1610 if (ref_map) {
1611 ref_map->peer_ref = get_local_ref(refspec->dst);
1612 if (ref_map->peer_ref && refspec->force)
1613 ref_map->peer_ref->force = 1;
1617 for (rmp = &ref_map; *rmp; ) {
1618 if ((*rmp)->peer_ref) {
1619 if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
1620 check_refname_format((*rmp)->peer_ref->name, 0)) {
1621 struct ref *ignore = *rmp;
1622 error("* Ignoring funny ref '%s' locally",
1623 (*rmp)->peer_ref->name);
1624 *rmp = (*rmp)->next;
1625 free(ignore->peer_ref);
1626 free(ignore);
1627 continue;
1630 rmp = &((*rmp)->next);
1633 if (ref_map)
1634 tail_link_ref(ref_map, tail);
1636 return 0;
1639 int resolve_remote_symref(struct ref *ref, struct ref *list)
1641 if (!ref->symref)
1642 return 0;
1643 for (; list; list = list->next)
1644 if (!strcmp(ref->symref, list->name)) {
1645 hashcpy(ref->old_sha1, list->old_sha1);
1646 return 0;
1648 return 1;
1651 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1653 while (list) {
1654 struct commit_list *temp = list;
1655 temp->item->object.flags &= ~mark;
1656 list = temp->next;
1657 free(temp);
1661 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1663 struct object *o;
1664 struct commit *old, *new;
1665 struct commit_list *list, *used;
1666 int found = 0;
1669 * Both new and old must be commit-ish and new is descendant of
1670 * old. Otherwise we require --force.
1672 o = deref_tag(parse_object(old_sha1), NULL, 0);
1673 if (!o || o->type != OBJ_COMMIT)
1674 return 0;
1675 old = (struct commit *) o;
1677 o = deref_tag(parse_object(new_sha1), NULL, 0);
1678 if (!o || o->type != OBJ_COMMIT)
1679 return 0;
1680 new = (struct commit *) o;
1682 if (parse_commit(new) < 0)
1683 return 0;
1685 used = list = NULL;
1686 commit_list_insert(new, &list);
1687 while (list) {
1688 new = pop_most_recent_commit(&list, TMP_MARK);
1689 commit_list_insert(new, &used);
1690 if (new == old) {
1691 found = 1;
1692 break;
1695 unmark_and_free(list, TMP_MARK);
1696 unmark_and_free(used, TMP_MARK);
1697 return found;
1701 * Return true if there is anything to report, otherwise false.
1703 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1705 unsigned char sha1[20];
1706 struct commit *ours, *theirs;
1707 char symmetric[84];
1708 struct rev_info revs;
1709 const char *rev_argv[10], *base;
1710 int rev_argc;
1713 * Nothing to report unless we are marked to build on top of
1714 * somebody else.
1716 if (!branch ||
1717 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1718 return 0;
1721 * If what we used to build on no longer exists, there is
1722 * nothing to report.
1724 base = branch->merge[0]->dst;
1725 if (read_ref(base, sha1))
1726 return 0;
1727 theirs = lookup_commit_reference(sha1);
1728 if (!theirs)
1729 return 0;
1731 if (read_ref(branch->refname, sha1))
1732 return 0;
1733 ours = lookup_commit_reference(sha1);
1734 if (!ours)
1735 return 0;
1737 /* are we the same? */
1738 if (theirs == ours)
1739 return 0;
1741 /* Run "rev-list --left-right ours...theirs" internally... */
1742 rev_argc = 0;
1743 rev_argv[rev_argc++] = NULL;
1744 rev_argv[rev_argc++] = "--left-right";
1745 rev_argv[rev_argc++] = symmetric;
1746 rev_argv[rev_argc++] = "--";
1747 rev_argv[rev_argc] = NULL;
1749 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1750 strcpy(symmetric + 40, "...");
1751 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1753 init_revisions(&revs, NULL);
1754 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1755 prepare_revision_walk(&revs);
1757 /* ... and count the commits on each side. */
1758 *num_ours = 0;
1759 *num_theirs = 0;
1760 while (1) {
1761 struct commit *c = get_revision(&revs);
1762 if (!c)
1763 break;
1764 if (c->object.flags & SYMMETRIC_LEFT)
1765 (*num_ours)++;
1766 else
1767 (*num_theirs)++;
1770 /* clear object flags smudged by the above traversal */
1771 clear_commit_marks(ours, ALL_REV_FLAGS);
1772 clear_commit_marks(theirs, ALL_REV_FLAGS);
1773 return 1;
1777 * Return true when there is anything to report, otherwise false.
1779 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1781 int num_ours, num_theirs;
1782 const char *base;
1784 if (!stat_tracking_info(branch, &num_ours, &num_theirs))
1785 return 0;
1787 base = branch->merge[0]->dst;
1788 base = shorten_unambiguous_ref(base, 0);
1789 if (!num_theirs) {
1790 strbuf_addf(sb,
1791 Q_("Your branch is ahead of '%s' by %d commit.\n",
1792 "Your branch is ahead of '%s' by %d commits.\n",
1793 num_ours),
1794 base, num_ours);
1795 if (advice_status_hints)
1796 strbuf_addf(sb,
1797 _(" (use \"git push\" to publish your local commits)\n"));
1798 } else if (!num_ours) {
1799 strbuf_addf(sb,
1800 Q_("Your branch is behind '%s' by %d commit, "
1801 "and can be fast-forwarded.\n",
1802 "Your branch is behind '%s' by %d commits, "
1803 "and can be fast-forwarded.\n",
1804 num_theirs),
1805 base, num_theirs);
1806 if (advice_status_hints)
1807 strbuf_addf(sb,
1808 _(" (use \"git pull\" to update your local branch)\n"));
1809 } else {
1810 strbuf_addf(sb,
1811 Q_("Your branch and '%s' have diverged,\n"
1812 "and have %d and %d different commit each, "
1813 "respectively.\n",
1814 "Your branch and '%s' have diverged,\n"
1815 "and have %d and %d different commits each, "
1816 "respectively.\n",
1817 num_theirs),
1818 base, num_ours, num_theirs);
1819 if (advice_status_hints)
1820 strbuf_addf(sb,
1821 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1823 return 1;
1826 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1828 struct ref ***local_tail = cb_data;
1829 struct ref *ref;
1830 int len;
1832 /* we already know it starts with refs/ to get here */
1833 if (check_refname_format(refname + 5, 0))
1834 return 0;
1836 len = strlen(refname) + 1;
1837 ref = xcalloc(1, sizeof(*ref) + len);
1838 hashcpy(ref->new_sha1, sha1);
1839 memcpy(ref->name, refname, len);
1840 **local_tail = ref;
1841 *local_tail = &ref->next;
1842 return 0;
1845 struct ref *get_local_heads(void)
1847 struct ref *local_refs = NULL, **local_tail = &local_refs;
1848 for_each_ref(one_local_ref, &local_tail);
1849 return local_refs;
1852 struct ref *guess_remote_head(const struct ref *head,
1853 const struct ref *refs,
1854 int all)
1856 const struct ref *r;
1857 struct ref *list = NULL;
1858 struct ref **tail = &list;
1860 if (!head)
1861 return NULL;
1864 * Some transports support directly peeking at
1865 * where HEAD points; if that is the case, then
1866 * we don't have to guess.
1868 if (head->symref)
1869 return copy_ref(find_ref_by_name(refs, head->symref));
1871 /* If refs/heads/master could be right, it is. */
1872 if (!all) {
1873 r = find_ref_by_name(refs, "refs/heads/master");
1874 if (r && !hashcmp(r->old_sha1, head->old_sha1))
1875 return copy_ref(r);
1878 /* Look for another ref that points there */
1879 for (r = refs; r; r = r->next) {
1880 if (r != head &&
1881 !prefixcmp(r->name, "refs/heads/") &&
1882 !hashcmp(r->old_sha1, head->old_sha1)) {
1883 *tail = copy_ref(r);
1884 tail = &((*tail)->next);
1885 if (!all)
1886 break;
1890 return list;
1893 struct stale_heads_info {
1894 struct string_list *ref_names;
1895 struct ref **stale_refs_tail;
1896 struct refspec *refs;
1897 int ref_count;
1900 static int get_stale_heads_cb(const char *refname,
1901 const unsigned char *sha1, int flags, void *cb_data)
1903 struct stale_heads_info *info = cb_data;
1904 struct refspec query;
1905 memset(&query, 0, sizeof(struct refspec));
1906 query.dst = (char *)refname;
1908 if (query_refspecs(info->refs, info->ref_count, &query))
1909 return 0; /* No matches */
1912 * If we did find a suitable refspec and it's not a symref and
1913 * it's not in the list of refs that currently exist in that
1914 * remote we consider it to be stale.
1916 if (!((flags & REF_ISSYMREF) ||
1917 string_list_has_string(info->ref_names, query.src))) {
1918 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1919 hashcpy(ref->new_sha1, sha1);
1922 free(query.src);
1923 return 0;
1926 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1928 struct ref *ref, *stale_refs = NULL;
1929 struct string_list ref_names = STRING_LIST_INIT_NODUP;
1930 struct stale_heads_info info;
1931 info.ref_names = &ref_names;
1932 info.stale_refs_tail = &stale_refs;
1933 info.refs = refs;
1934 info.ref_count = ref_count;
1935 for (ref = fetch_map; ref; ref = ref->next)
1936 string_list_append(&ref_names, ref->name);
1937 sort_string_list(&ref_names);
1938 for_each_ref(get_stale_heads_cb, &info);
1939 string_list_clear(&ref_names, 0);
1940 return stale_refs;