9 #include "string-list.h"
10 #include "mergesort.h"
11 #include "argv-array.h"
13 enum map_direction { FROM_SRC, FROM_DST };
15 static struct refspec s_tag_refspec = {
24 const struct refspec *tag_refspec = &s_tag_refspec;
26 struct counted_string {
33 struct counted_string *instead_of;
38 struct rewrite **rewrite;
43 static struct remote **remotes;
44 static int remotes_alloc;
45 static int remotes_nr;
46 static struct hashmap remotes_hash;
48 static struct branch **branches;
49 static int branches_alloc;
50 static int branches_nr;
52 static struct branch *current_branch;
53 static const char *pushremote_name;
55 static struct rewrites rewrites;
56 static struct rewrites rewrites_push;
58 static int valid_remote(const struct remote *remote)
60 return (!!remote->url) || (!!remote->foreign_vcs);
63 static const char *alias_url(const char *url, struct rewrites *r)
66 struct counted_string *longest;
71 for (i = 0; i < r->rewrite_nr; i++) {
74 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
75 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
77 longest->len < r->rewrite[i]->instead_of[j].len)) {
78 longest = &(r->rewrite[i]->instead_of[j]);
86 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
89 static void add_push_refspec(struct remote *remote, const char *ref)
91 ALLOC_GROW(remote->push_refspec,
92 remote->push_refspec_nr + 1,
93 remote->push_refspec_alloc);
94 remote->push_refspec[remote->push_refspec_nr++] = ref;
97 static void add_fetch_refspec(struct remote *remote, const char *ref)
99 ALLOC_GROW(remote->fetch_refspec,
100 remote->fetch_refspec_nr + 1,
101 remote->fetch_refspec_alloc);
102 remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
105 static void add_url(struct remote *remote, const char *url)
107 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
108 remote->url[remote->url_nr++] = url;
111 static void add_pushurl(struct remote *remote, const char *pushurl)
113 ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
114 remote->pushurl[remote->pushurl_nr++] = pushurl;
117 static void add_pushurl_alias(struct remote *remote, const char *url)
119 const char *pushurl = alias_url(url, &rewrites_push);
121 add_pushurl(remote, pushurl);
124 static void add_url_alias(struct remote *remote, const char *url)
126 add_url(remote, alias_url(url, &rewrites));
127 add_pushurl_alias(remote, url);
130 struct remotes_hash_key {
135 static int remotes_hash_cmp(const struct remote *a, const struct remote *b, const struct remotes_hash_key *key)
138 return strncmp(a->name, key->str, key->len) || a->name[key->len];
140 return strcmp(a->name, b->name);
143 static inline void init_remotes_hash(void)
145 if (!remotes_hash.cmpfn)
146 hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0);
149 static struct remote *make_remote(const char *name, int len)
151 struct remote *ret, *replaced;
152 struct remotes_hash_key lookup;
153 struct hashmap_entry lookup_entry;
161 hashmap_entry_init(&lookup_entry, memhash(name, len));
163 if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
166 ret = xcalloc(1, sizeof(struct remote));
167 ret->prune = -1; /* unspecified */
168 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
169 remotes[remotes_nr++] = ret;
170 ret->name = xstrndup(name, len);
172 hashmap_entry_init(ret, lookup_entry.hash);
173 replaced = hashmap_put(&remotes_hash, ret);
174 assert(replaced == NULL); /* no previous entry overwritten */
178 static void add_merge(struct branch *branch, const char *name)
180 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
181 branch->merge_alloc);
182 branch->merge_name[branch->merge_nr++] = name;
185 static struct branch *make_branch(const char *name, int len)
190 for (i = 0; i < branches_nr; i++) {
191 if (len ? (!strncmp(name, branches[i]->name, len) &&
192 !branches[i]->name[len]) :
193 !strcmp(name, branches[i]->name))
197 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
198 ret = xcalloc(1, sizeof(struct branch));
199 branches[branches_nr++] = ret;
201 ret->name = xstrndup(name, len);
203 ret->name = xstrdup(name);
204 ret->refname = xstrfmt("refs/heads/%s", ret->name);
209 static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
214 for (i = 0; i < r->rewrite_nr; i++) {
216 ? (len == r->rewrite[i]->baselen &&
217 !strncmp(base, r->rewrite[i]->base, len))
218 : !strcmp(base, r->rewrite[i]->base))
219 return r->rewrite[i];
222 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
223 ret = xcalloc(1, sizeof(struct rewrite));
224 r->rewrite[r->rewrite_nr++] = ret;
226 ret->base = xstrndup(base, len);
230 ret->base = xstrdup(base);
231 ret->baselen = strlen(base);
236 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
238 ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
239 rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
240 rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
241 rewrite->instead_of_nr++;
244 static const char *skip_spaces(const char *s)
251 static void read_remotes_file(struct remote *remote)
253 struct strbuf buf = STRBUF_INIT;
254 FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
258 remote->origin = REMOTE_REMOTES;
259 while (strbuf_getline(&buf, f) != EOF) {
264 if (skip_prefix(buf.buf, "URL:", &v))
265 add_url_alias(remote, xstrdup(skip_spaces(v)));
266 else if (skip_prefix(buf.buf, "Push:", &v))
267 add_push_refspec(remote, xstrdup(skip_spaces(v)));
268 else if (skip_prefix(buf.buf, "Pull:", &v))
269 add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
271 strbuf_release(&buf);
275 static void read_branches_file(struct remote *remote)
278 struct strbuf buf = STRBUF_INIT;
279 FILE *f = fopen(git_path("branches/%s", remote->name), "r");
284 strbuf_getline_lf(&buf, f);
288 strbuf_release(&buf);
292 remote->origin = REMOTE_BRANCHES;
295 * The branches file would have URL and optionally
296 * #branch specified. The "master" (or specified) branch is
297 * fetched and stored in the local branch matching the
300 frag = strchr(buf.buf, '#');
306 add_url_alias(remote, strbuf_detach(&buf, NULL));
307 add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
308 frag, remote->name));
311 * Cogito compatible push: push current HEAD to remote #branch
312 * (master if missing)
314 add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
315 remote->fetch_tags = 1; /* always auto-follow */
318 static int handle_config(const char *key, const char *value, void *cb)
323 struct remote *remote;
324 struct branch *branch;
325 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
328 branch = make_branch(name, namelen);
329 if (!strcmp(subkey, "remote")) {
330 return git_config_string(&branch->remote_name, key, value);
331 } else if (!strcmp(subkey, "pushremote")) {
332 return git_config_string(&branch->pushremote_name, key, value);
333 } else if (!strcmp(subkey, "merge")) {
335 return config_error_nonbool(key);
336 add_merge(branch, xstrdup(value));
340 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
341 struct rewrite *rewrite;
344 if (!strcmp(subkey, "insteadof")) {
345 rewrite = make_rewrite(&rewrites, name, namelen);
347 return config_error_nonbool(key);
348 add_instead_of(rewrite, xstrdup(value));
349 } else if (!strcmp(subkey, "pushinsteadof")) {
350 rewrite = make_rewrite(&rewrites_push, name, namelen);
352 return config_error_nonbool(key);
353 add_instead_of(rewrite, xstrdup(value));
357 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
360 /* Handle remote.* variables */
361 if (!name && !strcmp(subkey, "pushdefault"))
362 return git_config_string(&pushremote_name, key, value);
366 /* Handle remote.<name>.* variables */
368 warning("Config remote shorthand cannot begin with '/': %s",
372 remote = make_remote(name, namelen);
373 remote->origin = REMOTE_CONFIG;
374 if (!strcmp(subkey, "mirror"))
375 remote->mirror = git_config_bool(key, value);
376 else if (!strcmp(subkey, "skipdefaultupdate"))
377 remote->skip_default_update = git_config_bool(key, value);
378 else if (!strcmp(subkey, "skipfetchall"))
379 remote->skip_default_update = git_config_bool(key, value);
380 else if (!strcmp(subkey, "prune"))
381 remote->prune = git_config_bool(key, value);
382 else if (!strcmp(subkey, "url")) {
384 if (git_config_string(&v, key, value))
387 } else if (!strcmp(subkey, "pushurl")) {
389 if (git_config_string(&v, key, value))
391 add_pushurl(remote, v);
392 } else if (!strcmp(subkey, "push")) {
394 if (git_config_string(&v, key, value))
396 add_push_refspec(remote, v);
397 } else if (!strcmp(subkey, "fetch")) {
399 if (git_config_string(&v, key, value))
401 add_fetch_refspec(remote, v);
402 } else if (!strcmp(subkey, "receivepack")) {
404 if (git_config_string(&v, key, value))
406 if (!remote->receivepack)
407 remote->receivepack = v;
409 error("more than one receivepack given, using the first");
410 } else if (!strcmp(subkey, "uploadpack")) {
412 if (git_config_string(&v, key, value))
414 if (!remote->uploadpack)
415 remote->uploadpack = v;
417 error("more than one uploadpack given, using the first");
418 } else if (!strcmp(subkey, "tagopt")) {
419 if (!strcmp(value, "--no-tags"))
420 remote->fetch_tags = -1;
421 else if (!strcmp(value, "--tags"))
422 remote->fetch_tags = 2;
423 } else if (!strcmp(subkey, "proxy")) {
424 return git_config_string((const char **)&remote->http_proxy,
426 } else if (!strcmp(subkey, "proxyauthmethod")) {
427 return git_config_string((const char **)&remote->http_proxy_authmethod,
429 } else if (!strcmp(subkey, "vcs")) {
430 return git_config_string(&remote->foreign_vcs, key, value);
435 static void alias_all_urls(void)
438 for (i = 0; i < remotes_nr; i++) {
439 int add_pushurl_aliases;
442 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
443 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
445 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
446 for (j = 0; j < remotes[i]->url_nr; j++) {
447 if (add_pushurl_aliases)
448 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
449 remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
454 static void read_config(void)
457 struct object_id oid;
464 current_branch = NULL;
465 if (startup_info->have_repository) {
466 const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
467 if (head_ref && (flag & REF_ISSYMREF) &&
468 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
469 current_branch = make_branch(head_ref, 0);
472 git_config(handle_config, NULL);
477 * This function frees a refspec array.
478 * Warning: code paths should be checked to ensure that the src
479 * and dst pointers are always freeable pointers as well
480 * as the refspec pointer itself.
482 static void free_refspecs(struct refspec *refspec, int nr_refspec)
489 for (i = 0; i < nr_refspec; i++) {
490 free(refspec[i].src);
491 free(refspec[i].dst);
496 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
499 struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
501 for (i = 0; i < nr_refspec; i++) {
504 const char *lhs, *rhs;
515 rhs = strrchr(lhs, ':');
518 * Before going on, special case ":" (or "+:") as a refspec
519 * for pushing matching refs.
521 if (!fetch && rhs == lhs && rhs[1] == '\0') {
527 size_t rlen = strlen(++rhs);
528 is_glob = (1 <= rlen && strchr(rhs, '*'));
529 rs[i].dst = xstrndup(rhs, rlen);
532 llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
533 if (1 <= llen && memchr(lhs, '*', llen)) {
534 if ((rhs && !is_glob) || (!rhs && fetch))
537 } else if (rhs && is_glob) {
541 rs[i].pattern = is_glob;
542 rs[i].src = xstrndup(lhs, llen);
543 flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
546 struct object_id unused;
550 ; /* empty is ok; it means "HEAD" */
551 else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
552 rs[i].exact_sha1 = 1; /* ok */
553 else if (!check_refname_format(rs[i].src, flags))
554 ; /* valid looking ref is ok */
559 ; /* missing is ok; it is the same as empty */
560 else if (!*rs[i].dst)
561 ; /* empty is ok; it means "do not store" */
562 else if (!check_refname_format(rs[i].dst, flags))
563 ; /* valid looking ref is ok */
569 * - empty is allowed; it means delete.
570 * - when wildcarded, it must be a valid looking ref.
571 * - otherwise, it must be an extended SHA-1, but
572 * there is no existing way to validate this.
577 if (check_refname_format(rs[i].src, flags))
581 ; /* anything goes, for now */
584 * - missing is allowed, but LHS then must be a
586 * - empty is not allowed.
587 * - otherwise it must be a valid looking ref.
590 if (check_refname_format(rs[i].src, flags))
592 } else if (!*rs[i].dst) {
595 if (check_refname_format(rs[i].dst, flags))
605 * nr_refspec must be greater than zero and i must be valid
606 * since it is only possible to reach this point from within
607 * the for loop above.
609 free_refspecs(rs, i+1);
612 die("Invalid refspec '%s'", refspec[i]);
615 int valid_fetch_refspec(const char *fetch_refspec_str)
617 struct refspec *refspec;
619 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
620 free_refspecs(refspec, 1);
624 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
626 return parse_refspec_internal(nr_refspec, refspec, 1, 0);
629 static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
631 return parse_refspec_internal(nr_refspec, refspec, 0, 0);
634 void free_refspec(int nr_refspec, struct refspec *refspec)
637 for (i = 0; i < nr_refspec; i++) {
638 free(refspec[i].src);
639 free(refspec[i].dst);
644 static int valid_remote_nick(const char *name)
646 if (!name[0] || is_dot_or_dotdot(name))
648 return !strchr(name, '/'); /* no slash */
651 const char *remote_for_branch(struct branch *branch, int *explicit)
653 if (branch && branch->remote_name) {
656 return branch->remote_name;
663 const char *pushremote_for_branch(struct branch *branch, int *explicit)
665 if (branch && branch->pushremote_name) {
668 return branch->pushremote_name;
670 if (pushremote_name) {
673 return pushremote_name;
675 return remote_for_branch(branch, explicit);
678 static struct remote *remote_get_1(const char *name,
679 const char *(*get_default)(struct branch *, int *))
689 name = get_default(current_branch, &name_given);
691 ret = make_remote(name, 0);
692 if (valid_remote_nick(name) && have_git_dir()) {
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))
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);
707 struct remote *remote_get(const char *name)
709 return remote_get_1(name, remote_for_branch);
712 struct remote *pushremote_get(const char *name)
714 return remote_get_1(name, pushremote_for_branch);
717 int remote_is_configured(struct remote *remote)
719 return remote && remote->origin;
722 int for_each_remote(each_remote_fn fn, void *priv)
726 for (i = 0; i < remotes_nr && !result; i++) {
727 struct remote *r = remotes[i];
731 r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
734 r->push = parse_push_refspec(r->push_refspec_nr,
736 result = fn(r, priv);
741 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
743 if (strcmp(ref1->name, ref2->name)) {
744 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
745 ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
746 die(_("Cannot fetch both %s and %s to %s"),
747 ref1->name, ref2->name, ref2->peer_ref->name);
748 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
749 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
750 warning(_("%s usually tracks %s, not %s"),
751 ref2->peer_ref->name, ref2->name, ref1->name);
752 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
753 ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
754 die(_("%s tracks both %s and %s"),
755 ref2->peer_ref->name, ref1->name, ref2->name);
758 * This last possibility doesn't occur because
759 * FETCH_HEAD_IGNORE entries always appear at
760 * the end of the list.
762 die(_("Internal error"));
765 free(ref2->peer_ref);
769 struct ref *ref_remove_duplicates(struct ref *ref_map)
771 struct string_list refs = STRING_LIST_INIT_NODUP;
772 struct ref *retval = NULL;
773 struct ref **p = &retval;
776 struct ref *ref = ref_map;
778 ref_map = ref_map->next;
781 if (!ref->peer_ref) {
785 struct string_list_item *item =
786 string_list_insert(&refs, ref->peer_ref->name);
789 /* Entry already existed */
790 handle_duplicate((struct ref *)item->util, ref);
799 string_list_clear(&refs, 0);
803 int remote_has_url(struct remote *remote, const char *url)
806 for (i = 0; i < remote->url_nr; i++) {
807 if (!strcmp(remote->url[i], url))
813 static int match_name_with_pattern(const char *key, const char *name,
814 const char *value, char **result)
816 const char *kstar = strchr(key, '*');
822 die("Key '%s' of pattern had no '*'", key);
824 ksuffixlen = strlen(kstar + 1);
825 namelen = strlen(name);
826 ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
827 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
829 struct strbuf sb = STRBUF_INIT;
830 const char *vstar = strchr(value, '*');
832 die("Value '%s' of pattern has no '*'", value);
833 strbuf_add(&sb, value, vstar - value);
834 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
835 strbuf_addstr(&sb, vstar + 1);
836 *result = strbuf_detach(&sb, NULL);
841 static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
844 int find_src = !query->src;
846 if (find_src && !query->dst)
847 error("query_refspecs_multiple: need either src or dst");
849 for (i = 0; i < ref_count; i++) {
850 struct refspec *refspec = &refs[i];
851 const char *key = find_src ? refspec->dst : refspec->src;
852 const char *value = find_src ? refspec->src : refspec->dst;
853 const char *needle = find_src ? query->dst : query->src;
854 char **result = find_src ? &query->src : &query->dst;
858 if (refspec->pattern) {
859 if (match_name_with_pattern(key, needle, value, result))
860 string_list_append_nodup(results, *result);
861 } else if (!strcmp(needle, key)) {
862 string_list_append(results, value);
867 int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
870 int find_src = !query->src;
871 const char *needle = find_src ? query->dst : query->src;
872 char **result = find_src ? &query->src : &query->dst;
874 if (find_src && !query->dst)
875 return error("query_refspecs: need either src or dst");
877 for (i = 0; i < ref_count; i++) {
878 struct refspec *refspec = &refs[i];
879 const char *key = find_src ? refspec->dst : refspec->src;
880 const char *value = find_src ? refspec->src : refspec->dst;
884 if (refspec->pattern) {
885 if (match_name_with_pattern(key, needle, value, result)) {
886 query->force = refspec->force;
889 } else if (!strcmp(needle, key)) {
890 *result = xstrdup(value);
891 query->force = refspec->force;
898 char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
901 struct refspec query;
903 memset(&query, 0, sizeof(struct refspec));
904 query.src = (char *)name;
906 if (query_refspecs(refspecs, nr_refspec, &query))
912 int remote_find_tracking(struct remote *remote, struct refspec *refspec)
914 return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
917 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
920 size_t len = strlen(name);
921 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
922 memcpy(ref->name, prefix, prefixlen);
923 memcpy(ref->name + prefixlen, name, len);
927 struct ref *alloc_ref(const char *name)
929 return alloc_ref_with_prefix("", 0, name);
932 struct ref *copy_ref(const struct ref *ref)
938 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
940 memcpy(cpy, ref, len);
942 cpy->symref = xstrdup_or_null(ref->symref);
943 cpy->remote_status = xstrdup_or_null(ref->remote_status);
944 cpy->peer_ref = copy_ref(ref->peer_ref);
948 struct ref *copy_ref_list(const struct ref *ref)
950 struct ref *ret = NULL;
951 struct ref **tail = &ret;
953 *tail = copy_ref(ref);
955 tail = &((*tail)->next);
960 static void free_ref(struct ref *ref)
964 free_ref(ref->peer_ref);
965 free(ref->remote_status);
970 void free_refs(struct ref *ref)
980 int ref_compare_name(const void *va, const void *vb)
982 const struct ref *a = va, *b = vb;
983 return strcmp(a->name, b->name);
986 static void *ref_list_get_next(const void *a)
988 return ((const struct ref *)a)->next;
991 static void ref_list_set_next(void *a, void *next)
993 ((struct ref *)a)->next = next;
996 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
998 *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
1001 int count_refspec_match(const char *pattern,
1003 struct ref **matched_ref)
1005 int patlen = strlen(pattern);
1006 struct ref *matched_weak = NULL;
1007 struct ref *matched = NULL;
1011 for (weak_match = match = 0; refs; refs = refs->next) {
1012 char *name = refs->name;
1013 int namelen = strlen(name);
1015 if (!refname_match(pattern, name))
1018 /* A match is "weak" if it is with refs outside
1019 * heads or tags, and did not specify the pattern
1020 * in full (e.g. "refs/remotes/origin/master") or at
1021 * least from the toplevel (e.g. "remotes/origin/master");
1022 * otherwise "git push $URL master" would result in
1023 * ambiguity between remotes/origin/master and heads/master
1024 * at the remote site.
1026 if (namelen != patlen &&
1027 patlen != namelen - 5 &&
1028 !starts_with(name, "refs/heads/") &&
1029 !starts_with(name, "refs/tags/")) {
1030 /* We want to catch the case where only weak
1031 * matches are found and there are multiple
1032 * matches, and where more than one strong
1033 * matches are found, as ambiguous. One
1034 * strong match with zero or more weak matches
1035 * are acceptable as a unique match.
1037 matched_weak = refs;
1047 *matched_ref = matched_weak;
1052 *matched_ref = matched;
1057 static void tail_link_ref(struct ref *ref, struct ref ***tail)
1065 static struct ref *alloc_delete_ref(void)
1067 struct ref *ref = alloc_ref("(delete)");
1068 oidclr(&ref->new_oid);
1072 static int try_explicit_object_name(const char *name,
1075 struct object_id oid;
1079 *match = alloc_delete_ref();
1083 if (get_sha1(name, oid.hash))
1087 *match = alloc_ref(name);
1088 oidcpy(&(*match)->new_oid, &oid);
1093 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1095 struct ref *ret = alloc_ref(name);
1096 tail_link_ref(ret, tail);
1100 static char *guess_ref(const char *name, struct ref *peer)
1102 struct strbuf buf = STRBUF_INIT;
1103 struct object_id oid;
1105 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1110 if (starts_with(r, "refs/heads/"))
1111 strbuf_addstr(&buf, "refs/heads/");
1112 else if (starts_with(r, "refs/tags/"))
1113 strbuf_addstr(&buf, "refs/tags/");
1117 strbuf_addstr(&buf, name);
1118 return strbuf_detach(&buf, NULL);
1121 static int match_explicit_lhs(struct ref *src,
1124 int *allocated_match)
1126 switch (count_refspec_match(rs->src, src, match)) {
1128 if (allocated_match)
1129 *allocated_match = 0;
1132 /* The source could be in the get_sha1() format
1133 * not a reference name. :refs/other is a
1134 * way to delete 'other' ref at the remote end.
1136 if (try_explicit_object_name(rs->src, match) < 0)
1137 return error("src refspec %s does not match any.", rs->src);
1138 if (allocated_match)
1139 *allocated_match = 1;
1142 return error("src refspec %s matches more than one.", rs->src);
1146 static int match_explicit(struct ref *src, struct ref *dst,
1147 struct ref ***dst_tail,
1150 struct ref *matched_src, *matched_dst;
1153 const char *dst_value = rs->dst;
1156 if (rs->pattern || rs->matching)
1159 matched_src = matched_dst = NULL;
1160 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1164 struct object_id oid;
1167 dst_value = resolve_ref_unsafe(matched_src->name,
1168 RESOLVE_REF_READING,
1171 ((flag & REF_ISSYMREF) &&
1172 !starts_with(dst_value, "refs/heads/")))
1173 die("%s cannot be resolved to branch.",
1177 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1181 if (starts_with(dst_value, "refs/"))
1182 matched_dst = make_linked_ref(dst_value, dst_tail);
1183 else if (is_null_oid(&matched_src->new_oid))
1184 error("unable to delete '%s': remote ref does not exist",
1186 else if ((dst_guess = guess_ref(dst_value, matched_src)))
1187 matched_dst = make_linked_ref(dst_guess, dst_tail);
1189 error("unable to push to unqualified destination: %s\n"
1190 "The destination refspec neither matches an "
1191 "existing ref on the remote nor\n"
1192 "begins with refs/, and we are unable to "
1193 "guess a prefix based on the source ref.",
1198 error("dst refspec %s matches more than one.",
1204 if (matched_dst->peer_ref)
1205 return error("dst ref %s receives from more than one src.",
1208 matched_dst->peer_ref = allocated_src ?
1210 copy_ref(matched_src);
1211 matched_dst->force = rs->force;
1216 static int match_explicit_refs(struct ref *src, struct ref *dst,
1217 struct ref ***dst_tail, struct refspec *rs,
1221 for (i = errs = 0; i < rs_nr; i++)
1222 errs += match_explicit(src, dst, dst_tail, &rs[i]);
1226 static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
1227 int send_mirror, int direction, const struct refspec **ret_pat)
1229 const struct refspec *pat;
1232 int matching_refs = -1;
1233 for (i = 0; i < rs_nr; i++) {
1234 if (rs[i].matching &&
1235 (matching_refs == -1 || rs[i].force)) {
1240 if (rs[i].pattern) {
1241 const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
1243 if (direction == FROM_SRC)
1244 match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
1246 match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
1253 if (matching_refs == -1)
1256 pat = rs + matching_refs;
1257 if (pat->matching) {
1259 * "matching refs"; traditionally we pushed everything
1260 * including refs outside refs/heads/ hierarchy, but
1261 * that does not make much sense these days.
1263 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1265 name = xstrdup(ref->name);
1272 static struct ref **tail_ref(struct ref **head)
1274 struct ref **tail = head;
1276 tail = &((*tail)->next);
1281 struct commit **tip;
1285 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1287 struct commit *commit;
1289 if (is_null_oid(oid))
1291 commit = lookup_commit_reference_gently(oid->hash, 1);
1292 if (!commit || (commit->object.flags & TMP_MARK))
1294 commit->object.flags |= TMP_MARK;
1295 ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1296 tips->tip[tips->nr++] = commit;
1299 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1301 struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1302 struct string_list src_tag = STRING_LIST_INIT_NODUP;
1303 struct string_list_item *item;
1305 struct tips sent_tips;
1308 * Collect everything we know they would have at the end of
1309 * this push, and collect all tags they have.
1311 memset(&sent_tips, 0, sizeof(sent_tips));
1312 for (ref = *dst; ref; ref = ref->next) {
1313 if (ref->peer_ref &&
1314 !is_null_oid(&ref->peer_ref->new_oid))
1315 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1317 add_to_tips(&sent_tips, &ref->old_oid);
1318 if (starts_with(ref->name, "refs/tags/"))
1319 string_list_append(&dst_tag, ref->name);
1321 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1323 string_list_sort(&dst_tag);
1325 /* Collect tags they do not have. */
1326 for (ref = src; ref; ref = ref->next) {
1327 if (!starts_with(ref->name, "refs/tags/"))
1328 continue; /* not a tag */
1329 if (string_list_has_string(&dst_tag, ref->name))
1330 continue; /* they already have it */
1331 if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
1332 continue; /* be conservative */
1333 item = string_list_append(&src_tag, ref->name);
1336 string_list_clear(&dst_tag, 0);
1339 * At this point, src_tag lists tags that are missing from
1340 * dst, and sent_tips lists the tips we are pushing or those
1341 * that we know they already have. An element in the src_tag
1342 * that is an ancestor of any of the sent_tips needs to be
1343 * sent to the other side.
1346 for_each_string_list_item(item, &src_tag) {
1347 struct ref *ref = item->util;
1348 struct ref *dst_ref;
1349 struct commit *commit;
1351 if (is_null_oid(&ref->new_oid))
1353 commit = lookup_commit_reference_gently(ref->new_oid.hash, 1);
1355 /* not pushing a commit, which is not an error */
1359 * Is this tag, which they do not have, reachable from
1360 * any of the commits we are sending?
1362 if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
1366 dst_ref = make_linked_ref(ref->name, dst_tail);
1367 oidcpy(&dst_ref->new_oid, &ref->new_oid);
1368 dst_ref->peer_ref = copy_ref(ref);
1371 string_list_clear(&src_tag, 0);
1372 free(sent_tips.tip);
1375 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1377 for ( ; list; list = list->next)
1378 if (!strcmp(list->name, name))
1379 return (struct ref *)list;
1383 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1385 for ( ; ref; ref = ref->next)
1386 string_list_append_nodup(ref_index, ref->name)->util = ref;
1388 string_list_sort(ref_index);
1392 * Given only the set of local refs, sanity-check the set of push
1393 * refspecs. We can't catch all errors that match_push_refs would,
1394 * but we can catch some errors early before even talking to the
1397 int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
1399 struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
1403 for (i = 0; i < nr_refspec; i++) {
1404 struct refspec *rs = refspec + i;
1406 if (rs->pattern || rs->matching)
1409 ret |= match_explicit_lhs(src, rs, NULL, NULL);
1412 free_refspec(nr_refspec, refspec);
1417 * Given the set of refs the local repository has, the set of refs the
1418 * remote repository has, and the refspec used for push, determine
1419 * what remote refs we will update and with what value by setting
1420 * peer_ref (which object is being pushed) and force (if the push is
1421 * forced) in elements of "dst". The function may add new elements to
1422 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1424 int match_push_refs(struct ref *src, struct ref **dst,
1425 int nr_refspec, const char **refspec, int flags)
1428 int send_all = flags & MATCH_REFS_ALL;
1429 int send_mirror = flags & MATCH_REFS_MIRROR;
1430 int send_prune = flags & MATCH_REFS_PRUNE;
1432 static const char *default_refspec[] = { ":", NULL };
1433 struct ref *ref, **dst_tail = tail_ref(dst);
1434 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1438 refspec = default_refspec;
1440 rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1441 errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1443 /* pick the remainder */
1444 for (ref = src; ref; ref = ref->next) {
1445 struct string_list_item *dst_item;
1446 struct ref *dst_peer;
1447 const struct refspec *pat = NULL;
1450 dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1454 if (!dst_ref_index.nr)
1455 prepare_ref_index(&dst_ref_index, *dst);
1457 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1458 dst_peer = dst_item ? dst_item->util : NULL;
1460 if (dst_peer->peer_ref)
1461 /* We're already sending something to this ref. */
1464 if (pat->matching && !(send_all || send_mirror))
1466 * Remote doesn't have it, and we have no
1467 * explicit pattern, and we don't have
1468 * --all or --mirror.
1472 /* Create a new one and link it */
1473 dst_peer = make_linked_ref(dst_name, &dst_tail);
1474 oidcpy(&dst_peer->new_oid, &ref->new_oid);
1475 string_list_insert(&dst_ref_index,
1476 dst_peer->name)->util = dst_peer;
1478 dst_peer->peer_ref = copy_ref(ref);
1479 dst_peer->force = pat->force;
1484 string_list_clear(&dst_ref_index, 0);
1486 if (flags & MATCH_REFS_FOLLOW_TAGS)
1487 add_missing_tags(src, dst, &dst_tail);
1490 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1491 /* check for missing refs on the remote */
1492 for (ref = *dst; ref; ref = ref->next) {
1496 /* We're already sending something to this ref. */
1499 src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
1501 if (!src_ref_index.nr)
1502 prepare_ref_index(&src_ref_index, src);
1503 if (!string_list_has_string(&src_ref_index,
1505 ref->peer_ref = alloc_delete_ref();
1509 string_list_clear(&src_ref_index, 0);
1516 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1521 for (ref = remote_refs; ref; ref = ref->next) {
1522 int force_ref_update = ref->force || force_update;
1523 int reject_reason = 0;
1526 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1527 else if (!send_mirror)
1530 ref->deletion = is_null_oid(&ref->new_oid);
1531 if (!ref->deletion &&
1532 !oidcmp(&ref->old_oid, &ref->new_oid)) {
1533 ref->status = REF_STATUS_UPTODATE;
1538 * If the remote ref has moved and is now different
1539 * from what we expect, reject any push.
1541 * It also is an error if the user told us to check
1542 * with the remote-tracking branch to find the value
1543 * to expect, but we did not have such a tracking
1546 if (ref->expect_old_sha1) {
1547 if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1548 reject_reason = REF_STATUS_REJECT_STALE;
1550 /* If the ref isn't stale then force the update. */
1551 force_ref_update = 1;
1555 * If the update isn't already rejected then check
1556 * the usual "must fast-forward" rules.
1558 * Decide whether an individual refspec A:B can be
1559 * pushed. The push will succeed if any of the
1560 * following are true:
1562 * (1) the remote reference B does not exist
1564 * (2) the remote reference B is being removed (i.e.,
1565 * pushing :B where no source is specified)
1567 * (3) the destination is not under refs/tags/, and
1568 * if the old and new value is a commit, the new
1569 * is a descendant of the old.
1571 * (4) it is forced using the +A:B notation, or by
1572 * passing the --force argument
1575 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1576 if (starts_with(ref->name, "refs/tags/"))
1577 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1578 else if (!has_object_file(&ref->old_oid))
1579 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1580 else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
1581 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
1582 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1583 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1584 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1588 * "--force" will defeat any rejection implemented
1589 * by the rules above.
1591 if (!force_ref_update)
1592 ref->status = reject_reason;
1593 else if (reject_reason)
1594 ref->forced_update = 1;
1598 static void set_merge(struct branch *ret)
1600 struct remote *remote;
1602 struct object_id oid;
1606 return; /* no branch */
1608 return; /* already run */
1609 if (!ret->remote_name || !ret->merge_nr) {
1611 * no merge config; let's make sure we don't confuse callers
1612 * with a non-zero merge_nr but a NULL merge
1618 remote = remote_get(ret->remote_name);
1620 ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1621 for (i = 0; i < ret->merge_nr; i++) {
1622 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1623 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1624 if (!remote_find_tracking(remote, ret->merge[i]) ||
1625 strcmp(ret->remote_name, "."))
1627 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1628 oid.hash, &ref) == 1)
1629 ret->merge[i]->dst = ref;
1631 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1635 struct branch *branch_get(const char *name)
1640 if (!name || !*name || !strcmp(name, "HEAD"))
1641 ret = current_branch;
1643 ret = make_branch(name, 0);
1648 int branch_has_merge_config(struct branch *branch)
1650 return branch && !!branch->merge;
1653 int branch_merge_matches(struct branch *branch,
1655 const char *refname)
1657 if (!branch || i < 0 || i >= branch->merge_nr)
1659 return refname_match(branch->merge[i]->src, refname);
1662 __attribute__((format (printf,2,3)))
1663 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1668 strbuf_vaddf(err, fmt, ap);
1674 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1677 return error_buf(err, _("HEAD does not point to a branch"));
1679 if (!branch->merge || !branch->merge[0]) {
1681 * no merge config; is it because the user didn't define any,
1682 * or because it is not a real branch, and get_branch
1685 if (!ref_exists(branch->refname))
1686 return error_buf(err, _("no such branch: '%s'"),
1688 return error_buf(err,
1689 _("no upstream configured for branch '%s'"),
1693 if (!branch->merge[0]->dst)
1694 return error_buf(err,
1695 _("upstream branch '%s' not stored as a remote-tracking branch"),
1696 branch->merge[0]->src);
1698 return branch->merge[0]->dst;
1701 static const char *tracking_for_push_dest(struct remote *remote,
1702 const char *refname,
1707 ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
1709 return error_buf(err,
1710 _("push destination '%s' on remote '%s' has no local tracking branch"),
1711 refname, remote->name);
1715 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1717 struct remote *remote;
1719 remote = remote_get(pushremote_for_branch(branch, NULL));
1721 return error_buf(err,
1722 _("branch '%s' has no remote for pushing"),
1725 if (remote->push_refspec_nr) {
1729 dst = apply_refspecs(remote->push, remote->push_refspec_nr,
1732 return error_buf(err,
1733 _("push refspecs for '%s' do not include '%s'"),
1734 remote->name, branch->name);
1736 ret = tracking_for_push_dest(remote, dst, err);
1742 return tracking_for_push_dest(remote, branch->refname, err);
1744 switch (push_default) {
1745 case PUSH_DEFAULT_NOTHING:
1746 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1748 case PUSH_DEFAULT_MATCHING:
1749 case PUSH_DEFAULT_CURRENT:
1750 return tracking_for_push_dest(remote, branch->refname, err);
1752 case PUSH_DEFAULT_UPSTREAM:
1753 return branch_get_upstream(branch, err);
1755 case PUSH_DEFAULT_UNSPECIFIED:
1756 case PUSH_DEFAULT_SIMPLE:
1758 const char *up, *cur;
1760 up = branch_get_upstream(branch, err);
1763 cur = tracking_for_push_dest(remote, branch->refname, err);
1766 if (strcmp(cur, up))
1767 return error_buf(err,
1768 _("cannot resolve 'simple' push to a single destination"));
1773 die("BUG: unhandled push situation");
1776 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1779 return error_buf(err, _("HEAD does not point to a branch"));
1781 if (!branch->push_tracking_ref)
1782 branch->push_tracking_ref = branch_get_push_1(branch, err);
1783 return branch->push_tracking_ref;
1786 static int ignore_symref_update(const char *refname)
1788 struct object_id oid;
1791 if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1792 return 0; /* non-existing refs are OK */
1793 return (flag & REF_ISSYMREF);
1797 * Create and return a list of (struct ref) consisting of copies of
1798 * each remote_ref that matches refspec. refspec must be a pattern.
1799 * Fill in the copies' peer_ref to describe the local tracking refs to
1800 * which they map. Omit any references that would map to an existing
1801 * local symbolic ref.
1803 static struct ref *get_expanded_map(const struct ref *remote_refs,
1804 const struct refspec *refspec)
1806 const struct ref *ref;
1807 struct ref *ret = NULL;
1808 struct ref **tail = &ret;
1810 for (ref = remote_refs; ref; ref = ref->next) {
1811 char *expn_name = NULL;
1813 if (strchr(ref->name, '^'))
1814 continue; /* a dereference item */
1815 if (match_name_with_pattern(refspec->src, ref->name,
1816 refspec->dst, &expn_name) &&
1817 !ignore_symref_update(expn_name)) {
1818 struct ref *cpy = copy_ref(ref);
1820 cpy->peer_ref = alloc_ref(expn_name);
1822 cpy->peer_ref->force = 1;
1832 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1834 const struct ref *ref;
1835 for (ref = refs; ref; ref = ref->next) {
1836 if (refname_match(name, ref->name))
1842 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1844 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1849 return copy_ref(ref);
1852 static struct ref *get_local_ref(const char *name)
1854 if (!name || name[0] == '\0')
1857 if (starts_with(name, "refs/"))
1858 return alloc_ref(name);
1860 if (starts_with(name, "heads/") ||
1861 starts_with(name, "tags/") ||
1862 starts_with(name, "remotes/"))
1863 return alloc_ref_with_prefix("refs/", 5, name);
1865 return alloc_ref_with_prefix("refs/heads/", 11, name);
1868 int get_fetch_map(const struct ref *remote_refs,
1869 const struct refspec *refspec,
1873 struct ref *ref_map, **rmp;
1875 if (refspec->pattern) {
1876 ref_map = get_expanded_map(remote_refs, refspec);
1878 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1880 if (refspec->exact_sha1) {
1881 ref_map = alloc_ref(name);
1882 get_oid_hex(name, &ref_map->old_oid);
1884 ref_map = get_remote_ref(remote_refs, name);
1886 if (!missing_ok && !ref_map)
1887 die("Couldn't find remote ref %s", name);
1889 ref_map->peer_ref = get_local_ref(refspec->dst);
1890 if (ref_map->peer_ref && refspec->force)
1891 ref_map->peer_ref->force = 1;
1895 for (rmp = &ref_map; *rmp; ) {
1896 if ((*rmp)->peer_ref) {
1897 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1898 check_refname_format((*rmp)->peer_ref->name, 0)) {
1899 struct ref *ignore = *rmp;
1900 error("* Ignoring funny ref '%s' locally",
1901 (*rmp)->peer_ref->name);
1902 *rmp = (*rmp)->next;
1903 free(ignore->peer_ref);
1908 rmp = &((*rmp)->next);
1912 tail_link_ref(ref_map, tail);
1917 int resolve_remote_symref(struct ref *ref, struct ref *list)
1921 for (; list; list = list->next)
1922 if (!strcmp(ref->symref, list->name)) {
1923 oidcpy(&ref->old_oid, &list->old_oid);
1929 static void unmark_and_free(struct commit_list *list, unsigned int mark)
1932 struct commit *commit = pop_commit(&list);
1933 commit->object.flags &= ~mark;
1937 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1940 struct commit *old, *new;
1941 struct commit_list *list, *used;
1945 * Both new and old must be commit-ish and new is descendant of
1946 * old. Otherwise we require --force.
1948 o = deref_tag(parse_object(old_oid->hash), NULL, 0);
1949 if (!o || o->type != OBJ_COMMIT)
1951 old = (struct commit *) o;
1953 o = deref_tag(parse_object(new_oid->hash), NULL, 0);
1954 if (!o || o->type != OBJ_COMMIT)
1956 new = (struct commit *) o;
1958 if (parse_commit(new) < 0)
1962 commit_list_insert(new, &list);
1964 new = pop_most_recent_commit(&list, TMP_MARK);
1965 commit_list_insert(new, &used);
1971 unmark_and_free(list, TMP_MARK);
1972 unmark_and_free(used, TMP_MARK);
1977 * Compare a branch with its upstream, and save their differences (number
1978 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1979 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1980 * is not itself NULL.
1982 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1983 * upstream defined, or ref does not exist), 0 otherwise.
1985 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1986 const char **upstream_name)
1988 struct object_id oid;
1989 struct commit *ours, *theirs;
1990 struct rev_info revs;
1992 struct argv_array argv = ARGV_ARRAY_INIT;
1994 /* Cannot stat unless we are marked to build on top of somebody else. */
1995 base = branch_get_upstream(branch, NULL);
1997 *upstream_name = base;
2001 /* Cannot stat if what we used to build on no longer exists */
2002 if (read_ref(base, oid.hash))
2004 theirs = lookup_commit_reference(oid.hash);
2008 if (read_ref(branch->refname, oid.hash))
2010 ours = lookup_commit_reference(oid.hash);
2014 /* are we the same? */
2015 if (theirs == ours) {
2016 *num_theirs = *num_ours = 0;
2020 /* Run "rev-list --left-right ours...theirs" internally... */
2021 argv_array_push(&argv, ""); /* ignored */
2022 argv_array_push(&argv, "--left-right");
2023 argv_array_pushf(&argv, "%s...%s",
2024 oid_to_hex(&ours->object.oid),
2025 oid_to_hex(&theirs->object.oid));
2026 argv_array_push(&argv, "--");
2028 init_revisions(&revs, NULL);
2029 setup_revisions(argv.argc, argv.argv, &revs, NULL);
2030 if (prepare_revision_walk(&revs))
2031 die("revision walk setup failed");
2033 /* ... and count the commits on each side. */
2037 struct commit *c = get_revision(&revs);
2040 if (c->object.flags & SYMMETRIC_LEFT)
2046 /* clear object flags smudged by the above traversal */
2047 clear_commit_marks(ours, ALL_REV_FLAGS);
2048 clear_commit_marks(theirs, ALL_REV_FLAGS);
2050 argv_array_clear(&argv);
2055 * Return true when there is anything to report, otherwise false.
2057 int format_tracking_info(struct branch *branch, struct strbuf *sb)
2060 const char *full_base;
2062 int upstream_is_gone = 0;
2064 if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
2067 upstream_is_gone = 1;
2070 base = shorten_unambiguous_ref(full_base, 0);
2071 if (upstream_is_gone) {
2073 _("Your branch is based on '%s', but the upstream is gone.\n"),
2075 if (advice_status_hints)
2077 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2078 } else if (!ours && !theirs) {
2080 _("Your branch is up-to-date with '%s'.\n"),
2082 } else if (!theirs) {
2084 Q_("Your branch is ahead of '%s' by %d commit.\n",
2085 "Your branch is ahead of '%s' by %d commits.\n",
2088 if (advice_status_hints)
2090 _(" (use \"git push\" to publish your local commits)\n"));
2093 Q_("Your branch is behind '%s' by %d commit, "
2094 "and can be fast-forwarded.\n",
2095 "Your branch is behind '%s' by %d commits, "
2096 "and can be fast-forwarded.\n",
2099 if (advice_status_hints)
2101 _(" (use \"git pull\" to update your local branch)\n"));
2104 Q_("Your branch and '%s' have diverged,\n"
2105 "and have %d and %d different commit each, "
2107 "Your branch and '%s' have diverged,\n"
2108 "and have %d and %d different commits each, "
2111 base, ours, theirs);
2112 if (advice_status_hints)
2114 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2120 static int one_local_ref(const char *refname, const struct object_id *oid,
2121 int flag, void *cb_data)
2123 struct ref ***local_tail = cb_data;
2126 /* we already know it starts with refs/ to get here */
2127 if (check_refname_format(refname + 5, 0))
2130 ref = alloc_ref(refname);
2131 oidcpy(&ref->new_oid, oid);
2133 *local_tail = &ref->next;
2137 struct ref *get_local_heads(void)
2139 struct ref *local_refs = NULL, **local_tail = &local_refs;
2141 for_each_ref(one_local_ref, &local_tail);
2145 struct ref *guess_remote_head(const struct ref *head,
2146 const struct ref *refs,
2149 const struct ref *r;
2150 struct ref *list = NULL;
2151 struct ref **tail = &list;
2157 * Some transports support directly peeking at
2158 * where HEAD points; if that is the case, then
2159 * we don't have to guess.
2162 return copy_ref(find_ref_by_name(refs, head->symref));
2164 /* If refs/heads/master could be right, it is. */
2166 r = find_ref_by_name(refs, "refs/heads/master");
2167 if (r && !oidcmp(&r->old_oid, &head->old_oid))
2171 /* Look for another ref that points there */
2172 for (r = refs; r; r = r->next) {
2174 starts_with(r->name, "refs/heads/") &&
2175 !oidcmp(&r->old_oid, &head->old_oid)) {
2176 *tail = copy_ref(r);
2177 tail = &((*tail)->next);
2186 struct stale_heads_info {
2187 struct string_list *ref_names;
2188 struct ref **stale_refs_tail;
2189 struct refspec *refs;
2193 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2194 int flags, void *cb_data)
2196 struct stale_heads_info *info = cb_data;
2197 struct string_list matches = STRING_LIST_INIT_DUP;
2198 struct refspec query;
2200 memset(&query, 0, sizeof(struct refspec));
2201 query.dst = (char *)refname;
2203 query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2204 if (matches.nr == 0)
2205 goto clean_exit; /* No matches */
2208 * If we did find a suitable refspec and it's not a symref and
2209 * it's not in the list of refs that currently exist in that
2210 * remote, we consider it to be stale. In order to deal with
2211 * overlapping refspecs, we need to go over all of the
2214 if (flags & REF_ISSYMREF)
2217 for (i = 0; stale && i < matches.nr; i++)
2218 if (string_list_has_string(info->ref_names, matches.items[i].string))
2222 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2223 oidcpy(&ref->new_oid, oid);
2227 string_list_clear(&matches, 0);
2231 struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2233 struct ref *ref, *stale_refs = NULL;
2234 struct string_list ref_names = STRING_LIST_INIT_NODUP;
2235 struct stale_heads_info info;
2237 info.ref_names = &ref_names;
2238 info.stale_refs_tail = &stale_refs;
2240 info.ref_count = ref_count;
2241 for (ref = fetch_map; ref; ref = ref->next)
2242 string_list_append(&ref_names, ref->name);
2243 string_list_sort(&ref_names);
2244 for_each_ref(get_stale_heads_cb, &info);
2245 string_list_clear(&ref_names, 0);
2252 static void clear_cas_option(struct push_cas_option *cas)
2256 for (i = 0; i < cas->nr; i++)
2257 free(cas->entry[i].refname);
2259 memset(cas, 0, sizeof(*cas));
2262 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2263 const char *refname,
2266 struct push_cas *entry;
2267 ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2268 entry = &cas->entry[cas->nr++];
2269 memset(entry, 0, sizeof(*entry));
2270 entry->refname = xmemdupz(refname, refnamelen);
2274 int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2277 struct push_cas *entry;
2280 /* "--no-<option>" */
2281 clear_cas_option(cas);
2286 /* just "--<option>" */
2287 cas->use_tracking_for_rest = 1;
2291 /* "--<option>=refname" or "--<option>=refname:value" */
2292 colon = strchrnul(arg, ':');
2293 entry = add_cas_entry(cas, arg, colon - arg);
2295 entry->use_tracking = 1;
2297 hashclr(entry->expect);
2298 else if (get_sha1(colon + 1, entry->expect))
2299 return error("cannot parse expected object name '%s'", colon + 1);
2303 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2305 return parse_push_cas_option(opt->value, arg, unset);
2308 int is_empty_cas(const struct push_cas_option *cas)
2310 return !cas->use_tracking_for_rest && !cas->nr;
2314 * Look at remote.fetch refspec and see if we have a remote
2315 * tracking branch for the refname there. Fill its current
2317 * If we cannot do so, return negative to signal an error.
2319 static int remote_tracking(struct remote *remote, const char *refname,
2320 struct object_id *oid)
2324 dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
2326 return -1; /* no tracking ref for refname at remote */
2327 if (read_ref(dst, oid->hash))
2328 return -1; /* we know what the tracking ref is but we cannot read it */
2332 static void apply_cas(struct push_cas_option *cas,
2333 struct remote *remote,
2338 /* Find an explicit --<option>=<name>[:<value>] entry */
2339 for (i = 0; i < cas->nr; i++) {
2340 struct push_cas *entry = &cas->entry[i];
2341 if (!refname_match(entry->refname, ref->name))
2343 ref->expect_old_sha1 = 1;
2344 if (!entry->use_tracking)
2345 hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2346 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2347 oidclr(&ref->old_oid_expect);
2351 /* Are we using "--<option>" to cover all? */
2352 if (!cas->use_tracking_for_rest)
2355 ref->expect_old_sha1 = 1;
2356 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2357 oidclr(&ref->old_oid_expect);
2360 void apply_push_cas(struct push_cas_option *cas,
2361 struct remote *remote,
2362 struct ref *remote_refs)
2365 for (ref = remote_refs; ref; ref = ref->next)
2366 apply_cas(cas, remote, ref);