remote.c: introduce a way to have different remotes for fetch/push
[git/mjg.git] / remote.c
blob2b06e222a4c394687648d373cae1b66c9d9d289a
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 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
152 remotes[remotes_nr++] = ret;
153 if (len)
154 ret->name = xstrndup(name, len);
155 else
156 ret->name = xstrdup(name);
157 return ret;
160 static void add_merge(struct branch *branch, const char *name)
162 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
163 branch->merge_alloc);
164 branch->merge_name[branch->merge_nr++] = name;
167 static struct branch *make_branch(const char *name, int len)
169 struct branch *ret;
170 int i;
171 char *refname;
173 for (i = 0; i < branches_nr; i++) {
174 if (len ? (!strncmp(name, branches[i]->name, len) &&
175 !branches[i]->name[len]) :
176 !strcmp(name, branches[i]->name))
177 return branches[i];
180 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
181 ret = xcalloc(1, sizeof(struct branch));
182 branches[branches_nr++] = ret;
183 if (len)
184 ret->name = xstrndup(name, len);
185 else
186 ret->name = xstrdup(name);
187 refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
188 strcpy(refname, "refs/heads/");
189 strcpy(refname + strlen("refs/heads/"), ret->name);
190 ret->refname = refname;
192 return ret;
195 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
197 struct rewrite *ret;
198 int i;
200 for (i = 0; i < r->rewrite_nr; i++) {
201 if (len
202 ? (len == r->rewrite[i]->baselen &&
203 !strncmp(base, r->rewrite[i]->base, len))
204 : !strcmp(base, r->rewrite[i]->base))
205 return r->rewrite[i];
208 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
209 ret = xcalloc(1, sizeof(struct rewrite));
210 r->rewrite[r->rewrite_nr++] = ret;
211 if (len) {
212 ret->base = xstrndup(base, len);
213 ret->baselen = len;
215 else {
216 ret->base = xstrdup(base);
217 ret->baselen = strlen(base);
219 return ret;
222 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
224 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
225 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
226 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
227 rewrite->instead_of_nr++;
230 static void read_remotes_file(struct remote *remote)
232 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
234 if (!f)
235 return;
236 remote->origin = REMOTE_REMOTES;
237 while (fgets(buffer, BUF_SIZE, f)) {
238 int value_list;
239 char *s, *p;
241 if (!prefixcmp(buffer, "URL:")) {
242 value_list = 0;
243 s = buffer + 4;
244 } else if (!prefixcmp(buffer, "Push:")) {
245 value_list = 1;
246 s = buffer + 5;
247 } else if (!prefixcmp(buffer, "Pull:")) {
248 value_list = 2;
249 s = buffer + 5;
250 } else
251 continue;
253 while (isspace(*s))
254 s++;
255 if (!*s)
256 continue;
258 p = s + strlen(s);
259 while (isspace(p[-1]))
260 *--p = 0;
262 switch (value_list) {
263 case 0:
264 add_url_alias(remote, xstrdup(s));
265 break;
266 case 1:
267 add_push_refspec(remote, xstrdup(s));
268 break;
269 case 2:
270 add_fetch_refspec(remote, xstrdup(s));
271 break;
274 fclose(f);
277 static void read_branches_file(struct remote *remote)
279 const char *slash = strchr(remote->name, '/');
280 char *frag;
281 struct strbuf branch = STRBUF_INIT;
282 int n = slash ? slash - remote->name : 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 if (slash)
303 len += strlen(slash);
304 p = xmalloc(len + 1);
305 strcpy(p, s);
306 if (slash)
307 strcat(p, slash);
310 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
311 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
312 * the partial URL obtained from the branches file plus
313 * "/netdev-2.6" and does not store it in any tracking ref.
314 * #branch specifier in the file is ignored.
316 * Otherwise, the branches file would have URL and optionally
317 * #branch specified. The "master" (or specified) branch is
318 * fetched and stored in the local branch of the same name.
320 frag = strchr(p, '#');
321 if (frag) {
322 *(frag++) = '\0';
323 strbuf_addf(&branch, "refs/heads/%s", frag);
324 } else
325 strbuf_addstr(&branch, "refs/heads/master");
326 if (!slash) {
327 strbuf_addf(&branch, ":refs/heads/%s", remote->name);
328 } else {
329 strbuf_reset(&branch);
330 strbuf_addstr(&branch, "HEAD:");
332 add_url_alias(remote, p);
333 add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
335 * Cogito compatible push: push current HEAD to remote #branch
336 * (master if missing)
338 strbuf_init(&branch, 0);
339 strbuf_addstr(&branch, "HEAD");
340 if (frag)
341 strbuf_addf(&branch, ":refs/heads/%s", frag);
342 else
343 strbuf_addstr(&branch, ":refs/heads/master");
344 add_push_refspec(remote, strbuf_detach(&branch, NULL));
345 remote->fetch_tags = 1; /* always auto-follow */
348 static int handle_config(const char *key, const char *value, void *cb)
350 const char *name;
351 const char *subkey;
352 struct remote *remote;
353 struct branch *branch;
354 if (!prefixcmp(key, "branch.")) {
355 name = key + 7;
356 subkey = strrchr(name, '.');
357 if (!subkey)
358 return 0;
359 branch = make_branch(name, subkey - name);
360 if (!strcmp(subkey, ".remote")) {
361 if (git_config_string(&branch->remote_name, key, value))
362 return -1;
363 if (branch == current_branch) {
364 default_remote_name = branch->remote_name;
365 explicit_default_remote_name = 1;
367 } else if (!strcmp(subkey, ".merge")) {
368 if (!value)
369 return config_error_nonbool(key);
370 add_merge(branch, xstrdup(value));
372 return 0;
374 if (!prefixcmp(key, "url.")) {
375 struct rewrite *rewrite;
376 name = key + 4;
377 subkey = strrchr(name, '.');
378 if (!subkey)
379 return 0;
380 if (!strcmp(subkey, ".insteadof")) {
381 rewrite = make_rewrite(&rewrites, name, subkey - name);
382 if (!value)
383 return config_error_nonbool(key);
384 add_instead_of(rewrite, xstrdup(value));
385 } else if (!strcmp(subkey, ".pushinsteadof")) {
386 rewrite = make_rewrite(&rewrites_push, name, subkey - name);
387 if (!value)
388 return config_error_nonbool(key);
389 add_instead_of(rewrite, xstrdup(value));
392 if (prefixcmp(key, "remote."))
393 return 0;
394 name = key + 7;
395 if (*name == '/') {
396 warning("Config remote shorthand cannot begin with '/': %s",
397 name);
398 return 0;
400 subkey = strrchr(name, '.');
401 if (!subkey)
402 return 0;
403 remote = make_remote(name, subkey - name);
404 remote->origin = REMOTE_CONFIG;
405 if (!strcmp(subkey, ".mirror"))
406 remote->mirror = git_config_bool(key, value);
407 else if (!strcmp(subkey, ".skipdefaultupdate"))
408 remote->skip_default_update = git_config_bool(key, value);
409 else if (!strcmp(subkey, ".skipfetchall"))
410 remote->skip_default_update = git_config_bool(key, value);
411 else if (!strcmp(subkey, ".url")) {
412 const char *v;
413 if (git_config_string(&v, key, value))
414 return -1;
415 add_url(remote, v);
416 } else if (!strcmp(subkey, ".pushurl")) {
417 const char *v;
418 if (git_config_string(&v, key, value))
419 return -1;
420 add_pushurl(remote, v);
421 } else if (!strcmp(subkey, ".push")) {
422 const char *v;
423 if (git_config_string(&v, key, value))
424 return -1;
425 add_push_refspec(remote, v);
426 } else if (!strcmp(subkey, ".fetch")) {
427 const char *v;
428 if (git_config_string(&v, key, value))
429 return -1;
430 add_fetch_refspec(remote, v);
431 } else if (!strcmp(subkey, ".receivepack")) {
432 const char *v;
433 if (git_config_string(&v, key, value))
434 return -1;
435 if (!remote->receivepack)
436 remote->receivepack = v;
437 else
438 error("more than one receivepack given, using the first");
439 } else if (!strcmp(subkey, ".uploadpack")) {
440 const char *v;
441 if (git_config_string(&v, key, value))
442 return -1;
443 if (!remote->uploadpack)
444 remote->uploadpack = v;
445 else
446 error("more than one uploadpack given, using the first");
447 } else if (!strcmp(subkey, ".tagopt")) {
448 if (!strcmp(value, "--no-tags"))
449 remote->fetch_tags = -1;
450 else if (!strcmp(value, "--tags"))
451 remote->fetch_tags = 2;
452 } else if (!strcmp(subkey, ".proxy")) {
453 return git_config_string((const char **)&remote->http_proxy,
454 key, value);
455 } else if (!strcmp(subkey, ".vcs")) {
456 return git_config_string(&remote->foreign_vcs, key, value);
458 return 0;
461 static void alias_all_urls(void)
463 int i, j;
464 for (i = 0; i < remotes_nr; i++) {
465 int add_pushurl_aliases;
466 if (!remotes[i])
467 continue;
468 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
469 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
471 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
472 for (j = 0; j < remotes[i]->url_nr; j++) {
473 if (add_pushurl_aliases)
474 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
475 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
480 static void read_config(void)
482 unsigned char sha1[20];
483 const char *head_ref;
484 int flag;
485 if (default_remote_name) /* did this already */
486 return;
487 default_remote_name = xstrdup("origin");
488 current_branch = NULL;
489 head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
490 if (head_ref && (flag & REF_ISSYMREF) &&
491 !prefixcmp(head_ref, "refs/heads/")) {
492 current_branch =
493 make_branch(head_ref + strlen("refs/heads/"), 0);
495 git_config(handle_config, NULL);
496 alias_all_urls();
500 * This function frees a refspec array.
501 * Warning: code paths should be checked to ensure that the src
502 * and dst pointers are always freeable pointers as well
503 * as the refspec pointer itself.
505 static void free_refspecs(struct refspec *refspec, int nr_refspec)
507 int i;
509 if (!refspec)
510 return;
512 for (i = 0; i < nr_refspec; i++) {
513 free(refspec[i].src);
514 free(refspec[i].dst);
516 free(refspec);
519 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
521 int i;
522 struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
524 for (i = 0; i < nr_refspec; i++) {
525 size_t llen;
526 int is_glob;
527 const char *lhs, *rhs;
528 int flags;
530 is_glob = 0;
532 lhs = refspec[i];
533 if (*lhs == '+') {
534 rs[i].force = 1;
535 lhs++;
538 rhs = strrchr(lhs, ':');
541 * Before going on, special case ":" (or "+:") as a refspec
542 * for pushing matching refs.
544 if (!fetch && rhs == lhs && rhs[1] == '\0') {
545 rs[i].matching = 1;
546 continue;
549 if (rhs) {
550 size_t rlen = strlen(++rhs);
551 is_glob = (1 <= rlen && strchr(rhs, '*'));
552 rs[i].dst = xstrndup(rhs, rlen);
555 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
556 if (1 <= llen && memchr(lhs, '*', llen)) {
557 if ((rhs && !is_glob) || (!rhs && fetch))
558 goto invalid;
559 is_glob = 1;
560 } else if (rhs && is_glob) {
561 goto invalid;
564 rs[i].pattern = is_glob;
565 rs[i].src = xstrndup(lhs, llen);
566 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
568 if (fetch) {
569 unsigned char unused[40];
571 /* LHS */
572 if (!*rs[i].src)
573 ; /* empty is ok; it means "HEAD" */
574 else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
575 rs[i].exact_sha1 = 1; /* ok */
576 else if (!check_refname_format(rs[i].src, flags))
577 ; /* valid looking ref is ok */
578 else
579 goto invalid;
580 /* RHS */
581 if (!rs[i].dst)
582 ; /* missing is ok; it is the same as empty */
583 else if (!*rs[i].dst)
584 ; /* empty is ok; it means "do not store" */
585 else if (!check_refname_format(rs[i].dst, flags))
586 ; /* valid looking ref is ok */
587 else
588 goto invalid;
589 } else {
591 * LHS
592 * - empty is allowed; it means delete.
593 * - when wildcarded, it must be a valid looking ref.
594 * - otherwise, it must be an extended SHA-1, but
595 * there is no existing way to validate this.
597 if (!*rs[i].src)
598 ; /* empty is ok */
599 else if (is_glob) {
600 if (check_refname_format(rs[i].src, flags))
601 goto invalid;
603 else
604 ; /* anything goes, for now */
606 * RHS
607 * - missing is allowed, but LHS then must be a
608 * valid looking ref.
609 * - empty is not allowed.
610 * - otherwise it must be a valid looking ref.
612 if (!rs[i].dst) {
613 if (check_refname_format(rs[i].src, flags))
614 goto invalid;
615 } else if (!*rs[i].dst) {
616 goto invalid;
617 } else {
618 if (check_refname_format(rs[i].dst, flags))
619 goto invalid;
623 return rs;
625 invalid:
626 if (verify) {
628 * nr_refspec must be greater than zero and i must be valid
629 * since it is only possible to reach this point from within
630 * the for loop above.
632 free_refspecs(rs, i+1);
633 return NULL;
635 die("Invalid refspec '%s'", refspec[i]);
638 int valid_fetch_refspec(const char *fetch_refspec_str)
640 struct refspec *refspec;
642 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
643 free_refspecs(refspec, 1);
644 return !!refspec;
647 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
649 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
652 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
654 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
657 void free_refspec(int nr_refspec, struct refspec *refspec)
659 int i;
660 for (i = 0; i < nr_refspec; i++) {
661 free(refspec[i].src);
662 free(refspec[i].dst);
664 free(refspec);
667 static int valid_remote_nick(const char *name)
669 if (!name[0] || is_dot_or_dotdot(name))
670 return 0;
671 return !strchr(name, '/'); /* no slash */
674 static struct remote *remote_get_1(const char *name, const char *pushremote_name)
676 struct remote *ret;
677 int name_given = 0;
679 if (name)
680 name_given = 1;
681 else {
682 if (pushremote_name) {
683 name = pushremote_name;
684 name_given = 1;
685 } else {
686 name = default_remote_name;
687 name_given = explicit_default_remote_name;
691 ret = make_remote(name, 0);
692 if (valid_remote_nick(name)) {
693 if (!valid_remote(ret))
694 read_remotes_file(ret);
695 if (!valid_remote(ret))
696 read_branches_file(ret);
698 if (name_given && !valid_remote(ret))
699 add_url_alias(ret, name);
700 if (!valid_remote(ret))
701 return NULL;
702 ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
703 ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
704 return ret;
707 struct remote *remote_get(const char *name)
709 read_config();
710 return remote_get_1(name, NULL);
713 struct remote *pushremote_get(const char *name)
715 read_config();
716 return remote_get_1(name, pushremote_name);
719 int remote_is_configured(const char *name)
721 int i;
722 read_config();
724 for (i = 0; i < remotes_nr; i++)
725 if (!strcmp(name, remotes[i]->name))
726 return 1;
727 return 0;
730 int for_each_remote(each_remote_fn fn, void *priv)
732 int i, result = 0;
733 read_config();
734 for (i = 0; i < remotes_nr && !result; i++) {
735 struct remote *r = remotes[i];
736 if (!r)
737 continue;
738 if (!r->fetch)
739 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
740 r->fetch_refspec);
741 if (!r->push)
742 r->push = parse_push_refspec(r->push_refspec_nr,
743 r->push_refspec);
744 result = fn(r, priv);
746 return result;
749 void ref_remove_duplicates(struct ref *ref_map)
751 struct string_list refs = STRING_LIST_INIT_NODUP;
752 struct string_list_item *item = NULL;
753 struct ref *prev = NULL, *next = NULL;
754 for (; ref_map; prev = ref_map, ref_map = next) {
755 next = ref_map->next;
756 if (!ref_map->peer_ref)
757 continue;
759 item = string_list_lookup(&refs, ref_map->peer_ref->name);
760 if (item) {
761 if (strcmp(((struct ref *)item->util)->name,
762 ref_map->name))
763 die("%s tracks both %s and %s",
764 ref_map->peer_ref->name,
765 ((struct ref *)item->util)->name,
766 ref_map->name);
767 prev->next = ref_map->next;
768 free(ref_map->peer_ref);
769 free(ref_map);
770 ref_map = prev; /* skip this; we freed it */
771 continue;
774 item = string_list_insert(&refs, ref_map->peer_ref->name);
775 item->util = ref_map;
777 string_list_clear(&refs, 0);
780 int remote_has_url(struct remote *remote, const char *url)
782 int i;
783 for (i = 0; i < remote->url_nr; i++) {
784 if (!strcmp(remote->url[i], url))
785 return 1;
787 return 0;
790 static int match_name_with_pattern(const char *key, const char *name,
791 const char *value, char **result)
793 const char *kstar = strchr(key, '*');
794 size_t klen;
795 size_t ksuffixlen;
796 size_t namelen;
797 int ret;
798 if (!kstar)
799 die("Key '%s' of pattern had no '*'", key);
800 klen = kstar - key;
801 ksuffixlen = strlen(kstar + 1);
802 namelen = strlen(name);
803 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
804 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
805 if (ret && value) {
806 const char *vstar = strchr(value, '*');
807 size_t vlen;
808 size_t vsuffixlen;
809 if (!vstar)
810 die("Value '%s' of pattern has no '*'", value);
811 vlen = vstar - value;
812 vsuffixlen = strlen(vstar + 1);
813 *result = xmalloc(vlen + vsuffixlen +
814 strlen(name) -
815 klen - ksuffixlen + 1);
816 strncpy(*result, value, vlen);
817 strncpy(*result + vlen,
818 name + klen, namelen - klen - ksuffixlen);
819 strcpy(*result + vlen + namelen - klen - ksuffixlen,
820 vstar + 1);
822 return ret;
825 static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
827 int i;
828 int find_src = !query->src;
830 if (find_src && !query->dst)
831 return error("query_refspecs: need either src or dst");
833 for (i = 0; i < ref_count; i++) {
834 struct refspec *refspec = &refs[i];
835 const char *key = find_src ? refspec->dst : refspec->src;
836 const char *value = find_src ? refspec->src : refspec->dst;
837 const char *needle = find_src ? query->dst : query->src;
838 char **result = find_src ? &query->src : &query->dst;
840 if (!refspec->dst)
841 continue;
842 if (refspec->pattern) {
843 if (match_name_with_pattern(key, needle, value, result)) {
844 query->force = refspec->force;
845 return 0;
847 } else if (!strcmp(needle, key)) {
848 *result = xstrdup(value);
849 query->force = refspec->force;
850 return 0;
853 return -1;
856 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
857 const char *name)
859 struct refspec query;
861 memset(&query, 0, sizeof(struct refspec));
862 query.src = (char *)name;
864 if (query_refspecs(refspecs, nr_refspec, &query))
865 return NULL;
867 return query.dst;
870 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
872 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
875 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
876 const char *name)
878 size_t len = strlen(name);
879 struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
880 memcpy(ref->name, prefix, prefixlen);
881 memcpy(ref->name + prefixlen, name, len);
882 return ref;
885 struct ref *alloc_ref(const char *name)
887 return alloc_ref_with_prefix("", 0, name);
890 struct ref *copy_ref(const struct ref *ref)
892 struct ref *cpy;
893 size_t len;
894 if (!ref)
895 return NULL;
896 len = strlen(ref->name);
897 cpy = xmalloc(sizeof(struct ref) + len + 1);
898 memcpy(cpy, ref, sizeof(struct ref) + len + 1);
899 cpy->next = NULL;
900 cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
901 cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
902 cpy->peer_ref = copy_ref(ref->peer_ref);
903 return cpy;
906 struct ref *copy_ref_list(const struct ref *ref)
908 struct ref *ret = NULL;
909 struct ref **tail = &ret;
910 while (ref) {
911 *tail = copy_ref(ref);
912 ref = ref->next;
913 tail = &((*tail)->next);
915 return ret;
918 static void free_ref(struct ref *ref)
920 if (!ref)
921 return;
922 free_ref(ref->peer_ref);
923 free(ref->remote_status);
924 free(ref->symref);
925 free(ref);
928 void free_refs(struct ref *ref)
930 struct ref *next;
931 while (ref) {
932 next = ref->next;
933 free_ref(ref);
934 ref = next;
938 int ref_compare_name(const void *va, const void *vb)
940 const struct ref *a = va, *b = vb;
941 return strcmp(a->name, b->name);
944 static void *ref_list_get_next(const void *a)
946 return ((const struct ref *)a)->next;
949 static void ref_list_set_next(void *a, void *next)
951 ((struct ref *)a)->next = next;
954 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
956 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
959 static int count_refspec_match(const char *pattern,
960 struct ref *refs,
961 struct ref **matched_ref)
963 int patlen = strlen(pattern);
964 struct ref *matched_weak = NULL;
965 struct ref *matched = NULL;
966 int weak_match = 0;
967 int match = 0;
969 for (weak_match = match = 0; refs; refs = refs->next) {
970 char *name = refs->name;
971 int namelen = strlen(name);
973 if (!refname_match(pattern, name, ref_rev_parse_rules))
974 continue;
976 /* A match is "weak" if it is with refs outside
977 * heads or tags, and did not specify the pattern
978 * in full (e.g. "refs/remotes/origin/master") or at
979 * least from the toplevel (e.g. "remotes/origin/master");
980 * otherwise "git push $URL master" would result in
981 * ambiguity between remotes/origin/master and heads/master
982 * at the remote site.
984 if (namelen != patlen &&
985 patlen != namelen - 5 &&
986 prefixcmp(name, "refs/heads/") &&
987 prefixcmp(name, "refs/tags/")) {
988 /* We want to catch the case where only weak
989 * matches are found and there are multiple
990 * matches, and where more than one strong
991 * matches are found, as ambiguous. One
992 * strong match with zero or more weak matches
993 * are acceptable as a unique match.
995 matched_weak = refs;
996 weak_match++;
998 else {
999 matched = refs;
1000 match++;
1003 if (!matched) {
1004 *matched_ref = matched_weak;
1005 return weak_match;
1007 else {
1008 *matched_ref = matched;
1009 return match;
1013 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1015 **tail = ref;
1016 while (ref->next)
1017 ref = ref->next;
1018 *tail = &ref->next;
1021 static struct ref *alloc_delete_ref(void)
1023 struct ref *ref = alloc_ref("(delete)");
1024 hashclr(ref->new_sha1);
1025 return ref;
1028 static struct ref *try_explicit_object_name(const char *name)
1030 unsigned char sha1[20];
1031 struct ref *ref;
1033 if (!*name)
1034 return alloc_delete_ref();
1035 if (get_sha1(name, sha1))
1036 return NULL;
1037 ref = alloc_ref(name);
1038 hashcpy(ref->new_sha1, sha1);
1039 return ref;
1042 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1044 struct ref *ret = alloc_ref(name);
1045 tail_link_ref(ret, tail);
1046 return ret;
1049 static char *guess_ref(const char *name, struct ref *peer)
1051 struct strbuf buf = STRBUF_INIT;
1052 unsigned char sha1[20];
1054 const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1055 if (!r)
1056 return NULL;
1058 if (!prefixcmp(r, "refs/heads/"))
1059 strbuf_addstr(&buf, "refs/heads/");
1060 else if (!prefixcmp(r, "refs/tags/"))
1061 strbuf_addstr(&buf, "refs/tags/");
1062 else
1063 return NULL;
1065 strbuf_addstr(&buf, name);
1066 return strbuf_detach(&buf, NULL);
1069 static int match_explicit(struct ref *src, struct ref *dst,
1070 struct ref ***dst_tail,
1071 struct refspec *rs)
1073 struct ref *matched_src, *matched_dst;
1074 int copy_src;
1076 const char *dst_value = rs->dst;
1077 char *dst_guess;
1079 if (rs->pattern || rs->matching)
1080 return 0;
1082 matched_src = matched_dst = NULL;
1083 switch (count_refspec_match(rs->src, src, &matched_src)) {
1084 case 1:
1085 copy_src = 1;
1086 break;
1087 case 0:
1088 /* The source could be in the get_sha1() format
1089 * not a reference name. :refs/other is a
1090 * way to delete 'other' ref at the remote end.
1092 matched_src = try_explicit_object_name(rs->src);
1093 if (!matched_src)
1094 return error("src refspec %s does not match any.", rs->src);
1095 copy_src = 0;
1096 break;
1097 default:
1098 return error("src refspec %s matches more than one.", rs->src);
1101 if (!dst_value) {
1102 unsigned char sha1[20];
1103 int flag;
1105 dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1106 if (!dst_value ||
1107 ((flag & REF_ISSYMREF) &&
1108 prefixcmp(dst_value, "refs/heads/")))
1109 die("%s cannot be resolved to branch.",
1110 matched_src->name);
1113 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1114 case 1:
1115 break;
1116 case 0:
1117 if (!memcmp(dst_value, "refs/", 5))
1118 matched_dst = make_linked_ref(dst_value, dst_tail);
1119 else if (is_null_sha1(matched_src->new_sha1))
1120 error("unable to delete '%s': remote ref does not exist",
1121 dst_value);
1122 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1123 matched_dst = make_linked_ref(dst_guess, dst_tail);
1124 else
1125 error("unable to push to unqualified destination: %s\n"
1126 "The destination refspec neither matches an "
1127 "existing ref on the remote nor\n"
1128 "begins with refs/, and we are unable to "
1129 "guess a prefix based on the source ref.",
1130 dst_value);
1131 break;
1132 default:
1133 matched_dst = NULL;
1134 error("dst refspec %s matches more than one.",
1135 dst_value);
1136 break;
1138 if (!matched_dst)
1139 return -1;
1140 if (matched_dst->peer_ref)
1141 return error("dst ref %s receives from more than one src.",
1142 matched_dst->name);
1143 else {
1144 matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1145 matched_dst->force = rs->force;
1147 return 0;
1150 static int match_explicit_refs(struct ref *src, struct ref *dst,
1151 struct ref ***dst_tail, struct refspec *rs,
1152 int rs_nr)
1154 int i, errs;
1155 for (i = errs = 0; i < rs_nr; i++)
1156 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1157 return errs;
1160 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1161 int send_mirror, int direction, const struct refspec **ret_pat)
1163 const struct refspec *pat;
1164 char *name;
1165 int i;
1166 int matching_refs = -1;
1167 for (i = 0; i < rs_nr; i++) {
1168 if (rs[i].matching &&
1169 (matching_refs == -1 || rs[i].force)) {
1170 matching_refs = i;
1171 continue;
1174 if (rs[i].pattern) {
1175 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1176 int match;
1177 if (direction == FROM_SRC)
1178 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1179 else
1180 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1181 if (match) {
1182 matching_refs = i;
1183 break;
1187 if (matching_refs == -1)
1188 return NULL;
1190 pat = rs + matching_refs;
1191 if (pat->matching) {
1193 * "matching refs"; traditionally we pushed everything
1194 * including refs outside refs/heads/ hierarchy, but
1195 * that does not make much sense these days.
1197 if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
1198 return NULL;
1199 name = xstrdup(ref->name);
1201 if (ret_pat)
1202 *ret_pat = pat;
1203 return name;
1206 static struct ref **tail_ref(struct ref **head)
1208 struct ref **tail = head;
1209 while (*tail)
1210 tail = &((*tail)->next);
1211 return tail;
1214 struct tips {
1215 struct commit **tip;
1216 int nr, alloc;
1219 static void add_to_tips(struct tips *tips, const unsigned char *sha1)
1221 struct commit *commit;
1223 if (is_null_sha1(sha1))
1224 return;
1225 commit = lookup_commit_reference_gently(sha1, 1);
1226 if (!commit || (commit->object.flags & TMP_MARK))
1227 return;
1228 commit->object.flags |= TMP_MARK;
1229 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1230 tips->tip[tips->nr++] = commit;
1233 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1235 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1236 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1237 struct string_list_item *item;
1238 struct ref *ref;
1239 struct tips sent_tips;
1242 * Collect everything we know they would have at the end of
1243 * this push, and collect all tags they have.
1245 memset(&sent_tips, 0, sizeof(sent_tips));
1246 for (ref = *dst; ref; ref = ref->next) {
1247 if (ref->peer_ref &&
1248 !is_null_sha1(ref->peer_ref->new_sha1))
1249 add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
1250 else
1251 add_to_tips(&sent_tips, ref->old_sha1);
1252 if (!prefixcmp(ref->name, "refs/tags/"))
1253 string_list_append(&dst_tag, ref->name);
1255 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1257 sort_string_list(&dst_tag);
1259 /* Collect tags they do not have. */
1260 for (ref = src; ref; ref = ref->next) {
1261 if (prefixcmp(ref->name, "refs/tags/"))
1262 continue; /* not a tag */
1263 if (string_list_has_string(&dst_tag, ref->name))
1264 continue; /* they already have it */
1265 if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
1266 continue; /* be conservative */
1267 item = string_list_append(&src_tag, ref->name);
1268 item->util = ref;
1270 string_list_clear(&dst_tag, 0);
1273 * At this point, src_tag lists tags that are missing from
1274 * dst, and sent_tips lists the tips we are pushing or those
1275 * that we know they already have. An element in the src_tag
1276 * that is an ancestor of any of the sent_tips needs to be
1277 * sent to the other side.
1279 if (sent_tips.nr) {
1280 for_each_string_list_item(item, &src_tag) {
1281 struct ref *ref = item->util;
1282 struct ref *dst_ref;
1283 struct commit *commit;
1285 if (is_null_sha1(ref->new_sha1))
1286 continue;
1287 commit = lookup_commit_reference_gently(ref->new_sha1, 1);
1288 if (!commit)
1289 /* not pushing a commit, which is not an error */
1290 continue;
1293 * Is this tag, which they do not have, reachable from
1294 * any of the commits we are sending?
1296 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1297 continue;
1299 /* Add it in */
1300 dst_ref = make_linked_ref(ref->name, dst_tail);
1301 hashcpy(dst_ref->new_sha1, ref->new_sha1);
1302 dst_ref->peer_ref = copy_ref(ref);
1305 string_list_clear(&src_tag, 0);
1306 free(sent_tips.tip);
1310 * Given the set of refs the local repository has, the set of refs the
1311 * remote repository has, and the refspec used for push, determine
1312 * what remote refs we will update and with what value by setting
1313 * peer_ref (which object is being pushed) and force (if the push is
1314 * forced) in elements of "dst". The function may add new elements to
1315 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1317 int match_push_refs(struct ref *src, struct ref **dst,
1318 int nr_refspec, const char **refspec, int flags)
1320 struct refspec *rs;
1321 int send_all = flags & MATCH_REFS_ALL;
1322 int send_mirror = flags & MATCH_REFS_MIRROR;
1323 int send_prune = flags & MATCH_REFS_PRUNE;
1324 int errs;
1325 static const char *default_refspec[] = { ":", NULL };
1326 struct ref *ref, **dst_tail = tail_ref(dst);
1328 if (!nr_refspec) {
1329 nr_refspec = 1;
1330 refspec = default_refspec;
1332 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1333 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1335 /* pick the remainder */
1336 for (ref = src; ref; ref = ref->next) {
1337 struct ref *dst_peer;
1338 const struct refspec *pat = NULL;
1339 char *dst_name;
1341 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1342 if (!dst_name)
1343 continue;
1345 dst_peer = find_ref_by_name(*dst, dst_name);
1346 if (dst_peer) {
1347 if (dst_peer->peer_ref)
1348 /* We're already sending something to this ref. */
1349 goto free_name;
1350 } else {
1351 if (pat->matching && !(send_all || send_mirror))
1353 * Remote doesn't have it, and we have no
1354 * explicit pattern, and we don't have
1355 * --all nor --mirror.
1357 goto free_name;
1359 /* Create a new one and link it */
1360 dst_peer = make_linked_ref(dst_name, &dst_tail);
1361 hashcpy(dst_peer->new_sha1, ref->new_sha1);
1363 dst_peer->peer_ref = copy_ref(ref);
1364 dst_peer->force = pat->force;
1365 free_name:
1366 free(dst_name);
1369 if (flags & MATCH_REFS_FOLLOW_TAGS)
1370 add_missing_tags(src, dst, &dst_tail);
1372 if (send_prune) {
1373 /* check for missing refs on the remote */
1374 for (ref = *dst; ref; ref = ref->next) {
1375 char *src_name;
1377 if (ref->peer_ref)
1378 /* We're already sending something to this ref. */
1379 continue;
1381 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1382 if (src_name) {
1383 if (!find_ref_by_name(src, src_name))
1384 ref->peer_ref = alloc_delete_ref();
1385 free(src_name);
1389 if (errs)
1390 return -1;
1391 return 0;
1394 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1395 int force_update)
1397 struct ref *ref;
1399 for (ref = remote_refs; ref; ref = ref->next) {
1400 int force_ref_update = ref->force || force_update;
1402 if (ref->peer_ref)
1403 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1404 else if (!send_mirror)
1405 continue;
1407 ref->deletion = is_null_sha1(ref->new_sha1);
1408 if (!ref->deletion &&
1409 !hashcmp(ref->old_sha1, ref->new_sha1)) {
1410 ref->status = REF_STATUS_UPTODATE;
1411 continue;
1415 * Decide whether an individual refspec A:B can be
1416 * pushed. The push will succeed if any of the
1417 * following are true:
1419 * (1) the remote reference B does not exist
1421 * (2) the remote reference B is being removed (i.e.,
1422 * pushing :B where no source is specified)
1424 * (3) the destination is not under refs/tags/, and
1425 * if the old and new value is a commit, the new
1426 * is a descendant of the old.
1428 * (4) it is forced using the +A:B notation, or by
1429 * passing the --force argument
1432 if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1433 int why = 0; /* why would this push require --force? */
1435 if (!prefixcmp(ref->name, "refs/tags/"))
1436 why = REF_STATUS_REJECT_ALREADY_EXISTS;
1437 else if (!has_sha1_file(ref->old_sha1))
1438 why = REF_STATUS_REJECT_FETCH_FIRST;
1439 else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
1440 !lookup_commit_reference_gently(ref->new_sha1, 1))
1441 why = REF_STATUS_REJECT_NEEDS_FORCE;
1442 else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1443 why = REF_STATUS_REJECT_NONFASTFORWARD;
1445 if (!force_ref_update)
1446 ref->status = why;
1447 else if (why)
1448 ref->forced_update = 1;
1453 struct branch *branch_get(const char *name)
1455 struct branch *ret;
1457 read_config();
1458 if (!name || !*name || !strcmp(name, "HEAD"))
1459 ret = current_branch;
1460 else
1461 ret = make_branch(name, 0);
1462 if (ret && ret->remote_name) {
1463 ret->remote = remote_get(ret->remote_name);
1464 if (ret->merge_nr) {
1465 int i;
1466 ret->merge = xcalloc(sizeof(*ret->merge),
1467 ret->merge_nr);
1468 for (i = 0; i < ret->merge_nr; i++) {
1469 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1470 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1471 if (remote_find_tracking(ret->remote, ret->merge[i])
1472 && !strcmp(ret->remote_name, "."))
1473 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1477 return ret;
1480 int branch_has_merge_config(struct branch *branch)
1482 return branch && !!branch->merge;
1485 int branch_merge_matches(struct branch *branch,
1486 int i,
1487 const char *refname)
1489 if (!branch || i < 0 || i >= branch->merge_nr)
1490 return 0;
1491 return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1494 static int ignore_symref_update(const char *refname)
1496 unsigned char sha1[20];
1497 int flag;
1499 if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
1500 return 0; /* non-existing refs are OK */
1501 return (flag & REF_ISSYMREF);
1504 static struct ref *get_expanded_map(const struct ref *remote_refs,
1505 const struct refspec *refspec)
1507 const struct ref *ref;
1508 struct ref *ret = NULL;
1509 struct ref **tail = &ret;
1511 char *expn_name;
1513 for (ref = remote_refs; ref; ref = ref->next) {
1514 if (strchr(ref->name, '^'))
1515 continue; /* a dereference item */
1516 if (match_name_with_pattern(refspec->src, ref->name,
1517 refspec->dst, &expn_name) &&
1518 !ignore_symref_update(expn_name)) {
1519 struct ref *cpy = copy_ref(ref);
1521 cpy->peer_ref = alloc_ref(expn_name);
1522 free(expn_name);
1523 if (refspec->force)
1524 cpy->peer_ref->force = 1;
1525 *tail = cpy;
1526 tail = &cpy->next;
1530 return ret;
1533 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1535 const struct ref *ref;
1536 for (ref = refs; ref; ref = ref->next) {
1537 if (refname_match(name, ref->name, ref_fetch_rules))
1538 return ref;
1540 return NULL;
1543 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1545 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1547 if (!ref)
1548 return NULL;
1550 return copy_ref(ref);
1553 static struct ref *get_local_ref(const char *name)
1555 if (!name || name[0] == '\0')
1556 return NULL;
1558 if (!prefixcmp(name, "refs/"))
1559 return alloc_ref(name);
1561 if (!prefixcmp(name, "heads/") ||
1562 !prefixcmp(name, "tags/") ||
1563 !prefixcmp(name, "remotes/"))
1564 return alloc_ref_with_prefix("refs/", 5, name);
1566 return alloc_ref_with_prefix("refs/heads/", 11, name);
1569 int get_fetch_map(const struct ref *remote_refs,
1570 const struct refspec *refspec,
1571 struct ref ***tail,
1572 int missing_ok)
1574 struct ref *ref_map, **rmp;
1576 if (refspec->pattern) {
1577 ref_map = get_expanded_map(remote_refs, refspec);
1578 } else {
1579 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1581 if (refspec->exact_sha1) {
1582 ref_map = alloc_ref(name);
1583 get_sha1_hex(name, ref_map->old_sha1);
1584 } else {
1585 ref_map = get_remote_ref(remote_refs, name);
1587 if (!missing_ok && !ref_map)
1588 die("Couldn't find remote ref %s", name);
1589 if (ref_map) {
1590 ref_map->peer_ref = get_local_ref(refspec->dst);
1591 if (ref_map->peer_ref && refspec->force)
1592 ref_map->peer_ref->force = 1;
1596 for (rmp = &ref_map; *rmp; ) {
1597 if ((*rmp)->peer_ref) {
1598 if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
1599 check_refname_format((*rmp)->peer_ref->name, 0)) {
1600 struct ref *ignore = *rmp;
1601 error("* Ignoring funny ref '%s' locally",
1602 (*rmp)->peer_ref->name);
1603 *rmp = (*rmp)->next;
1604 free(ignore->peer_ref);
1605 free(ignore);
1606 continue;
1609 rmp = &((*rmp)->next);
1612 if (ref_map)
1613 tail_link_ref(ref_map, tail);
1615 return 0;
1618 int resolve_remote_symref(struct ref *ref, struct ref *list)
1620 if (!ref->symref)
1621 return 0;
1622 for (; list; list = list->next)
1623 if (!strcmp(ref->symref, list->name)) {
1624 hashcpy(ref->old_sha1, list->old_sha1);
1625 return 0;
1627 return 1;
1630 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1632 while (list) {
1633 struct commit_list *temp = list;
1634 temp->item->object.flags &= ~mark;
1635 list = temp->next;
1636 free(temp);
1640 int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
1642 struct object *o;
1643 struct commit *old, *new;
1644 struct commit_list *list, *used;
1645 int found = 0;
1648 * Both new and old must be commit-ish and new is descendant of
1649 * old. Otherwise we require --force.
1651 o = deref_tag(parse_object(old_sha1), NULL, 0);
1652 if (!o || o->type != OBJ_COMMIT)
1653 return 0;
1654 old = (struct commit *) o;
1656 o = deref_tag(parse_object(new_sha1), NULL, 0);
1657 if (!o || o->type != OBJ_COMMIT)
1658 return 0;
1659 new = (struct commit *) o;
1661 if (parse_commit(new) < 0)
1662 return 0;
1664 used = list = NULL;
1665 commit_list_insert(new, &list);
1666 while (list) {
1667 new = pop_most_recent_commit(&list, TMP_MARK);
1668 commit_list_insert(new, &used);
1669 if (new == old) {
1670 found = 1;
1671 break;
1674 unmark_and_free(list, TMP_MARK);
1675 unmark_and_free(used, TMP_MARK);
1676 return found;
1680 * Return true if there is anything to report, otherwise false.
1682 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1684 unsigned char sha1[20];
1685 struct commit *ours, *theirs;
1686 char symmetric[84];
1687 struct rev_info revs;
1688 const char *rev_argv[10], *base;
1689 int rev_argc;
1692 * Nothing to report unless we are marked to build on top of
1693 * somebody else.
1695 if (!branch ||
1696 !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
1697 return 0;
1700 * If what we used to build on no longer exists, there is
1701 * nothing to report.
1703 base = branch->merge[0]->dst;
1704 if (read_ref(base, sha1))
1705 return 0;
1706 theirs = lookup_commit_reference(sha1);
1707 if (!theirs)
1708 return 0;
1710 if (read_ref(branch->refname, sha1))
1711 return 0;
1712 ours = lookup_commit_reference(sha1);
1713 if (!ours)
1714 return 0;
1716 /* are we the same? */
1717 if (theirs == ours)
1718 return 0;
1720 /* Run "rev-list --left-right ours...theirs" internally... */
1721 rev_argc = 0;
1722 rev_argv[rev_argc++] = NULL;
1723 rev_argv[rev_argc++] = "--left-right";
1724 rev_argv[rev_argc++] = symmetric;
1725 rev_argv[rev_argc++] = "--";
1726 rev_argv[rev_argc] = NULL;
1728 strcpy(symmetric, sha1_to_hex(ours->object.sha1));
1729 strcpy(symmetric + 40, "...");
1730 strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
1732 init_revisions(&revs, NULL);
1733 setup_revisions(rev_argc, rev_argv, &revs, NULL);
1734 prepare_revision_walk(&revs);
1736 /* ... and count the commits on each side. */
1737 *num_ours = 0;
1738 *num_theirs = 0;
1739 while (1) {
1740 struct commit *c = get_revision(&revs);
1741 if (!c)
1742 break;
1743 if (c->object.flags & SYMMETRIC_LEFT)
1744 (*num_ours)++;
1745 else
1746 (*num_theirs)++;
1749 /* clear object flags smudged by the above traversal */
1750 clear_commit_marks(ours, ALL_REV_FLAGS);
1751 clear_commit_marks(theirs, ALL_REV_FLAGS);
1752 return 1;
1756 * Return true when there is anything to report, otherwise false.
1758 int format_tracking_info(struct branch *branch, struct strbuf *sb)
1760 int num_ours, num_theirs;
1761 const char *base;
1763 if (!stat_tracking_info(branch, &num_ours, &num_theirs))
1764 return 0;
1766 base = branch->merge[0]->dst;
1767 base = shorten_unambiguous_ref(base, 0);
1768 if (!num_theirs) {
1769 strbuf_addf(sb,
1770 Q_("Your branch is ahead of '%s' by %d commit.\n",
1771 "Your branch is ahead of '%s' by %d commits.\n",
1772 num_ours),
1773 base, num_ours);
1774 if (advice_status_hints)
1775 strbuf_addf(sb,
1776 _(" (use \"git push\" to publish your local commits)\n"));
1777 } else if (!num_ours) {
1778 strbuf_addf(sb,
1779 Q_("Your branch is behind '%s' by %d commit, "
1780 "and can be fast-forwarded.\n",
1781 "Your branch is behind '%s' by %d commits, "
1782 "and can be fast-forwarded.\n",
1783 num_theirs),
1784 base, num_theirs);
1785 if (advice_status_hints)
1786 strbuf_addf(sb,
1787 _(" (use \"git pull\" to update your local branch)\n"));
1788 } else {
1789 strbuf_addf(sb,
1790 Q_("Your branch and '%s' have diverged,\n"
1791 "and have %d and %d different commit each, "
1792 "respectively.\n",
1793 "Your branch and '%s' have diverged,\n"
1794 "and have %d and %d different commits each, "
1795 "respectively.\n",
1796 num_theirs),
1797 base, num_ours, num_theirs);
1798 if (advice_status_hints)
1799 strbuf_addf(sb,
1800 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1802 return 1;
1805 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1807 struct ref ***local_tail = cb_data;
1808 struct ref *ref;
1809 int len;
1811 /* we already know it starts with refs/ to get here */
1812 if (check_refname_format(refname + 5, 0))
1813 return 0;
1815 len = strlen(refname) + 1;
1816 ref = xcalloc(1, sizeof(*ref) + len);
1817 hashcpy(ref->new_sha1, sha1);
1818 memcpy(ref->name, refname, len);
1819 **local_tail = ref;
1820 *local_tail = &ref->next;
1821 return 0;
1824 struct ref *get_local_heads(void)
1826 struct ref *local_refs = NULL, **local_tail = &local_refs;
1827 for_each_ref(one_local_ref, &local_tail);
1828 return local_refs;
1831 struct ref *guess_remote_head(const struct ref *head,
1832 const struct ref *refs,
1833 int all)
1835 const struct ref *r;
1836 struct ref *list = NULL;
1837 struct ref **tail = &list;
1839 if (!head)
1840 return NULL;
1843 * Some transports support directly peeking at
1844 * where HEAD points; if that is the case, then
1845 * we don't have to guess.
1847 if (head->symref)
1848 return copy_ref(find_ref_by_name(refs, head->symref));
1850 /* If refs/heads/master could be right, it is. */
1851 if (!all) {
1852 r = find_ref_by_name(refs, "refs/heads/master");
1853 if (r && !hashcmp(r->old_sha1, head->old_sha1))
1854 return copy_ref(r);
1857 /* Look for another ref that points there */
1858 for (r = refs; r; r = r->next) {
1859 if (r != head &&
1860 !prefixcmp(r->name, "refs/heads/") &&
1861 !hashcmp(r->old_sha1, head->old_sha1)) {
1862 *tail = copy_ref(r);
1863 tail = &((*tail)->next);
1864 if (!all)
1865 break;
1869 return list;
1872 struct stale_heads_info {
1873 struct string_list *ref_names;
1874 struct ref **stale_refs_tail;
1875 struct refspec *refs;
1876 int ref_count;
1879 static int get_stale_heads_cb(const char *refname,
1880 const unsigned char *sha1, int flags, void *cb_data)
1882 struct stale_heads_info *info = cb_data;
1883 struct refspec query;
1884 memset(&query, 0, sizeof(struct refspec));
1885 query.dst = (char *)refname;
1887 if (query_refspecs(info->refs, info->ref_count, &query))
1888 return 0; /* No matches */
1891 * If we did find a suitable refspec and it's not a symref and
1892 * it's not in the list of refs that currently exist in that
1893 * remote we consider it to be stale.
1895 if (!((flags & REF_ISSYMREF) ||
1896 string_list_has_string(info->ref_names, query.src))) {
1897 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1898 hashcpy(ref->new_sha1, sha1);
1901 free(query.src);
1902 return 0;
1905 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1907 struct ref *ref, *stale_refs = NULL;
1908 struct string_list ref_names = STRING_LIST_INIT_NODUP;
1909 struct stale_heads_info info;
1910 info.ref_names = &ref_names;
1911 info.stale_refs_tail = &stale_refs;
1912 info.refs = refs;
1913 info.ref_count = ref_count;
1914 for (ref = fetch_map; ref; ref = ref->next)
1915 string_list_append(&ref_names, ref->name);
1916 sort_string_list(&ref_names);
1917 for_each_ref(get_stale_heads_cb, &info);
1918 string_list_clear(&ref_names, 0);
1919 return stale_refs;