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
->configured_in_repo
= 1;
259 remote
->origin
= REMOTE_REMOTES
;
260 while (strbuf_getline(&buf
, f
) != EOF
) {
265 if (skip_prefix(buf
.buf
, "URL:", &v
))
266 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
267 else if (skip_prefix(buf
.buf
, "Push:", &v
))
268 add_push_refspec(remote
, xstrdup(skip_spaces(v
)));
269 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
270 add_fetch_refspec(remote
, xstrdup(skip_spaces(v
)));
272 strbuf_release(&buf
);
276 static void read_branches_file(struct remote
*remote
)
279 struct strbuf buf
= STRBUF_INIT
;
280 FILE *f
= fopen(git_path("branches/%s", remote
->name
), "r");
285 strbuf_getline_lf(&buf
, f
);
289 strbuf_release(&buf
);
293 remote
->configured_in_repo
= 1;
294 remote
->origin
= REMOTE_BRANCHES
;
297 * The branches file would have URL and optionally
298 * #branch specified. The "master" (or specified) branch is
299 * fetched and stored in the local branch matching the
302 frag
= strchr(buf
.buf
, '#');
308 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
309 add_fetch_refspec(remote
, xstrfmt("refs/heads/%s:refs/heads/%s",
310 frag
, remote
->name
));
313 * Cogito compatible push: push current HEAD to remote #branch
314 * (master if missing)
316 add_push_refspec(remote
, xstrfmt("HEAD:refs/heads/%s", frag
));
317 remote
->fetch_tags
= 1; /* always auto-follow */
320 static int handle_config(const char *key
, const char *value
, void *cb
)
325 struct remote
*remote
;
326 struct branch
*branch
;
327 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
330 branch
= make_branch(name
, namelen
);
331 if (!strcmp(subkey
, "remote")) {
332 return git_config_string(&branch
->remote_name
, key
, value
);
333 } else if (!strcmp(subkey
, "pushremote")) {
334 return git_config_string(&branch
->pushremote_name
, key
, value
);
335 } else if (!strcmp(subkey
, "merge")) {
337 return config_error_nonbool(key
);
338 add_merge(branch
, xstrdup(value
));
342 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
343 struct rewrite
*rewrite
;
346 if (!strcmp(subkey
, "insteadof")) {
347 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
349 return config_error_nonbool(key
);
350 add_instead_of(rewrite
, xstrdup(value
));
351 } else if (!strcmp(subkey
, "pushinsteadof")) {
352 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
354 return config_error_nonbool(key
);
355 add_instead_of(rewrite
, xstrdup(value
));
359 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
362 /* Handle remote.* variables */
363 if (!name
&& !strcmp(subkey
, "pushdefault"))
364 return git_config_string(&pushremote_name
, key
, value
);
368 /* Handle remote.<name>.* variables */
370 warning("Config remote shorthand cannot begin with '/': %s",
374 remote
= make_remote(name
, namelen
);
375 remote
->origin
= REMOTE_CONFIG
;
376 if (current_config_scope() == CONFIG_SCOPE_REPO
)
377 remote
->configured_in_repo
= 1;
378 if (!strcmp(subkey
, "mirror"))
379 remote
->mirror
= git_config_bool(key
, value
);
380 else if (!strcmp(subkey
, "skipdefaultupdate"))
381 remote
->skip_default_update
= git_config_bool(key
, value
);
382 else if (!strcmp(subkey
, "skipfetchall"))
383 remote
->skip_default_update
= git_config_bool(key
, value
);
384 else if (!strcmp(subkey
, "prune"))
385 remote
->prune
= git_config_bool(key
, value
);
386 else if (!strcmp(subkey
, "url")) {
388 if (git_config_string(&v
, key
, value
))
391 } else if (!strcmp(subkey
, "pushurl")) {
393 if (git_config_string(&v
, key
, value
))
395 add_pushurl(remote
, v
);
396 } else if (!strcmp(subkey
, "push")) {
398 if (git_config_string(&v
, key
, value
))
400 add_push_refspec(remote
, v
);
401 } else if (!strcmp(subkey
, "fetch")) {
403 if (git_config_string(&v
, key
, value
))
405 add_fetch_refspec(remote
, v
);
406 } else if (!strcmp(subkey
, "receivepack")) {
408 if (git_config_string(&v
, key
, value
))
410 if (!remote
->receivepack
)
411 remote
->receivepack
= v
;
413 error("more than one receivepack given, using the first");
414 } else if (!strcmp(subkey
, "uploadpack")) {
416 if (git_config_string(&v
, key
, value
))
418 if (!remote
->uploadpack
)
419 remote
->uploadpack
= v
;
421 error("more than one uploadpack given, using the first");
422 } else if (!strcmp(subkey
, "tagopt")) {
423 if (!strcmp(value
, "--no-tags"))
424 remote
->fetch_tags
= -1;
425 else if (!strcmp(value
, "--tags"))
426 remote
->fetch_tags
= 2;
427 } else if (!strcmp(subkey
, "proxy")) {
428 return git_config_string((const char **)&remote
->http_proxy
,
430 } else if (!strcmp(subkey
, "proxyauthmethod")) {
431 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
433 } else if (!strcmp(subkey
, "vcs")) {
434 return git_config_string(&remote
->foreign_vcs
, key
, value
);
439 static void alias_all_urls(void)
442 for (i
= 0; i
< remotes_nr
; i
++) {
443 int add_pushurl_aliases
;
446 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
447 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
449 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
450 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
451 if (add_pushurl_aliases
)
452 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
453 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
458 static void read_config(void)
461 struct object_id oid
;
468 current_branch
= NULL
;
469 if (startup_info
->have_repository
) {
470 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, oid
.hash
, &flag
);
471 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
472 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
473 current_branch
= make_branch(head_ref
, 0);
476 git_config(handle_config
, NULL
);
480 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
483 struct refspec
*rs
= xcalloc(nr_refspec
, sizeof(*rs
));
485 for (i
= 0; i
< nr_refspec
; i
++) {
488 const char *lhs
, *rhs
;
499 rhs
= strrchr(lhs
, ':');
502 * Before going on, special case ":" (or "+:") as a refspec
503 * for pushing matching refs.
505 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
511 size_t rlen
= strlen(++rhs
);
512 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
513 rs
[i
].dst
= xstrndup(rhs
, rlen
);
516 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
517 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
518 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
521 } else if (rhs
&& is_glob
) {
525 rs
[i
].pattern
= is_glob
;
526 rs
[i
].src
= xstrndup(lhs
, llen
);
527 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
530 struct object_id unused
;
534 ; /* empty is ok; it means "HEAD" */
535 else if (llen
== GIT_SHA1_HEXSZ
&& !get_oid_hex(rs
[i
].src
, &unused
))
536 rs
[i
].exact_sha1
= 1; /* ok */
537 else if (!check_refname_format(rs
[i
].src
, flags
))
538 ; /* valid looking ref is ok */
543 ; /* missing is ok; it is the same as empty */
544 else if (!*rs
[i
].dst
)
545 ; /* empty is ok; it means "do not store" */
546 else if (!check_refname_format(rs
[i
].dst
, flags
))
547 ; /* valid looking ref is ok */
553 * - empty is allowed; it means delete.
554 * - when wildcarded, it must be a valid looking ref.
555 * - otherwise, it must be an extended SHA-1, but
556 * there is no existing way to validate this.
561 if (check_refname_format(rs
[i
].src
, flags
))
565 ; /* anything goes, for now */
568 * - missing is allowed, but LHS then must be a
570 * - empty is not allowed.
571 * - otherwise it must be a valid looking ref.
574 if (check_refname_format(rs
[i
].src
, flags
))
576 } else if (!*rs
[i
].dst
) {
579 if (check_refname_format(rs
[i
].dst
, flags
))
589 * nr_refspec must be greater than zero and i must be valid
590 * since it is only possible to reach this point from within
591 * the for loop above.
593 free_refspec(i
+1, rs
);
596 die("Invalid refspec '%s'", refspec
[i
]);
599 int valid_fetch_refspec(const char *fetch_refspec_str
)
601 struct refspec
*refspec
;
603 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
604 free_refspec(1, refspec
);
608 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
610 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
613 struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
615 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
618 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
625 for (i
= 0; i
< nr_refspec
; i
++) {
626 free(refspec
[i
].src
);
627 free(refspec
[i
].dst
);
632 static int valid_remote_nick(const char *name
)
634 if (!name
[0] || is_dot_or_dotdot(name
))
636 return !strchr(name
, '/'); /* no slash */
639 const char *remote_for_branch(struct branch
*branch
, int *explicit)
641 if (branch
&& branch
->remote_name
) {
644 return branch
->remote_name
;
651 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
653 if (branch
&& branch
->pushremote_name
) {
656 return branch
->pushremote_name
;
658 if (pushremote_name
) {
661 return pushremote_name
;
663 return remote_for_branch(branch
, explicit);
666 static struct remote
*remote_get_1(const char *name
,
667 const char *(*get_default
)(struct branch
*, int *))
677 name
= get_default(current_branch
, &name_given
);
679 ret
= make_remote(name
, 0);
680 if (valid_remote_nick(name
) && have_git_dir()) {
681 if (!valid_remote(ret
))
682 read_remotes_file(ret
);
683 if (!valid_remote(ret
))
684 read_branches_file(ret
);
686 if (name_given
&& !valid_remote(ret
))
687 add_url_alias(ret
, name
);
688 if (!valid_remote(ret
))
690 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
691 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
695 struct remote
*remote_get(const char *name
)
697 return remote_get_1(name
, remote_for_branch
);
700 struct remote
*pushremote_get(const char *name
)
702 return remote_get_1(name
, pushremote_for_branch
);
705 int remote_is_configured(struct remote
*remote
, int in_repo
)
710 return remote
->configured_in_repo
;
711 return !!remote
->origin
;
714 int for_each_remote(each_remote_fn fn
, void *priv
)
718 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
719 struct remote
*r
= remotes
[i
];
723 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
726 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
728 result
= fn(r
, priv
);
733 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
735 if (strcmp(ref1
->name
, ref2
->name
)) {
736 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
737 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
738 die(_("Cannot fetch both %s and %s to %s"),
739 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
740 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
741 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
742 warning(_("%s usually tracks %s, not %s"),
743 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
744 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
745 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
746 die(_("%s tracks both %s and %s"),
747 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
750 * This last possibility doesn't occur because
751 * FETCH_HEAD_IGNORE entries always appear at
752 * the end of the list.
754 die(_("Internal error"));
757 free(ref2
->peer_ref
);
761 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
763 struct string_list refs
= STRING_LIST_INIT_NODUP
;
764 struct ref
*retval
= NULL
;
765 struct ref
**p
= &retval
;
768 struct ref
*ref
= ref_map
;
770 ref_map
= ref_map
->next
;
773 if (!ref
->peer_ref
) {
777 struct string_list_item
*item
=
778 string_list_insert(&refs
, ref
->peer_ref
->name
);
781 /* Entry already existed */
782 handle_duplicate((struct ref
*)item
->util
, ref
);
791 string_list_clear(&refs
, 0);
795 int remote_has_url(struct remote
*remote
, const char *url
)
798 for (i
= 0; i
< remote
->url_nr
; i
++) {
799 if (!strcmp(remote
->url
[i
], url
))
805 static int match_name_with_pattern(const char *key
, const char *name
,
806 const char *value
, char **result
)
808 const char *kstar
= strchr(key
, '*');
814 die("Key '%s' of pattern had no '*'", key
);
816 ksuffixlen
= strlen(kstar
+ 1);
817 namelen
= strlen(name
);
818 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
819 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
821 struct strbuf sb
= STRBUF_INIT
;
822 const char *vstar
= strchr(value
, '*');
824 die("Value '%s' of pattern has no '*'", value
);
825 strbuf_add(&sb
, value
, vstar
- value
);
826 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
827 strbuf_addstr(&sb
, vstar
+ 1);
828 *result
= strbuf_detach(&sb
, NULL
);
833 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
836 int find_src
= !query
->src
;
838 if (find_src
&& !query
->dst
)
839 error("query_refspecs_multiple: need either src or dst");
841 for (i
= 0; i
< ref_count
; i
++) {
842 struct refspec
*refspec
= &refs
[i
];
843 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
844 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
845 const char *needle
= find_src
? query
->dst
: query
->src
;
846 char **result
= find_src
? &query
->src
: &query
->dst
;
850 if (refspec
->pattern
) {
851 if (match_name_with_pattern(key
, needle
, value
, result
))
852 string_list_append_nodup(results
, *result
);
853 } else if (!strcmp(needle
, key
)) {
854 string_list_append(results
, value
);
859 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
862 int find_src
= !query
->src
;
863 const char *needle
= find_src
? query
->dst
: query
->src
;
864 char **result
= find_src
? &query
->src
: &query
->dst
;
866 if (find_src
&& !query
->dst
)
867 return error("query_refspecs: need either src or dst");
869 for (i
= 0; i
< ref_count
; i
++) {
870 struct refspec
*refspec
= &refs
[i
];
871 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
872 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
876 if (refspec
->pattern
) {
877 if (match_name_with_pattern(key
, needle
, value
, result
)) {
878 query
->force
= refspec
->force
;
881 } else if (!strcmp(needle
, key
)) {
882 *result
= xstrdup(value
);
883 query
->force
= refspec
->force
;
890 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
893 struct refspec query
;
895 memset(&query
, 0, sizeof(struct refspec
));
896 query
.src
= (char *)name
;
898 if (query_refspecs(refspecs
, nr_refspec
, &query
))
904 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
906 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
909 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
912 size_t len
= strlen(name
);
913 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
914 memcpy(ref
->name
, prefix
, prefixlen
);
915 memcpy(ref
->name
+ prefixlen
, name
, len
);
919 struct ref
*alloc_ref(const char *name
)
921 return alloc_ref_with_prefix("", 0, name
);
924 struct ref
*copy_ref(const struct ref
*ref
)
930 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
932 memcpy(cpy
, ref
, len
);
934 cpy
->symref
= xstrdup_or_null(ref
->symref
);
935 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
936 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
940 struct ref
*copy_ref_list(const struct ref
*ref
)
942 struct ref
*ret
= NULL
;
943 struct ref
**tail
= &ret
;
945 *tail
= copy_ref(ref
);
947 tail
= &((*tail
)->next
);
952 static void free_ref(struct ref
*ref
)
956 free_ref(ref
->peer_ref
);
957 free(ref
->remote_status
);
962 void free_refs(struct ref
*ref
)
972 int ref_compare_name(const void *va
, const void *vb
)
974 const struct ref
*a
= va
, *b
= vb
;
975 return strcmp(a
->name
, b
->name
);
978 static void *ref_list_get_next(const void *a
)
980 return ((const struct ref
*)a
)->next
;
983 static void ref_list_set_next(void *a
, void *next
)
985 ((struct ref
*)a
)->next
= next
;
988 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
990 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
993 int count_refspec_match(const char *pattern
,
995 struct ref
**matched_ref
)
997 int patlen
= strlen(pattern
);
998 struct ref
*matched_weak
= NULL
;
999 struct ref
*matched
= NULL
;
1003 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1004 char *name
= refs
->name
;
1005 int namelen
= strlen(name
);
1007 if (!refname_match(pattern
, name
))
1010 /* A match is "weak" if it is with refs outside
1011 * heads or tags, and did not specify the pattern
1012 * in full (e.g. "refs/remotes/origin/master") or at
1013 * least from the toplevel (e.g. "remotes/origin/master");
1014 * otherwise "git push $URL master" would result in
1015 * ambiguity between remotes/origin/master and heads/master
1016 * at the remote site.
1018 if (namelen
!= patlen
&&
1019 patlen
!= namelen
- 5 &&
1020 !starts_with(name
, "refs/heads/") &&
1021 !starts_with(name
, "refs/tags/")) {
1022 /* We want to catch the case where only weak
1023 * matches are found and there are multiple
1024 * matches, and where more than one strong
1025 * matches are found, as ambiguous. One
1026 * strong match with zero or more weak matches
1027 * are acceptable as a unique match.
1029 matched_weak
= refs
;
1039 *matched_ref
= matched_weak
;
1044 *matched_ref
= matched
;
1049 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1057 static struct ref
*alloc_delete_ref(void)
1059 struct ref
*ref
= alloc_ref("(delete)");
1060 oidclr(&ref
->new_oid
);
1064 static int try_explicit_object_name(const char *name
,
1067 struct object_id oid
;
1071 *match
= alloc_delete_ref();
1075 if (get_sha1(name
, oid
.hash
))
1079 *match
= alloc_ref(name
);
1080 oidcpy(&(*match
)->new_oid
, &oid
);
1085 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1087 struct ref
*ret
= alloc_ref(name
);
1088 tail_link_ref(ret
, tail
);
1092 static char *guess_ref(const char *name
, struct ref
*peer
)
1094 struct strbuf buf
= STRBUF_INIT
;
1095 struct object_id oid
;
1097 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1102 if (starts_with(r
, "refs/heads/"))
1103 strbuf_addstr(&buf
, "refs/heads/");
1104 else if (starts_with(r
, "refs/tags/"))
1105 strbuf_addstr(&buf
, "refs/tags/");
1109 strbuf_addstr(&buf
, name
);
1110 return strbuf_detach(&buf
, NULL
);
1113 static int match_explicit_lhs(struct ref
*src
,
1116 int *allocated_match
)
1118 switch (count_refspec_match(rs
->src
, src
, match
)) {
1120 if (allocated_match
)
1121 *allocated_match
= 0;
1124 /* The source could be in the get_sha1() format
1125 * not a reference name. :refs/other is a
1126 * way to delete 'other' ref at the remote end.
1128 if (try_explicit_object_name(rs
->src
, match
) < 0)
1129 return error("src refspec %s does not match any.", rs
->src
);
1130 if (allocated_match
)
1131 *allocated_match
= 1;
1134 return error("src refspec %s matches more than one.", rs
->src
);
1138 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1139 struct ref
***dst_tail
,
1142 struct ref
*matched_src
, *matched_dst
;
1145 const char *dst_value
= rs
->dst
;
1148 if (rs
->pattern
|| rs
->matching
)
1151 matched_src
= matched_dst
= NULL
;
1152 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1156 struct object_id oid
;
1159 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1160 RESOLVE_REF_READING
,
1163 ((flag
& REF_ISSYMREF
) &&
1164 !starts_with(dst_value
, "refs/heads/")))
1165 die("%s cannot be resolved to branch.",
1169 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1173 if (starts_with(dst_value
, "refs/"))
1174 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1175 else if (is_null_oid(&matched_src
->new_oid
))
1176 error("unable to delete '%s': remote ref does not exist",
1178 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1179 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1181 error("unable to push to unqualified destination: %s\n"
1182 "The destination refspec neither matches an "
1183 "existing ref on the remote nor\n"
1184 "begins with refs/, and we are unable to "
1185 "guess a prefix based on the source ref.",
1190 error("dst refspec %s matches more than one.",
1196 if (matched_dst
->peer_ref
)
1197 return error("dst ref %s receives from more than one src.",
1200 matched_dst
->peer_ref
= allocated_src
?
1202 copy_ref(matched_src
);
1203 matched_dst
->force
= rs
->force
;
1208 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1209 struct ref
***dst_tail
, struct refspec
*rs
,
1213 for (i
= errs
= 0; i
< rs_nr
; i
++)
1214 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1218 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1219 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1221 const struct refspec
*pat
;
1224 int matching_refs
= -1;
1225 for (i
= 0; i
< rs_nr
; i
++) {
1226 if (rs
[i
].matching
&&
1227 (matching_refs
== -1 || rs
[i
].force
)) {
1232 if (rs
[i
].pattern
) {
1233 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1235 if (direction
== FROM_SRC
)
1236 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1238 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1245 if (matching_refs
== -1)
1248 pat
= rs
+ matching_refs
;
1249 if (pat
->matching
) {
1251 * "matching refs"; traditionally we pushed everything
1252 * including refs outside refs/heads/ hierarchy, but
1253 * that does not make much sense these days.
1255 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1257 name
= xstrdup(ref
->name
);
1264 static struct ref
**tail_ref(struct ref
**head
)
1266 struct ref
**tail
= head
;
1268 tail
= &((*tail
)->next
);
1273 struct commit
**tip
;
1277 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1279 struct commit
*commit
;
1281 if (is_null_oid(oid
))
1283 commit
= lookup_commit_reference_gently(oid
->hash
, 1);
1284 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1286 commit
->object
.flags
|= TMP_MARK
;
1287 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1288 tips
->tip
[tips
->nr
++] = commit
;
1291 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1293 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1294 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1295 struct string_list_item
*item
;
1297 struct tips sent_tips
;
1300 * Collect everything we know they would have at the end of
1301 * this push, and collect all tags they have.
1303 memset(&sent_tips
, 0, sizeof(sent_tips
));
1304 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1305 if (ref
->peer_ref
&&
1306 !is_null_oid(&ref
->peer_ref
->new_oid
))
1307 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1309 add_to_tips(&sent_tips
, &ref
->old_oid
);
1310 if (starts_with(ref
->name
, "refs/tags/"))
1311 string_list_append(&dst_tag
, ref
->name
);
1313 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1315 string_list_sort(&dst_tag
);
1317 /* Collect tags they do not have. */
1318 for (ref
= src
; ref
; ref
= ref
->next
) {
1319 if (!starts_with(ref
->name
, "refs/tags/"))
1320 continue; /* not a tag */
1321 if (string_list_has_string(&dst_tag
, ref
->name
))
1322 continue; /* they already have it */
1323 if (sha1_object_info(ref
->new_oid
.hash
, NULL
) != OBJ_TAG
)
1324 continue; /* be conservative */
1325 item
= string_list_append(&src_tag
, ref
->name
);
1328 string_list_clear(&dst_tag
, 0);
1331 * At this point, src_tag lists tags that are missing from
1332 * dst, and sent_tips lists the tips we are pushing or those
1333 * that we know they already have. An element in the src_tag
1334 * that is an ancestor of any of the sent_tips needs to be
1335 * sent to the other side.
1338 for_each_string_list_item(item
, &src_tag
) {
1339 struct ref
*ref
= item
->util
;
1340 struct ref
*dst_ref
;
1341 struct commit
*commit
;
1343 if (is_null_oid(&ref
->new_oid
))
1345 commit
= lookup_commit_reference_gently(ref
->new_oid
.hash
, 1);
1347 /* not pushing a commit, which is not an error */
1351 * Is this tag, which they do not have, reachable from
1352 * any of the commits we are sending?
1354 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1358 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1359 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1360 dst_ref
->peer_ref
= copy_ref(ref
);
1363 string_list_clear(&src_tag
, 0);
1364 free(sent_tips
.tip
);
1367 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1369 for ( ; list
; list
= list
->next
)
1370 if (!strcmp(list
->name
, name
))
1371 return (struct ref
*)list
;
1375 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1377 for ( ; ref
; ref
= ref
->next
)
1378 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1380 string_list_sort(ref_index
);
1384 * Given only the set of local refs, sanity-check the set of push
1385 * refspecs. We can't catch all errors that match_push_refs would,
1386 * but we can catch some errors early before even talking to the
1389 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1391 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1395 for (i
= 0; i
< nr_refspec
; i
++) {
1396 struct refspec
*rs
= refspec
+ i
;
1398 if (rs
->pattern
|| rs
->matching
)
1401 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1404 free_refspec(nr_refspec
, refspec
);
1409 * Given the set of refs the local repository has, the set of refs the
1410 * remote repository has, and the refspec used for push, determine
1411 * what remote refs we will update and with what value by setting
1412 * peer_ref (which object is being pushed) and force (if the push is
1413 * forced) in elements of "dst". The function may add new elements to
1414 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1416 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1417 int nr_refspec
, const char **refspec
, int flags
)
1420 int send_all
= flags
& MATCH_REFS_ALL
;
1421 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1422 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1424 static const char *default_refspec
[] = { ":", NULL
};
1425 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1426 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1430 refspec
= default_refspec
;
1432 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1433 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1435 /* pick the remainder */
1436 for (ref
= src
; ref
; ref
= ref
->next
) {
1437 struct string_list_item
*dst_item
;
1438 struct ref
*dst_peer
;
1439 const struct refspec
*pat
= NULL
;
1442 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1446 if (!dst_ref_index
.nr
)
1447 prepare_ref_index(&dst_ref_index
, *dst
);
1449 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1450 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1452 if (dst_peer
->peer_ref
)
1453 /* We're already sending something to this ref. */
1456 if (pat
->matching
&& !(send_all
|| send_mirror
))
1458 * Remote doesn't have it, and we have no
1459 * explicit pattern, and we don't have
1460 * --all or --mirror.
1464 /* Create a new one and link it */
1465 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1466 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1467 string_list_insert(&dst_ref_index
,
1468 dst_peer
->name
)->util
= dst_peer
;
1470 dst_peer
->peer_ref
= copy_ref(ref
);
1471 dst_peer
->force
= pat
->force
;
1476 string_list_clear(&dst_ref_index
, 0);
1478 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1479 add_missing_tags(src
, dst
, &dst_tail
);
1482 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1483 /* check for missing refs on the remote */
1484 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1488 /* We're already sending something to this ref. */
1491 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1493 if (!src_ref_index
.nr
)
1494 prepare_ref_index(&src_ref_index
, src
);
1495 if (!string_list_has_string(&src_ref_index
,
1497 ref
->peer_ref
= alloc_delete_ref();
1501 string_list_clear(&src_ref_index
, 0);
1508 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1513 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1514 int force_ref_update
= ref
->force
|| force_update
;
1515 int reject_reason
= 0;
1518 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1519 else if (!send_mirror
)
1522 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1523 if (!ref
->deletion
&&
1524 !oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
1525 ref
->status
= REF_STATUS_UPTODATE
;
1530 * If the remote ref has moved and is now different
1531 * from what we expect, reject any push.
1533 * It also is an error if the user told us to check
1534 * with the remote-tracking branch to find the value
1535 * to expect, but we did not have such a tracking
1538 if (ref
->expect_old_sha1
) {
1539 if (oidcmp(&ref
->old_oid
, &ref
->old_oid_expect
))
1540 reject_reason
= REF_STATUS_REJECT_STALE
;
1542 /* If the ref isn't stale then force the update. */
1543 force_ref_update
= 1;
1547 * If the update isn't already rejected then check
1548 * the usual "must fast-forward" rules.
1550 * Decide whether an individual refspec A:B can be
1551 * pushed. The push will succeed if any of the
1552 * following are true:
1554 * (1) the remote reference B does not exist
1556 * (2) the remote reference B is being removed (i.e.,
1557 * pushing :B where no source is specified)
1559 * (3) the destination is not under refs/tags/, and
1560 * if the old and new value is a commit, the new
1561 * is a descendant of the old.
1563 * (4) it is forced using the +A:B notation, or by
1564 * passing the --force argument
1567 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1568 if (starts_with(ref
->name
, "refs/tags/"))
1569 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1570 else if (!has_object_file(&ref
->old_oid
))
1571 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1572 else if (!lookup_commit_reference_gently(ref
->old_oid
.hash
, 1) ||
1573 !lookup_commit_reference_gently(ref
->new_oid
.hash
, 1))
1574 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1575 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1576 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1580 * "--force" will defeat any rejection implemented
1581 * by the rules above.
1583 if (!force_ref_update
)
1584 ref
->status
= reject_reason
;
1585 else if (reject_reason
)
1586 ref
->forced_update
= 1;
1590 static void set_merge(struct branch
*ret
)
1592 struct remote
*remote
;
1594 struct object_id oid
;
1598 return; /* no branch */
1600 return; /* already run */
1601 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1603 * no merge config; let's make sure we don't confuse callers
1604 * with a non-zero merge_nr but a NULL merge
1610 remote
= remote_get(ret
->remote_name
);
1612 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1613 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1614 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1615 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1616 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1617 strcmp(ret
->remote_name
, "."))
1619 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1620 oid
.hash
, &ref
) == 1)
1621 ret
->merge
[i
]->dst
= ref
;
1623 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1627 struct branch
*branch_get(const char *name
)
1632 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1633 ret
= current_branch
;
1635 ret
= make_branch(name
, 0);
1640 int branch_has_merge_config(struct branch
*branch
)
1642 return branch
&& !!branch
->merge
;
1645 int branch_merge_matches(struct branch
*branch
,
1647 const char *refname
)
1649 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1651 return refname_match(branch
->merge
[i
]->src
, refname
);
1654 __attribute__((format (printf
,2,3)))
1655 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1660 strbuf_vaddf(err
, fmt
, ap
);
1666 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1669 return error_buf(err
, _("HEAD does not point to a branch"));
1671 if (!branch
->merge
|| !branch
->merge
[0]) {
1673 * no merge config; is it because the user didn't define any,
1674 * or because it is not a real branch, and get_branch
1677 if (!ref_exists(branch
->refname
))
1678 return error_buf(err
, _("no such branch: '%s'"),
1680 return error_buf(err
,
1681 _("no upstream configured for branch '%s'"),
1685 if (!branch
->merge
[0]->dst
)
1686 return error_buf(err
,
1687 _("upstream branch '%s' not stored as a remote-tracking branch"),
1688 branch
->merge
[0]->src
);
1690 return branch
->merge
[0]->dst
;
1693 static const char *tracking_for_push_dest(struct remote
*remote
,
1694 const char *refname
,
1699 ret
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
1701 return error_buf(err
,
1702 _("push destination '%s' on remote '%s' has no local tracking branch"),
1703 refname
, remote
->name
);
1707 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1709 struct remote
*remote
;
1711 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1713 return error_buf(err
,
1714 _("branch '%s' has no remote for pushing"),
1717 if (remote
->push_refspec_nr
) {
1721 dst
= apply_refspecs(remote
->push
, remote
->push_refspec_nr
,
1724 return error_buf(err
,
1725 _("push refspecs for '%s' do not include '%s'"),
1726 remote
->name
, branch
->name
);
1728 ret
= tracking_for_push_dest(remote
, dst
, err
);
1734 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1736 switch (push_default
) {
1737 case PUSH_DEFAULT_NOTHING
:
1738 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1740 case PUSH_DEFAULT_MATCHING
:
1741 case PUSH_DEFAULT_CURRENT
:
1742 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1744 case PUSH_DEFAULT_UPSTREAM
:
1745 return branch_get_upstream(branch
, err
);
1747 case PUSH_DEFAULT_UNSPECIFIED
:
1748 case PUSH_DEFAULT_SIMPLE
:
1750 const char *up
, *cur
;
1752 up
= branch_get_upstream(branch
, err
);
1755 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1758 if (strcmp(cur
, up
))
1759 return error_buf(err
,
1760 _("cannot resolve 'simple' push to a single destination"));
1765 die("BUG: unhandled push situation");
1768 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1771 return error_buf(err
, _("HEAD does not point to a branch"));
1773 if (!branch
->push_tracking_ref
)
1774 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1775 return branch
->push_tracking_ref
;
1778 static int ignore_symref_update(const char *refname
)
1780 struct object_id oid
;
1783 if (!resolve_ref_unsafe(refname
, 0, oid
.hash
, &flag
))
1784 return 0; /* non-existing refs are OK */
1785 return (flag
& REF_ISSYMREF
);
1789 * Create and return a list of (struct ref) consisting of copies of
1790 * each remote_ref that matches refspec. refspec must be a pattern.
1791 * Fill in the copies' peer_ref to describe the local tracking refs to
1792 * which they map. Omit any references that would map to an existing
1793 * local symbolic ref.
1795 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1796 const struct refspec
*refspec
)
1798 const struct ref
*ref
;
1799 struct ref
*ret
= NULL
;
1800 struct ref
**tail
= &ret
;
1802 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1803 char *expn_name
= NULL
;
1805 if (strchr(ref
->name
, '^'))
1806 continue; /* a dereference item */
1807 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1808 refspec
->dst
, &expn_name
) &&
1809 !ignore_symref_update(expn_name
)) {
1810 struct ref
*cpy
= copy_ref(ref
);
1812 cpy
->peer_ref
= alloc_ref(expn_name
);
1814 cpy
->peer_ref
->force
= 1;
1824 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1826 const struct ref
*ref
;
1827 for (ref
= refs
; ref
; ref
= ref
->next
) {
1828 if (refname_match(name
, ref
->name
))
1834 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1836 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1841 return copy_ref(ref
);
1844 static struct ref
*get_local_ref(const char *name
)
1846 if (!name
|| name
[0] == '\0')
1849 if (starts_with(name
, "refs/"))
1850 return alloc_ref(name
);
1852 if (starts_with(name
, "heads/") ||
1853 starts_with(name
, "tags/") ||
1854 starts_with(name
, "remotes/"))
1855 return alloc_ref_with_prefix("refs/", 5, name
);
1857 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1860 int get_fetch_map(const struct ref
*remote_refs
,
1861 const struct refspec
*refspec
,
1865 struct ref
*ref_map
, **rmp
;
1867 if (refspec
->pattern
) {
1868 ref_map
= get_expanded_map(remote_refs
, refspec
);
1870 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1872 if (refspec
->exact_sha1
) {
1873 ref_map
= alloc_ref(name
);
1874 get_oid_hex(name
, &ref_map
->old_oid
);
1876 ref_map
= get_remote_ref(remote_refs
, name
);
1878 if (!missing_ok
&& !ref_map
)
1879 die("Couldn't find remote ref %s", name
);
1881 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1882 if (ref_map
->peer_ref
&& refspec
->force
)
1883 ref_map
->peer_ref
->force
= 1;
1887 for (rmp
= &ref_map
; *rmp
; ) {
1888 if ((*rmp
)->peer_ref
) {
1889 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1890 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1891 struct ref
*ignore
= *rmp
;
1892 error("* Ignoring funny ref '%s' locally",
1893 (*rmp
)->peer_ref
->name
);
1894 *rmp
= (*rmp
)->next
;
1895 free(ignore
->peer_ref
);
1900 rmp
= &((*rmp
)->next
);
1904 tail_link_ref(ref_map
, tail
);
1909 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1913 for (; list
; list
= list
->next
)
1914 if (!strcmp(ref
->symref
, list
->name
)) {
1915 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1921 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1924 struct commit
*commit
= pop_commit(&list
);
1925 commit
->object
.flags
&= ~mark
;
1929 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
1932 struct commit
*old
, *new;
1933 struct commit_list
*list
, *used
;
1937 * Both new and old must be commit-ish and new is descendant of
1938 * old. Otherwise we require --force.
1940 o
= deref_tag(parse_object(old_oid
->hash
), NULL
, 0);
1941 if (!o
|| o
->type
!= OBJ_COMMIT
)
1943 old
= (struct commit
*) o
;
1945 o
= deref_tag(parse_object(new_oid
->hash
), NULL
, 0);
1946 if (!o
|| o
->type
!= OBJ_COMMIT
)
1948 new = (struct commit
*) o
;
1950 if (parse_commit(new) < 0)
1954 commit_list_insert(new, &list
);
1956 new = pop_most_recent_commit(&list
, TMP_MARK
);
1957 commit_list_insert(new, &used
);
1963 unmark_and_free(list
, TMP_MARK
);
1964 unmark_and_free(used
, TMP_MARK
);
1969 * Compare a branch with its upstream, and save their differences (number
1970 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1971 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1972 * is not itself NULL.
1974 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1975 * upstream defined, or ref does not exist), 0 otherwise.
1977 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1978 const char **upstream_name
)
1980 struct object_id oid
;
1981 struct commit
*ours
, *theirs
;
1982 struct rev_info revs
;
1984 struct argv_array argv
= ARGV_ARRAY_INIT
;
1986 /* Cannot stat unless we are marked to build on top of somebody else. */
1987 base
= branch_get_upstream(branch
, NULL
);
1989 *upstream_name
= base
;
1993 /* Cannot stat if what we used to build on no longer exists */
1994 if (read_ref(base
, oid
.hash
))
1996 theirs
= lookup_commit_reference(oid
.hash
);
2000 if (read_ref(branch
->refname
, oid
.hash
))
2002 ours
= lookup_commit_reference(oid
.hash
);
2006 /* are we the same? */
2007 if (theirs
== ours
) {
2008 *num_theirs
= *num_ours
= 0;
2012 /* Run "rev-list --left-right ours...theirs" internally... */
2013 argv_array_push(&argv
, ""); /* ignored */
2014 argv_array_push(&argv
, "--left-right");
2015 argv_array_pushf(&argv
, "%s...%s",
2016 oid_to_hex(&ours
->object
.oid
),
2017 oid_to_hex(&theirs
->object
.oid
));
2018 argv_array_push(&argv
, "--");
2020 init_revisions(&revs
, NULL
);
2021 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
2022 if (prepare_revision_walk(&revs
))
2023 die("revision walk setup failed");
2025 /* ... and count the commits on each side. */
2029 struct commit
*c
= get_revision(&revs
);
2032 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2038 /* clear object flags smudged by the above traversal */
2039 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2040 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2042 argv_array_clear(&argv
);
2047 * Return true when there is anything to report, otherwise false.
2049 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
2052 const char *full_base
;
2054 int upstream_is_gone
= 0;
2056 if (stat_tracking_info(branch
, &ours
, &theirs
, &full_base
) < 0) {
2059 upstream_is_gone
= 1;
2062 base
= shorten_unambiguous_ref(full_base
, 0);
2063 if (upstream_is_gone
) {
2065 _("Your branch is based on '%s', but the upstream is gone.\n"),
2067 if (advice_status_hints
)
2069 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2070 } else if (!ours
&& !theirs
) {
2072 _("Your branch is up-to-date with '%s'.\n"),
2074 } else if (!theirs
) {
2076 Q_("Your branch is ahead of '%s' by %d commit.\n",
2077 "Your branch is ahead of '%s' by %d commits.\n",
2080 if (advice_status_hints
)
2082 _(" (use \"git push\" to publish your local commits)\n"));
2085 Q_("Your branch is behind '%s' by %d commit, "
2086 "and can be fast-forwarded.\n",
2087 "Your branch is behind '%s' by %d commits, "
2088 "and can be fast-forwarded.\n",
2091 if (advice_status_hints
)
2093 _(" (use \"git pull\" to update your local branch)\n"));
2096 Q_("Your branch and '%s' have diverged,\n"
2097 "and have %d and %d different commit each, "
2099 "Your branch and '%s' have diverged,\n"
2100 "and have %d and %d different commits each, "
2103 base
, ours
, theirs
);
2104 if (advice_status_hints
)
2106 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2112 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2113 int flag
, void *cb_data
)
2115 struct ref
***local_tail
= cb_data
;
2118 /* we already know it starts with refs/ to get here */
2119 if (check_refname_format(refname
+ 5, 0))
2122 ref
= alloc_ref(refname
);
2123 oidcpy(&ref
->new_oid
, oid
);
2125 *local_tail
= &ref
->next
;
2129 struct ref
*get_local_heads(void)
2131 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2133 for_each_ref(one_local_ref
, &local_tail
);
2137 struct ref
*guess_remote_head(const struct ref
*head
,
2138 const struct ref
*refs
,
2141 const struct ref
*r
;
2142 struct ref
*list
= NULL
;
2143 struct ref
**tail
= &list
;
2149 * Some transports support directly peeking at
2150 * where HEAD points; if that is the case, then
2151 * we don't have to guess.
2154 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2156 /* If refs/heads/master could be right, it is. */
2158 r
= find_ref_by_name(refs
, "refs/heads/master");
2159 if (r
&& !oidcmp(&r
->old_oid
, &head
->old_oid
))
2163 /* Look for another ref that points there */
2164 for (r
= refs
; r
; r
= r
->next
) {
2166 starts_with(r
->name
, "refs/heads/") &&
2167 !oidcmp(&r
->old_oid
, &head
->old_oid
)) {
2168 *tail
= copy_ref(r
);
2169 tail
= &((*tail
)->next
);
2178 struct stale_heads_info
{
2179 struct string_list
*ref_names
;
2180 struct ref
**stale_refs_tail
;
2181 struct refspec
*refs
;
2185 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2186 int flags
, void *cb_data
)
2188 struct stale_heads_info
*info
= cb_data
;
2189 struct string_list matches
= STRING_LIST_INIT_DUP
;
2190 struct refspec query
;
2192 memset(&query
, 0, sizeof(struct refspec
));
2193 query
.dst
= (char *)refname
;
2195 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2196 if (matches
.nr
== 0)
2197 goto clean_exit
; /* No matches */
2200 * If we did find a suitable refspec and it's not a symref and
2201 * it's not in the list of refs that currently exist in that
2202 * remote, we consider it to be stale. In order to deal with
2203 * overlapping refspecs, we need to go over all of the
2206 if (flags
& REF_ISSYMREF
)
2209 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2210 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2214 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2215 oidcpy(&ref
->new_oid
, oid
);
2219 string_list_clear(&matches
, 0);
2223 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2225 struct ref
*ref
, *stale_refs
= NULL
;
2226 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2227 struct stale_heads_info info
;
2229 info
.ref_names
= &ref_names
;
2230 info
.stale_refs_tail
= &stale_refs
;
2232 info
.ref_count
= ref_count
;
2233 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2234 string_list_append(&ref_names
, ref
->name
);
2235 string_list_sort(&ref_names
);
2236 for_each_ref(get_stale_heads_cb
, &info
);
2237 string_list_clear(&ref_names
, 0);
2244 static void clear_cas_option(struct push_cas_option
*cas
)
2248 for (i
= 0; i
< cas
->nr
; i
++)
2249 free(cas
->entry
[i
].refname
);
2251 memset(cas
, 0, sizeof(*cas
));
2254 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2255 const char *refname
,
2258 struct push_cas
*entry
;
2259 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2260 entry
= &cas
->entry
[cas
->nr
++];
2261 memset(entry
, 0, sizeof(*entry
));
2262 entry
->refname
= xmemdupz(refname
, refnamelen
);
2266 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2269 struct push_cas
*entry
;
2272 /* "--no-<option>" */
2273 clear_cas_option(cas
);
2278 /* just "--<option>" */
2279 cas
->use_tracking_for_rest
= 1;
2283 /* "--<option>=refname" or "--<option>=refname:value" */
2284 colon
= strchrnul(arg
, ':');
2285 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2287 entry
->use_tracking
= 1;
2289 hashclr(entry
->expect
);
2290 else if (get_sha1(colon
+ 1, entry
->expect
))
2291 return error("cannot parse expected object name '%s'", colon
+ 1);
2295 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2297 return parse_push_cas_option(opt
->value
, arg
, unset
);
2300 int is_empty_cas(const struct push_cas_option
*cas
)
2302 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2306 * Look at remote.fetch refspec and see if we have a remote
2307 * tracking branch for the refname there. Fill its current
2309 * If we cannot do so, return negative to signal an error.
2311 static int remote_tracking(struct remote
*remote
, const char *refname
,
2312 struct object_id
*oid
)
2316 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2318 return -1; /* no tracking ref for refname at remote */
2319 if (read_ref(dst
, oid
->hash
))
2320 return -1; /* we know what the tracking ref is but we cannot read it */
2324 static void apply_cas(struct push_cas_option
*cas
,
2325 struct remote
*remote
,
2330 /* Find an explicit --<option>=<name>[:<value>] entry */
2331 for (i
= 0; i
< cas
->nr
; i
++) {
2332 struct push_cas
*entry
= &cas
->entry
[i
];
2333 if (!refname_match(entry
->refname
, ref
->name
))
2335 ref
->expect_old_sha1
= 1;
2336 if (!entry
->use_tracking
)
2337 hashcpy(ref
->old_oid_expect
.hash
, cas
->entry
[i
].expect
);
2338 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2339 oidclr(&ref
->old_oid_expect
);
2343 /* Are we using "--<option>" to cover all? */
2344 if (!cas
->use_tracking_for_rest
)
2347 ref
->expect_old_sha1
= 1;
2348 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2349 oidclr(&ref
->old_oid_expect
);
2352 void apply_push_cas(struct push_cas_option
*cas
,
2353 struct remote
*remote
,
2354 struct ref
*remote_refs
)
2357 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2358 apply_cas(cas
, remote
, ref
);