1 #include "git-compat-util.h"
9 #include "object-store.h"
15 #include "string-list.h"
17 #include "commit-reach.h"
20 #include "parse-options.h"
22 enum map_direction
{ FROM_SRC
, FROM_DST
};
24 struct counted_string
{
29 static int valid_remote(const struct remote
*remote
)
31 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
34 static const char *alias_url(const char *url
, struct rewrites
*r
)
37 struct counted_string
*longest
;
42 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
45 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
46 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
48 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
49 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
57 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
60 static void add_url(struct remote
*remote
, const char *url
)
62 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
63 remote
->url
[remote
->url_nr
++] = url
;
66 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
68 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
69 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
72 static void add_pushurl_alias(struct remote_state
*remote_state
,
73 struct remote
*remote
, const char *url
)
75 const char *pushurl
= alias_url(url
, &remote_state
->rewrites_push
);
77 add_pushurl(remote
, pushurl
);
80 static void add_url_alias(struct remote_state
*remote_state
,
81 struct remote
*remote
, const char *url
)
83 add_url(remote
, alias_url(url
, &remote_state
->rewrites
));
84 add_pushurl_alias(remote_state
, remote
, url
);
87 struct remotes_hash_key
{
92 static int remotes_hash_cmp(const void *cmp_data UNUSED
,
93 const struct hashmap_entry
*eptr
,
94 const struct hashmap_entry
*entry_or_key
,
97 const struct remote
*a
, *b
;
98 const struct remotes_hash_key
*key
= keydata
;
100 a
= container_of(eptr
, const struct remote
, ent
);
101 b
= container_of(entry_or_key
, const struct remote
, ent
);
104 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
106 return strcmp(a
->name
, b
->name
);
109 static struct remote
*make_remote(struct remote_state
*remote_state
,
110 const char *name
, int len
)
113 struct remotes_hash_key lookup
;
114 struct hashmap_entry lookup_entry
, *e
;
121 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
123 e
= hashmap_get(&remote_state
->remotes_hash
, &lookup_entry
, &lookup
);
125 return container_of(e
, struct remote
, ent
);
127 CALLOC_ARRAY(ret
, 1);
128 ret
->prune
= -1; /* unspecified */
129 ret
->prune_tags
= -1; /* unspecified */
130 ret
->name
= xstrndup(name
, len
);
131 refspec_init(&ret
->push
, REFSPEC_PUSH
);
132 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
134 ALLOC_GROW(remote_state
->remotes
, remote_state
->remotes_nr
+ 1,
135 remote_state
->remotes_alloc
);
136 remote_state
->remotes
[remote_state
->remotes_nr
++] = ret
;
138 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
139 if (hashmap_put_entry(&remote_state
->remotes_hash
, ret
, ent
))
140 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
144 static void remote_clear(struct remote
*remote
)
148 free((char *)remote
->name
);
149 free((char *)remote
->foreign_vcs
);
151 for (i
= 0; i
< remote
->url_nr
; i
++)
152 free((char *)remote
->url
[i
]);
153 FREE_AND_NULL(remote
->url
);
155 for (i
= 0; i
< remote
->pushurl_nr
; i
++)
156 free((char *)remote
->pushurl
[i
]);
157 FREE_AND_NULL(remote
->pushurl
);
158 free((char *)remote
->receivepack
);
159 free((char *)remote
->uploadpack
);
160 FREE_AND_NULL(remote
->http_proxy
);
161 FREE_AND_NULL(remote
->http_proxy_authmethod
);
164 static void add_merge(struct branch
*branch
, const char *name
)
166 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
167 branch
->merge_alloc
);
168 branch
->merge_name
[branch
->merge_nr
++] = name
;
171 struct branches_hash_key
{
176 static int branches_hash_cmp(const void *cmp_data UNUSED
,
177 const struct hashmap_entry
*eptr
,
178 const struct hashmap_entry
*entry_or_key
,
181 const struct branch
*a
, *b
;
182 const struct branches_hash_key
*key
= keydata
;
184 a
= container_of(eptr
, const struct branch
, ent
);
185 b
= container_of(entry_or_key
, const struct branch
, ent
);
188 return strncmp(a
->name
, key
->str
, key
->len
) ||
191 return strcmp(a
->name
, b
->name
);
194 static struct branch
*find_branch(struct remote_state
*remote_state
,
195 const char *name
, size_t len
)
197 struct branches_hash_key lookup
;
198 struct hashmap_entry lookup_entry
, *e
;
202 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
204 e
= hashmap_get(&remote_state
->branches_hash
, &lookup_entry
, &lookup
);
206 return container_of(e
, struct branch
, ent
);
211 static void die_on_missing_branch(struct repository
*repo
,
212 struct branch
*branch
)
214 /* branch == NULL is always valid because it represents detached HEAD. */
216 branch
!= find_branch(repo
->remote_state
, branch
->name
,
217 strlen(branch
->name
)))
218 die("branch %s was not found in the repository", branch
->name
);
221 static struct branch
*make_branch(struct remote_state
*remote_state
,
222 const char *name
, size_t len
)
226 ret
= find_branch(remote_state
, name
, len
);
230 CALLOC_ARRAY(ret
, 1);
231 ret
->name
= xstrndup(name
, len
);
232 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
234 hashmap_entry_init(&ret
->ent
, memhash(name
, len
));
235 if (hashmap_put_entry(&remote_state
->branches_hash
, ret
, ent
))
236 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
240 static struct rewrite
*make_rewrite(struct rewrites
*r
,
241 const char *base
, size_t len
)
246 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
247 if (len
== r
->rewrite
[i
]->baselen
&&
248 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
249 return r
->rewrite
[i
];
252 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
253 CALLOC_ARRAY(ret
, 1);
254 r
->rewrite
[r
->rewrite_nr
++] = ret
;
255 ret
->base
= xstrndup(base
, len
);
260 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
262 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
263 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
264 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
265 rewrite
->instead_of_nr
++;
268 static const char *skip_spaces(const char *s
)
275 static void read_remotes_file(struct remote_state
*remote_state
,
276 struct remote
*remote
)
278 struct strbuf buf
= STRBUF_INIT
;
279 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
283 remote
->configured_in_repo
= 1;
284 remote
->origin
= REMOTE_REMOTES
;
285 while (strbuf_getline(&buf
, f
) != EOF
) {
290 if (skip_prefix(buf
.buf
, "URL:", &v
))
291 add_url_alias(remote_state
, remote
,
292 xstrdup(skip_spaces(v
)));
293 else if (skip_prefix(buf
.buf
, "Push:", &v
))
294 refspec_append(&remote
->push
, skip_spaces(v
));
295 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
296 refspec_append(&remote
->fetch
, skip_spaces(v
));
298 strbuf_release(&buf
);
302 static void read_branches_file(struct remote_state
*remote_state
,
303 struct remote
*remote
)
306 struct strbuf buf
= STRBUF_INIT
;
307 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
312 strbuf_getline_lf(&buf
, f
);
316 strbuf_release(&buf
);
320 remote
->configured_in_repo
= 1;
321 remote
->origin
= REMOTE_BRANCHES
;
324 * The branches file would have URL and optionally
325 * #branch specified. The default (or specified) branch is
326 * fetched and stored in the local branch matching the
329 frag
= strchr(buf
.buf
, '#');
333 frag
= (char *)git_default_branch_name(0);
335 add_url_alias(remote_state
, remote
, strbuf_detach(&buf
, NULL
));
336 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
340 * Cogito compatible push: push current HEAD to remote #branch
341 * (master if missing)
343 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
344 remote
->fetch_tags
= 1; /* always auto-follow */
347 static int handle_config(const char *key
, const char *value
, void *cb
)
352 struct remote
*remote
;
353 struct branch
*branch
;
354 struct remote_state
*remote_state
= cb
;
356 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
357 /* There is no subsection. */
360 /* There is a subsection, but it is empty. */
363 branch
= make_branch(remote_state
, name
, namelen
);
364 if (!strcmp(subkey
, "remote")) {
365 return git_config_string(&branch
->remote_name
, key
, value
);
366 } else if (!strcmp(subkey
, "pushremote")) {
367 return git_config_string(&branch
->pushremote_name
, key
, value
);
368 } else if (!strcmp(subkey
, "merge")) {
370 return config_error_nonbool(key
);
371 add_merge(branch
, xstrdup(value
));
375 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
376 struct rewrite
*rewrite
;
379 if (!strcmp(subkey
, "insteadof")) {
381 return config_error_nonbool(key
);
382 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
384 add_instead_of(rewrite
, xstrdup(value
));
385 } else if (!strcmp(subkey
, "pushinsteadof")) {
387 return config_error_nonbool(key
);
388 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
390 add_instead_of(rewrite
, xstrdup(value
));
394 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
397 /* Handle remote.* variables */
398 if (!name
&& !strcmp(subkey
, "pushdefault"))
399 return git_config_string(&remote_state
->pushremote_name
, key
,
404 /* Handle remote.<name>.* variables */
406 warning(_("config remote shorthand cannot begin with '/': %s"),
410 remote
= make_remote(remote_state
, name
, namelen
);
411 remote
->origin
= REMOTE_CONFIG
;
412 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
413 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
414 remote
->configured_in_repo
= 1;
415 if (!strcmp(subkey
, "mirror"))
416 remote
->mirror
= git_config_bool(key
, value
);
417 else if (!strcmp(subkey
, "skipdefaultupdate"))
418 remote
->skip_default_update
= git_config_bool(key
, value
);
419 else if (!strcmp(subkey
, "skipfetchall"))
420 remote
->skip_default_update
= git_config_bool(key
, value
);
421 else if (!strcmp(subkey
, "prune"))
422 remote
->prune
= git_config_bool(key
, value
);
423 else if (!strcmp(subkey
, "prunetags"))
424 remote
->prune_tags
= git_config_bool(key
, value
);
425 else if (!strcmp(subkey
, "url")) {
427 if (git_config_string(&v
, key
, value
))
430 } else if (!strcmp(subkey
, "pushurl")) {
432 if (git_config_string(&v
, key
, value
))
434 add_pushurl(remote
, v
);
435 } else if (!strcmp(subkey
, "push")) {
437 if (git_config_string(&v
, key
, value
))
439 refspec_append(&remote
->push
, v
);
441 } else if (!strcmp(subkey
, "fetch")) {
443 if (git_config_string(&v
, key
, value
))
445 refspec_append(&remote
->fetch
, v
);
447 } else if (!strcmp(subkey
, "receivepack")) {
449 if (git_config_string(&v
, key
, value
))
451 if (!remote
->receivepack
)
452 remote
->receivepack
= v
;
454 error(_("more than one receivepack given, using the first"));
455 } else if (!strcmp(subkey
, "uploadpack")) {
457 if (git_config_string(&v
, key
, value
))
459 if (!remote
->uploadpack
)
460 remote
->uploadpack
= v
;
462 error(_("more than one uploadpack given, using the first"));
463 } else if (!strcmp(subkey
, "tagopt")) {
464 if (!strcmp(value
, "--no-tags"))
465 remote
->fetch_tags
= -1;
466 else if (!strcmp(value
, "--tags"))
467 remote
->fetch_tags
= 2;
468 } else if (!strcmp(subkey
, "proxy")) {
469 return git_config_string((const char **)&remote
->http_proxy
,
471 } else if (!strcmp(subkey
, "proxyauthmethod")) {
472 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
474 } else if (!strcmp(subkey
, "vcs")) {
475 return git_config_string(&remote
->foreign_vcs
, key
, value
);
480 static void alias_all_urls(struct remote_state
*remote_state
)
483 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
484 int add_pushurl_aliases
;
485 if (!remote_state
->remotes
[i
])
487 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
488 remote_state
->remotes
[i
]->pushurl
[j
] =
489 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
490 &remote_state
->rewrites
);
492 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
493 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
494 if (add_pushurl_aliases
)
496 remote_state
, remote_state
->remotes
[i
],
497 remote_state
->remotes
[i
]->url
[j
]);
498 remote_state
->remotes
[i
]->url
[j
] =
499 alias_url(remote_state
->remotes
[i
]->url
[j
],
500 &remote_state
->rewrites
);
505 static void read_config(struct repository
*repo
)
509 if (repo
->remote_state
->initialized
)
511 repo
->remote_state
->initialized
= 1;
513 repo
->remote_state
->current_branch
= NULL
;
514 if (startup_info
->have_repository
) {
515 const char *head_ref
= refs_resolve_ref_unsafe(
516 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
);
517 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
518 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
519 repo
->remote_state
->current_branch
= make_branch(
520 repo
->remote_state
, head_ref
, strlen(head_ref
));
523 repo_config(repo
, handle_config
, repo
->remote_state
);
524 alias_all_urls(repo
->remote_state
);
527 static int valid_remote_nick(const char *name
)
529 if (!name
[0] || is_dot_or_dotdot(name
))
532 /* remote nicknames cannot contain slashes */
534 if (is_dir_sep(*name
++))
539 static const char *remotes_remote_for_branch(struct remote_state
*remote_state
,
540 struct branch
*branch
,
543 if (branch
&& branch
->remote_name
) {
546 return branch
->remote_name
;
550 if (remote_state
->remotes_nr
== 1)
551 return remote_state
->remotes
[0]->name
;
555 const char *remote_for_branch(struct branch
*branch
, int *explicit)
557 read_config(the_repository
);
558 die_on_missing_branch(the_repository
, branch
);
560 return remotes_remote_for_branch(the_repository
->remote_state
, branch
,
565 remotes_pushremote_for_branch(struct remote_state
*remote_state
,
566 struct branch
*branch
, int *explicit)
568 if (branch
&& branch
->pushremote_name
) {
571 return branch
->pushremote_name
;
573 if (remote_state
->pushremote_name
) {
576 return remote_state
->pushremote_name
;
578 return remotes_remote_for_branch(remote_state
, branch
, explicit);
581 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
583 read_config(the_repository
);
584 die_on_missing_branch(the_repository
, branch
);
586 return remotes_pushremote_for_branch(the_repository
->remote_state
,
590 static struct remote
*remotes_remote_get(struct remote_state
*remote_state
,
593 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
595 read_config(the_repository
);
596 die_on_missing_branch(the_repository
, branch
);
600 if (branch
->merge_nr
) {
601 return branch
->merge_name
[0];
605 *remote_name
= remotes_pushremote_for_branch(
606 the_repository
->remote_state
, branch
,
608 struct remote
*remote
= remotes_remote_get(
609 the_repository
->remote_state
, remote_name
);
611 if (remote
&& remote
->push
.nr
&&
612 (dst
= apply_refspecs(&remote
->push
,
621 static void validate_remote_url(struct remote
*remote
)
625 struct strbuf redacted
= STRBUF_INIT
;
628 if (git_config_get_string_tmp("transfer.credentialsinurl", &value
))
631 if (!strcmp("warn", value
))
633 else if (!strcmp("die", value
))
635 else if (!strcmp("allow", value
))
638 die(_("unrecognized value transfer.credentialsInUrl: '%s'"), value
);
640 for (i
= 0; i
< remote
->url_nr
; i
++) {
641 struct url_info url_info
= { 0 };
643 if (!url_normalize(remote
->url
[i
], &url_info
) ||
644 !url_info
.passwd_off
)
647 strbuf_reset(&redacted
);
648 strbuf_add(&redacted
, url_info
.url
, url_info
.passwd_off
);
649 strbuf_addstr(&redacted
, "<redacted>");
650 strbuf_addstr(&redacted
,
651 url_info
.url
+ url_info
.passwd_off
+ url_info
.passwd_len
);
654 warning(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
656 die(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
662 strbuf_release(&redacted
);
665 static struct remote
*
666 remotes_remote_get_1(struct remote_state
*remote_state
, const char *name
,
667 const char *(*get_default
)(struct remote_state
*,
668 struct branch
*, int *))
676 name
= get_default(remote_state
, remote_state
->current_branch
,
679 ret
= make_remote(remote_state
, name
, 0);
680 if (valid_remote_nick(name
) && have_git_dir()) {
681 if (!valid_remote(ret
))
682 read_remotes_file(remote_state
, ret
);
683 if (!valid_remote(ret
))
684 read_branches_file(remote_state
, ret
);
686 if (name_given
&& !valid_remote(ret
))
687 add_url_alias(remote_state
, ret
, name
);
688 if (!valid_remote(ret
))
691 validate_remote_url(ret
);
696 static inline struct remote
*
697 remotes_remote_get(struct remote_state
*remote_state
, const char *name
)
699 return remotes_remote_get_1(remote_state
, name
,
700 remotes_remote_for_branch
);
703 struct remote
*remote_get(const char *name
)
705 read_config(the_repository
);
706 return remotes_remote_get(the_repository
->remote_state
, name
);
709 static inline struct remote
*
710 remotes_pushremote_get(struct remote_state
*remote_state
, const char *name
)
712 return remotes_remote_get_1(remote_state
, name
,
713 remotes_pushremote_for_branch
);
716 struct remote
*pushremote_get(const char *name
)
718 read_config(the_repository
);
719 return remotes_pushremote_get(the_repository
->remote_state
, name
);
722 int remote_is_configured(struct remote
*remote
, int in_repo
)
727 return remote
->configured_in_repo
;
728 return !!remote
->origin
;
731 int for_each_remote(each_remote_fn fn
, void *priv
)
734 read_config(the_repository
);
735 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
737 struct remote
*remote
=
738 the_repository
->remote_state
->remotes
[i
];
741 result
= fn(remote
, priv
);
746 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
748 if (strcmp(ref1
->name
, ref2
->name
)) {
749 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
750 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
751 die(_("Cannot fetch both %s and %s to %s"),
752 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
753 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
754 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
755 warning(_("%s usually tracks %s, not %s"),
756 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
757 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
758 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
759 die(_("%s tracks both %s and %s"),
760 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
763 * This last possibility doesn't occur because
764 * FETCH_HEAD_IGNORE entries always appear at
765 * the end of the list.
767 BUG("Internal error");
770 free(ref2
->peer_ref
);
774 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
776 struct string_list refs
= STRING_LIST_INIT_NODUP
;
777 struct ref
*retval
= NULL
;
778 struct ref
**p
= &retval
;
781 struct ref
*ref
= ref_map
;
783 ref_map
= ref_map
->next
;
786 if (!ref
->peer_ref
) {
790 struct string_list_item
*item
=
791 string_list_insert(&refs
, ref
->peer_ref
->name
);
794 /* Entry already existed */
795 handle_duplicate((struct ref
*)item
->util
, ref
);
804 string_list_clear(&refs
, 0);
808 int remote_has_url(struct remote
*remote
, const char *url
)
811 for (i
= 0; i
< remote
->url_nr
; i
++) {
812 if (!strcmp(remote
->url
[i
], url
))
818 static int match_name_with_pattern(const char *key
, const char *name
,
819 const char *value
, char **result
)
821 const char *kstar
= strchr(key
, '*');
827 die(_("key '%s' of pattern had no '*'"), key
);
829 ksuffixlen
= strlen(kstar
+ 1);
830 namelen
= strlen(name
);
831 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
832 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
834 struct strbuf sb
= STRBUF_INIT
;
835 const char *vstar
= strchr(value
, '*');
837 die(_("value '%s' of pattern has no '*'"), value
);
838 strbuf_add(&sb
, value
, vstar
- value
);
839 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
840 strbuf_addstr(&sb
, vstar
+ 1);
841 *result
= strbuf_detach(&sb
, NULL
);
846 static int refspec_match(const struct refspec_item
*refspec
,
849 if (refspec
->pattern
)
850 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
852 return !strcmp(refspec
->src
, name
);
855 int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
859 for (i
= 0; i
< rs
->nr
; i
++) {
860 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
866 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
870 for (tail
= &ref_map
; *tail
; ) {
871 struct ref
*ref
= *tail
;
873 if (omit_name_by_refspec(ref
->name
, rs
)) {
884 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
886 int i
, matched_negative
= 0;
887 int find_src
= !query
->src
;
888 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
889 const char *needle
= find_src
? query
->dst
: query
->src
;
892 * Check whether the queried ref matches any negative refpsec. If so,
893 * then we should ultimately treat this as not matching the query at
896 * Note that negative refspecs always match the source, but the query
897 * item uses the destination. To handle this, we apply pattern
898 * refspecs in reverse to figure out if the query source matches any
899 * of the negative refspecs.
901 * The first loop finds and expands all positive refspecs
902 * matched by the queried ref.
904 * The second loop checks if any of the results of the first loop
905 * match any negative refspec.
907 for (i
= 0; i
< rs
->nr
; i
++) {
908 struct refspec_item
*refspec
= &rs
->items
[i
];
911 if (refspec
->negative
)
914 /* Note the reversal of src and dst */
915 if (refspec
->pattern
) {
916 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
917 const char *value
= refspec
->src
;
919 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
920 string_list_append_nodup(&reversed
, expn_name
);
921 } else if (refspec
->matching
) {
922 /* For the special matching refspec, any query should match */
923 string_list_append(&reversed
, needle
);
924 } else if (!refspec
->src
) {
925 BUG("refspec->src should not be null here");
926 } else if (!strcmp(needle
, refspec
->src
)) {
927 string_list_append(&reversed
, refspec
->src
);
931 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
932 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
933 matched_negative
= 1;
936 string_list_clear(&reversed
, 0);
938 return matched_negative
;
941 static void query_refspecs_multiple(struct refspec
*rs
,
942 struct refspec_item
*query
,
943 struct string_list
*results
)
946 int find_src
= !query
->src
;
948 if (find_src
&& !query
->dst
)
949 BUG("query_refspecs_multiple: need either src or dst");
951 if (query_matches_negative_refspec(rs
, query
))
954 for (i
= 0; i
< rs
->nr
; i
++) {
955 struct refspec_item
*refspec
= &rs
->items
[i
];
956 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
957 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
958 const char *needle
= find_src
? query
->dst
: query
->src
;
959 char **result
= find_src
? &query
->src
: &query
->dst
;
961 if (!refspec
->dst
|| refspec
->negative
)
963 if (refspec
->pattern
) {
964 if (match_name_with_pattern(key
, needle
, value
, result
))
965 string_list_append_nodup(results
, *result
);
966 } else if (!strcmp(needle
, key
)) {
967 string_list_append(results
, value
);
972 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
975 int find_src
= !query
->src
;
976 const char *needle
= find_src
? query
->dst
: query
->src
;
977 char **result
= find_src
? &query
->src
: &query
->dst
;
979 if (find_src
&& !query
->dst
)
980 BUG("query_refspecs: need either src or dst");
982 if (query_matches_negative_refspec(rs
, query
))
985 for (i
= 0; i
< rs
->nr
; i
++) {
986 struct refspec_item
*refspec
= &rs
->items
[i
];
987 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
988 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
990 if (!refspec
->dst
|| refspec
->negative
)
992 if (refspec
->pattern
) {
993 if (match_name_with_pattern(key
, needle
, value
, result
)) {
994 query
->force
= refspec
->force
;
997 } else if (!strcmp(needle
, key
)) {
998 *result
= xstrdup(value
);
999 query
->force
= refspec
->force
;
1006 char *apply_refspecs(struct refspec
*rs
, const char *name
)
1008 struct refspec_item query
;
1010 memset(&query
, 0, sizeof(struct refspec_item
));
1011 query
.src
= (char *)name
;
1013 if (query_refspecs(rs
, &query
))
1019 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
1021 return query_refspecs(&remote
->fetch
, refspec
);
1024 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
1027 size_t len
= strlen(name
);
1028 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
1029 memcpy(ref
->name
, prefix
, prefixlen
);
1030 memcpy(ref
->name
+ prefixlen
, name
, len
);
1034 struct ref
*alloc_ref(const char *name
)
1036 return alloc_ref_with_prefix("", 0, name
);
1039 struct ref
*copy_ref(const struct ref
*ref
)
1045 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
1047 memcpy(cpy
, ref
, len
);
1049 cpy
->symref
= xstrdup_or_null(ref
->symref
);
1050 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
1051 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
1055 struct ref
*copy_ref_list(const struct ref
*ref
)
1057 struct ref
*ret
= NULL
;
1058 struct ref
**tail
= &ret
;
1060 *tail
= copy_ref(ref
);
1062 tail
= &((*tail
)->next
);
1067 void free_one_ref(struct ref
*ref
)
1071 free_one_ref(ref
->peer_ref
);
1072 free(ref
->remote_status
);
1077 void free_refs(struct ref
*ref
)
1087 int count_refspec_match(const char *pattern
,
1089 struct ref
**matched_ref
)
1091 int patlen
= strlen(pattern
);
1092 struct ref
*matched_weak
= NULL
;
1093 struct ref
*matched
= NULL
;
1097 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1098 char *name
= refs
->name
;
1099 int namelen
= strlen(name
);
1101 if (!refname_match(pattern
, name
))
1104 /* A match is "weak" if it is with refs outside
1105 * heads or tags, and did not specify the pattern
1106 * in full (e.g. "refs/remotes/origin/master") or at
1107 * least from the toplevel (e.g. "remotes/origin/master");
1108 * otherwise "git push $URL master" would result in
1109 * ambiguity between remotes/origin/master and heads/master
1110 * at the remote site.
1112 if (namelen
!= patlen
&&
1113 patlen
!= namelen
- 5 &&
1114 !starts_with(name
, "refs/heads/") &&
1115 !starts_with(name
, "refs/tags/")) {
1116 /* We want to catch the case where only weak
1117 * matches are found and there are multiple
1118 * matches, and where more than one strong
1119 * matches are found, as ambiguous. One
1120 * strong match with zero or more weak matches
1121 * are acceptable as a unique match.
1123 matched_weak
= refs
;
1133 *matched_ref
= matched_weak
;
1138 *matched_ref
= matched
;
1143 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1151 static struct ref
*alloc_delete_ref(void)
1153 struct ref
*ref
= alloc_ref("(delete)");
1154 oidclr(&ref
->new_oid
);
1158 static int try_explicit_object_name(const char *name
,
1161 struct object_id oid
;
1165 *match
= alloc_delete_ref();
1169 if (get_oid(name
, &oid
))
1173 *match
= alloc_ref(name
);
1174 oidcpy(&(*match
)->new_oid
, &oid
);
1179 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1181 struct ref
*ret
= alloc_ref(name
);
1182 tail_link_ref(ret
, tail
);
1186 static char *guess_ref(const char *name
, struct ref
*peer
)
1188 struct strbuf buf
= STRBUF_INIT
;
1190 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1195 if (starts_with(r
, "refs/heads/")) {
1196 strbuf_addstr(&buf
, "refs/heads/");
1197 } else if (starts_with(r
, "refs/tags/")) {
1198 strbuf_addstr(&buf
, "refs/tags/");
1203 strbuf_addstr(&buf
, name
);
1204 return strbuf_detach(&buf
, NULL
);
1207 static int match_explicit_lhs(struct ref
*src
,
1208 struct refspec_item
*rs
,
1210 int *allocated_match
)
1212 switch (count_refspec_match(rs
->src
, src
, match
)) {
1214 if (allocated_match
)
1215 *allocated_match
= 0;
1218 /* The source could be in the get_sha1() format
1219 * not a reference name. :refs/other is a
1220 * way to delete 'other' ref at the remote end.
1222 if (try_explicit_object_name(rs
->src
, match
) < 0)
1223 return error(_("src refspec %s does not match any"), rs
->src
);
1224 if (allocated_match
)
1225 *allocated_match
= 1;
1228 return error(_("src refspec %s matches more than one"), rs
->src
);
1232 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1233 const char *matched_src_name
)
1235 struct object_id oid
;
1236 enum object_type type
;
1239 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1240 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1243 error(_("The destination you provided is not a full refname (i.e.,\n"
1244 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1246 "- Looking for a ref that matches '%s' on the remote side.\n"
1247 "- Checking if the <src> being pushed ('%s')\n"
1248 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1249 " refs/{heads,tags}/ prefix on the remote side.\n"
1251 "Neither worked, so we gave up. You must fully qualify the ref."),
1252 dst_value
, matched_src_name
);
1254 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1257 if (get_oid(matched_src_name
, &oid
))
1258 BUG("'%s' is not a valid object, "
1259 "match_explicit_lhs() should catch this!",
1261 type
= oid_object_info(the_repository
, &oid
, NULL
);
1262 if (type
== OBJ_COMMIT
) {
1263 advise(_("The <src> part of the refspec is a commit object.\n"
1264 "Did you mean to create a new branch by pushing to\n"
1265 "'%s:refs/heads/%s'?"),
1266 matched_src_name
, dst_value
);
1267 } else if (type
== OBJ_TAG
) {
1268 advise(_("The <src> part of the refspec is a tag object.\n"
1269 "Did you mean to create a new tag by pushing to\n"
1270 "'%s:refs/tags/%s'?"),
1271 matched_src_name
, dst_value
);
1272 } else if (type
== OBJ_TREE
) {
1273 advise(_("The <src> part of the refspec is a tree object.\n"
1274 "Did you mean to tag a new tree by pushing to\n"
1275 "'%s:refs/tags/%s'?"),
1276 matched_src_name
, dst_value
);
1277 } else if (type
== OBJ_BLOB
) {
1278 advise(_("The <src> part of the refspec is a blob object.\n"
1279 "Did you mean to tag a new blob by pushing to\n"
1280 "'%s:refs/tags/%s'?"),
1281 matched_src_name
, dst_value
);
1283 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1284 matched_src_name
, type
);
1288 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1289 struct ref
***dst_tail
,
1290 struct refspec_item
*rs
)
1292 struct ref
*matched_src
, *matched_dst
;
1295 const char *dst_value
= rs
->dst
;
1298 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1301 matched_src
= matched_dst
= NULL
;
1302 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1308 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1309 RESOLVE_REF_READING
,
1312 ((flag
& REF_ISSYMREF
) &&
1313 !starts_with(dst_value
, "refs/heads/")))
1314 die(_("%s cannot be resolved to branch"),
1318 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1322 if (starts_with(dst_value
, "refs/")) {
1323 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1324 } else if (is_null_oid(&matched_src
->new_oid
)) {
1325 error(_("unable to delete '%s': remote ref does not exist"),
1327 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1328 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1331 show_push_unqualified_ref_name_error(dst_value
,
1337 error(_("dst refspec %s matches more than one"),
1343 if (matched_dst
->peer_ref
)
1344 return error(_("dst ref %s receives from more than one src"),
1347 matched_dst
->peer_ref
= allocated_src
?
1349 copy_ref(matched_src
);
1350 matched_dst
->force
= rs
->force
;
1355 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1356 struct ref
***dst_tail
, struct refspec
*rs
)
1359 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1360 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1364 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1365 int send_mirror
, int direction
,
1366 const struct refspec_item
**ret_pat
)
1368 const struct refspec_item
*pat
;
1371 int matching_refs
= -1;
1372 for (i
= 0; i
< rs
->nr
; i
++) {
1373 const struct refspec_item
*item
= &rs
->items
[i
];
1378 if (item
->matching
&&
1379 (matching_refs
== -1 || item
->force
)) {
1384 if (item
->pattern
) {
1385 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1387 if (direction
== FROM_SRC
)
1388 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1390 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1397 if (matching_refs
== -1)
1400 pat
= &rs
->items
[matching_refs
];
1401 if (pat
->matching
) {
1403 * "matching refs"; traditionally we pushed everything
1404 * including refs outside refs/heads/ hierarchy, but
1405 * that does not make much sense these days.
1407 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1409 name
= xstrdup(ref
->name
);
1416 static struct ref
**tail_ref(struct ref
**head
)
1418 struct ref
**tail
= head
;
1420 tail
= &((*tail
)->next
);
1425 struct commit
**tip
;
1429 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1431 struct commit
*commit
;
1433 if (is_null_oid(oid
))
1435 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1436 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1438 commit
->object
.flags
|= TMP_MARK
;
1439 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1440 tips
->tip
[tips
->nr
++] = commit
;
1443 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1445 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1446 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1447 struct string_list_item
*item
;
1449 struct tips sent_tips
;
1452 * Collect everything we know they would have at the end of
1453 * this push, and collect all tags they have.
1455 memset(&sent_tips
, 0, sizeof(sent_tips
));
1456 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1457 if (ref
->peer_ref
&&
1458 !is_null_oid(&ref
->peer_ref
->new_oid
))
1459 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1461 add_to_tips(&sent_tips
, &ref
->old_oid
);
1462 if (starts_with(ref
->name
, "refs/tags/"))
1463 string_list_append(&dst_tag
, ref
->name
);
1465 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1467 string_list_sort(&dst_tag
);
1469 /* Collect tags they do not have. */
1470 for (ref
= src
; ref
; ref
= ref
->next
) {
1471 if (!starts_with(ref
->name
, "refs/tags/"))
1472 continue; /* not a tag */
1473 if (string_list_has_string(&dst_tag
, ref
->name
))
1474 continue; /* they already have it */
1475 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1476 continue; /* be conservative */
1477 item
= string_list_append(&src_tag
, ref
->name
);
1480 string_list_clear(&dst_tag
, 0);
1483 * At this point, src_tag lists tags that are missing from
1484 * dst, and sent_tips lists the tips we are pushing or those
1485 * that we know they already have. An element in the src_tag
1486 * that is an ancestor of any of the sent_tips needs to be
1487 * sent to the other side.
1490 const int reachable_flag
= 1;
1491 struct commit_list
*found_commits
;
1492 struct commit
**src_commits
;
1493 int nr_src_commits
= 0, alloc_src_commits
= 16;
1494 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1496 for_each_string_list_item(item
, &src_tag
) {
1497 struct ref
*ref
= item
->util
;
1498 struct commit
*commit
;
1500 if (is_null_oid(&ref
->new_oid
))
1502 commit
= lookup_commit_reference_gently(the_repository
,
1506 /* not pushing a commit, which is not an error */
1509 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1510 src_commits
[nr_src_commits
++] = commit
;
1513 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1514 src_commits
, nr_src_commits
,
1517 for_each_string_list_item(item
, &src_tag
) {
1518 struct ref
*dst_ref
;
1519 struct ref
*ref
= item
->util
;
1520 struct commit
*commit
;
1522 if (is_null_oid(&ref
->new_oid
))
1524 commit
= lookup_commit_reference_gently(the_repository
,
1528 /* not pushing a commit, which is not an error */
1532 * Is this tag, which they do not have, reachable from
1533 * any of the commits we are sending?
1535 if (!(commit
->object
.flags
& reachable_flag
))
1539 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1540 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1541 dst_ref
->peer_ref
= copy_ref(ref
);
1544 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1546 free_commit_list(found_commits
);
1549 string_list_clear(&src_tag
, 0);
1550 free(sent_tips
.tip
);
1553 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1555 for ( ; list
; list
= list
->next
)
1556 if (!strcmp(list
->name
, name
))
1557 return (struct ref
*)list
;
1561 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1563 for ( ; ref
; ref
= ref
->next
)
1564 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1566 string_list_sort(ref_index
);
1570 * Given only the set of local refs, sanity-check the set of push
1571 * refspecs. We can't catch all errors that match_push_refs would,
1572 * but we can catch some errors early before even talking to the
1575 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1580 for (i
= 0; i
< rs
->nr
; i
++) {
1581 struct refspec_item
*item
= &rs
->items
[i
];
1583 if (item
->pattern
|| item
->matching
|| item
->negative
)
1586 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1593 * Given the set of refs the local repository has, the set of refs the
1594 * remote repository has, and the refspec used for push, determine
1595 * what remote refs we will update and with what value by setting
1596 * peer_ref (which object is being pushed) and force (if the push is
1597 * forced) in elements of "dst". The function may add new elements to
1598 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1600 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1601 struct refspec
*rs
, int flags
)
1603 int send_all
= flags
& MATCH_REFS_ALL
;
1604 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1605 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1607 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1608 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1610 /* If no refspec is provided, use the default ":" */
1612 refspec_append(rs
, ":");
1614 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1616 /* pick the remainder */
1617 for (ref
= src
; ref
; ref
= ref
->next
) {
1618 struct string_list_item
*dst_item
;
1619 struct ref
*dst_peer
;
1620 const struct refspec_item
*pat
= NULL
;
1623 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1627 if (!dst_ref_index
.nr
)
1628 prepare_ref_index(&dst_ref_index
, *dst
);
1630 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1631 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1633 if (dst_peer
->peer_ref
)
1634 /* We're already sending something to this ref. */
1637 if (pat
->matching
&& !(send_all
|| send_mirror
))
1639 * Remote doesn't have it, and we have no
1640 * explicit pattern, and we don't have
1641 * --all or --mirror.
1645 /* Create a new one and link it */
1646 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1647 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1648 string_list_insert(&dst_ref_index
,
1649 dst_peer
->name
)->util
= dst_peer
;
1651 dst_peer
->peer_ref
= copy_ref(ref
);
1652 dst_peer
->force
= pat
->force
;
1657 string_list_clear(&dst_ref_index
, 0);
1659 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1660 add_missing_tags(src
, dst
, &dst_tail
);
1663 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1664 /* check for missing refs on the remote */
1665 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1669 /* We're already sending something to this ref. */
1672 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1674 if (!src_ref_index
.nr
)
1675 prepare_ref_index(&src_ref_index
, src
);
1676 if (!string_list_has_string(&src_ref_index
,
1678 ref
->peer_ref
= alloc_delete_ref();
1682 string_list_clear(&src_ref_index
, 0);
1685 *dst
= apply_negative_refspecs(*dst
, rs
);
1692 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1697 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1698 int force_ref_update
= ref
->force
|| force_update
;
1699 int reject_reason
= 0;
1702 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1703 else if (!send_mirror
)
1706 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1707 if (!ref
->deletion
&&
1708 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1709 ref
->status
= REF_STATUS_UPTODATE
;
1714 * If the remote ref has moved and is now different
1715 * from what we expect, reject any push.
1717 * It also is an error if the user told us to check
1718 * with the remote-tracking branch to find the value
1719 * to expect, but we did not have such a tracking
1722 * If the tip of the remote-tracking ref is unreachable
1723 * from any reflog entry of its local ref indicating a
1724 * possible update since checkout; reject the push.
1726 if (ref
->expect_old_sha1
) {
1727 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1728 reject_reason
= REF_STATUS_REJECT_STALE
;
1729 else if (ref
->check_reachable
&& ref
->unreachable
)
1731 REF_STATUS_REJECT_REMOTE_UPDATED
;
1734 * If the ref isn't stale, and is reachable
1735 * from one of the reflog entries of
1736 * the local branch, force the update.
1738 force_ref_update
= 1;
1742 * If the update isn't already rejected then check
1743 * the usual "must fast-forward" rules.
1745 * Decide whether an individual refspec A:B can be
1746 * pushed. The push will succeed if any of the
1747 * following are true:
1749 * (1) the remote reference B does not exist
1751 * (2) the remote reference B is being removed (i.e.,
1752 * pushing :B where no source is specified)
1754 * (3) the destination is not under refs/tags/, and
1755 * if the old and new value is a commit, the new
1756 * is a descendant of the old.
1758 * (4) it is forced using the +A:B notation, or by
1759 * passing the --force argument
1762 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1763 if (starts_with(ref
->name
, "refs/tags/"))
1764 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1765 else if (!has_object_file(&ref
->old_oid
))
1766 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1767 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1768 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1769 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1770 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1771 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1775 * "--force" will defeat any rejection implemented
1776 * by the rules above.
1778 if (!force_ref_update
)
1779 ref
->status
= reject_reason
;
1780 else if (reject_reason
)
1781 ref
->forced_update
= 1;
1785 static void set_merge(struct remote_state
*remote_state
, struct branch
*ret
)
1787 struct remote
*remote
;
1789 struct object_id oid
;
1793 return; /* no branch */
1795 return; /* already run */
1796 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1798 * no merge config; let's make sure we don't confuse callers
1799 * with a non-zero merge_nr but a NULL merge
1805 remote
= remotes_remote_get(remote_state
, ret
->remote_name
);
1807 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1808 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1809 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1810 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1811 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1812 strcmp(ret
->remote_name
, "."))
1814 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1815 &oid
, &ref
, 0) == 1)
1816 ret
->merge
[i
]->dst
= ref
;
1818 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1822 struct branch
*branch_get(const char *name
)
1826 read_config(the_repository
);
1827 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1828 ret
= the_repository
->remote_state
->current_branch
;
1830 ret
= make_branch(the_repository
->remote_state
, name
,
1832 set_merge(the_repository
->remote_state
, ret
);
1836 int branch_has_merge_config(struct branch
*branch
)
1838 return branch
&& !!branch
->merge
;
1841 int branch_merge_matches(struct branch
*branch
,
1843 const char *refname
)
1845 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1847 return refname_match(branch
->merge
[i
]->src
, refname
);
1850 __attribute__((format (printf
,2,3)))
1851 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1856 strbuf_vaddf(err
, fmt
, ap
);
1862 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1865 return error_buf(err
, _("HEAD does not point to a branch"));
1867 if (!branch
->merge
|| !branch
->merge
[0]) {
1869 * no merge config; is it because the user didn't define any,
1870 * or because it is not a real branch, and get_branch
1873 if (!ref_exists(branch
->refname
))
1874 return error_buf(err
, _("no such branch: '%s'"),
1876 return error_buf(err
,
1877 _("no upstream configured for branch '%s'"),
1881 if (!branch
->merge
[0]->dst
)
1882 return error_buf(err
,
1883 _("upstream branch '%s' not stored as a remote-tracking branch"),
1884 branch
->merge
[0]->src
);
1886 return branch
->merge
[0]->dst
;
1889 static const char *tracking_for_push_dest(struct remote
*remote
,
1890 const char *refname
,
1895 ret
= apply_refspecs(&remote
->fetch
, refname
);
1897 return error_buf(err
,
1898 _("push destination '%s' on remote '%s' has no local tracking branch"),
1899 refname
, remote
->name
);
1903 static const char *branch_get_push_1(struct remote_state
*remote_state
,
1904 struct branch
*branch
, struct strbuf
*err
)
1906 struct remote
*remote
;
1908 remote
= remotes_remote_get(
1910 remotes_pushremote_for_branch(remote_state
, branch
, NULL
));
1912 return error_buf(err
,
1913 _("branch '%s' has no remote for pushing"),
1916 if (remote
->push
.nr
) {
1920 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1922 return error_buf(err
,
1923 _("push refspecs for '%s' do not include '%s'"),
1924 remote
->name
, branch
->name
);
1926 ret
= tracking_for_push_dest(remote
, dst
, err
);
1932 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1934 switch (push_default
) {
1935 case PUSH_DEFAULT_NOTHING
:
1936 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1938 case PUSH_DEFAULT_MATCHING
:
1939 case PUSH_DEFAULT_CURRENT
:
1940 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1942 case PUSH_DEFAULT_UPSTREAM
:
1943 return branch_get_upstream(branch
, err
);
1945 case PUSH_DEFAULT_UNSPECIFIED
:
1946 case PUSH_DEFAULT_SIMPLE
:
1948 const char *up
, *cur
;
1950 up
= branch_get_upstream(branch
, err
);
1953 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1956 if (strcmp(cur
, up
))
1957 return error_buf(err
,
1958 _("cannot resolve 'simple' push to a single destination"));
1963 BUG("unhandled push situation");
1966 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1968 read_config(the_repository
);
1969 die_on_missing_branch(the_repository
, branch
);
1972 return error_buf(err
, _("HEAD does not point to a branch"));
1974 if (!branch
->push_tracking_ref
)
1975 branch
->push_tracking_ref
= branch_get_push_1(
1976 the_repository
->remote_state
, branch
, err
);
1977 return branch
->push_tracking_ref
;
1980 static int ignore_symref_update(const char *refname
, struct strbuf
*scratch
)
1982 return !refs_read_symbolic_ref(get_main_ref_store(the_repository
), refname
, scratch
);
1986 * Create and return a list of (struct ref) consisting of copies of
1987 * each remote_ref that matches refspec. refspec must be a pattern.
1988 * Fill in the copies' peer_ref to describe the local tracking refs to
1989 * which they map. Omit any references that would map to an existing
1990 * local symbolic ref.
1992 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1993 const struct refspec_item
*refspec
)
1995 struct strbuf scratch
= STRBUF_INIT
;
1996 const struct ref
*ref
;
1997 struct ref
*ret
= NULL
;
1998 struct ref
**tail
= &ret
;
2000 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2001 char *expn_name
= NULL
;
2003 strbuf_reset(&scratch
);
2005 if (strchr(ref
->name
, '^'))
2006 continue; /* a dereference item */
2007 if (match_name_with_pattern(refspec
->src
, ref
->name
,
2008 refspec
->dst
, &expn_name
) &&
2009 !ignore_symref_update(expn_name
, &scratch
)) {
2010 struct ref
*cpy
= copy_ref(ref
);
2012 cpy
->peer_ref
= alloc_ref(expn_name
);
2014 cpy
->peer_ref
->force
= 1;
2021 strbuf_release(&scratch
);
2025 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
2027 const struct ref
*ref
;
2028 const struct ref
*best_match
= NULL
;
2031 for (ref
= refs
; ref
; ref
= ref
->next
) {
2032 int score
= refname_match(name
, ref
->name
);
2034 if (best_score
< score
) {
2042 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
2044 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
2049 return copy_ref(ref
);
2052 static struct ref
*get_local_ref(const char *name
)
2054 if (!name
|| name
[0] == '\0')
2057 if (starts_with(name
, "refs/"))
2058 return alloc_ref(name
);
2060 if (starts_with(name
, "heads/") ||
2061 starts_with(name
, "tags/") ||
2062 starts_with(name
, "remotes/"))
2063 return alloc_ref_with_prefix("refs/", 5, name
);
2065 return alloc_ref_with_prefix("refs/heads/", 11, name
);
2068 int get_fetch_map(const struct ref
*remote_refs
,
2069 const struct refspec_item
*refspec
,
2073 struct ref
*ref_map
, **rmp
;
2075 if (refspec
->negative
)
2078 if (refspec
->pattern
) {
2079 ref_map
= get_expanded_map(remote_refs
, refspec
);
2081 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
2083 if (refspec
->exact_sha1
) {
2084 ref_map
= alloc_ref(name
);
2085 get_oid_hex(name
, &ref_map
->old_oid
);
2086 ref_map
->exact_oid
= 1;
2088 ref_map
= get_remote_ref(remote_refs
, name
);
2090 if (!missing_ok
&& !ref_map
)
2091 die(_("couldn't find remote ref %s"), name
);
2093 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
2094 if (ref_map
->peer_ref
&& refspec
->force
)
2095 ref_map
->peer_ref
->force
= 1;
2099 for (rmp
= &ref_map
; *rmp
; ) {
2100 if ((*rmp
)->peer_ref
) {
2101 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
2102 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
2103 struct ref
*ignore
= *rmp
;
2104 error(_("* Ignoring funny ref '%s' locally"),
2105 (*rmp
)->peer_ref
->name
);
2106 *rmp
= (*rmp
)->next
;
2107 free(ignore
->peer_ref
);
2112 rmp
= &((*rmp
)->next
);
2116 tail_link_ref(ref_map
, tail
);
2121 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
2125 for (; list
; list
= list
->next
)
2126 if (!strcmp(ref
->symref
, list
->name
)) {
2127 oidcpy(&ref
->old_oid
, &list
->old_oid
);
2134 * Compute the commit ahead/behind values for the pair branch_name, base.
2136 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2137 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2138 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2141 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2142 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2143 * commits are different.
2146 static int stat_branch_pair(const char *branch_name
, const char *base
,
2147 int *num_ours
, int *num_theirs
,
2148 enum ahead_behind_flags abf
)
2150 struct object_id oid
;
2151 struct commit
*ours
, *theirs
;
2152 struct rev_info revs
;
2153 struct setup_revision_opt opt
= {
2154 .free_removed_argv_elements
= 1,
2156 struct strvec argv
= STRVEC_INIT
;
2158 /* Cannot stat if what we used to build on no longer exists */
2159 if (read_ref(base
, &oid
))
2161 theirs
= lookup_commit_reference(the_repository
, &oid
);
2165 if (read_ref(branch_name
, &oid
))
2167 ours
= lookup_commit_reference(the_repository
, &oid
);
2171 *num_theirs
= *num_ours
= 0;
2173 /* are we the same? */
2176 if (abf
== AHEAD_BEHIND_QUICK
)
2178 if (abf
!= AHEAD_BEHIND_FULL
)
2179 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2181 /* Run "rev-list --left-right ours...theirs" internally... */
2182 strvec_push(&argv
, ""); /* ignored */
2183 strvec_push(&argv
, "--left-right");
2184 strvec_pushf(&argv
, "%s...%s",
2185 oid_to_hex(&ours
->object
.oid
),
2186 oid_to_hex(&theirs
->object
.oid
));
2187 strvec_push(&argv
, "--");
2189 repo_init_revisions(the_repository
, &revs
, NULL
);
2190 setup_revisions(argv
.nr
, argv
.v
, &revs
, &opt
);
2191 if (prepare_revision_walk(&revs
))
2192 die(_("revision walk setup failed"));
2194 /* ... and count the commits on each side. */
2196 struct commit
*c
= get_revision(&revs
);
2199 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2205 /* clear object flags smudged by the above traversal */
2206 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2207 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2209 strvec_clear(&argv
);
2210 release_revisions(&revs
);
2215 * Lookup the tracking branch for the given branch and if present, optionally
2216 * compute the commit ahead/behind values for the pair.
2218 * If for_push is true, the tracking branch refers to the push branch,
2219 * otherwise it refers to the upstream branch.
2221 * The name of the tracking branch (or NULL if it is not defined) is
2222 * returned via *tracking_name, if it is not itself NULL.
2224 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2225 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2226 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2229 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2230 * upstream defined, or ref does not exist). Returns 0 if the commits are
2231 * identical. Returns 1 if commits are different.
2233 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2234 const char **tracking_name
, int for_push
,
2235 enum ahead_behind_flags abf
)
2239 /* Cannot stat unless we are marked to build on top of somebody else. */
2240 base
= for_push
? branch_get_push(branch
, NULL
) :
2241 branch_get_upstream(branch
, NULL
);
2243 *tracking_name
= base
;
2247 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2251 * Return true when there is anything to report, otherwise false.
2253 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2254 enum ahead_behind_flags abf
)
2256 int ours
, theirs
, sti
;
2257 const char *full_base
;
2259 int upstream_is_gone
= 0;
2261 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2265 upstream_is_gone
= 1;
2268 base
= shorten_unambiguous_ref(full_base
, 0);
2269 if (upstream_is_gone
) {
2271 _("Your branch is based on '%s', but the upstream is gone.\n"),
2273 if (advice_enabled(ADVICE_STATUS_HINTS
))
2275 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2278 _("Your branch is up to date with '%s'.\n"),
2280 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2282 _("Your branch and '%s' refer to different commits.\n"),
2284 if (advice_enabled(ADVICE_STATUS_HINTS
))
2285 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2286 "git status --ahead-behind");
2287 } else if (!theirs
) {
2289 Q_("Your branch is ahead of '%s' by %d commit.\n",
2290 "Your branch is ahead of '%s' by %d commits.\n",
2293 if (advice_enabled(ADVICE_STATUS_HINTS
))
2295 _(" (use \"git push\" to publish your local commits)\n"));
2298 Q_("Your branch is behind '%s' by %d commit, "
2299 "and can be fast-forwarded.\n",
2300 "Your branch is behind '%s' by %d commits, "
2301 "and can be fast-forwarded.\n",
2304 if (advice_enabled(ADVICE_STATUS_HINTS
))
2306 _(" (use \"git pull\" to update your local branch)\n"));
2309 Q_("Your branch and '%s' have diverged,\n"
2310 "and have %d and %d different commit each, "
2312 "Your branch and '%s' have diverged,\n"
2313 "and have %d and %d different commits each, "
2316 base
, ours
, theirs
);
2317 if (advice_enabled(ADVICE_STATUS_HINTS
))
2319 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2325 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2329 struct ref
***local_tail
= cb_data
;
2332 /* we already know it starts with refs/ to get here */
2333 if (check_refname_format(refname
+ 5, 0))
2336 ref
= alloc_ref(refname
);
2337 oidcpy(&ref
->new_oid
, oid
);
2339 *local_tail
= &ref
->next
;
2343 struct ref
*get_local_heads(void)
2345 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2347 for_each_ref(one_local_ref
, &local_tail
);
2351 struct ref
*guess_remote_head(const struct ref
*head
,
2352 const struct ref
*refs
,
2355 const struct ref
*r
;
2356 struct ref
*list
= NULL
;
2357 struct ref
**tail
= &list
;
2363 * Some transports support directly peeking at
2364 * where HEAD points; if that is the case, then
2365 * we don't have to guess.
2368 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2370 /* If a remote branch exists with the default branch name, let's use it. */
2372 char *ref
= xstrfmt("refs/heads/%s",
2373 git_default_branch_name(0));
2375 r
= find_ref_by_name(refs
, ref
);
2377 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2380 /* Fall back to the hard-coded historical default */
2381 r
= find_ref_by_name(refs
, "refs/heads/master");
2382 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2386 /* Look for another ref that points there */
2387 for (r
= refs
; r
; r
= r
->next
) {
2389 starts_with(r
->name
, "refs/heads/") &&
2390 oideq(&r
->old_oid
, &head
->old_oid
)) {
2391 *tail
= copy_ref(r
);
2392 tail
= &((*tail
)->next
);
2401 struct stale_heads_info
{
2402 struct string_list
*ref_names
;
2403 struct ref
**stale_refs_tail
;
2407 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2408 int flags
, void *cb_data
)
2410 struct stale_heads_info
*info
= cb_data
;
2411 struct string_list matches
= STRING_LIST_INIT_DUP
;
2412 struct refspec_item query
;
2414 memset(&query
, 0, sizeof(struct refspec_item
));
2415 query
.dst
= (char *)refname
;
2417 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2418 if (matches
.nr
== 0)
2419 goto clean_exit
; /* No matches */
2422 * If we did find a suitable refspec and it's not a symref and
2423 * it's not in the list of refs that currently exist in that
2424 * remote, we consider it to be stale. In order to deal with
2425 * overlapping refspecs, we need to go over all of the
2428 if (flags
& REF_ISSYMREF
)
2431 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2432 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2436 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2437 oidcpy(&ref
->new_oid
, oid
);
2441 string_list_clear(&matches
, 0);
2445 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2447 struct ref
*ref
, *stale_refs
= NULL
;
2448 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2449 struct stale_heads_info info
;
2451 info
.ref_names
= &ref_names
;
2452 info
.stale_refs_tail
= &stale_refs
;
2454 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2455 string_list_append(&ref_names
, ref
->name
);
2456 string_list_sort(&ref_names
);
2457 for_each_ref(get_stale_heads_cb
, &info
);
2458 string_list_clear(&ref_names
, 0);
2465 static void clear_cas_option(struct push_cas_option
*cas
)
2469 for (i
= 0; i
< cas
->nr
; i
++)
2470 free(cas
->entry
[i
].refname
);
2472 memset(cas
, 0, sizeof(*cas
));
2475 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2476 const char *refname
,
2479 struct push_cas
*entry
;
2480 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2481 entry
= &cas
->entry
[cas
->nr
++];
2482 memset(entry
, 0, sizeof(*entry
));
2483 entry
->refname
= xmemdupz(refname
, refnamelen
);
2487 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2490 struct push_cas
*entry
;
2493 /* "--no-<option>" */
2494 clear_cas_option(cas
);
2499 /* just "--<option>" */
2500 cas
->use_tracking_for_rest
= 1;
2504 /* "--<option>=refname" or "--<option>=refname:value" */
2505 colon
= strchrnul(arg
, ':');
2506 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2508 entry
->use_tracking
= 1;
2510 oidclr(&entry
->expect
);
2511 else if (get_oid(colon
+ 1, &entry
->expect
))
2512 return error(_("cannot parse expected object name '%s'"),
2517 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2519 return parse_push_cas_option(opt
->value
, arg
, unset
);
2522 int is_empty_cas(const struct push_cas_option
*cas
)
2524 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2528 * Look at remote.fetch refspec and see if we have a remote
2529 * tracking branch for the refname there. Fill the name of
2530 * the remote-tracking branch in *dst_refname, and the name
2531 * of the commit object at its tip in oid[].
2532 * If we cannot do so, return negative to signal an error.
2534 static int remote_tracking(struct remote
*remote
, const char *refname
,
2535 struct object_id
*oid
, char **dst_refname
)
2539 dst
= apply_refspecs(&remote
->fetch
, refname
);
2541 return -1; /* no tracking ref for refname at remote */
2542 if (read_ref(dst
, oid
))
2543 return -1; /* we know what the tracking ref is but we cannot read it */
2550 * The struct "reflog_commit_array" and related helper functions
2551 * are used for collecting commits into an array during reflog
2552 * traversals in "check_and_collect_until()".
2554 struct reflog_commit_array
{
2555 struct commit
**item
;
2559 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2561 /* Append a commit to the array. */
2562 static void append_commit(struct reflog_commit_array
*arr
,
2563 struct commit
*commit
)
2565 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2566 arr
->item
[arr
->nr
++] = commit
;
2569 /* Free and reset the array. */
2570 static void free_commit_array(struct reflog_commit_array
*arr
)
2572 FREE_AND_NULL(arr
->item
);
2573 arr
->nr
= arr
->alloc
= 0;
2576 struct check_and_collect_until_cb_data
{
2577 struct commit
*remote_commit
;
2578 struct reflog_commit_array
*local_commits
;
2579 timestamp_t remote_reflog_timestamp
;
2582 /* Get the timestamp of the latest entry. */
2583 static int peek_reflog(struct object_id
*o_oid UNUSED
,
2584 struct object_id
*n_oid UNUSED
,
2585 const char *ident UNUSED
,
2586 timestamp_t timestamp
, int tz UNUSED
,
2587 const char *message UNUSED
, void *cb_data
)
2589 timestamp_t
*ts
= cb_data
;
2594 static int check_and_collect_until(struct object_id
*o_oid UNUSED
,
2595 struct object_id
*n_oid
,
2596 const char *ident UNUSED
,
2597 timestamp_t timestamp
, int tz UNUSED
,
2598 const char *message UNUSED
, void *cb_data
)
2600 struct commit
*commit
;
2601 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2603 /* An entry was found. */
2604 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2607 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2608 append_commit(cb
->local_commits
, commit
);
2611 * If the reflog entry timestamp is older than the remote ref's
2612 * latest reflog entry, there is no need to check or collect
2613 * entries older than this one.
2615 if (timestamp
< cb
->remote_reflog_timestamp
)
2621 #define MERGE_BASES_BATCH_SIZE 8
2624 * Iterate through the reflog of the local ref to check if there is an entry
2625 * for the given remote-tracking ref; runs until the timestamp of an entry is
2626 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2627 * are that seen along the way are collected into an array to check if the
2628 * remote-tracking ref is reachable from any of them.
2630 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2633 struct commit
*commit
;
2634 struct commit
**chunk
;
2635 struct check_and_collect_until_cb_data cb
;
2636 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2640 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2642 goto cleanup_return
;
2645 * Get the timestamp from the latest entry
2646 * of the remote-tracking ref's reflog.
2648 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2650 cb
.remote_commit
= commit
;
2651 cb
.local_commits
= &arr
;
2652 cb
.remote_reflog_timestamp
= date
;
2653 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2655 /* We found an entry in the reflog. */
2657 goto cleanup_return
;
2660 * Check if the remote commit is reachable from any
2661 * of the commits in the collected array, in batches.
2663 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2664 size
= arr
.item
+ arr
.nr
- chunk
;
2665 if (MERGE_BASES_BATCH_SIZE
< size
)
2666 size
= MERGE_BASES_BATCH_SIZE
;
2668 if ((ret
= in_merge_bases_many(commit
, size
, chunk
)))
2673 free_commit_array(&arr
);
2678 * Check for reachability of a remote-tracking
2679 * ref in the reflog entries of its local ref.
2681 static void check_if_includes_upstream(struct ref
*remote
)
2683 struct ref
*local
= get_local_ref(remote
->name
);
2687 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2688 remote
->unreachable
= 1;
2691 static void apply_cas(struct push_cas_option
*cas
,
2692 struct remote
*remote
,
2697 /* Find an explicit --<option>=<name>[:<value>] entry */
2698 for (i
= 0; i
< cas
->nr
; i
++) {
2699 struct push_cas
*entry
= &cas
->entry
[i
];
2700 if (!refname_match(entry
->refname
, ref
->name
))
2702 ref
->expect_old_sha1
= 1;
2703 if (!entry
->use_tracking
)
2704 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2705 else if (remote_tracking(remote
, ref
->name
,
2706 &ref
->old_oid_expect
,
2707 &ref
->tracking_ref
))
2708 oidclr(&ref
->old_oid_expect
);
2710 ref
->check_reachable
= cas
->use_force_if_includes
;
2714 /* Are we using "--<option>" to cover all? */
2715 if (!cas
->use_tracking_for_rest
)
2718 ref
->expect_old_sha1
= 1;
2719 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
;
2727 void apply_push_cas(struct push_cas_option
*cas
,
2728 struct remote
*remote
,
2729 struct ref
*remote_refs
)
2732 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2733 apply_cas(cas
, remote
, ref
);
2736 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2737 * mode, and if "--force-if-includes" was specified, run
2740 if (ref
->check_reachable
)
2741 check_if_includes_upstream(ref
);
2745 struct remote_state
*remote_state_new(void)
2747 struct remote_state
*r
= xmalloc(sizeof(*r
));
2749 memset(r
, 0, sizeof(*r
));
2751 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2752 hashmap_init(&r
->branches_hash
, branches_hash_cmp
, NULL
, 0);
2756 void remote_state_clear(struct remote_state
*remote_state
)
2760 for (i
= 0; i
< remote_state
->remotes_nr
; i
++)
2761 remote_clear(remote_state
->remotes
[i
]);
2762 FREE_AND_NULL(remote_state
->remotes
);
2763 remote_state
->remotes_alloc
= 0;
2764 remote_state
->remotes_nr
= 0;
2766 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2767 hashmap_clear_and_free(&remote_state
->branches_hash
, struct remote
, ent
);
2771 * Returns 1 if it was the last chop before ':'.
2773 static int chop_last_dir(char **remoteurl
, int is_relative
)
2775 char *rfind
= find_last_dir_sep(*remoteurl
);
2781 rfind
= strrchr(*remoteurl
, ':');
2787 if (is_relative
|| !strcmp(".", *remoteurl
))
2788 die(_("cannot strip one component off url '%s'"),
2792 *remoteurl
= xstrdup(".");
2796 char *relative_url(const char *remote_url
, const char *url
,
2797 const char *up_path
)
2799 int is_relative
= 0;
2803 struct strbuf sb
= STRBUF_INIT
;
2806 if (!url_is_local_not_ssh(url
) || is_absolute_path(url
))
2807 return xstrdup(url
);
2809 len
= strlen(remote_url
);
2811 BUG("invalid empty remote_url");
2813 remoteurl
= xstrdup(remote_url
);
2814 if (is_dir_sep(remoteurl
[len
-1]))
2815 remoteurl
[len
-1] = '\0';
2817 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
2822 * Prepend a './' to ensure all relative
2823 * remoteurls start with './' or '../'
2825 if (!starts_with_dot_slash_native(remoteurl
) &&
2826 !starts_with_dot_dot_slash_native(remoteurl
)) {
2828 strbuf_addf(&sb
, "./%s", remoteurl
);
2830 remoteurl
= strbuf_detach(&sb
, NULL
);
2834 * When the url starts with '../', remove that and the
2835 * last directory in remoteurl.
2838 if (starts_with_dot_dot_slash_native(url
)) {
2840 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
2841 } else if (starts_with_dot_slash_native(url
))
2847 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
2848 if (ends_with(url
, "/"))
2849 strbuf_setlen(&sb
, sb
.len
- 1);
2852 if (starts_with_dot_slash_native(sb
.buf
))
2853 out
= xstrdup(sb
.buf
+ 2);
2855 out
= xstrdup(sb
.buf
);
2857 if (!up_path
|| !is_relative
) {
2858 strbuf_release(&sb
);
2863 strbuf_addf(&sb
, "%s%s", up_path
, out
);
2865 return strbuf_detach(&sb
, NULL
);