1 #include "git-compat-util.h"
4 #include "environment.h"
11 #include "object-name.h"
12 #include "object-store-ll.h"
19 #include "string-list.h"
21 #include "commit-reach.h"
24 #include "parse-options.h"
26 enum map_direction
{ FROM_SRC
, FROM_DST
};
28 struct counted_string
{
33 static int valid_remote(const struct remote
*remote
)
35 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
38 static const char *alias_url(const char *url
, struct rewrites
*r
)
41 struct counted_string
*longest
;
46 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
49 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
50 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
52 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
53 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
61 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
64 static void add_url(struct remote
*remote
, const char *url
)
66 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
67 remote
->url
[remote
->url_nr
++] = url
;
70 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
72 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
73 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
76 static void add_pushurl_alias(struct remote_state
*remote_state
,
77 struct remote
*remote
, const char *url
)
79 const char *pushurl
= alias_url(url
, &remote_state
->rewrites_push
);
81 add_pushurl(remote
, pushurl
);
84 static void add_url_alias(struct remote_state
*remote_state
,
85 struct remote
*remote
, const char *url
)
87 add_url(remote
, alias_url(url
, &remote_state
->rewrites
));
88 add_pushurl_alias(remote_state
, remote
, url
);
91 struct remotes_hash_key
{
96 static int remotes_hash_cmp(const void *cmp_data UNUSED
,
97 const struct hashmap_entry
*eptr
,
98 const struct hashmap_entry
*entry_or_key
,
101 const struct remote
*a
, *b
;
102 const struct remotes_hash_key
*key
= keydata
;
104 a
= container_of(eptr
, const struct remote
, ent
);
105 b
= container_of(entry_or_key
, const struct remote
, ent
);
108 return !!xstrncmpz(a
->name
, key
->str
, key
->len
);
110 return strcmp(a
->name
, b
->name
);
113 static struct remote
*make_remote(struct remote_state
*remote_state
,
114 const char *name
, int len
)
117 struct remotes_hash_key lookup
;
118 struct hashmap_entry lookup_entry
, *e
;
125 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
127 e
= hashmap_get(&remote_state
->remotes_hash
, &lookup_entry
, &lookup
);
129 return container_of(e
, struct remote
, ent
);
131 CALLOC_ARRAY(ret
, 1);
132 ret
->prune
= -1; /* unspecified */
133 ret
->prune_tags
= -1; /* unspecified */
134 ret
->name
= xstrndup(name
, len
);
135 refspec_init(&ret
->push
, REFSPEC_PUSH
);
136 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
138 ALLOC_GROW(remote_state
->remotes
, remote_state
->remotes_nr
+ 1,
139 remote_state
->remotes_alloc
);
140 remote_state
->remotes
[remote_state
->remotes_nr
++] = ret
;
142 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
143 if (hashmap_put_entry(&remote_state
->remotes_hash
, ret
, ent
))
144 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
148 static void remote_clear(struct remote
*remote
)
152 free((char *)remote
->name
);
153 free((char *)remote
->foreign_vcs
);
155 for (i
= 0; i
< remote
->url_nr
; i
++)
156 free((char *)remote
->url
[i
]);
157 FREE_AND_NULL(remote
->url
);
159 for (i
= 0; i
< remote
->pushurl_nr
; i
++)
160 free((char *)remote
->pushurl
[i
]);
161 FREE_AND_NULL(remote
->pushurl
);
162 free((char *)remote
->receivepack
);
163 free((char *)remote
->uploadpack
);
164 FREE_AND_NULL(remote
->http_proxy
);
165 FREE_AND_NULL(remote
->http_proxy_authmethod
);
168 static void add_merge(struct branch
*branch
, const char *name
)
170 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
171 branch
->merge_alloc
);
172 branch
->merge_name
[branch
->merge_nr
++] = name
;
175 struct branches_hash_key
{
180 static int branches_hash_cmp(const void *cmp_data UNUSED
,
181 const struct hashmap_entry
*eptr
,
182 const struct hashmap_entry
*entry_or_key
,
185 const struct branch
*a
, *b
;
186 const struct branches_hash_key
*key
= keydata
;
188 a
= container_of(eptr
, const struct branch
, ent
);
189 b
= container_of(entry_or_key
, const struct branch
, ent
);
192 return !!xstrncmpz(a
->name
, key
->str
, key
->len
);
194 return strcmp(a
->name
, b
->name
);
197 static struct branch
*find_branch(struct remote_state
*remote_state
,
198 const char *name
, size_t len
)
200 struct branches_hash_key lookup
;
201 struct hashmap_entry lookup_entry
, *e
;
205 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
207 e
= hashmap_get(&remote_state
->branches_hash
, &lookup_entry
, &lookup
);
209 return container_of(e
, struct branch
, ent
);
214 static void die_on_missing_branch(struct repository
*repo
,
215 struct branch
*branch
)
217 /* branch == NULL is always valid because it represents detached HEAD. */
219 branch
!= find_branch(repo
->remote_state
, branch
->name
,
220 strlen(branch
->name
)))
221 die("branch %s was not found in the repository", branch
->name
);
224 static struct branch
*make_branch(struct remote_state
*remote_state
,
225 const char *name
, size_t len
)
229 ret
= find_branch(remote_state
, name
, len
);
233 CALLOC_ARRAY(ret
, 1);
234 ret
->name
= xstrndup(name
, len
);
235 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
237 hashmap_entry_init(&ret
->ent
, memhash(name
, len
));
238 if (hashmap_put_entry(&remote_state
->branches_hash
, ret
, ent
))
239 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
243 static struct rewrite
*make_rewrite(struct rewrites
*r
,
244 const char *base
, size_t len
)
249 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
250 if (len
== r
->rewrite
[i
]->baselen
&&
251 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
252 return r
->rewrite
[i
];
255 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
256 CALLOC_ARRAY(ret
, 1);
257 r
->rewrite
[r
->rewrite_nr
++] = ret
;
258 ret
->base
= xstrndup(base
, len
);
263 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
265 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
266 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
267 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
268 rewrite
->instead_of_nr
++;
271 static const char *skip_spaces(const char *s
)
278 static void read_remotes_file(struct remote_state
*remote_state
,
279 struct remote
*remote
)
281 struct strbuf buf
= STRBUF_INIT
;
282 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
286 remote
->configured_in_repo
= 1;
287 remote
->origin
= REMOTE_REMOTES
;
288 while (strbuf_getline(&buf
, f
) != EOF
) {
293 if (skip_prefix(buf
.buf
, "URL:", &v
))
294 add_url_alias(remote_state
, remote
,
295 xstrdup(skip_spaces(v
)));
296 else if (skip_prefix(buf
.buf
, "Push:", &v
))
297 refspec_append(&remote
->push
, skip_spaces(v
));
298 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
299 refspec_append(&remote
->fetch
, skip_spaces(v
));
301 strbuf_release(&buf
);
305 static void read_branches_file(struct remote_state
*remote_state
,
306 struct remote
*remote
)
309 struct strbuf buf
= STRBUF_INIT
;
310 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
315 strbuf_getline_lf(&buf
, f
);
319 strbuf_release(&buf
);
323 remote
->configured_in_repo
= 1;
324 remote
->origin
= REMOTE_BRANCHES
;
327 * The branches file would have URL and optionally
328 * #branch specified. The default (or specified) branch is
329 * fetched and stored in the local branch matching the
332 frag
= strchr(buf
.buf
, '#');
336 frag
= (char *)git_default_branch_name(0);
338 add_url_alias(remote_state
, remote
, strbuf_detach(&buf
, NULL
));
339 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
343 * Cogito compatible push: push current HEAD to remote #branch
344 * (master if missing)
346 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
347 remote
->fetch_tags
= 1; /* always auto-follow */
350 static int handle_config(const char *key
, const char *value
,
351 const struct config_context
*ctx
, void *cb
)
356 struct remote
*remote
;
357 struct branch
*branch
;
358 struct remote_state
*remote_state
= cb
;
359 const struct key_value_info
*kvi
= ctx
->kvi
;
361 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
362 /* There is no subsection. */
365 /* There is a subsection, but it is empty. */
368 branch
= make_branch(remote_state
, name
, namelen
);
369 if (!strcmp(subkey
, "remote")) {
370 return git_config_string(&branch
->remote_name
, key
, value
);
371 } else if (!strcmp(subkey
, "pushremote")) {
372 return git_config_string(&branch
->pushremote_name
, key
, value
);
373 } else if (!strcmp(subkey
, "merge")) {
375 return config_error_nonbool(key
);
376 add_merge(branch
, xstrdup(value
));
380 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
381 struct rewrite
*rewrite
;
384 if (!strcmp(subkey
, "insteadof")) {
386 return config_error_nonbool(key
);
387 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
389 add_instead_of(rewrite
, xstrdup(value
));
390 } else if (!strcmp(subkey
, "pushinsteadof")) {
392 return config_error_nonbool(key
);
393 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
395 add_instead_of(rewrite
, xstrdup(value
));
399 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
402 /* Handle remote.* variables */
403 if (!name
&& !strcmp(subkey
, "pushdefault"))
404 return git_config_string(&remote_state
->pushremote_name
, key
,
409 /* Handle remote.<name>.* variables */
411 warning(_("config remote shorthand cannot begin with '/': %s"),
415 remote
= make_remote(remote_state
, name
, namelen
);
416 remote
->origin
= REMOTE_CONFIG
;
417 if (kvi
->scope
== CONFIG_SCOPE_LOCAL
||
418 kvi
->scope
== CONFIG_SCOPE_WORKTREE
)
419 remote
->configured_in_repo
= 1;
420 if (!strcmp(subkey
, "mirror"))
421 remote
->mirror
= git_config_bool(key
, value
);
422 else if (!strcmp(subkey
, "skipdefaultupdate"))
423 remote
->skip_default_update
= git_config_bool(key
, value
);
424 else if (!strcmp(subkey
, "skipfetchall"))
425 remote
->skip_default_update
= git_config_bool(key
, value
);
426 else if (!strcmp(subkey
, "prune"))
427 remote
->prune
= git_config_bool(key
, value
);
428 else if (!strcmp(subkey
, "prunetags"))
429 remote
->prune_tags
= git_config_bool(key
, value
);
430 else if (!strcmp(subkey
, "url")) {
432 if (git_config_string(&v
, key
, value
))
435 } else if (!strcmp(subkey
, "pushurl")) {
437 if (git_config_string(&v
, key
, value
))
439 add_pushurl(remote
, v
);
440 } else if (!strcmp(subkey
, "push")) {
442 if (git_config_string(&v
, key
, value
))
444 refspec_append(&remote
->push
, v
);
446 } else if (!strcmp(subkey
, "fetch")) {
448 if (git_config_string(&v
, key
, value
))
450 refspec_append(&remote
->fetch
, v
);
452 } else if (!strcmp(subkey
, "receivepack")) {
454 if (git_config_string(&v
, key
, value
))
456 if (!remote
->receivepack
)
457 remote
->receivepack
= v
;
459 error(_("more than one receivepack given, using the first"));
460 } else if (!strcmp(subkey
, "uploadpack")) {
462 if (git_config_string(&v
, key
, value
))
464 if (!remote
->uploadpack
)
465 remote
->uploadpack
= v
;
467 error(_("more than one uploadpack given, using the first"));
468 } else if (!strcmp(subkey
, "tagopt")) {
469 if (!strcmp(value
, "--no-tags"))
470 remote
->fetch_tags
= -1;
471 else if (!strcmp(value
, "--tags"))
472 remote
->fetch_tags
= 2;
473 } else if (!strcmp(subkey
, "proxy")) {
474 return git_config_string((const char **)&remote
->http_proxy
,
476 } else if (!strcmp(subkey
, "proxyauthmethod")) {
477 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
479 } else if (!strcmp(subkey
, "vcs")) {
480 return git_config_string(&remote
->foreign_vcs
, key
, value
);
485 static void alias_all_urls(struct remote_state
*remote_state
)
488 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
489 int add_pushurl_aliases
;
490 if (!remote_state
->remotes
[i
])
492 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
493 remote_state
->remotes
[i
]->pushurl
[j
] =
494 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
495 &remote_state
->rewrites
);
497 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
498 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
499 if (add_pushurl_aliases
)
501 remote_state
, remote_state
->remotes
[i
],
502 remote_state
->remotes
[i
]->url
[j
]);
503 remote_state
->remotes
[i
]->url
[j
] =
504 alias_url(remote_state
->remotes
[i
]->url
[j
],
505 &remote_state
->rewrites
);
510 static void read_config(struct repository
*repo
, int early
)
514 if (repo
->remote_state
->initialized
)
516 repo
->remote_state
->initialized
= 1;
518 repo
->remote_state
->current_branch
= NULL
;
519 if (startup_info
->have_repository
&& !early
) {
520 const char *head_ref
= refs_resolve_ref_unsafe(
521 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
);
522 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
523 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
524 repo
->remote_state
->current_branch
= make_branch(
525 repo
->remote_state
, head_ref
, strlen(head_ref
));
528 repo_config(repo
, handle_config
, repo
->remote_state
);
529 alias_all_urls(repo
->remote_state
);
532 static int valid_remote_nick(const char *name
)
534 if (!name
[0] || is_dot_or_dotdot(name
))
537 /* remote nicknames cannot contain slashes */
539 if (is_dir_sep(*name
++))
544 static const char *remotes_remote_for_branch(struct remote_state
*remote_state
,
545 struct branch
*branch
,
548 if (branch
&& branch
->remote_name
) {
551 return branch
->remote_name
;
555 if (remote_state
->remotes_nr
== 1)
556 return remote_state
->remotes
[0]->name
;
560 const char *remote_for_branch(struct branch
*branch
, int *explicit)
562 read_config(the_repository
, 0);
563 die_on_missing_branch(the_repository
, branch
);
565 return remotes_remote_for_branch(the_repository
->remote_state
, branch
,
570 remotes_pushremote_for_branch(struct remote_state
*remote_state
,
571 struct branch
*branch
, int *explicit)
573 if (branch
&& branch
->pushremote_name
) {
576 return branch
->pushremote_name
;
578 if (remote_state
->pushremote_name
) {
581 return remote_state
->pushremote_name
;
583 return remotes_remote_for_branch(remote_state
, branch
, explicit);
586 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
588 read_config(the_repository
, 0);
589 die_on_missing_branch(the_repository
, branch
);
591 return remotes_pushremote_for_branch(the_repository
->remote_state
,
595 static struct remote
*remotes_remote_get(struct remote_state
*remote_state
,
598 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
600 read_config(the_repository
, 0);
601 die_on_missing_branch(the_repository
, branch
);
605 if (branch
->merge_nr
) {
606 return branch
->merge_name
[0];
610 *remote_name
= remotes_pushremote_for_branch(
611 the_repository
->remote_state
, branch
,
613 struct remote
*remote
= remotes_remote_get(
614 the_repository
->remote_state
, remote_name
);
616 if (remote
&& remote
->push
.nr
&&
617 (dst
= apply_refspecs(&remote
->push
,
626 static void validate_remote_url(struct remote
*remote
)
630 struct strbuf redacted
= STRBUF_INIT
;
633 if (git_config_get_string_tmp("transfer.credentialsinurl", &value
))
636 if (!strcmp("warn", value
))
638 else if (!strcmp("die", value
))
640 else if (!strcmp("allow", value
))
643 die(_("unrecognized value transfer.credentialsInUrl: '%s'"), value
);
645 for (i
= 0; i
< remote
->url_nr
; i
++) {
646 struct url_info url_info
= { 0 };
648 if (!url_normalize(remote
->url
[i
], &url_info
) ||
649 !url_info
.passwd_off
)
652 strbuf_reset(&redacted
);
653 strbuf_add(&redacted
, url_info
.url
, url_info
.passwd_off
);
654 strbuf_addstr(&redacted
, "<redacted>");
655 strbuf_addstr(&redacted
,
656 url_info
.url
+ url_info
.passwd_off
+ url_info
.passwd_len
);
659 warning(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
661 die(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
667 strbuf_release(&redacted
);
670 static struct remote
*
671 remotes_remote_get_1(struct remote_state
*remote_state
, const char *name
,
672 const char *(*get_default
)(struct remote_state
*,
673 struct branch
*, int *))
681 name
= get_default(remote_state
, remote_state
->current_branch
,
684 ret
= make_remote(remote_state
, name
, 0);
685 if (valid_remote_nick(name
) && have_git_dir()) {
686 if (!valid_remote(ret
))
687 read_remotes_file(remote_state
, ret
);
688 if (!valid_remote(ret
))
689 read_branches_file(remote_state
, ret
);
691 if (name_given
&& !valid_remote(ret
))
692 add_url_alias(remote_state
, ret
, name
);
693 if (!valid_remote(ret
))
696 validate_remote_url(ret
);
701 static inline struct remote
*
702 remotes_remote_get(struct remote_state
*remote_state
, const char *name
)
704 return remotes_remote_get_1(remote_state
, name
,
705 remotes_remote_for_branch
);
708 struct remote
*remote_get(const char *name
)
710 read_config(the_repository
, 0);
711 return remotes_remote_get(the_repository
->remote_state
, name
);
714 struct remote
*remote_get_early(const char *name
)
716 read_config(the_repository
, 1);
717 return remotes_remote_get(the_repository
->remote_state
, name
);
720 static inline struct remote
*
721 remotes_pushremote_get(struct remote_state
*remote_state
, const char *name
)
723 return remotes_remote_get_1(remote_state
, name
,
724 remotes_pushremote_for_branch
);
727 struct remote
*pushremote_get(const char *name
)
729 read_config(the_repository
, 0);
730 return remotes_pushremote_get(the_repository
->remote_state
, name
);
733 int remote_is_configured(struct remote
*remote
, int in_repo
)
738 return remote
->configured_in_repo
;
739 return !!remote
->origin
;
742 int for_each_remote(each_remote_fn fn
, void *priv
)
745 read_config(the_repository
, 0);
746 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
748 struct remote
*remote
=
749 the_repository
->remote_state
->remotes
[i
];
752 result
= fn(remote
, priv
);
757 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
759 if (strcmp(ref1
->name
, ref2
->name
)) {
760 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
761 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
762 die(_("Cannot fetch both %s and %s to %s"),
763 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
764 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
765 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
766 warning(_("%s usually tracks %s, not %s"),
767 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
768 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
769 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
770 die(_("%s tracks both %s and %s"),
771 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
774 * This last possibility doesn't occur because
775 * FETCH_HEAD_IGNORE entries always appear at
776 * the end of the list.
778 BUG("Internal error");
781 free(ref2
->peer_ref
);
785 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
787 struct string_list refs
= STRING_LIST_INIT_NODUP
;
788 struct ref
*retval
= NULL
;
789 struct ref
**p
= &retval
;
792 struct ref
*ref
= ref_map
;
794 ref_map
= ref_map
->next
;
797 if (!ref
->peer_ref
) {
801 struct string_list_item
*item
=
802 string_list_insert(&refs
, ref
->peer_ref
->name
);
805 /* Entry already existed */
806 handle_duplicate((struct ref
*)item
->util
, ref
);
815 string_list_clear(&refs
, 0);
819 int remote_has_url(struct remote
*remote
, const char *url
)
822 for (i
= 0; i
< remote
->url_nr
; i
++) {
823 if (!strcmp(remote
->url
[i
], url
))
829 static int match_name_with_pattern(const char *key
, const char *name
,
830 const char *value
, char **result
)
832 const char *kstar
= strchr(key
, '*');
838 die(_("key '%s' of pattern had no '*'"), key
);
840 ksuffixlen
= strlen(kstar
+ 1);
841 namelen
= strlen(name
);
842 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
843 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
845 struct strbuf sb
= STRBUF_INIT
;
846 const char *vstar
= strchr(value
, '*');
848 die(_("value '%s' of pattern has no '*'"), value
);
849 strbuf_add(&sb
, value
, vstar
- value
);
850 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
851 strbuf_addstr(&sb
, vstar
+ 1);
852 *result
= strbuf_detach(&sb
, NULL
);
857 static int refspec_match(const struct refspec_item
*refspec
,
860 if (refspec
->pattern
)
861 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
863 return !strcmp(refspec
->src
, name
);
866 int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
870 for (i
= 0; i
< rs
->nr
; i
++) {
871 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
877 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
881 for (tail
= &ref_map
; *tail
; ) {
882 struct ref
*ref
= *tail
;
884 if (omit_name_by_refspec(ref
->name
, rs
)) {
895 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
897 int i
, matched_negative
= 0;
898 int find_src
= !query
->src
;
899 struct string_list reversed
= STRING_LIST_INIT_DUP
;
900 const char *needle
= find_src
? query
->dst
: query
->src
;
903 * Check whether the queried ref matches any negative refpsec. If so,
904 * then we should ultimately treat this as not matching the query at
907 * Note that negative refspecs always match the source, but the query
908 * item uses the destination. To handle this, we apply pattern
909 * refspecs in reverse to figure out if the query source matches any
910 * of the negative refspecs.
912 * The first loop finds and expands all positive refspecs
913 * matched by the queried ref.
915 * The second loop checks if any of the results of the first loop
916 * match any negative refspec.
918 for (i
= 0; i
< rs
->nr
; i
++) {
919 struct refspec_item
*refspec
= &rs
->items
[i
];
922 if (refspec
->negative
)
925 /* Note the reversal of src and dst */
926 if (refspec
->pattern
) {
927 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
928 const char *value
= refspec
->src
;
930 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
931 string_list_append_nodup(&reversed
, expn_name
);
932 } else if (refspec
->matching
) {
933 /* For the special matching refspec, any query should match */
934 string_list_append(&reversed
, needle
);
935 } else if (!refspec
->src
) {
936 BUG("refspec->src should not be null here");
937 } else if (!strcmp(needle
, refspec
->src
)) {
938 string_list_append(&reversed
, refspec
->src
);
942 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
943 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
944 matched_negative
= 1;
947 string_list_clear(&reversed
, 0);
949 return matched_negative
;
952 static void query_refspecs_multiple(struct refspec
*rs
,
953 struct refspec_item
*query
,
954 struct string_list
*results
)
957 int find_src
= !query
->src
;
959 if (find_src
&& !query
->dst
)
960 BUG("query_refspecs_multiple: need either src or dst");
962 if (query_matches_negative_refspec(rs
, query
))
965 for (i
= 0; i
< rs
->nr
; i
++) {
966 struct refspec_item
*refspec
= &rs
->items
[i
];
967 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
968 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
969 const char *needle
= find_src
? query
->dst
: query
->src
;
970 char **result
= find_src
? &query
->src
: &query
->dst
;
972 if (!refspec
->dst
|| refspec
->negative
)
974 if (refspec
->pattern
) {
975 if (match_name_with_pattern(key
, needle
, value
, result
))
976 string_list_append_nodup(results
, *result
);
977 } else if (!strcmp(needle
, key
)) {
978 string_list_append(results
, value
);
983 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
986 int find_src
= !query
->src
;
987 const char *needle
= find_src
? query
->dst
: query
->src
;
988 char **result
= find_src
? &query
->src
: &query
->dst
;
990 if (find_src
&& !query
->dst
)
991 BUG("query_refspecs: need either src or dst");
993 if (query_matches_negative_refspec(rs
, query
))
996 for (i
= 0; i
< rs
->nr
; i
++) {
997 struct refspec_item
*refspec
= &rs
->items
[i
];
998 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
999 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
1001 if (!refspec
->dst
|| refspec
->negative
)
1003 if (refspec
->pattern
) {
1004 if (match_name_with_pattern(key
, needle
, value
, result
)) {
1005 query
->force
= refspec
->force
;
1008 } else if (!strcmp(needle
, key
)) {
1009 *result
= xstrdup(value
);
1010 query
->force
= refspec
->force
;
1017 char *apply_refspecs(struct refspec
*rs
, const char *name
)
1019 struct refspec_item query
;
1021 memset(&query
, 0, sizeof(struct refspec_item
));
1022 query
.src
= (char *)name
;
1024 if (query_refspecs(rs
, &query
))
1030 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
1032 return query_refspecs(&remote
->fetch
, refspec
);
1035 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
1038 size_t len
= strlen(name
);
1039 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
1040 memcpy(ref
->name
, prefix
, prefixlen
);
1041 memcpy(ref
->name
+ prefixlen
, name
, len
);
1045 struct ref
*alloc_ref(const char *name
)
1047 return alloc_ref_with_prefix("", 0, name
);
1050 struct ref
*copy_ref(const struct ref
*ref
)
1056 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
1058 memcpy(cpy
, ref
, len
);
1060 cpy
->symref
= xstrdup_or_null(ref
->symref
);
1061 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
1062 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
1066 struct ref
*copy_ref_list(const struct ref
*ref
)
1068 struct ref
*ret
= NULL
;
1069 struct ref
**tail
= &ret
;
1071 *tail
= copy_ref(ref
);
1073 tail
= &((*tail
)->next
);
1078 void free_one_ref(struct ref
*ref
)
1082 free_one_ref(ref
->peer_ref
);
1083 free(ref
->remote_status
);
1088 void free_refs(struct ref
*ref
)
1098 int count_refspec_match(const char *pattern
,
1100 struct ref
**matched_ref
)
1102 int patlen
= strlen(pattern
);
1103 struct ref
*matched_weak
= NULL
;
1104 struct ref
*matched
= NULL
;
1108 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1109 char *name
= refs
->name
;
1110 int namelen
= strlen(name
);
1112 if (!refname_match(pattern
, name
))
1115 /* A match is "weak" if it is with refs outside
1116 * heads or tags, and did not specify the pattern
1117 * in full (e.g. "refs/remotes/origin/master") or at
1118 * least from the toplevel (e.g. "remotes/origin/master");
1119 * otherwise "git push $URL master" would result in
1120 * ambiguity between remotes/origin/master and heads/master
1121 * at the remote site.
1123 if (namelen
!= patlen
&&
1124 patlen
!= namelen
- 5 &&
1125 !starts_with(name
, "refs/heads/") &&
1126 !starts_with(name
, "refs/tags/")) {
1127 /* We want to catch the case where only weak
1128 * matches are found and there are multiple
1129 * matches, and where more than one strong
1130 * matches are found, as ambiguous. One
1131 * strong match with zero or more weak matches
1132 * are acceptable as a unique match.
1134 matched_weak
= refs
;
1144 *matched_ref
= matched_weak
;
1149 *matched_ref
= matched
;
1154 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1162 static struct ref
*alloc_delete_ref(void)
1164 struct ref
*ref
= alloc_ref("(delete)");
1165 oidclr(&ref
->new_oid
);
1169 static int try_explicit_object_name(const char *name
,
1172 struct object_id oid
;
1176 *match
= alloc_delete_ref();
1180 if (repo_get_oid(the_repository
, name
, &oid
))
1184 *match
= alloc_ref(name
);
1185 oidcpy(&(*match
)->new_oid
, &oid
);
1190 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1192 struct ref
*ret
= alloc_ref(name
);
1193 tail_link_ref(ret
, tail
);
1197 static char *guess_ref(const char *name
, struct ref
*peer
)
1199 struct strbuf buf
= STRBUF_INIT
;
1201 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1206 if (starts_with(r
, "refs/heads/")) {
1207 strbuf_addstr(&buf
, "refs/heads/");
1208 } else if (starts_with(r
, "refs/tags/")) {
1209 strbuf_addstr(&buf
, "refs/tags/");
1214 strbuf_addstr(&buf
, name
);
1215 return strbuf_detach(&buf
, NULL
);
1218 static int match_explicit_lhs(struct ref
*src
,
1219 struct refspec_item
*rs
,
1221 int *allocated_match
)
1223 switch (count_refspec_match(rs
->src
, src
, match
)) {
1225 if (allocated_match
)
1226 *allocated_match
= 0;
1229 /* The source could be in the get_sha1() format
1230 * not a reference name. :refs/other is a
1231 * way to delete 'other' ref at the remote end.
1233 if (try_explicit_object_name(rs
->src
, match
) < 0)
1234 return error(_("src refspec %s does not match any"), rs
->src
);
1235 if (allocated_match
)
1236 *allocated_match
= 1;
1239 return error(_("src refspec %s matches more than one"), rs
->src
);
1243 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1244 const char *matched_src_name
)
1246 struct object_id oid
;
1247 enum object_type type
;
1250 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1251 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1254 error(_("The destination you provided is not a full refname (i.e.,\n"
1255 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1257 "- Looking for a ref that matches '%s' on the remote side.\n"
1258 "- Checking if the <src> being pushed ('%s')\n"
1259 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1260 " refs/{heads,tags}/ prefix on the remote side.\n"
1262 "Neither worked, so we gave up. You must fully qualify the ref."),
1263 dst_value
, matched_src_name
);
1265 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1268 if (repo_get_oid(the_repository
, matched_src_name
, &oid
))
1269 BUG("'%s' is not a valid object, "
1270 "match_explicit_lhs() should catch this!",
1272 type
= oid_object_info(the_repository
, &oid
, NULL
);
1273 if (type
== OBJ_COMMIT
) {
1274 advise(_("The <src> part of the refspec is a commit object.\n"
1275 "Did you mean to create a new branch by pushing to\n"
1276 "'%s:refs/heads/%s'?"),
1277 matched_src_name
, dst_value
);
1278 } else if (type
== OBJ_TAG
) {
1279 advise(_("The <src> part of the refspec is a tag object.\n"
1280 "Did you mean to create a new tag by pushing to\n"
1281 "'%s:refs/tags/%s'?"),
1282 matched_src_name
, dst_value
);
1283 } else if (type
== OBJ_TREE
) {
1284 advise(_("The <src> part of the refspec is a tree object.\n"
1285 "Did you mean to tag a new tree by pushing to\n"
1286 "'%s:refs/tags/%s'?"),
1287 matched_src_name
, dst_value
);
1288 } else if (type
== OBJ_BLOB
) {
1289 advise(_("The <src> part of the refspec is a blob object.\n"
1290 "Did you mean to tag a new blob by pushing to\n"
1291 "'%s:refs/tags/%s'?"),
1292 matched_src_name
, dst_value
);
1294 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1295 matched_src_name
, type
);
1299 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1300 struct ref
***dst_tail
,
1301 struct refspec_item
*rs
)
1303 struct ref
*matched_src
, *matched_dst
;
1306 const char *dst_value
= rs
->dst
;
1309 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1312 matched_src
= matched_dst
= NULL
;
1313 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1319 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1320 RESOLVE_REF_READING
,
1323 ((flag
& REF_ISSYMREF
) &&
1324 !starts_with(dst_value
, "refs/heads/")))
1325 die(_("%s cannot be resolved to branch"),
1329 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1333 if (starts_with(dst_value
, "refs/")) {
1334 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1335 } else if (is_null_oid(&matched_src
->new_oid
)) {
1336 error(_("unable to delete '%s': remote ref does not exist"),
1338 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1339 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1342 show_push_unqualified_ref_name_error(dst_value
,
1348 error(_("dst refspec %s matches more than one"),
1354 if (matched_dst
->peer_ref
)
1355 return error(_("dst ref %s receives from more than one src"),
1358 matched_dst
->peer_ref
= allocated_src
?
1360 copy_ref(matched_src
);
1361 matched_dst
->force
= rs
->force
;
1366 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1367 struct ref
***dst_tail
, struct refspec
*rs
)
1370 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1371 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1375 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1376 int send_mirror
, int direction
,
1377 const struct refspec_item
**ret_pat
)
1379 const struct refspec_item
*pat
;
1382 int matching_refs
= -1;
1383 for (i
= 0; i
< rs
->nr
; i
++) {
1384 const struct refspec_item
*item
= &rs
->items
[i
];
1389 if (item
->matching
&&
1390 (matching_refs
== -1 || item
->force
)) {
1395 if (item
->pattern
) {
1396 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1398 if (direction
== FROM_SRC
)
1399 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1401 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1408 if (matching_refs
== -1)
1411 pat
= &rs
->items
[matching_refs
];
1412 if (pat
->matching
) {
1414 * "matching refs"; traditionally we pushed everything
1415 * including refs outside refs/heads/ hierarchy, but
1416 * that does not make much sense these days.
1418 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1420 name
= xstrdup(ref
->name
);
1427 static struct ref
**tail_ref(struct ref
**head
)
1429 struct ref
**tail
= head
;
1431 tail
= &((*tail
)->next
);
1436 struct commit
**tip
;
1440 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1442 struct commit
*commit
;
1444 if (is_null_oid(oid
))
1446 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1447 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1449 commit
->object
.flags
|= TMP_MARK
;
1450 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1451 tips
->tip
[tips
->nr
++] = commit
;
1454 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1456 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1457 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1458 struct string_list_item
*item
;
1460 struct tips sent_tips
;
1463 * Collect everything we know they would have at the end of
1464 * this push, and collect all tags they have.
1466 memset(&sent_tips
, 0, sizeof(sent_tips
));
1467 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1468 if (ref
->peer_ref
&&
1469 !is_null_oid(&ref
->peer_ref
->new_oid
))
1470 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1472 add_to_tips(&sent_tips
, &ref
->old_oid
);
1473 if (starts_with(ref
->name
, "refs/tags/"))
1474 string_list_append(&dst_tag
, ref
->name
);
1476 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1478 string_list_sort(&dst_tag
);
1480 /* Collect tags they do not have. */
1481 for (ref
= src
; ref
; ref
= ref
->next
) {
1482 if (!starts_with(ref
->name
, "refs/tags/"))
1483 continue; /* not a tag */
1484 if (string_list_has_string(&dst_tag
, ref
->name
))
1485 continue; /* they already have it */
1486 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1487 continue; /* be conservative */
1488 item
= string_list_append(&src_tag
, ref
->name
);
1491 string_list_clear(&dst_tag
, 0);
1494 * At this point, src_tag lists tags that are missing from
1495 * dst, and sent_tips lists the tips we are pushing or those
1496 * that we know they already have. An element in the src_tag
1497 * that is an ancestor of any of the sent_tips needs to be
1498 * sent to the other side.
1501 const int reachable_flag
= 1;
1502 struct commit_list
*found_commits
;
1503 struct commit
**src_commits
;
1504 int nr_src_commits
= 0, alloc_src_commits
= 16;
1505 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1507 for_each_string_list_item(item
, &src_tag
) {
1508 struct ref
*ref
= item
->util
;
1509 struct commit
*commit
;
1511 if (is_null_oid(&ref
->new_oid
))
1513 commit
= lookup_commit_reference_gently(the_repository
,
1517 /* not pushing a commit, which is not an error */
1520 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1521 src_commits
[nr_src_commits
++] = commit
;
1524 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1525 src_commits
, nr_src_commits
,
1528 for_each_string_list_item(item
, &src_tag
) {
1529 struct ref
*dst_ref
;
1530 struct ref
*ref
= item
->util
;
1531 struct commit
*commit
;
1533 if (is_null_oid(&ref
->new_oid
))
1535 commit
= lookup_commit_reference_gently(the_repository
,
1539 /* not pushing a commit, which is not an error */
1543 * Is this tag, which they do not have, reachable from
1544 * any of the commits we are sending?
1546 if (!(commit
->object
.flags
& reachable_flag
))
1550 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1551 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1552 dst_ref
->peer_ref
= copy_ref(ref
);
1555 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1557 free_commit_list(found_commits
);
1560 string_list_clear(&src_tag
, 0);
1561 free(sent_tips
.tip
);
1564 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1566 for ( ; list
; list
= list
->next
)
1567 if (!strcmp(list
->name
, name
))
1568 return (struct ref
*)list
;
1572 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1574 for ( ; ref
; ref
= ref
->next
)
1575 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1577 string_list_sort(ref_index
);
1581 * Given only the set of local refs, sanity-check the set of push
1582 * refspecs. We can't catch all errors that match_push_refs would,
1583 * but we can catch some errors early before even talking to the
1586 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1591 for (i
= 0; i
< rs
->nr
; i
++) {
1592 struct refspec_item
*item
= &rs
->items
[i
];
1594 if (item
->pattern
|| item
->matching
|| item
->negative
)
1597 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1604 * Given the set of refs the local repository has, the set of refs the
1605 * remote repository has, and the refspec used for push, determine
1606 * what remote refs we will update and with what value by setting
1607 * peer_ref (which object is being pushed) and force (if the push is
1608 * forced) in elements of "dst". The function may add new elements to
1609 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1611 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1612 struct refspec
*rs
, int flags
)
1614 int send_all
= flags
& MATCH_REFS_ALL
;
1615 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1616 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1618 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1619 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1621 /* If no refspec is provided, use the default ":" */
1623 refspec_append(rs
, ":");
1625 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1627 /* pick the remainder */
1628 for (ref
= src
; ref
; ref
= ref
->next
) {
1629 struct string_list_item
*dst_item
;
1630 struct ref
*dst_peer
;
1631 const struct refspec_item
*pat
= NULL
;
1634 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1638 if (!dst_ref_index
.nr
)
1639 prepare_ref_index(&dst_ref_index
, *dst
);
1641 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1642 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1644 if (dst_peer
->peer_ref
)
1645 /* We're already sending something to this ref. */
1648 if (pat
->matching
&& !(send_all
|| send_mirror
))
1650 * Remote doesn't have it, and we have no
1651 * explicit pattern, and we don't have
1652 * --all or --mirror.
1656 /* Create a new one and link it */
1657 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1658 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1659 string_list_insert(&dst_ref_index
,
1660 dst_peer
->name
)->util
= dst_peer
;
1662 dst_peer
->peer_ref
= copy_ref(ref
);
1663 dst_peer
->force
= pat
->force
;
1668 string_list_clear(&dst_ref_index
, 0);
1670 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1671 add_missing_tags(src
, dst
, &dst_tail
);
1674 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1675 /* check for missing refs on the remote */
1676 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1680 /* We're already sending something to this ref. */
1683 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1685 if (!src_ref_index
.nr
)
1686 prepare_ref_index(&src_ref_index
, src
);
1687 if (!string_list_has_string(&src_ref_index
,
1689 ref
->peer_ref
= alloc_delete_ref();
1693 string_list_clear(&src_ref_index
, 0);
1696 *dst
= apply_negative_refspecs(*dst
, rs
);
1703 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1708 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1709 int force_ref_update
= ref
->force
|| force_update
;
1710 int reject_reason
= 0;
1713 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1714 else if (!send_mirror
)
1717 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1718 if (!ref
->deletion
&&
1719 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1720 ref
->status
= REF_STATUS_UPTODATE
;
1725 * If the remote ref has moved and is now different
1726 * from what we expect, reject any push.
1728 * It also is an error if the user told us to check
1729 * with the remote-tracking branch to find the value
1730 * to expect, but we did not have such a tracking
1733 * If the tip of the remote-tracking ref is unreachable
1734 * from any reflog entry of its local ref indicating a
1735 * possible update since checkout; reject the push.
1737 if (ref
->expect_old_sha1
) {
1738 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1739 reject_reason
= REF_STATUS_REJECT_STALE
;
1740 else if (ref
->check_reachable
&& ref
->unreachable
)
1742 REF_STATUS_REJECT_REMOTE_UPDATED
;
1745 * If the ref isn't stale, and is reachable
1746 * from one of the reflog entries of
1747 * the local branch, force the update.
1749 force_ref_update
= 1;
1753 * If the update isn't already rejected then check
1754 * the usual "must fast-forward" rules.
1756 * Decide whether an individual refspec A:B can be
1757 * pushed. The push will succeed if any of the
1758 * following are true:
1760 * (1) the remote reference B does not exist
1762 * (2) the remote reference B is being removed (i.e.,
1763 * pushing :B where no source is specified)
1765 * (3) the destination is not under refs/tags/, and
1766 * if the old and new value is a commit, the new
1767 * is a descendant of the old.
1769 * (4) it is forced using the +A:B notation, or by
1770 * passing the --force argument
1773 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1774 if (starts_with(ref
->name
, "refs/tags/"))
1775 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1776 else if (!repo_has_object_file(the_repository
, &ref
->old_oid
))
1777 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1778 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1779 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1780 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1781 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1782 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1786 * "--force" will defeat any rejection implemented
1787 * by the rules above.
1789 if (!force_ref_update
)
1790 ref
->status
= reject_reason
;
1791 else if (reject_reason
)
1792 ref
->forced_update
= 1;
1796 static void set_merge(struct remote_state
*remote_state
, struct branch
*ret
)
1798 struct remote
*remote
;
1800 struct object_id oid
;
1804 return; /* no branch */
1806 return; /* already run */
1807 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1809 * no merge config; let's make sure we don't confuse callers
1810 * with a non-zero merge_nr but a NULL merge
1816 remote
= remotes_remote_get(remote_state
, ret
->remote_name
);
1818 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1819 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1820 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1821 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1822 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1823 strcmp(ret
->remote_name
, "."))
1825 if (repo_dwim_ref(the_repository
, ret
->merge_name
[i
],
1826 strlen(ret
->merge_name
[i
]), &oid
, &ref
,
1828 ret
->merge
[i
]->dst
= ref
;
1830 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1834 struct branch
*branch_get(const char *name
)
1838 read_config(the_repository
, 0);
1839 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1840 ret
= the_repository
->remote_state
->current_branch
;
1842 ret
= make_branch(the_repository
->remote_state
, name
,
1844 set_merge(the_repository
->remote_state
, ret
);
1848 int branch_has_merge_config(struct branch
*branch
)
1850 return branch
&& !!branch
->merge
;
1853 int branch_merge_matches(struct branch
*branch
,
1855 const char *refname
)
1857 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1859 return refname_match(branch
->merge
[i
]->src
, refname
);
1862 __attribute__((format (printf
,2,3)))
1863 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1868 strbuf_vaddf(err
, fmt
, ap
);
1874 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1877 return error_buf(err
, _("HEAD does not point to a branch"));
1879 if (!branch
->merge
|| !branch
->merge
[0]) {
1881 * no merge config; is it because the user didn't define any,
1882 * or because it is not a real branch, and get_branch
1885 if (!ref_exists(branch
->refname
))
1886 return error_buf(err
, _("no such branch: '%s'"),
1888 return error_buf(err
,
1889 _("no upstream configured for branch '%s'"),
1893 if (!branch
->merge
[0]->dst
)
1894 return error_buf(err
,
1895 _("upstream branch '%s' not stored as a remote-tracking branch"),
1896 branch
->merge
[0]->src
);
1898 return branch
->merge
[0]->dst
;
1901 static const char *tracking_for_push_dest(struct remote
*remote
,
1902 const char *refname
,
1907 ret
= apply_refspecs(&remote
->fetch
, refname
);
1909 return error_buf(err
,
1910 _("push destination '%s' on remote '%s' has no local tracking branch"),
1911 refname
, remote
->name
);
1915 static const char *branch_get_push_1(struct remote_state
*remote_state
,
1916 struct branch
*branch
, struct strbuf
*err
)
1918 struct remote
*remote
;
1920 remote
= remotes_remote_get(
1922 remotes_pushremote_for_branch(remote_state
, branch
, NULL
));
1924 return error_buf(err
,
1925 _("branch '%s' has no remote for pushing"),
1928 if (remote
->push
.nr
) {
1932 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1934 return error_buf(err
,
1935 _("push refspecs for '%s' do not include '%s'"),
1936 remote
->name
, branch
->name
);
1938 ret
= tracking_for_push_dest(remote
, dst
, err
);
1944 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1946 switch (push_default
) {
1947 case PUSH_DEFAULT_NOTHING
:
1948 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1950 case PUSH_DEFAULT_MATCHING
:
1951 case PUSH_DEFAULT_CURRENT
:
1952 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1954 case PUSH_DEFAULT_UPSTREAM
:
1955 return branch_get_upstream(branch
, err
);
1957 case PUSH_DEFAULT_UNSPECIFIED
:
1958 case PUSH_DEFAULT_SIMPLE
:
1960 const char *up
, *cur
;
1962 up
= branch_get_upstream(branch
, err
);
1965 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1968 if (strcmp(cur
, up
))
1969 return error_buf(err
,
1970 _("cannot resolve 'simple' push to a single destination"));
1975 BUG("unhandled push situation");
1978 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1980 read_config(the_repository
, 0);
1981 die_on_missing_branch(the_repository
, branch
);
1984 return error_buf(err
, _("HEAD does not point to a branch"));
1986 if (!branch
->push_tracking_ref
)
1987 branch
->push_tracking_ref
= branch_get_push_1(
1988 the_repository
->remote_state
, branch
, err
);
1989 return branch
->push_tracking_ref
;
1992 static int ignore_symref_update(const char *refname
, struct strbuf
*scratch
)
1994 return !refs_read_symbolic_ref(get_main_ref_store(the_repository
), refname
, scratch
);
1998 * Create and return a list of (struct ref) consisting of copies of
1999 * each remote_ref that matches refspec. refspec must be a pattern.
2000 * Fill in the copies' peer_ref to describe the local tracking refs to
2001 * which they map. Omit any references that would map to an existing
2002 * local symbolic ref.
2004 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
2005 const struct refspec_item
*refspec
)
2007 struct strbuf scratch
= STRBUF_INIT
;
2008 const struct ref
*ref
;
2009 struct ref
*ret
= NULL
;
2010 struct ref
**tail
= &ret
;
2012 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2013 char *expn_name
= NULL
;
2015 strbuf_reset(&scratch
);
2017 if (strchr(ref
->name
, '^'))
2018 continue; /* a dereference item */
2019 if (match_name_with_pattern(refspec
->src
, ref
->name
,
2020 refspec
->dst
, &expn_name
) &&
2021 !ignore_symref_update(expn_name
, &scratch
)) {
2022 struct ref
*cpy
= copy_ref(ref
);
2024 cpy
->peer_ref
= alloc_ref(expn_name
);
2026 cpy
->peer_ref
->force
= 1;
2033 strbuf_release(&scratch
);
2037 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
2039 const struct ref
*ref
;
2040 const struct ref
*best_match
= NULL
;
2043 for (ref
= refs
; ref
; ref
= ref
->next
) {
2044 int score
= refname_match(name
, ref
->name
);
2046 if (best_score
< score
) {
2054 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
2056 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
2061 return copy_ref(ref
);
2064 static struct ref
*get_local_ref(const char *name
)
2066 if (!name
|| name
[0] == '\0')
2069 if (starts_with(name
, "refs/"))
2070 return alloc_ref(name
);
2072 if (starts_with(name
, "heads/") ||
2073 starts_with(name
, "tags/") ||
2074 starts_with(name
, "remotes/"))
2075 return alloc_ref_with_prefix("refs/", 5, name
);
2077 return alloc_ref_with_prefix("refs/heads/", 11, name
);
2080 int get_fetch_map(const struct ref
*remote_refs
,
2081 const struct refspec_item
*refspec
,
2085 struct ref
*ref_map
, **rmp
;
2087 if (refspec
->negative
)
2090 if (refspec
->pattern
) {
2091 ref_map
= get_expanded_map(remote_refs
, refspec
);
2093 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
2095 if (refspec
->exact_sha1
) {
2096 ref_map
= alloc_ref(name
);
2097 get_oid_hex(name
, &ref_map
->old_oid
);
2098 ref_map
->exact_oid
= 1;
2100 ref_map
= get_remote_ref(remote_refs
, name
);
2102 if (!missing_ok
&& !ref_map
)
2103 die(_("couldn't find remote ref %s"), name
);
2105 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
2106 if (ref_map
->peer_ref
&& refspec
->force
)
2107 ref_map
->peer_ref
->force
= 1;
2111 for (rmp
= &ref_map
; *rmp
; ) {
2112 if ((*rmp
)->peer_ref
) {
2113 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
2114 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
2115 struct ref
*ignore
= *rmp
;
2116 error(_("* Ignoring funny ref '%s' locally"),
2117 (*rmp
)->peer_ref
->name
);
2118 *rmp
= (*rmp
)->next
;
2119 free(ignore
->peer_ref
);
2124 rmp
= &((*rmp
)->next
);
2128 tail_link_ref(ref_map
, tail
);
2133 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
2137 for (; list
; list
= list
->next
)
2138 if (!strcmp(ref
->symref
, list
->name
)) {
2139 oidcpy(&ref
->old_oid
, &list
->old_oid
);
2146 * Compute the commit ahead/behind values for the pair branch_name, base.
2148 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2149 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2150 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2153 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2154 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2155 * commits are different.
2158 static int stat_branch_pair(const char *branch_name
, const char *base
,
2159 int *num_ours
, int *num_theirs
,
2160 enum ahead_behind_flags abf
)
2162 struct object_id oid
;
2163 struct commit
*ours
, *theirs
;
2164 struct rev_info revs
;
2165 struct setup_revision_opt opt
= {
2166 .free_removed_argv_elements
= 1,
2168 struct strvec argv
= STRVEC_INIT
;
2170 /* Cannot stat if what we used to build on no longer exists */
2171 if (read_ref(base
, &oid
))
2173 theirs
= lookup_commit_reference(the_repository
, &oid
);
2177 if (read_ref(branch_name
, &oid
))
2179 ours
= lookup_commit_reference(the_repository
, &oid
);
2183 *num_theirs
= *num_ours
= 0;
2185 /* are we the same? */
2188 if (abf
== AHEAD_BEHIND_QUICK
)
2190 if (abf
!= AHEAD_BEHIND_FULL
)
2191 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2193 /* Run "rev-list --left-right ours...theirs" internally... */
2194 strvec_push(&argv
, ""); /* ignored */
2195 strvec_push(&argv
, "--left-right");
2196 strvec_pushf(&argv
, "%s...%s",
2197 oid_to_hex(&ours
->object
.oid
),
2198 oid_to_hex(&theirs
->object
.oid
));
2199 strvec_push(&argv
, "--");
2201 repo_init_revisions(the_repository
, &revs
, NULL
);
2202 setup_revisions(argv
.nr
, argv
.v
, &revs
, &opt
);
2203 if (prepare_revision_walk(&revs
))
2204 die(_("revision walk setup failed"));
2206 /* ... and count the commits on each side. */
2208 struct commit
*c
= get_revision(&revs
);
2211 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2217 /* clear object flags smudged by the above traversal */
2218 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2219 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2221 strvec_clear(&argv
);
2222 release_revisions(&revs
);
2227 * Lookup the tracking branch for the given branch and if present, optionally
2228 * compute the commit ahead/behind values for the pair.
2230 * If for_push is true, the tracking branch refers to the push branch,
2231 * otherwise it refers to the upstream branch.
2233 * The name of the tracking branch (or NULL if it is not defined) is
2234 * returned via *tracking_name, if it is not itself NULL.
2236 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2237 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2238 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2241 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2242 * upstream defined, or ref does not exist). Returns 0 if the commits are
2243 * identical. Returns 1 if commits are different.
2245 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2246 const char **tracking_name
, int for_push
,
2247 enum ahead_behind_flags abf
)
2251 /* Cannot stat unless we are marked to build on top of somebody else. */
2252 base
= for_push
? branch_get_push(branch
, NULL
) :
2253 branch_get_upstream(branch
, NULL
);
2255 *tracking_name
= base
;
2259 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2263 * Return true when there is anything to report, otherwise false.
2265 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2266 enum ahead_behind_flags abf
,
2267 int show_divergence_advice
)
2269 int ours
, theirs
, sti
;
2270 const char *full_base
;
2272 int upstream_is_gone
= 0;
2274 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2278 upstream_is_gone
= 1;
2281 base
= shorten_unambiguous_ref(full_base
, 0);
2282 if (upstream_is_gone
) {
2284 _("Your branch is based on '%s', but the upstream is gone.\n"),
2286 if (advice_enabled(ADVICE_STATUS_HINTS
))
2288 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2291 _("Your branch is up to date with '%s'.\n"),
2293 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2295 _("Your branch and '%s' refer to different commits.\n"),
2297 if (advice_enabled(ADVICE_STATUS_HINTS
))
2298 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2299 "git status --ahead-behind");
2300 } else if (!theirs
) {
2302 Q_("Your branch is ahead of '%s' by %d commit.\n",
2303 "Your branch is ahead of '%s' by %d commits.\n",
2306 if (advice_enabled(ADVICE_STATUS_HINTS
))
2308 _(" (use \"git push\" to publish your local commits)\n"));
2311 Q_("Your branch is behind '%s' by %d commit, "
2312 "and can be fast-forwarded.\n",
2313 "Your branch is behind '%s' by %d commits, "
2314 "and can be fast-forwarded.\n",
2317 if (advice_enabled(ADVICE_STATUS_HINTS
))
2319 _(" (use \"git pull\" to update your local branch)\n"));
2322 Q_("Your branch and '%s' have diverged,\n"
2323 "and have %d and %d different commit each, "
2325 "Your branch and '%s' have diverged,\n"
2326 "and have %d and %d different commits each, "
2329 base
, ours
, theirs
);
2330 if (show_divergence_advice
&&
2331 advice_enabled(ADVICE_STATUS_HINTS
))
2333 _(" (use \"git pull\" if you want to integrate the remote branch with yours)\n"));
2339 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2343 struct ref
***local_tail
= cb_data
;
2346 /* we already know it starts with refs/ to get here */
2347 if (check_refname_format(refname
+ 5, 0))
2350 ref
= alloc_ref(refname
);
2351 oidcpy(&ref
->new_oid
, oid
);
2353 *local_tail
= &ref
->next
;
2357 struct ref
*get_local_heads(void)
2359 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2361 for_each_ref(one_local_ref
, &local_tail
);
2365 struct ref
*guess_remote_head(const struct ref
*head
,
2366 const struct ref
*refs
,
2369 const struct ref
*r
;
2370 struct ref
*list
= NULL
;
2371 struct ref
**tail
= &list
;
2377 * Some transports support directly peeking at
2378 * where HEAD points; if that is the case, then
2379 * we don't have to guess.
2382 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2384 /* If a remote branch exists with the default branch name, let's use it. */
2386 char *ref
= xstrfmt("refs/heads/%s",
2387 git_default_branch_name(0));
2389 r
= find_ref_by_name(refs
, ref
);
2391 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2394 /* Fall back to the hard-coded historical default */
2395 r
= find_ref_by_name(refs
, "refs/heads/master");
2396 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2400 /* Look for another ref that points there */
2401 for (r
= refs
; r
; r
= r
->next
) {
2403 starts_with(r
->name
, "refs/heads/") &&
2404 oideq(&r
->old_oid
, &head
->old_oid
)) {
2405 *tail
= copy_ref(r
);
2406 tail
= &((*tail
)->next
);
2415 struct stale_heads_info
{
2416 struct string_list
*ref_names
;
2417 struct ref
**stale_refs_tail
;
2421 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2422 int flags
, void *cb_data
)
2424 struct stale_heads_info
*info
= cb_data
;
2425 struct string_list matches
= STRING_LIST_INIT_DUP
;
2426 struct refspec_item query
;
2428 memset(&query
, 0, sizeof(struct refspec_item
));
2429 query
.dst
= (char *)refname
;
2431 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2432 if (matches
.nr
== 0)
2433 goto clean_exit
; /* No matches */
2436 * If we did find a suitable refspec and it's not a symref and
2437 * it's not in the list of refs that currently exist in that
2438 * remote, we consider it to be stale. In order to deal with
2439 * overlapping refspecs, we need to go over all of the
2442 if (flags
& REF_ISSYMREF
)
2445 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2446 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2450 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2451 oidcpy(&ref
->new_oid
, oid
);
2455 string_list_clear(&matches
, 0);
2459 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2461 struct ref
*ref
, *stale_refs
= NULL
;
2462 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2463 struct stale_heads_info info
;
2465 info
.ref_names
= &ref_names
;
2466 info
.stale_refs_tail
= &stale_refs
;
2468 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2469 string_list_append(&ref_names
, ref
->name
);
2470 string_list_sort(&ref_names
);
2471 for_each_ref(get_stale_heads_cb
, &info
);
2472 string_list_clear(&ref_names
, 0);
2479 static void clear_cas_option(struct push_cas_option
*cas
)
2483 for (i
= 0; i
< cas
->nr
; i
++)
2484 free(cas
->entry
[i
].refname
);
2486 memset(cas
, 0, sizeof(*cas
));
2489 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2490 const char *refname
,
2493 struct push_cas
*entry
;
2494 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2495 entry
= &cas
->entry
[cas
->nr
++];
2496 memset(entry
, 0, sizeof(*entry
));
2497 entry
->refname
= xmemdupz(refname
, refnamelen
);
2501 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2504 struct push_cas
*entry
;
2507 /* "--no-<option>" */
2508 clear_cas_option(cas
);
2513 /* just "--<option>" */
2514 cas
->use_tracking_for_rest
= 1;
2518 /* "--<option>=refname" or "--<option>=refname:value" */
2519 colon
= strchrnul(arg
, ':');
2520 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2522 entry
->use_tracking
= 1;
2524 oidclr(&entry
->expect
);
2525 else if (repo_get_oid(the_repository
, colon
+ 1, &entry
->expect
))
2526 return error(_("cannot parse expected object name '%s'"),
2531 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2533 return parse_push_cas_option(opt
->value
, arg
, unset
);
2536 int is_empty_cas(const struct push_cas_option
*cas
)
2538 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2542 * Look at remote.fetch refspec and see if we have a remote
2543 * tracking branch for the refname there. Fill the name of
2544 * the remote-tracking branch in *dst_refname, and the name
2545 * of the commit object at its tip in oid[].
2546 * If we cannot do so, return negative to signal an error.
2548 static int remote_tracking(struct remote
*remote
, const char *refname
,
2549 struct object_id
*oid
, char **dst_refname
)
2553 dst
= apply_refspecs(&remote
->fetch
, refname
);
2555 return -1; /* no tracking ref for refname at remote */
2556 if (read_ref(dst
, oid
))
2557 return -1; /* we know what the tracking ref is but we cannot read it */
2564 * The struct "reflog_commit_array" and related helper functions
2565 * are used for collecting commits into an array during reflog
2566 * traversals in "check_and_collect_until()".
2568 struct reflog_commit_array
{
2569 struct commit
**item
;
2573 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2575 /* Append a commit to the array. */
2576 static void append_commit(struct reflog_commit_array
*arr
,
2577 struct commit
*commit
)
2579 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2580 arr
->item
[arr
->nr
++] = commit
;
2583 /* Free and reset the array. */
2584 static void free_commit_array(struct reflog_commit_array
*arr
)
2586 FREE_AND_NULL(arr
->item
);
2587 arr
->nr
= arr
->alloc
= 0;
2590 struct check_and_collect_until_cb_data
{
2591 struct commit
*remote_commit
;
2592 struct reflog_commit_array
*local_commits
;
2593 timestamp_t remote_reflog_timestamp
;
2596 /* Get the timestamp of the latest entry. */
2597 static int peek_reflog(struct object_id
*o_oid UNUSED
,
2598 struct object_id
*n_oid UNUSED
,
2599 const char *ident UNUSED
,
2600 timestamp_t timestamp
, int tz UNUSED
,
2601 const char *message UNUSED
, void *cb_data
)
2603 timestamp_t
*ts
= cb_data
;
2608 static int check_and_collect_until(struct object_id
*o_oid UNUSED
,
2609 struct object_id
*n_oid
,
2610 const char *ident UNUSED
,
2611 timestamp_t timestamp
, int tz UNUSED
,
2612 const char *message UNUSED
, void *cb_data
)
2614 struct commit
*commit
;
2615 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2617 /* An entry was found. */
2618 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2621 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2622 append_commit(cb
->local_commits
, commit
);
2625 * If the reflog entry timestamp is older than the remote ref's
2626 * latest reflog entry, there is no need to check or collect
2627 * entries older than this one.
2629 if (timestamp
< cb
->remote_reflog_timestamp
)
2635 #define MERGE_BASES_BATCH_SIZE 8
2638 * Iterate through the reflog of the local ref to check if there is an entry
2639 * for the given remote-tracking ref; runs until the timestamp of an entry is
2640 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2641 * are that seen along the way are collected into an array to check if the
2642 * remote-tracking ref is reachable from any of them.
2644 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2647 struct commit
*commit
;
2648 struct commit
**chunk
;
2649 struct check_and_collect_until_cb_data cb
;
2650 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2654 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2656 goto cleanup_return
;
2659 * Get the timestamp from the latest entry
2660 * of the remote-tracking ref's reflog.
2662 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2664 cb
.remote_commit
= commit
;
2665 cb
.local_commits
= &arr
;
2666 cb
.remote_reflog_timestamp
= date
;
2667 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2669 /* We found an entry in the reflog. */
2671 goto cleanup_return
;
2674 * Check if the remote commit is reachable from any
2675 * of the commits in the collected array, in batches.
2677 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2678 size
= arr
.item
+ arr
.nr
- chunk
;
2679 if (MERGE_BASES_BATCH_SIZE
< size
)
2680 size
= MERGE_BASES_BATCH_SIZE
;
2682 if ((ret
= repo_in_merge_bases_many(the_repository
, commit
, size
, chunk
, 0)))
2687 free_commit_array(&arr
);
2692 * Check for reachability of a remote-tracking
2693 * ref in the reflog entries of its local ref.
2695 static void check_if_includes_upstream(struct ref
*remote
)
2697 struct ref
*local
= get_local_ref(remote
->name
);
2701 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2702 remote
->unreachable
= 1;
2705 static void apply_cas(struct push_cas_option
*cas
,
2706 struct remote
*remote
,
2711 /* Find an explicit --<option>=<name>[:<value>] entry */
2712 for (i
= 0; i
< cas
->nr
; i
++) {
2713 struct push_cas
*entry
= &cas
->entry
[i
];
2714 if (!refname_match(entry
->refname
, ref
->name
))
2716 ref
->expect_old_sha1
= 1;
2717 if (!entry
->use_tracking
)
2718 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2719 else if (remote_tracking(remote
, ref
->name
,
2720 &ref
->old_oid_expect
,
2721 &ref
->tracking_ref
))
2722 oidclr(&ref
->old_oid_expect
);
2724 ref
->check_reachable
= cas
->use_force_if_includes
;
2728 /* Are we using "--<option>" to cover all? */
2729 if (!cas
->use_tracking_for_rest
)
2732 ref
->expect_old_sha1
= 1;
2733 if (remote_tracking(remote
, ref
->name
,
2734 &ref
->old_oid_expect
,
2735 &ref
->tracking_ref
))
2736 oidclr(&ref
->old_oid_expect
);
2738 ref
->check_reachable
= cas
->use_force_if_includes
;
2741 void apply_push_cas(struct push_cas_option
*cas
,
2742 struct remote
*remote
,
2743 struct ref
*remote_refs
)
2746 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2747 apply_cas(cas
, remote
, ref
);
2750 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2751 * mode, and if "--force-if-includes" was specified, run
2754 if (ref
->check_reachable
)
2755 check_if_includes_upstream(ref
);
2759 struct remote_state
*remote_state_new(void)
2761 struct remote_state
*r
= xmalloc(sizeof(*r
));
2763 memset(r
, 0, sizeof(*r
));
2765 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2766 hashmap_init(&r
->branches_hash
, branches_hash_cmp
, NULL
, 0);
2770 void remote_state_clear(struct remote_state
*remote_state
)
2774 for (i
= 0; i
< remote_state
->remotes_nr
; i
++)
2775 remote_clear(remote_state
->remotes
[i
]);
2776 FREE_AND_NULL(remote_state
->remotes
);
2777 remote_state
->remotes_alloc
= 0;
2778 remote_state
->remotes_nr
= 0;
2780 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2781 hashmap_clear_and_free(&remote_state
->branches_hash
, struct remote
, ent
);
2785 * Returns 1 if it was the last chop before ':'.
2787 static int chop_last_dir(char **remoteurl
, int is_relative
)
2789 char *rfind
= find_last_dir_sep(*remoteurl
);
2795 rfind
= strrchr(*remoteurl
, ':');
2801 if (is_relative
|| !strcmp(".", *remoteurl
))
2802 die(_("cannot strip one component off url '%s'"),
2806 *remoteurl
= xstrdup(".");
2810 char *relative_url(const char *remote_url
, const char *url
,
2811 const char *up_path
)
2813 int is_relative
= 0;
2817 struct strbuf sb
= STRBUF_INIT
;
2820 if (!url_is_local_not_ssh(url
) || is_absolute_path(url
))
2821 return xstrdup(url
);
2823 len
= strlen(remote_url
);
2825 BUG("invalid empty remote_url");
2827 remoteurl
= xstrdup(remote_url
);
2828 if (is_dir_sep(remoteurl
[len
-1]))
2829 remoteurl
[len
-1] = '\0';
2831 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
2836 * Prepend a './' to ensure all relative
2837 * remoteurls start with './' or '../'
2839 if (!starts_with_dot_slash_native(remoteurl
) &&
2840 !starts_with_dot_dot_slash_native(remoteurl
)) {
2842 strbuf_addf(&sb
, "./%s", remoteurl
);
2844 remoteurl
= strbuf_detach(&sb
, NULL
);
2848 * When the url starts with '../', remove that and the
2849 * last directory in remoteurl.
2852 if (starts_with_dot_dot_slash_native(url
)) {
2854 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
2855 } else if (starts_with_dot_slash_native(url
))
2861 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
2862 if (ends_with(url
, "/"))
2863 strbuf_setlen(&sb
, sb
.len
- 1);
2866 if (starts_with_dot_slash_native(sb
.buf
))
2867 out
= xstrdup(sb
.buf
+ 2);
2869 out
= xstrdup(sb
.buf
);
2871 if (!up_path
|| !is_relative
) {
2872 strbuf_release(&sb
);
2877 strbuf_addf(&sb
, "%s%s", up_path
, out
);
2879 return strbuf_detach(&sb
, NULL
);