1 #include "git-compat-util.h"
4 #include "environment.h"
11 #include "object-name.h"
12 #include "object-store-ll.h"
20 #include "string-list.h"
22 #include "commit-reach.h"
25 #include "parse-options.h"
27 enum map_direction
{ FROM_SRC
, FROM_DST
};
29 struct counted_string
{
34 static int valid_remote(const struct remote
*remote
)
36 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
39 static const char *alias_url(const char *url
, struct rewrites
*r
)
42 struct counted_string
*longest
;
47 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
50 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
51 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
53 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
54 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
62 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
65 static void add_url(struct remote
*remote
, const char *url
)
67 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
68 remote
->url
[remote
->url_nr
++] = url
;
71 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
73 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
74 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
77 static void add_pushurl_alias(struct remote_state
*remote_state
,
78 struct remote
*remote
, const char *url
)
80 const char *pushurl
= alias_url(url
, &remote_state
->rewrites_push
);
82 add_pushurl(remote
, pushurl
);
85 static void add_url_alias(struct remote_state
*remote_state
,
86 struct remote
*remote
, const char *url
)
88 add_url(remote
, alias_url(url
, &remote_state
->rewrites
));
89 add_pushurl_alias(remote_state
, remote
, url
);
92 struct remotes_hash_key
{
97 static int remotes_hash_cmp(const void *cmp_data UNUSED
,
98 const struct hashmap_entry
*eptr
,
99 const struct hashmap_entry
*entry_or_key
,
102 const struct remote
*a
, *b
;
103 const struct remotes_hash_key
*key
= keydata
;
105 a
= container_of(eptr
, const struct remote
, ent
);
106 b
= container_of(entry_or_key
, const struct remote
, ent
);
109 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
111 return strcmp(a
->name
, b
->name
);
114 static struct remote
*make_remote(struct remote_state
*remote_state
,
115 const char *name
, int len
)
118 struct remotes_hash_key lookup
;
119 struct hashmap_entry lookup_entry
, *e
;
126 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
128 e
= hashmap_get(&remote_state
->remotes_hash
, &lookup_entry
, &lookup
);
130 return container_of(e
, struct remote
, ent
);
132 CALLOC_ARRAY(ret
, 1);
133 ret
->prune
= -1; /* unspecified */
134 ret
->prune_tags
= -1; /* unspecified */
135 ret
->name
= xstrndup(name
, len
);
136 refspec_init(&ret
->push
, REFSPEC_PUSH
);
137 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
139 ALLOC_GROW(remote_state
->remotes
, remote_state
->remotes_nr
+ 1,
140 remote_state
->remotes_alloc
);
141 remote_state
->remotes
[remote_state
->remotes_nr
++] = ret
;
143 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
144 if (hashmap_put_entry(&remote_state
->remotes_hash
, ret
, ent
))
145 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
149 static void remote_clear(struct remote
*remote
)
153 free((char *)remote
->name
);
154 free((char *)remote
->foreign_vcs
);
156 for (i
= 0; i
< remote
->url_nr
; i
++)
157 free((char *)remote
->url
[i
]);
158 FREE_AND_NULL(remote
->url
);
160 for (i
= 0; i
< remote
->pushurl_nr
; i
++)
161 free((char *)remote
->pushurl
[i
]);
162 FREE_AND_NULL(remote
->pushurl
);
163 free((char *)remote
->receivepack
);
164 free((char *)remote
->uploadpack
);
165 FREE_AND_NULL(remote
->http_proxy
);
166 FREE_AND_NULL(remote
->http_proxy_authmethod
);
169 static void add_merge(struct branch
*branch
, const char *name
)
171 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
172 branch
->merge_alloc
);
173 branch
->merge_name
[branch
->merge_nr
++] = name
;
176 struct branches_hash_key
{
181 static int branches_hash_cmp(const void *cmp_data UNUSED
,
182 const struct hashmap_entry
*eptr
,
183 const struct hashmap_entry
*entry_or_key
,
186 const struct branch
*a
, *b
;
187 const struct branches_hash_key
*key
= keydata
;
189 a
= container_of(eptr
, const struct branch
, ent
);
190 b
= container_of(entry_or_key
, const struct branch
, ent
);
193 return strncmp(a
->name
, key
->str
, key
->len
) ||
196 return strcmp(a
->name
, b
->name
);
199 static struct branch
*find_branch(struct remote_state
*remote_state
,
200 const char *name
, size_t len
)
202 struct branches_hash_key lookup
;
203 struct hashmap_entry lookup_entry
, *e
;
207 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
209 e
= hashmap_get(&remote_state
->branches_hash
, &lookup_entry
, &lookup
);
211 return container_of(e
, struct branch
, ent
);
216 static void die_on_missing_branch(struct repository
*repo
,
217 struct branch
*branch
)
219 /* branch == NULL is always valid because it represents detached HEAD. */
221 branch
!= find_branch(repo
->remote_state
, branch
->name
,
222 strlen(branch
->name
)))
223 die("branch %s was not found in the repository", branch
->name
);
226 static struct branch
*make_branch(struct remote_state
*remote_state
,
227 const char *name
, size_t len
)
231 ret
= find_branch(remote_state
, name
, len
);
235 CALLOC_ARRAY(ret
, 1);
236 ret
->name
= xstrndup(name
, len
);
237 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
239 hashmap_entry_init(&ret
->ent
, memhash(name
, len
));
240 if (hashmap_put_entry(&remote_state
->branches_hash
, ret
, ent
))
241 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
245 static struct rewrite
*make_rewrite(struct rewrites
*r
,
246 const char *base
, size_t len
)
251 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
252 if (len
== r
->rewrite
[i
]->baselen
&&
253 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
254 return r
->rewrite
[i
];
257 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
258 CALLOC_ARRAY(ret
, 1);
259 r
->rewrite
[r
->rewrite_nr
++] = ret
;
260 ret
->base
= xstrndup(base
, len
);
265 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
267 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
268 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
269 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
270 rewrite
->instead_of_nr
++;
273 static const char *skip_spaces(const char *s
)
280 static void read_remotes_file(struct remote_state
*remote_state
,
281 struct remote
*remote
)
283 struct strbuf buf
= STRBUF_INIT
;
284 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
288 remote
->configured_in_repo
= 1;
289 remote
->origin
= REMOTE_REMOTES
;
290 while (strbuf_getline(&buf
, f
) != EOF
) {
295 if (skip_prefix(buf
.buf
, "URL:", &v
))
296 add_url_alias(remote_state
, remote
,
297 xstrdup(skip_spaces(v
)));
298 else if (skip_prefix(buf
.buf
, "Push:", &v
))
299 refspec_append(&remote
->push
, skip_spaces(v
));
300 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
301 refspec_append(&remote
->fetch
, skip_spaces(v
));
303 strbuf_release(&buf
);
307 static void read_branches_file(struct remote_state
*remote_state
,
308 struct remote
*remote
)
311 struct strbuf buf
= STRBUF_INIT
;
312 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
317 strbuf_getline_lf(&buf
, f
);
321 strbuf_release(&buf
);
325 remote
->configured_in_repo
= 1;
326 remote
->origin
= REMOTE_BRANCHES
;
329 * The branches file would have URL and optionally
330 * #branch specified. The default (or specified) branch is
331 * fetched and stored in the local branch matching the
334 frag
= strchr(buf
.buf
, '#');
338 frag
= (char *)git_default_branch_name(0);
340 add_url_alias(remote_state
, remote
, strbuf_detach(&buf
, NULL
));
341 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
345 * Cogito compatible push: push current HEAD to remote #branch
346 * (master if missing)
348 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
349 remote
->fetch_tags
= 1; /* always auto-follow */
352 static int handle_config(const char *key
, const char *value
,
353 const struct config_context
*ctx
, void *cb
)
358 struct remote
*remote
;
359 struct branch
*branch
;
360 struct remote_state
*remote_state
= cb
;
361 const struct key_value_info
*kvi
= ctx
->kvi
;
363 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
364 /* There is no subsection. */
367 /* There is a subsection, but it is empty. */
370 branch
= make_branch(remote_state
, name
, namelen
);
371 if (!strcmp(subkey
, "remote")) {
372 return git_config_string(&branch
->remote_name
, key
, value
);
373 } else if (!strcmp(subkey
, "pushremote")) {
374 return git_config_string(&branch
->pushremote_name
, key
, value
);
375 } else if (!strcmp(subkey
, "merge")) {
377 return config_error_nonbool(key
);
378 add_merge(branch
, xstrdup(value
));
382 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
383 struct rewrite
*rewrite
;
386 if (!strcmp(subkey
, "insteadof")) {
388 return config_error_nonbool(key
);
389 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
391 add_instead_of(rewrite
, xstrdup(value
));
392 } else if (!strcmp(subkey
, "pushinsteadof")) {
394 return config_error_nonbool(key
);
395 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
397 add_instead_of(rewrite
, xstrdup(value
));
401 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
404 /* Handle remote.* variables */
405 if (!name
&& !strcmp(subkey
, "pushdefault"))
406 return git_config_string(&remote_state
->pushremote_name
, key
,
411 /* Handle remote.<name>.* variables */
413 warning(_("config remote shorthand cannot begin with '/': %s"),
417 remote
= make_remote(remote_state
, name
, namelen
);
418 remote
->origin
= REMOTE_CONFIG
;
419 if (kvi
->scope
== CONFIG_SCOPE_LOCAL
||
420 kvi
->scope
== CONFIG_SCOPE_WORKTREE
)
421 remote
->configured_in_repo
= 1;
422 if (!strcmp(subkey
, "mirror"))
423 remote
->mirror
= git_config_bool(key
, value
);
424 else if (!strcmp(subkey
, "skipdefaultupdate"))
425 remote
->skip_default_update
= git_config_bool(key
, value
);
426 else if (!strcmp(subkey
, "skipfetchall"))
427 remote
->skip_default_update
= git_config_bool(key
, value
);
428 else if (!strcmp(subkey
, "prune"))
429 remote
->prune
= git_config_bool(key
, value
);
430 else if (!strcmp(subkey
, "prunetags"))
431 remote
->prune_tags
= git_config_bool(key
, value
);
432 else if (!strcmp(subkey
, "url")) {
434 if (git_config_string(&v
, key
, value
))
437 } else if (!strcmp(subkey
, "pushurl")) {
439 if (git_config_string(&v
, key
, value
))
441 add_pushurl(remote
, v
);
442 } else if (!strcmp(subkey
, "push")) {
444 if (git_config_string(&v
, key
, value
))
446 refspec_append(&remote
->push
, v
);
448 } else if (!strcmp(subkey
, "fetch")) {
450 if (git_config_string(&v
, key
, value
))
452 refspec_append(&remote
->fetch
, v
);
454 } else if (!strcmp(subkey
, "receivepack")) {
456 if (git_config_string(&v
, key
, value
))
458 if (!remote
->receivepack
)
459 remote
->receivepack
= v
;
461 error(_("more than one receivepack given, using the first"));
462 } else if (!strcmp(subkey
, "uploadpack")) {
464 if (git_config_string(&v
, key
, value
))
466 if (!remote
->uploadpack
)
467 remote
->uploadpack
= v
;
469 error(_("more than one uploadpack given, using the first"));
470 } else if (!strcmp(subkey
, "tagopt")) {
471 if (!strcmp(value
, "--no-tags"))
472 remote
->fetch_tags
= -1;
473 else if (!strcmp(value
, "--tags"))
474 remote
->fetch_tags
= 2;
475 } else if (!strcmp(subkey
, "proxy")) {
476 return git_config_string((const char **)&remote
->http_proxy
,
478 } else if (!strcmp(subkey
, "proxyauthmethod")) {
479 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
481 } else if (!strcmp(subkey
, "vcs")) {
482 return git_config_string(&remote
->foreign_vcs
, key
, value
);
487 static void alias_all_urls(struct remote_state
*remote_state
)
490 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
491 int add_pushurl_aliases
;
492 if (!remote_state
->remotes
[i
])
494 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
495 remote_state
->remotes
[i
]->pushurl
[j
] =
496 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
497 &remote_state
->rewrites
);
499 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
500 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
501 if (add_pushurl_aliases
)
503 remote_state
, remote_state
->remotes
[i
],
504 remote_state
->remotes
[i
]->url
[j
]);
505 remote_state
->remotes
[i
]->url
[j
] =
506 alias_url(remote_state
->remotes
[i
]->url
[j
],
507 &remote_state
->rewrites
);
512 static void read_config(struct repository
*repo
)
516 if (repo
->remote_state
->initialized
)
518 repo
->remote_state
->initialized
= 1;
520 repo
->remote_state
->current_branch
= NULL
;
521 if (startup_info
->have_repository
) {
522 const char *head_ref
= refs_resolve_ref_unsafe(
523 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
);
524 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
525 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
526 repo
->remote_state
->current_branch
= make_branch(
527 repo
->remote_state
, head_ref
, strlen(head_ref
));
530 repo_config(repo
, handle_config
, repo
->remote_state
);
531 alias_all_urls(repo
->remote_state
);
534 static int valid_remote_nick(const char *name
)
536 if (!name
[0] || is_dot_or_dotdot(name
))
539 /* remote nicknames cannot contain slashes */
541 if (is_dir_sep(*name
++))
546 static const char *remotes_remote_for_branch(struct remote_state
*remote_state
,
547 struct branch
*branch
,
550 if (branch
&& branch
->remote_name
) {
553 return branch
->remote_name
;
557 if (remote_state
->remotes_nr
== 1)
558 return remote_state
->remotes
[0]->name
;
562 const char *remote_for_branch(struct branch
*branch
, int *explicit)
564 read_config(the_repository
);
565 die_on_missing_branch(the_repository
, branch
);
567 return remotes_remote_for_branch(the_repository
->remote_state
, branch
,
572 remotes_pushremote_for_branch(struct remote_state
*remote_state
,
573 struct branch
*branch
, int *explicit)
575 if (branch
&& branch
->pushremote_name
) {
578 return branch
->pushremote_name
;
580 if (remote_state
->pushremote_name
) {
583 return remote_state
->pushremote_name
;
585 return remotes_remote_for_branch(remote_state
, branch
, explicit);
588 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
590 read_config(the_repository
);
591 die_on_missing_branch(the_repository
, branch
);
593 return remotes_pushremote_for_branch(the_repository
->remote_state
,
597 static struct remote
*remotes_remote_get(struct remote_state
*remote_state
,
600 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
602 read_config(the_repository
);
603 die_on_missing_branch(the_repository
, branch
);
607 if (branch
->merge_nr
) {
608 return branch
->merge_name
[0];
612 *remote_name
= remotes_pushremote_for_branch(
613 the_repository
->remote_state
, branch
,
615 struct remote
*remote
= remotes_remote_get(
616 the_repository
->remote_state
, remote_name
);
618 if (remote
&& remote
->push
.nr
&&
619 (dst
= apply_refspecs(&remote
->push
,
628 static void validate_remote_url(struct remote
*remote
)
632 struct strbuf redacted
= STRBUF_INIT
;
635 if (git_config_get_string_tmp("transfer.credentialsinurl", &value
))
638 if (!strcmp("warn", value
))
640 else if (!strcmp("die", value
))
642 else if (!strcmp("allow", value
))
645 die(_("unrecognized value transfer.credentialsInUrl: '%s'"), value
);
647 for (i
= 0; i
< remote
->url_nr
; i
++) {
648 struct url_info url_info
= { 0 };
650 if (!url_normalize(remote
->url
[i
], &url_info
) ||
651 !url_info
.passwd_off
)
654 strbuf_reset(&redacted
);
655 strbuf_add(&redacted
, url_info
.url
, url_info
.passwd_off
);
656 strbuf_addstr(&redacted
, "<redacted>");
657 strbuf_addstr(&redacted
,
658 url_info
.url
+ url_info
.passwd_off
+ url_info
.passwd_len
);
661 warning(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
663 die(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
669 strbuf_release(&redacted
);
672 static struct remote
*
673 remotes_remote_get_1(struct remote_state
*remote_state
, const char *name
,
674 const char *(*get_default
)(struct remote_state
*,
675 struct branch
*, int *))
683 name
= get_default(remote_state
, remote_state
->current_branch
,
686 ret
= make_remote(remote_state
, name
, 0);
687 if (valid_remote_nick(name
) && have_git_dir()) {
688 if (!valid_remote(ret
))
689 read_remotes_file(remote_state
, ret
);
690 if (!valid_remote(ret
))
691 read_branches_file(remote_state
, ret
);
693 if (name_given
&& !valid_remote(ret
))
694 add_url_alias(remote_state
, ret
, name
);
695 if (!valid_remote(ret
))
698 validate_remote_url(ret
);
703 static inline struct remote
*
704 remotes_remote_get(struct remote_state
*remote_state
, const char *name
)
706 return remotes_remote_get_1(remote_state
, name
,
707 remotes_remote_for_branch
);
710 struct remote
*remote_get(const char *name
)
712 read_config(the_repository
);
713 return remotes_remote_get(the_repository
->remote_state
, name
);
716 static inline struct remote
*
717 remotes_pushremote_get(struct remote_state
*remote_state
, const char *name
)
719 return remotes_remote_get_1(remote_state
, name
,
720 remotes_pushremote_for_branch
);
723 struct remote
*pushremote_get(const char *name
)
725 read_config(the_repository
);
726 return remotes_pushremote_get(the_repository
->remote_state
, name
);
729 int remote_is_configured(struct remote
*remote
, int in_repo
)
734 return remote
->configured_in_repo
;
735 return !!remote
->origin
;
738 int for_each_remote(each_remote_fn fn
, void *priv
)
741 read_config(the_repository
);
742 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
744 struct remote
*remote
=
745 the_repository
->remote_state
->remotes
[i
];
748 result
= fn(remote
, priv
);
753 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
755 if (strcmp(ref1
->name
, ref2
->name
)) {
756 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
757 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
758 die(_("Cannot fetch both %s and %s to %s"),
759 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
760 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
761 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
762 warning(_("%s usually tracks %s, not %s"),
763 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
764 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
765 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
766 die(_("%s tracks both %s and %s"),
767 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
770 * This last possibility doesn't occur because
771 * FETCH_HEAD_IGNORE entries always appear at
772 * the end of the list.
774 BUG("Internal error");
777 free(ref2
->peer_ref
);
781 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
783 struct string_list refs
= STRING_LIST_INIT_NODUP
;
784 struct ref
*retval
= NULL
;
785 struct ref
**p
= &retval
;
788 struct ref
*ref
= ref_map
;
790 ref_map
= ref_map
->next
;
793 if (!ref
->peer_ref
) {
797 struct string_list_item
*item
=
798 string_list_insert(&refs
, ref
->peer_ref
->name
);
801 /* Entry already existed */
802 handle_duplicate((struct ref
*)item
->util
, ref
);
811 string_list_clear(&refs
, 0);
815 int remote_has_url(struct remote
*remote
, const char *url
)
818 for (i
= 0; i
< remote
->url_nr
; i
++) {
819 if (!strcmp(remote
->url
[i
], url
))
825 static int match_name_with_pattern(const char *key
, const char *name
,
826 const char *value
, char **result
)
828 const char *kstar
= strchr(key
, '*');
834 die(_("key '%s' of pattern had no '*'"), key
);
836 ksuffixlen
= strlen(kstar
+ 1);
837 namelen
= strlen(name
);
838 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
839 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
841 struct strbuf sb
= STRBUF_INIT
;
842 const char *vstar
= strchr(value
, '*');
844 die(_("value '%s' of pattern has no '*'"), value
);
845 strbuf_add(&sb
, value
, vstar
- value
);
846 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
847 strbuf_addstr(&sb
, vstar
+ 1);
848 *result
= strbuf_detach(&sb
, NULL
);
853 static int refspec_match(const struct refspec_item
*refspec
,
856 if (refspec
->pattern
)
857 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
859 return !strcmp(refspec
->src
, name
);
862 int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
866 for (i
= 0; i
< rs
->nr
; i
++) {
867 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
873 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
877 for (tail
= &ref_map
; *tail
; ) {
878 struct ref
*ref
= *tail
;
880 if (omit_name_by_refspec(ref
->name
, rs
)) {
891 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
893 int i
, matched_negative
= 0;
894 int find_src
= !query
->src
;
895 struct string_list reversed
= STRING_LIST_INIT_DUP
;
896 const char *needle
= find_src
? query
->dst
: query
->src
;
899 * Check whether the queried ref matches any negative refpsec. If so,
900 * then we should ultimately treat this as not matching the query at
903 * Note that negative refspecs always match the source, but the query
904 * item uses the destination. To handle this, we apply pattern
905 * refspecs in reverse to figure out if the query source matches any
906 * of the negative refspecs.
908 * The first loop finds and expands all positive refspecs
909 * matched by the queried ref.
911 * The second loop checks if any of the results of the first loop
912 * match any negative refspec.
914 for (i
= 0; i
< rs
->nr
; i
++) {
915 struct refspec_item
*refspec
= &rs
->items
[i
];
918 if (refspec
->negative
)
921 /* Note the reversal of src and dst */
922 if (refspec
->pattern
) {
923 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
924 const char *value
= refspec
->src
;
926 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
927 string_list_append_nodup(&reversed
, expn_name
);
928 } else if (refspec
->matching
) {
929 /* For the special matching refspec, any query should match */
930 string_list_append(&reversed
, needle
);
931 } else if (!refspec
->src
) {
932 BUG("refspec->src should not be null here");
933 } else if (!strcmp(needle
, refspec
->src
)) {
934 string_list_append(&reversed
, refspec
->src
);
938 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
939 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
940 matched_negative
= 1;
943 string_list_clear(&reversed
, 0);
945 return matched_negative
;
948 static void query_refspecs_multiple(struct refspec
*rs
,
949 struct refspec_item
*query
,
950 struct string_list
*results
)
953 int find_src
= !query
->src
;
955 if (find_src
&& !query
->dst
)
956 BUG("query_refspecs_multiple: need either src or dst");
958 if (query_matches_negative_refspec(rs
, query
))
961 for (i
= 0; i
< rs
->nr
; i
++) {
962 struct refspec_item
*refspec
= &rs
->items
[i
];
963 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
964 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
965 const char *needle
= find_src
? query
->dst
: query
->src
;
966 char **result
= find_src
? &query
->src
: &query
->dst
;
968 if (!refspec
->dst
|| refspec
->negative
)
970 if (refspec
->pattern
) {
971 if (match_name_with_pattern(key
, needle
, value
, result
))
972 string_list_append_nodup(results
, *result
);
973 } else if (!strcmp(needle
, key
)) {
974 string_list_append(results
, value
);
979 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
982 int find_src
= !query
->src
;
983 const char *needle
= find_src
? query
->dst
: query
->src
;
984 char **result
= find_src
? &query
->src
: &query
->dst
;
986 if (find_src
&& !query
->dst
)
987 BUG("query_refspecs: need either src or dst");
989 if (query_matches_negative_refspec(rs
, query
))
992 for (i
= 0; i
< rs
->nr
; i
++) {
993 struct refspec_item
*refspec
= &rs
->items
[i
];
994 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
995 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
997 if (!refspec
->dst
|| refspec
->negative
)
999 if (refspec
->pattern
) {
1000 if (match_name_with_pattern(key
, needle
, value
, result
)) {
1001 query
->force
= refspec
->force
;
1004 } else if (!strcmp(needle
, key
)) {
1005 *result
= xstrdup(value
);
1006 query
->force
= refspec
->force
;
1013 char *apply_refspecs(struct refspec
*rs
, const char *name
)
1015 struct refspec_item query
;
1017 memset(&query
, 0, sizeof(struct refspec_item
));
1018 query
.src
= (char *)name
;
1020 if (query_refspecs(rs
, &query
))
1026 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
1028 return query_refspecs(&remote
->fetch
, refspec
);
1031 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
1034 size_t len
= strlen(name
);
1035 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
1036 memcpy(ref
->name
, prefix
, prefixlen
);
1037 memcpy(ref
->name
+ prefixlen
, name
, len
);
1041 struct ref
*alloc_ref(const char *name
)
1043 return alloc_ref_with_prefix("", 0, name
);
1046 struct ref
*copy_ref(const struct ref
*ref
)
1052 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
1054 memcpy(cpy
, ref
, len
);
1056 cpy
->symref
= xstrdup_or_null(ref
->symref
);
1057 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
1058 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
1062 struct ref
*copy_ref_list(const struct ref
*ref
)
1064 struct ref
*ret
= NULL
;
1065 struct ref
**tail
= &ret
;
1067 *tail
= copy_ref(ref
);
1069 tail
= &((*tail
)->next
);
1074 void free_one_ref(struct ref
*ref
)
1078 free_one_ref(ref
->peer_ref
);
1079 free(ref
->remote_status
);
1084 void free_refs(struct ref
*ref
)
1094 int count_refspec_match(const char *pattern
,
1096 struct ref
**matched_ref
)
1098 int patlen
= strlen(pattern
);
1099 struct ref
*matched_weak
= NULL
;
1100 struct ref
*matched
= NULL
;
1104 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1105 char *name
= refs
->name
;
1106 int namelen
= strlen(name
);
1108 if (!refname_match(pattern
, name
))
1111 /* A match is "weak" if it is with refs outside
1112 * heads or tags, and did not specify the pattern
1113 * in full (e.g. "refs/remotes/origin/master") or at
1114 * least from the toplevel (e.g. "remotes/origin/master");
1115 * otherwise "git push $URL master" would result in
1116 * ambiguity between remotes/origin/master and heads/master
1117 * at the remote site.
1119 if (namelen
!= patlen
&&
1120 patlen
!= namelen
- 5 &&
1121 !starts_with(name
, "refs/heads/") &&
1122 !starts_with(name
, "refs/tags/")) {
1123 /* We want to catch the case where only weak
1124 * matches are found and there are multiple
1125 * matches, and where more than one strong
1126 * matches are found, as ambiguous. One
1127 * strong match with zero or more weak matches
1128 * are acceptable as a unique match.
1130 matched_weak
= refs
;
1140 *matched_ref
= matched_weak
;
1145 *matched_ref
= matched
;
1150 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1158 static struct ref
*alloc_delete_ref(void)
1160 struct ref
*ref
= alloc_ref("(delete)");
1161 oidclr(&ref
->new_oid
);
1165 static int try_explicit_object_name(const char *name
,
1168 struct object_id oid
;
1172 *match
= alloc_delete_ref();
1176 if (repo_get_oid(the_repository
, name
, &oid
))
1180 *match
= alloc_ref(name
);
1181 oidcpy(&(*match
)->new_oid
, &oid
);
1186 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1188 struct ref
*ret
= alloc_ref(name
);
1189 tail_link_ref(ret
, tail
);
1193 static char *guess_ref(const char *name
, struct ref
*peer
)
1195 struct strbuf buf
= STRBUF_INIT
;
1197 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1202 if (starts_with(r
, "refs/heads/")) {
1203 strbuf_addstr(&buf
, "refs/heads/");
1204 } else if (starts_with(r
, "refs/tags/")) {
1205 strbuf_addstr(&buf
, "refs/tags/");
1210 strbuf_addstr(&buf
, name
);
1211 return strbuf_detach(&buf
, NULL
);
1214 static int match_explicit_lhs(struct ref
*src
,
1215 struct refspec_item
*rs
,
1217 int *allocated_match
)
1219 switch (count_refspec_match(rs
->src
, src
, match
)) {
1221 if (allocated_match
)
1222 *allocated_match
= 0;
1225 /* The source could be in the get_sha1() format
1226 * not a reference name. :refs/other is a
1227 * way to delete 'other' ref at the remote end.
1229 if (try_explicit_object_name(rs
->src
, match
) < 0)
1230 return error(_("src refspec %s does not match any"), rs
->src
);
1231 if (allocated_match
)
1232 *allocated_match
= 1;
1235 return error(_("src refspec %s matches more than one"), rs
->src
);
1239 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1240 const char *matched_src_name
)
1242 struct object_id oid
;
1243 enum object_type type
;
1246 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1247 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1250 error(_("The destination you provided is not a full refname (i.e.,\n"
1251 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1253 "- Looking for a ref that matches '%s' on the remote side.\n"
1254 "- Checking if the <src> being pushed ('%s')\n"
1255 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1256 " refs/{heads,tags}/ prefix on the remote side.\n"
1258 "Neither worked, so we gave up. You must fully qualify the ref."),
1259 dst_value
, matched_src_name
);
1261 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1264 if (repo_get_oid(the_repository
, matched_src_name
, &oid
))
1265 BUG("'%s' is not a valid object, "
1266 "match_explicit_lhs() should catch this!",
1268 type
= oid_object_info(the_repository
, &oid
, NULL
);
1269 if (type
== OBJ_COMMIT
) {
1270 advise(_("The <src> part of the refspec is a commit object.\n"
1271 "Did you mean to create a new branch by pushing to\n"
1272 "'%s:refs/heads/%s'?"),
1273 matched_src_name
, dst_value
);
1274 } else if (type
== OBJ_TAG
) {
1275 advise(_("The <src> part of the refspec is a tag object.\n"
1276 "Did you mean to create a new tag by pushing to\n"
1277 "'%s:refs/tags/%s'?"),
1278 matched_src_name
, dst_value
);
1279 } else if (type
== OBJ_TREE
) {
1280 advise(_("The <src> part of the refspec is a tree object.\n"
1281 "Did you mean to tag a new tree by pushing to\n"
1282 "'%s:refs/tags/%s'?"),
1283 matched_src_name
, dst_value
);
1284 } else if (type
== OBJ_BLOB
) {
1285 advise(_("The <src> part of the refspec is a blob object.\n"
1286 "Did you mean to tag a new blob by pushing to\n"
1287 "'%s:refs/tags/%s'?"),
1288 matched_src_name
, dst_value
);
1290 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1291 matched_src_name
, type
);
1295 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1296 struct ref
***dst_tail
,
1297 struct refspec_item
*rs
)
1299 struct ref
*matched_src
, *matched_dst
;
1302 const char *dst_value
= rs
->dst
;
1305 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1308 matched_src
= matched_dst
= NULL
;
1309 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1315 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1316 RESOLVE_REF_READING
,
1319 ((flag
& REF_ISSYMREF
) &&
1320 !starts_with(dst_value
, "refs/heads/")))
1321 die(_("%s cannot be resolved to branch"),
1325 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1329 if (starts_with(dst_value
, "refs/")) {
1330 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1331 } else if (is_null_oid(&matched_src
->new_oid
)) {
1332 error(_("unable to delete '%s': remote ref does not exist"),
1334 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1335 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1338 show_push_unqualified_ref_name_error(dst_value
,
1344 error(_("dst refspec %s matches more than one"),
1350 if (matched_dst
->peer_ref
)
1351 return error(_("dst ref %s receives from more than one src"),
1354 matched_dst
->peer_ref
= allocated_src
?
1356 copy_ref(matched_src
);
1357 matched_dst
->force
= rs
->force
;
1362 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1363 struct ref
***dst_tail
, struct refspec
*rs
)
1366 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1367 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1371 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1372 int send_mirror
, int direction
,
1373 const struct refspec_item
**ret_pat
)
1375 const struct refspec_item
*pat
;
1378 int matching_refs
= -1;
1379 for (i
= 0; i
< rs
->nr
; i
++) {
1380 const struct refspec_item
*item
= &rs
->items
[i
];
1385 if (item
->matching
&&
1386 (matching_refs
== -1 || item
->force
)) {
1391 if (item
->pattern
) {
1392 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1394 if (direction
== FROM_SRC
)
1395 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1397 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1404 if (matching_refs
== -1)
1407 pat
= &rs
->items
[matching_refs
];
1408 if (pat
->matching
) {
1410 * "matching refs"; traditionally we pushed everything
1411 * including refs outside refs/heads/ hierarchy, but
1412 * that does not make much sense these days.
1414 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1416 name
= xstrdup(ref
->name
);
1423 static struct ref
**tail_ref(struct ref
**head
)
1425 struct ref
**tail
= head
;
1427 tail
= &((*tail
)->next
);
1432 struct commit
**tip
;
1436 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1438 struct commit
*commit
;
1440 if (is_null_oid(oid
))
1442 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1443 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1445 commit
->object
.flags
|= TMP_MARK
;
1446 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1447 tips
->tip
[tips
->nr
++] = commit
;
1450 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1452 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1453 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1454 struct string_list_item
*item
;
1456 struct tips sent_tips
;
1459 * Collect everything we know they would have at the end of
1460 * this push, and collect all tags they have.
1462 memset(&sent_tips
, 0, sizeof(sent_tips
));
1463 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1464 if (ref
->peer_ref
&&
1465 !is_null_oid(&ref
->peer_ref
->new_oid
))
1466 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1468 add_to_tips(&sent_tips
, &ref
->old_oid
);
1469 if (starts_with(ref
->name
, "refs/tags/"))
1470 string_list_append(&dst_tag
, ref
->name
);
1472 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1474 string_list_sort(&dst_tag
);
1476 /* Collect tags they do not have. */
1477 for (ref
= src
; ref
; ref
= ref
->next
) {
1478 if (!starts_with(ref
->name
, "refs/tags/"))
1479 continue; /* not a tag */
1480 if (string_list_has_string(&dst_tag
, ref
->name
))
1481 continue; /* they already have it */
1482 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1483 continue; /* be conservative */
1484 item
= string_list_append(&src_tag
, ref
->name
);
1487 string_list_clear(&dst_tag
, 0);
1490 * At this point, src_tag lists tags that are missing from
1491 * dst, and sent_tips lists the tips we are pushing or those
1492 * that we know they already have. An element in the src_tag
1493 * that is an ancestor of any of the sent_tips needs to be
1494 * sent to the other side.
1497 const int reachable_flag
= 1;
1498 struct commit_list
*found_commits
;
1499 struct commit
**src_commits
;
1500 int nr_src_commits
= 0, alloc_src_commits
= 16;
1501 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1503 for_each_string_list_item(item
, &src_tag
) {
1504 struct ref
*ref
= item
->util
;
1505 struct commit
*commit
;
1507 if (is_null_oid(&ref
->new_oid
))
1509 commit
= lookup_commit_reference_gently(the_repository
,
1513 /* not pushing a commit, which is not an error */
1516 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1517 src_commits
[nr_src_commits
++] = commit
;
1520 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1521 src_commits
, nr_src_commits
,
1524 for_each_string_list_item(item
, &src_tag
) {
1525 struct ref
*dst_ref
;
1526 struct ref
*ref
= item
->util
;
1527 struct commit
*commit
;
1529 if (is_null_oid(&ref
->new_oid
))
1531 commit
= lookup_commit_reference_gently(the_repository
,
1535 /* not pushing a commit, which is not an error */
1539 * Is this tag, which they do not have, reachable from
1540 * any of the commits we are sending?
1542 if (!(commit
->object
.flags
& reachable_flag
))
1546 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1547 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1548 dst_ref
->peer_ref
= copy_ref(ref
);
1551 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1553 free_commit_list(found_commits
);
1556 string_list_clear(&src_tag
, 0);
1557 free(sent_tips
.tip
);
1560 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1562 for ( ; list
; list
= list
->next
)
1563 if (!strcmp(list
->name
, name
))
1564 return (struct ref
*)list
;
1568 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1570 for ( ; ref
; ref
= ref
->next
)
1571 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1573 string_list_sort(ref_index
);
1577 * Given only the set of local refs, sanity-check the set of push
1578 * refspecs. We can't catch all errors that match_push_refs would,
1579 * but we can catch some errors early before even talking to the
1582 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1587 for (i
= 0; i
< rs
->nr
; i
++) {
1588 struct refspec_item
*item
= &rs
->items
[i
];
1590 if (item
->pattern
|| item
->matching
|| item
->negative
)
1593 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1600 * Given the set of refs the local repository has, the set of refs the
1601 * remote repository has, and the refspec used for push, determine
1602 * what remote refs we will update and with what value by setting
1603 * peer_ref (which object is being pushed) and force (if the push is
1604 * forced) in elements of "dst". The function may add new elements to
1605 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1607 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1608 struct refspec
*rs
, int flags
)
1610 int send_all
= flags
& MATCH_REFS_ALL
;
1611 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1612 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1614 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1615 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1617 /* If no refspec is provided, use the default ":" */
1619 refspec_append(rs
, ":");
1621 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1623 /* pick the remainder */
1624 for (ref
= src
; ref
; ref
= ref
->next
) {
1625 struct string_list_item
*dst_item
;
1626 struct ref
*dst_peer
;
1627 const struct refspec_item
*pat
= NULL
;
1630 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1634 if (!dst_ref_index
.nr
)
1635 prepare_ref_index(&dst_ref_index
, *dst
);
1637 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1638 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1640 if (dst_peer
->peer_ref
)
1641 /* We're already sending something to this ref. */
1644 if (pat
->matching
&& !(send_all
|| send_mirror
))
1646 * Remote doesn't have it, and we have no
1647 * explicit pattern, and we don't have
1648 * --all or --mirror.
1652 /* Create a new one and link it */
1653 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1654 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1655 string_list_insert(&dst_ref_index
,
1656 dst_peer
->name
)->util
= dst_peer
;
1658 dst_peer
->peer_ref
= copy_ref(ref
);
1659 dst_peer
->force
= pat
->force
;
1664 string_list_clear(&dst_ref_index
, 0);
1666 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1667 add_missing_tags(src
, dst
, &dst_tail
);
1670 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1671 /* check for missing refs on the remote */
1672 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1676 /* We're already sending something to this ref. */
1679 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1681 if (!src_ref_index
.nr
)
1682 prepare_ref_index(&src_ref_index
, src
);
1683 if (!string_list_has_string(&src_ref_index
,
1685 ref
->peer_ref
= alloc_delete_ref();
1689 string_list_clear(&src_ref_index
, 0);
1692 *dst
= apply_negative_refspecs(*dst
, rs
);
1699 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1704 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1705 int force_ref_update
= ref
->force
|| force_update
;
1706 int reject_reason
= 0;
1709 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1710 else if (!send_mirror
)
1713 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1714 if (!ref
->deletion
&&
1715 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1716 ref
->status
= REF_STATUS_UPTODATE
;
1721 * If the remote ref has moved and is now different
1722 * from what we expect, reject any push.
1724 * It also is an error if the user told us to check
1725 * with the remote-tracking branch to find the value
1726 * to expect, but we did not have such a tracking
1729 * If the tip of the remote-tracking ref is unreachable
1730 * from any reflog entry of its local ref indicating a
1731 * possible update since checkout; reject the push.
1733 if (ref
->expect_old_sha1
) {
1734 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1735 reject_reason
= REF_STATUS_REJECT_STALE
;
1736 else if (ref
->check_reachable
&& ref
->unreachable
)
1738 REF_STATUS_REJECT_REMOTE_UPDATED
;
1741 * If the ref isn't stale, and is reachable
1742 * from one of the reflog entries of
1743 * the local branch, force the update.
1745 force_ref_update
= 1;
1749 * If the update isn't already rejected then check
1750 * the usual "must fast-forward" rules.
1752 * Decide whether an individual refspec A:B can be
1753 * pushed. The push will succeed if any of the
1754 * following are true:
1756 * (1) the remote reference B does not exist
1758 * (2) the remote reference B is being removed (i.e.,
1759 * pushing :B where no source is specified)
1761 * (3) the destination is not under refs/tags/, and
1762 * if the old and new value is a commit, the new
1763 * is a descendant of the old.
1765 * (4) it is forced using the +A:B notation, or by
1766 * passing the --force argument
1769 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1770 if (starts_with(ref
->name
, "refs/tags/"))
1771 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1772 else if (!repo_has_object_file(the_repository
, &ref
->old_oid
))
1773 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1774 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1775 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1776 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1777 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1778 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1782 * "--force" will defeat any rejection implemented
1783 * by the rules above.
1785 if (!force_ref_update
)
1786 ref
->status
= reject_reason
;
1787 else if (reject_reason
)
1788 ref
->forced_update
= 1;
1792 static void set_merge(struct remote_state
*remote_state
, struct branch
*ret
)
1794 struct remote
*remote
;
1796 struct object_id oid
;
1800 return; /* no branch */
1802 return; /* already run */
1803 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1805 * no merge config; let's make sure we don't confuse callers
1806 * with a non-zero merge_nr but a NULL merge
1812 remote
= remotes_remote_get(remote_state
, ret
->remote_name
);
1814 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1815 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1816 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1817 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1818 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1819 strcmp(ret
->remote_name
, "."))
1821 if (repo_dwim_ref(the_repository
, ret
->merge_name
[i
],
1822 strlen(ret
->merge_name
[i
]), &oid
, &ref
,
1824 ret
->merge
[i
]->dst
= ref
;
1826 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1830 struct branch
*branch_get(const char *name
)
1834 read_config(the_repository
);
1835 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1836 ret
= the_repository
->remote_state
->current_branch
;
1838 ret
= make_branch(the_repository
->remote_state
, name
,
1840 set_merge(the_repository
->remote_state
, ret
);
1844 int branch_has_merge_config(struct branch
*branch
)
1846 return branch
&& !!branch
->merge
;
1849 int branch_merge_matches(struct branch
*branch
,
1851 const char *refname
)
1853 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1855 return refname_match(branch
->merge
[i
]->src
, refname
);
1858 __attribute__((format (printf
,2,3)))
1859 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1864 strbuf_vaddf(err
, fmt
, ap
);
1870 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1873 return error_buf(err
, _("HEAD does not point to a branch"));
1875 if (!branch
->merge
|| !branch
->merge
[0]) {
1877 * no merge config; is it because the user didn't define any,
1878 * or because it is not a real branch, and get_branch
1881 if (!ref_exists(branch
->refname
))
1882 return error_buf(err
, _("no such branch: '%s'"),
1884 return error_buf(err
,
1885 _("no upstream configured for branch '%s'"),
1889 if (!branch
->merge
[0]->dst
)
1890 return error_buf(err
,
1891 _("upstream branch '%s' not stored as a remote-tracking branch"),
1892 branch
->merge
[0]->src
);
1894 return branch
->merge
[0]->dst
;
1897 static const char *tracking_for_push_dest(struct remote
*remote
,
1898 const char *refname
,
1903 ret
= apply_refspecs(&remote
->fetch
, refname
);
1905 return error_buf(err
,
1906 _("push destination '%s' on remote '%s' has no local tracking branch"),
1907 refname
, remote
->name
);
1911 static const char *branch_get_push_1(struct remote_state
*remote_state
,
1912 struct branch
*branch
, struct strbuf
*err
)
1914 struct remote
*remote
;
1916 remote
= remotes_remote_get(
1918 remotes_pushremote_for_branch(remote_state
, branch
, NULL
));
1920 return error_buf(err
,
1921 _("branch '%s' has no remote for pushing"),
1924 if (remote
->push
.nr
) {
1928 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1930 return error_buf(err
,
1931 _("push refspecs for '%s' do not include '%s'"),
1932 remote
->name
, branch
->name
);
1934 ret
= tracking_for_push_dest(remote
, dst
, err
);
1940 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1942 switch (push_default
) {
1943 case PUSH_DEFAULT_NOTHING
:
1944 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1946 case PUSH_DEFAULT_MATCHING
:
1947 case PUSH_DEFAULT_CURRENT
:
1948 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1950 case PUSH_DEFAULT_UPSTREAM
:
1951 return branch_get_upstream(branch
, err
);
1953 case PUSH_DEFAULT_UNSPECIFIED
:
1954 case PUSH_DEFAULT_SIMPLE
:
1956 const char *up
, *cur
;
1958 up
= branch_get_upstream(branch
, err
);
1961 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1964 if (strcmp(cur
, up
))
1965 return error_buf(err
,
1966 _("cannot resolve 'simple' push to a single destination"));
1971 BUG("unhandled push situation");
1974 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1976 read_config(the_repository
);
1977 die_on_missing_branch(the_repository
, branch
);
1980 return error_buf(err
, _("HEAD does not point to a branch"));
1982 if (!branch
->push_tracking_ref
)
1983 branch
->push_tracking_ref
= branch_get_push_1(
1984 the_repository
->remote_state
, branch
, err
);
1985 return branch
->push_tracking_ref
;
1988 static int ignore_symref_update(const char *refname
, struct strbuf
*scratch
)
1990 return !refs_read_symbolic_ref(get_main_ref_store(the_repository
), refname
, scratch
);
1994 * Create and return a list of (struct ref) consisting of copies of
1995 * each remote_ref that matches refspec. refspec must be a pattern.
1996 * Fill in the copies' peer_ref to describe the local tracking refs to
1997 * which they map. Omit any references that would map to an existing
1998 * local symbolic ref.
2000 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
2001 const struct refspec_item
*refspec
)
2003 struct strbuf scratch
= STRBUF_INIT
;
2004 const struct ref
*ref
;
2005 struct ref
*ret
= NULL
;
2006 struct ref
**tail
= &ret
;
2008 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2009 char *expn_name
= NULL
;
2011 strbuf_reset(&scratch
);
2013 if (strchr(ref
->name
, '^'))
2014 continue; /* a dereference item */
2015 if (match_name_with_pattern(refspec
->src
, ref
->name
,
2016 refspec
->dst
, &expn_name
) &&
2017 !ignore_symref_update(expn_name
, &scratch
)) {
2018 struct ref
*cpy
= copy_ref(ref
);
2020 cpy
->peer_ref
= alloc_ref(expn_name
);
2022 cpy
->peer_ref
->force
= 1;
2029 strbuf_release(&scratch
);
2033 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
2035 const struct ref
*ref
;
2036 const struct ref
*best_match
= NULL
;
2039 for (ref
= refs
; ref
; ref
= ref
->next
) {
2040 int score
= refname_match(name
, ref
->name
);
2042 if (best_score
< score
) {
2050 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
2052 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
2057 return copy_ref(ref
);
2060 static struct ref
*get_local_ref(const char *name
)
2062 if (!name
|| name
[0] == '\0')
2065 if (starts_with(name
, "refs/"))
2066 return alloc_ref(name
);
2068 if (starts_with(name
, "heads/") ||
2069 starts_with(name
, "tags/") ||
2070 starts_with(name
, "remotes/"))
2071 return alloc_ref_with_prefix("refs/", 5, name
);
2073 return alloc_ref_with_prefix("refs/heads/", 11, name
);
2076 int get_fetch_map(const struct ref
*remote_refs
,
2077 const struct refspec_item
*refspec
,
2081 struct ref
*ref_map
, **rmp
;
2083 if (refspec
->negative
)
2086 if (refspec
->pattern
) {
2087 ref_map
= get_expanded_map(remote_refs
, refspec
);
2089 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
2091 if (refspec
->exact_sha1
) {
2092 ref_map
= alloc_ref(name
);
2093 get_oid_hex(name
, &ref_map
->old_oid
);
2094 ref_map
->exact_oid
= 1;
2096 ref_map
= get_remote_ref(remote_refs
, name
);
2098 if (!missing_ok
&& !ref_map
)
2099 die(_("couldn't find remote ref %s"), name
);
2101 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
2102 if (ref_map
->peer_ref
&& refspec
->force
)
2103 ref_map
->peer_ref
->force
= 1;
2107 for (rmp
= &ref_map
; *rmp
; ) {
2108 if ((*rmp
)->peer_ref
) {
2109 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
2110 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
2111 struct ref
*ignore
= *rmp
;
2112 error(_("* Ignoring funny ref '%s' locally"),
2113 (*rmp
)->peer_ref
->name
);
2114 *rmp
= (*rmp
)->next
;
2115 free(ignore
->peer_ref
);
2120 rmp
= &((*rmp
)->next
);
2124 tail_link_ref(ref_map
, tail
);
2129 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
2133 for (; list
; list
= list
->next
)
2134 if (!strcmp(ref
->symref
, list
->name
)) {
2135 oidcpy(&ref
->old_oid
, &list
->old_oid
);
2142 * Compute the commit ahead/behind values for the pair branch_name, base.
2144 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2145 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2146 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2149 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2150 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2151 * commits are different.
2154 static int stat_branch_pair(const char *branch_name
, const char *base
,
2155 int *num_ours
, int *num_theirs
,
2156 enum ahead_behind_flags abf
)
2158 struct object_id oid
;
2159 struct commit
*ours
, *theirs
;
2160 struct rev_info revs
;
2161 struct setup_revision_opt opt
= {
2162 .free_removed_argv_elements
= 1,
2164 struct strvec argv
= STRVEC_INIT
;
2166 /* Cannot stat if what we used to build on no longer exists */
2167 if (read_ref(base
, &oid
))
2169 theirs
= lookup_commit_reference(the_repository
, &oid
);
2173 if (read_ref(branch_name
, &oid
))
2175 ours
= lookup_commit_reference(the_repository
, &oid
);
2179 *num_theirs
= *num_ours
= 0;
2181 /* are we the same? */
2184 if (abf
== AHEAD_BEHIND_QUICK
)
2186 if (abf
!= AHEAD_BEHIND_FULL
)
2187 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2189 /* Run "rev-list --left-right ours...theirs" internally... */
2190 strvec_push(&argv
, ""); /* ignored */
2191 strvec_push(&argv
, "--left-right");
2192 strvec_pushf(&argv
, "%s...%s",
2193 oid_to_hex(&ours
->object
.oid
),
2194 oid_to_hex(&theirs
->object
.oid
));
2195 strvec_push(&argv
, "--");
2197 repo_init_revisions(the_repository
, &revs
, NULL
);
2198 setup_revisions(argv
.nr
, argv
.v
, &revs
, &opt
);
2199 if (prepare_revision_walk(&revs
))
2200 die(_("revision walk setup failed"));
2202 /* ... and count the commits on each side. */
2204 struct commit
*c
= get_revision(&revs
);
2207 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2213 /* clear object flags smudged by the above traversal */
2214 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2215 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2217 strvec_clear(&argv
);
2218 release_revisions(&revs
);
2223 * Lookup the tracking branch for the given branch and if present, optionally
2224 * compute the commit ahead/behind values for the pair.
2226 * If for_push is true, the tracking branch refers to the push branch,
2227 * otherwise it refers to the upstream branch.
2229 * The name of the tracking branch (or NULL if it is not defined) is
2230 * returned via *tracking_name, if it is not itself NULL.
2232 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2233 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2234 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2237 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2238 * upstream defined, or ref does not exist). Returns 0 if the commits are
2239 * identical. Returns 1 if commits are different.
2241 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2242 const char **tracking_name
, int for_push
,
2243 enum ahead_behind_flags abf
)
2247 /* Cannot stat unless we are marked to build on top of somebody else. */
2248 base
= for_push
? branch_get_push(branch
, NULL
) :
2249 branch_get_upstream(branch
, NULL
);
2251 *tracking_name
= base
;
2255 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2259 * Return true when there is anything to report, otherwise false.
2261 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2262 enum ahead_behind_flags abf
,
2263 int show_divergence_advice
)
2265 int ours
, theirs
, sti
;
2266 const char *full_base
;
2268 int upstream_is_gone
= 0;
2270 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2274 upstream_is_gone
= 1;
2277 base
= shorten_unambiguous_ref(full_base
, 0);
2278 if (upstream_is_gone
) {
2280 _("Your branch is based on '%s', but the upstream is gone.\n"),
2282 if (advice_enabled(ADVICE_STATUS_HINTS
))
2284 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2287 _("Your branch is up to date with '%s'.\n"),
2289 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2291 _("Your branch and '%s' refer to different commits.\n"),
2293 if (advice_enabled(ADVICE_STATUS_HINTS
))
2294 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2295 "git status --ahead-behind");
2296 } else if (!theirs
) {
2298 Q_("Your branch is ahead of '%s' by %d commit.\n",
2299 "Your branch is ahead of '%s' by %d commits.\n",
2302 if (advice_enabled(ADVICE_STATUS_HINTS
))
2304 _(" (use \"git push\" to publish your local commits)\n"));
2307 Q_("Your branch is behind '%s' by %d commit, "
2308 "and can be fast-forwarded.\n",
2309 "Your branch is behind '%s' by %d commits, "
2310 "and can be fast-forwarded.\n",
2313 if (advice_enabled(ADVICE_STATUS_HINTS
))
2315 _(" (use \"git pull\" to update your local branch)\n"));
2318 Q_("Your branch and '%s' have diverged,\n"
2319 "and have %d and %d different commit each, "
2321 "Your branch and '%s' have diverged,\n"
2322 "and have %d and %d different commits each, "
2325 base
, ours
, theirs
);
2326 if (show_divergence_advice
&&
2327 advice_enabled(ADVICE_STATUS_HINTS
))
2329 _(" (use \"git pull\" if you want to integrate the remote branch with yours)\n"));
2335 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2339 struct ref
***local_tail
= cb_data
;
2342 /* we already know it starts with refs/ to get here */
2343 if (check_refname_format(refname
+ 5, 0))
2346 ref
= alloc_ref(refname
);
2347 oidcpy(&ref
->new_oid
, oid
);
2349 *local_tail
= &ref
->next
;
2353 struct ref
*get_local_heads(void)
2355 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2357 for_each_ref(one_local_ref
, &local_tail
);
2361 struct ref
*guess_remote_head(const struct ref
*head
,
2362 const struct ref
*refs
,
2365 const struct ref
*r
;
2366 struct ref
*list
= NULL
;
2367 struct ref
**tail
= &list
;
2373 * Some transports support directly peeking at
2374 * where HEAD points; if that is the case, then
2375 * we don't have to guess.
2378 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2380 /* If a remote branch exists with the default branch name, let's use it. */
2382 char *ref
= xstrfmt("refs/heads/%s",
2383 git_default_branch_name(0));
2385 r
= find_ref_by_name(refs
, ref
);
2387 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2390 /* Fall back to the hard-coded historical default */
2391 r
= find_ref_by_name(refs
, "refs/heads/master");
2392 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2396 /* Look for another ref that points there */
2397 for (r
= refs
; r
; r
= r
->next
) {
2399 starts_with(r
->name
, "refs/heads/") &&
2400 oideq(&r
->old_oid
, &head
->old_oid
)) {
2401 *tail
= copy_ref(r
);
2402 tail
= &((*tail
)->next
);
2411 struct stale_heads_info
{
2412 struct string_list
*ref_names
;
2413 struct ref
**stale_refs_tail
;
2417 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2418 int flags
, void *cb_data
)
2420 struct stale_heads_info
*info
= cb_data
;
2421 struct string_list matches
= STRING_LIST_INIT_DUP
;
2422 struct refspec_item query
;
2424 memset(&query
, 0, sizeof(struct refspec_item
));
2425 query
.dst
= (char *)refname
;
2427 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2428 if (matches
.nr
== 0)
2429 goto clean_exit
; /* No matches */
2432 * If we did find a suitable refspec and it's not a symref and
2433 * it's not in the list of refs that currently exist in that
2434 * remote, we consider it to be stale. In order to deal with
2435 * overlapping refspecs, we need to go over all of the
2438 if (flags
& REF_ISSYMREF
)
2441 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2442 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2446 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2447 oidcpy(&ref
->new_oid
, oid
);
2451 string_list_clear(&matches
, 0);
2455 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2457 struct ref
*ref
, *stale_refs
= NULL
;
2458 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2459 struct stale_heads_info info
;
2461 info
.ref_names
= &ref_names
;
2462 info
.stale_refs_tail
= &stale_refs
;
2464 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2465 string_list_append(&ref_names
, ref
->name
);
2466 string_list_sort(&ref_names
);
2467 for_each_ref(get_stale_heads_cb
, &info
);
2468 string_list_clear(&ref_names
, 0);
2475 static void clear_cas_option(struct push_cas_option
*cas
)
2479 for (i
= 0; i
< cas
->nr
; i
++)
2480 free(cas
->entry
[i
].refname
);
2482 memset(cas
, 0, sizeof(*cas
));
2485 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2486 const char *refname
,
2489 struct push_cas
*entry
;
2490 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2491 entry
= &cas
->entry
[cas
->nr
++];
2492 memset(entry
, 0, sizeof(*entry
));
2493 entry
->refname
= xmemdupz(refname
, refnamelen
);
2497 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2500 struct push_cas
*entry
;
2503 /* "--no-<option>" */
2504 clear_cas_option(cas
);
2509 /* just "--<option>" */
2510 cas
->use_tracking_for_rest
= 1;
2514 /* "--<option>=refname" or "--<option>=refname:value" */
2515 colon
= strchrnul(arg
, ':');
2516 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2518 entry
->use_tracking
= 1;
2520 oidclr(&entry
->expect
);
2521 else if (repo_get_oid(the_repository
, colon
+ 1, &entry
->expect
))
2522 return error(_("cannot parse expected object name '%s'"),
2527 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2529 return parse_push_cas_option(opt
->value
, arg
, unset
);
2532 int is_empty_cas(const struct push_cas_option
*cas
)
2534 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2538 * Look at remote.fetch refspec and see if we have a remote
2539 * tracking branch for the refname there. Fill the name of
2540 * the remote-tracking branch in *dst_refname, and the name
2541 * of the commit object at its tip in oid[].
2542 * If we cannot do so, return negative to signal an error.
2544 static int remote_tracking(struct remote
*remote
, const char *refname
,
2545 struct object_id
*oid
, char **dst_refname
)
2549 dst
= apply_refspecs(&remote
->fetch
, refname
);
2551 return -1; /* no tracking ref for refname at remote */
2552 if (read_ref(dst
, oid
))
2553 return -1; /* we know what the tracking ref is but we cannot read it */
2560 * The struct "reflog_commit_array" and related helper functions
2561 * are used for collecting commits into an array during reflog
2562 * traversals in "check_and_collect_until()".
2564 struct reflog_commit_array
{
2565 struct commit
**item
;
2569 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2571 /* Append a commit to the array. */
2572 static void append_commit(struct reflog_commit_array
*arr
,
2573 struct commit
*commit
)
2575 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2576 arr
->item
[arr
->nr
++] = commit
;
2579 /* Free and reset the array. */
2580 static void free_commit_array(struct reflog_commit_array
*arr
)
2582 FREE_AND_NULL(arr
->item
);
2583 arr
->nr
= arr
->alloc
= 0;
2586 struct check_and_collect_until_cb_data
{
2587 struct commit
*remote_commit
;
2588 struct reflog_commit_array
*local_commits
;
2589 timestamp_t remote_reflog_timestamp
;
2592 /* Get the timestamp of the latest entry. */
2593 static int peek_reflog(struct object_id
*o_oid UNUSED
,
2594 struct object_id
*n_oid UNUSED
,
2595 const char *ident UNUSED
,
2596 timestamp_t timestamp
, int tz UNUSED
,
2597 const char *message UNUSED
, void *cb_data
)
2599 timestamp_t
*ts
= cb_data
;
2604 static int check_and_collect_until(struct object_id
*o_oid UNUSED
,
2605 struct object_id
*n_oid
,
2606 const char *ident UNUSED
,
2607 timestamp_t timestamp
, int tz UNUSED
,
2608 const char *message UNUSED
, void *cb_data
)
2610 struct commit
*commit
;
2611 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2613 /* An entry was found. */
2614 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2617 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2618 append_commit(cb
->local_commits
, commit
);
2621 * If the reflog entry timestamp is older than the remote ref's
2622 * latest reflog entry, there is no need to check or collect
2623 * entries older than this one.
2625 if (timestamp
< cb
->remote_reflog_timestamp
)
2631 #define MERGE_BASES_BATCH_SIZE 8
2634 * Iterate through the reflog of the local ref to check if there is an entry
2635 * for the given remote-tracking ref; runs until the timestamp of an entry is
2636 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2637 * are that seen along the way are collected into an array to check if the
2638 * remote-tracking ref is reachable from any of them.
2640 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2643 struct commit
*commit
;
2644 struct commit
**chunk
;
2645 struct check_and_collect_until_cb_data cb
;
2646 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2650 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2652 goto cleanup_return
;
2655 * Get the timestamp from the latest entry
2656 * of the remote-tracking ref's reflog.
2658 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2660 cb
.remote_commit
= commit
;
2661 cb
.local_commits
= &arr
;
2662 cb
.remote_reflog_timestamp
= date
;
2663 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2665 /* We found an entry in the reflog. */
2667 goto cleanup_return
;
2670 * Check if the remote commit is reachable from any
2671 * of the commits in the collected array, in batches.
2673 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2674 size
= arr
.item
+ arr
.nr
- chunk
;
2675 if (MERGE_BASES_BATCH_SIZE
< size
)
2676 size
= MERGE_BASES_BATCH_SIZE
;
2678 if ((ret
= repo_in_merge_bases_many(the_repository
, commit
, size
, chunk
)))
2683 free_commit_array(&arr
);
2688 * Check for reachability of a remote-tracking
2689 * ref in the reflog entries of its local ref.
2691 static void check_if_includes_upstream(struct ref
*remote
)
2693 struct ref
*local
= get_local_ref(remote
->name
);
2697 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2698 remote
->unreachable
= 1;
2701 static void apply_cas(struct push_cas_option
*cas
,
2702 struct remote
*remote
,
2707 /* Find an explicit --<option>=<name>[:<value>] entry */
2708 for (i
= 0; i
< cas
->nr
; i
++) {
2709 struct push_cas
*entry
= &cas
->entry
[i
];
2710 if (!refname_match(entry
->refname
, ref
->name
))
2712 ref
->expect_old_sha1
= 1;
2713 if (!entry
->use_tracking
)
2714 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2715 else if (remote_tracking(remote
, ref
->name
,
2716 &ref
->old_oid_expect
,
2717 &ref
->tracking_ref
))
2718 oidclr(&ref
->old_oid_expect
);
2720 ref
->check_reachable
= cas
->use_force_if_includes
;
2724 /* Are we using "--<option>" to cover all? */
2725 if (!cas
->use_tracking_for_rest
)
2728 ref
->expect_old_sha1
= 1;
2729 if (remote_tracking(remote
, ref
->name
,
2730 &ref
->old_oid_expect
,
2731 &ref
->tracking_ref
))
2732 oidclr(&ref
->old_oid_expect
);
2734 ref
->check_reachable
= cas
->use_force_if_includes
;
2737 void apply_push_cas(struct push_cas_option
*cas
,
2738 struct remote
*remote
,
2739 struct ref
*remote_refs
)
2742 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2743 apply_cas(cas
, remote
, ref
);
2746 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2747 * mode, and if "--force-if-includes" was specified, run
2750 if (ref
->check_reachable
)
2751 check_if_includes_upstream(ref
);
2755 struct remote_state
*remote_state_new(void)
2757 struct remote_state
*r
= xmalloc(sizeof(*r
));
2759 memset(r
, 0, sizeof(*r
));
2761 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2762 hashmap_init(&r
->branches_hash
, branches_hash_cmp
, NULL
, 0);
2766 void remote_state_clear(struct remote_state
*remote_state
)
2770 for (i
= 0; i
< remote_state
->remotes_nr
; i
++)
2771 remote_clear(remote_state
->remotes
[i
]);
2772 FREE_AND_NULL(remote_state
->remotes
);
2773 remote_state
->remotes_alloc
= 0;
2774 remote_state
->remotes_nr
= 0;
2776 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2777 hashmap_clear_and_free(&remote_state
->branches_hash
, struct remote
, ent
);
2781 * Returns 1 if it was the last chop before ':'.
2783 static int chop_last_dir(char **remoteurl
, int is_relative
)
2785 char *rfind
= find_last_dir_sep(*remoteurl
);
2791 rfind
= strrchr(*remoteurl
, ':');
2797 if (is_relative
|| !strcmp(".", *remoteurl
))
2798 die(_("cannot strip one component off url '%s'"),
2802 *remoteurl
= xstrdup(".");
2806 char *relative_url(const char *remote_url
, const char *url
,
2807 const char *up_path
)
2809 int is_relative
= 0;
2813 struct strbuf sb
= STRBUF_INIT
;
2816 if (!url_is_local_not_ssh(url
) || is_absolute_path(url
))
2817 return xstrdup(url
);
2819 len
= strlen(remote_url
);
2821 BUG("invalid empty remote_url");
2823 remoteurl
= xstrdup(remote_url
);
2824 if (is_dir_sep(remoteurl
[len
-1]))
2825 remoteurl
[len
-1] = '\0';
2827 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
2832 * Prepend a './' to ensure all relative
2833 * remoteurls start with './' or '../'
2835 if (!starts_with_dot_slash_native(remoteurl
) &&
2836 !starts_with_dot_dot_slash_native(remoteurl
)) {
2838 strbuf_addf(&sb
, "./%s", remoteurl
);
2840 remoteurl
= strbuf_detach(&sb
, NULL
);
2844 * When the url starts with '../', remove that and the
2845 * last directory in remoteurl.
2848 if (starts_with_dot_dot_slash_native(url
)) {
2850 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
2851 } else if (starts_with_dot_slash_native(url
))
2857 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
2858 if (ends_with(url
, "/"))
2859 strbuf_setlen(&sb
, sb
.len
- 1);
2862 if (starts_with_dot_slash_native(sb
.buf
))
2863 out
= xstrdup(sb
.buf
+ 2);
2865 out
= xstrdup(sb
.buf
);
2867 if (!up_path
|| !is_relative
) {
2868 strbuf_release(&sb
);
2873 strbuf_addf(&sb
, "%s%s", up_path
, out
);
2875 return strbuf_detach(&sb
, NULL
);