6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
15 #include "commit-reach.h"
18 enum map_direction
{ FROM_SRC
, FROM_DST
};
20 struct counted_string
{
25 static int valid_remote(const struct remote
*remote
)
27 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
30 static const char *alias_url(const char *url
, struct rewrites
*r
)
33 struct counted_string
*longest
;
38 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
41 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
42 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
44 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
45 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
53 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
56 static void add_url(struct remote
*remote
, const char *url
)
58 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
59 remote
->url
[remote
->url_nr
++] = url
;
62 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
64 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
65 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
68 static void add_pushurl_alias(struct remote_state
*remote_state
,
69 struct remote
*remote
, const char *url
)
71 const char *pushurl
= alias_url(url
, &remote_state
->rewrites_push
);
73 add_pushurl(remote
, pushurl
);
76 static void add_url_alias(struct remote_state
*remote_state
,
77 struct remote
*remote
, const char *url
)
79 add_url(remote
, alias_url(url
, &remote_state
->rewrites
));
80 add_pushurl_alias(remote_state
, remote
, url
);
83 struct remotes_hash_key
{
88 static int remotes_hash_cmp(const void *unused_cmp_data
,
89 const struct hashmap_entry
*eptr
,
90 const struct hashmap_entry
*entry_or_key
,
93 const struct remote
*a
, *b
;
94 const struct remotes_hash_key
*key
= keydata
;
96 a
= container_of(eptr
, const struct remote
, ent
);
97 b
= container_of(entry_or_key
, const struct remote
, ent
);
100 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
102 return strcmp(a
->name
, b
->name
);
105 static struct remote
*make_remote(struct remote_state
*remote_state
,
106 const char *name
, int len
)
109 struct remotes_hash_key lookup
;
110 struct hashmap_entry lookup_entry
, *e
;
117 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
119 e
= hashmap_get(&remote_state
->remotes_hash
, &lookup_entry
, &lookup
);
121 return container_of(e
, struct remote
, ent
);
123 CALLOC_ARRAY(ret
, 1);
124 ret
->prune
= -1; /* unspecified */
125 ret
->prune_tags
= -1; /* unspecified */
126 ret
->name
= xstrndup(name
, len
);
127 refspec_init(&ret
->push
, REFSPEC_PUSH
);
128 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
130 ALLOC_GROW(remote_state
->remotes
, remote_state
->remotes_nr
+ 1,
131 remote_state
->remotes_alloc
);
132 remote_state
->remotes
[remote_state
->remotes_nr
++] = ret
;
134 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
135 if (hashmap_put_entry(&remote_state
->remotes_hash
, ret
, ent
))
136 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
140 static void remote_clear(struct remote
*remote
)
144 free((char *)remote
->name
);
145 free((char *)remote
->foreign_vcs
);
147 for (i
= 0; i
< remote
->url_nr
; i
++) {
148 free((char *)remote
->url
[i
]);
150 FREE_AND_NULL(remote
->pushurl
);
152 for (i
= 0; i
< remote
->pushurl_nr
; i
++) {
153 free((char *)remote
->pushurl
[i
]);
155 FREE_AND_NULL(remote
->pushurl
);
156 free((char *)remote
->receivepack
);
157 free((char *)remote
->uploadpack
);
158 FREE_AND_NULL(remote
->http_proxy
);
159 FREE_AND_NULL(remote
->http_proxy_authmethod
);
162 static void add_merge(struct branch
*branch
, const char *name
)
164 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
165 branch
->merge_alloc
);
166 branch
->merge_name
[branch
->merge_nr
++] = name
;
169 struct branches_hash_key
{
174 static int branches_hash_cmp(const void *unused_cmp_data
,
175 const struct hashmap_entry
*eptr
,
176 const struct hashmap_entry
*entry_or_key
,
179 const struct branch
*a
, *b
;
180 const struct branches_hash_key
*key
= keydata
;
182 a
= container_of(eptr
, const struct branch
, ent
);
183 b
= container_of(entry_or_key
, const struct branch
, ent
);
186 return strncmp(a
->name
, key
->str
, key
->len
) ||
189 return strcmp(a
->name
, b
->name
);
192 static struct branch
*find_branch(struct remote_state
*remote_state
,
193 const char *name
, size_t len
)
195 struct branches_hash_key lookup
;
196 struct hashmap_entry lookup_entry
, *e
;
203 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
205 e
= hashmap_get(&remote_state
->branches_hash
, &lookup_entry
, &lookup
);
207 return container_of(e
, struct branch
, ent
);
212 static void die_on_missing_branch(struct repository
*repo
,
213 struct branch
*branch
)
215 /* branch == NULL is always valid because it represents detached HEAD. */
217 branch
!= find_branch(repo
->remote_state
, branch
->name
, 0))
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) {
359 branch
= make_branch(remote_state
, name
, namelen
);
360 if (!strcmp(subkey
, "remote")) {
361 return git_config_string(&branch
->remote_name
, key
, value
);
362 } else if (!strcmp(subkey
, "pushremote")) {
363 return git_config_string(&branch
->pushremote_name
, key
, value
);
364 } else if (!strcmp(subkey
, "merge")) {
366 return config_error_nonbool(key
);
367 add_merge(branch
, xstrdup(value
));
371 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
372 struct rewrite
*rewrite
;
375 if (!strcmp(subkey
, "insteadof")) {
377 return config_error_nonbool(key
);
378 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
380 add_instead_of(rewrite
, xstrdup(value
));
381 } else if (!strcmp(subkey
, "pushinsteadof")) {
383 return config_error_nonbool(key
);
384 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
386 add_instead_of(rewrite
, xstrdup(value
));
390 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
393 /* Handle remote.* variables */
394 if (!name
&& !strcmp(subkey
, "pushdefault"))
395 return git_config_string(&remote_state
->pushremote_name
, key
,
400 /* Handle remote.<name>.* variables */
402 warning(_("config remote shorthand cannot begin with '/': %s"),
406 remote
= make_remote(remote_state
, name
, namelen
);
407 remote
->origin
= REMOTE_CONFIG
;
408 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
409 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
410 remote
->configured_in_repo
= 1;
411 if (!strcmp(subkey
, "mirror"))
412 remote
->mirror
= git_config_bool(key
, value
);
413 else if (!strcmp(subkey
, "skipdefaultupdate"))
414 remote
->skip_default_update
= git_config_bool(key
, value
);
415 else if (!strcmp(subkey
, "skipfetchall"))
416 remote
->skip_default_update
= git_config_bool(key
, value
);
417 else if (!strcmp(subkey
, "prune"))
418 remote
->prune
= git_config_bool(key
, value
);
419 else if (!strcmp(subkey
, "prunetags"))
420 remote
->prune_tags
= git_config_bool(key
, value
);
421 else if (!strcmp(subkey
, "url")) {
423 if (git_config_string(&v
, key
, value
))
426 } else if (!strcmp(subkey
, "pushurl")) {
428 if (git_config_string(&v
, key
, value
))
430 add_pushurl(remote
, v
);
431 } else if (!strcmp(subkey
, "push")) {
433 if (git_config_string(&v
, key
, value
))
435 refspec_append(&remote
->push
, v
);
437 } else if (!strcmp(subkey
, "fetch")) {
439 if (git_config_string(&v
, key
, value
))
441 refspec_append(&remote
->fetch
, v
);
443 } else if (!strcmp(subkey
, "receivepack")) {
445 if (git_config_string(&v
, key
, value
))
447 if (!remote
->receivepack
)
448 remote
->receivepack
= v
;
450 error(_("more than one receivepack given, using the first"));
451 } else if (!strcmp(subkey
, "uploadpack")) {
453 if (git_config_string(&v
, key
, value
))
455 if (!remote
->uploadpack
)
456 remote
->uploadpack
= v
;
458 error(_("more than one uploadpack given, using the first"));
459 } else if (!strcmp(subkey
, "tagopt")) {
460 if (!strcmp(value
, "--no-tags"))
461 remote
->fetch_tags
= -1;
462 else if (!strcmp(value
, "--tags"))
463 remote
->fetch_tags
= 2;
464 } else if (!strcmp(subkey
, "proxy")) {
465 return git_config_string((const char **)&remote
->http_proxy
,
467 } else if (!strcmp(subkey
, "proxyauthmethod")) {
468 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
470 } else if (!strcmp(subkey
, "vcs")) {
471 return git_config_string(&remote
->foreign_vcs
, key
, value
);
476 static void alias_all_urls(struct remote_state
*remote_state
)
479 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
480 int add_pushurl_aliases
;
481 if (!remote_state
->remotes
[i
])
483 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
484 remote_state
->remotes
[i
]->pushurl
[j
] =
485 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
486 &remote_state
->rewrites
);
488 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
489 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
490 if (add_pushurl_aliases
)
492 remote_state
, remote_state
->remotes
[i
],
493 remote_state
->remotes
[i
]->url
[j
]);
494 remote_state
->remotes
[i
]->url
[j
] =
495 alias_url(remote_state
->remotes
[i
]->url
[j
],
496 &remote_state
->rewrites
);
501 static void read_config(struct repository
*repo
)
505 if (repo
->remote_state
->initialized
)
507 repo
->remote_state
->initialized
= 1;
509 repo
->remote_state
->current_branch
= NULL
;
510 if (startup_info
->have_repository
) {
512 const char *head_ref
= refs_resolve_ref_unsafe(
513 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
, &ignore_errno
);
514 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
515 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
516 repo
->remote_state
->current_branch
= make_branch(
517 repo
->remote_state
, head_ref
, strlen(head_ref
));
520 repo_config(repo
, handle_config
, repo
->remote_state
);
521 alias_all_urls(repo
->remote_state
);
524 static int valid_remote_nick(const char *name
)
526 if (!name
[0] || is_dot_or_dotdot(name
))
529 /* remote nicknames cannot contain slashes */
531 if (is_dir_sep(*name
++))
536 static const char *remotes_remote_for_branch(struct remote_state
*remote_state
,
537 struct branch
*branch
,
540 if (branch
&& branch
->remote_name
) {
543 return branch
->remote_name
;
550 const char *remote_for_branch(struct branch
*branch
, int *explicit)
552 read_config(the_repository
);
553 die_on_missing_branch(the_repository
, branch
);
555 return remotes_remote_for_branch(the_repository
->remote_state
, branch
,
560 remotes_pushremote_for_branch(struct remote_state
*remote_state
,
561 struct branch
*branch
, int *explicit)
563 if (branch
&& branch
->pushremote_name
) {
566 return branch
->pushremote_name
;
568 if (remote_state
->pushremote_name
) {
571 return remote_state
->pushremote_name
;
573 return remotes_remote_for_branch(remote_state
, branch
, explicit);
576 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
578 read_config(the_repository
);
579 die_on_missing_branch(the_repository
, branch
);
581 return remotes_pushremote_for_branch(the_repository
->remote_state
,
585 static struct remote
*remotes_remote_get(struct remote_state
*remote_state
,
588 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
590 read_config(the_repository
);
591 die_on_missing_branch(the_repository
, branch
);
595 if (branch
->merge_nr
) {
596 return branch
->merge_name
[0];
600 *remote_name
= remotes_pushremote_for_branch(
601 the_repository
->remote_state
, branch
,
603 struct remote
*remote
= remotes_remote_get(
604 the_repository
->remote_state
, remote_name
);
606 if (remote
&& remote
->push
.nr
&&
607 (dst
= apply_refspecs(&remote
->push
,
616 static struct remote
*
617 remotes_remote_get_1(struct remote_state
*remote_state
, const char *name
,
618 const char *(*get_default
)(struct remote_state
*,
619 struct branch
*, int *))
627 name
= get_default(remote_state
, remote_state
->current_branch
,
630 ret
= make_remote(remote_state
, name
, 0);
631 if (valid_remote_nick(name
) && have_git_dir()) {
632 if (!valid_remote(ret
))
633 read_remotes_file(remote_state
, ret
);
634 if (!valid_remote(ret
))
635 read_branches_file(remote_state
, ret
);
637 if (name_given
&& !valid_remote(ret
))
638 add_url_alias(remote_state
, ret
, name
);
639 if (!valid_remote(ret
))
644 static inline struct remote
*
645 remotes_remote_get(struct remote_state
*remote_state
, const char *name
)
647 return remotes_remote_get_1(remote_state
, name
,
648 remotes_remote_for_branch
);
651 struct remote
*remote_get(const char *name
)
653 read_config(the_repository
);
654 return remotes_remote_get(the_repository
->remote_state
, name
);
657 static inline struct remote
*
658 remotes_pushremote_get(struct remote_state
*remote_state
, const char *name
)
660 return remotes_remote_get_1(remote_state
, name
,
661 remotes_pushremote_for_branch
);
664 struct remote
*pushremote_get(const char *name
)
666 read_config(the_repository
);
667 return remotes_pushremote_get(the_repository
->remote_state
, name
);
670 int remote_is_configured(struct remote
*remote
, int in_repo
)
675 return remote
->configured_in_repo
;
676 return !!remote
->origin
;
679 int for_each_remote(each_remote_fn fn
, void *priv
)
682 read_config(the_repository
);
683 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
685 struct remote
*remote
=
686 the_repository
->remote_state
->remotes
[i
];
689 result
= fn(remote
, priv
);
694 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
696 if (strcmp(ref1
->name
, ref2
->name
)) {
697 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
698 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
699 die(_("Cannot fetch both %s and %s to %s"),
700 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
701 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
702 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
703 warning(_("%s usually tracks %s, not %s"),
704 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
705 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
706 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
707 die(_("%s tracks both %s and %s"),
708 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
711 * This last possibility doesn't occur because
712 * FETCH_HEAD_IGNORE entries always appear at
713 * the end of the list.
715 BUG("Internal error");
718 free(ref2
->peer_ref
);
722 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
724 struct string_list refs
= STRING_LIST_INIT_NODUP
;
725 struct ref
*retval
= NULL
;
726 struct ref
**p
= &retval
;
729 struct ref
*ref
= ref_map
;
731 ref_map
= ref_map
->next
;
734 if (!ref
->peer_ref
) {
738 struct string_list_item
*item
=
739 string_list_insert(&refs
, ref
->peer_ref
->name
);
742 /* Entry already existed */
743 handle_duplicate((struct ref
*)item
->util
, ref
);
752 string_list_clear(&refs
, 0);
756 int remote_has_url(struct remote
*remote
, const char *url
)
759 for (i
= 0; i
< remote
->url_nr
; i
++) {
760 if (!strcmp(remote
->url
[i
], url
))
766 static int match_name_with_pattern(const char *key
, const char *name
,
767 const char *value
, char **result
)
769 const char *kstar
= strchr(key
, '*');
775 die(_("key '%s' of pattern had no '*'"), key
);
777 ksuffixlen
= strlen(kstar
+ 1);
778 namelen
= strlen(name
);
779 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
780 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
782 struct strbuf sb
= STRBUF_INIT
;
783 const char *vstar
= strchr(value
, '*');
785 die(_("value '%s' of pattern has no '*'"), value
);
786 strbuf_add(&sb
, value
, vstar
- value
);
787 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
788 strbuf_addstr(&sb
, vstar
+ 1);
789 *result
= strbuf_detach(&sb
, NULL
);
794 static int refspec_match(const struct refspec_item
*refspec
,
797 if (refspec
->pattern
)
798 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
800 return !strcmp(refspec
->src
, name
);
803 static int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
807 for (i
= 0; i
< rs
->nr
; i
++) {
808 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
814 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
818 for (tail
= &ref_map
; *tail
; ) {
819 struct ref
*ref
= *tail
;
821 if (omit_name_by_refspec(ref
->name
, rs
)) {
832 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
834 int i
, matched_negative
= 0;
835 int find_src
= !query
->src
;
836 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
837 const char *needle
= find_src
? query
->dst
: query
->src
;
840 * Check whether the queried ref matches any negative refpsec. If so,
841 * then we should ultimately treat this as not matching the query at
844 * Note that negative refspecs always match the source, but the query
845 * item uses the destination. To handle this, we apply pattern
846 * refspecs in reverse to figure out if the query source matches any
847 * of the negative refspecs.
849 * The first loop finds and expands all positive refspecs
850 * matched by the queried ref.
852 * The second loop checks if any of the results of the first loop
853 * match any negative refspec.
855 for (i
= 0; i
< rs
->nr
; i
++) {
856 struct refspec_item
*refspec
= &rs
->items
[i
];
859 if (refspec
->negative
)
862 /* Note the reversal of src and dst */
863 if (refspec
->pattern
) {
864 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
865 const char *value
= refspec
->src
;
867 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
868 string_list_append_nodup(&reversed
, expn_name
);
869 } else if (refspec
->matching
) {
870 /* For the special matching refspec, any query should match */
871 string_list_append(&reversed
, needle
);
872 } else if (!refspec
->src
) {
873 BUG("refspec->src should not be null here");
874 } else if (!strcmp(needle
, refspec
->src
)) {
875 string_list_append(&reversed
, refspec
->src
);
879 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
880 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
881 matched_negative
= 1;
884 string_list_clear(&reversed
, 0);
886 return matched_negative
;
889 static void query_refspecs_multiple(struct refspec
*rs
,
890 struct refspec_item
*query
,
891 struct string_list
*results
)
894 int find_src
= !query
->src
;
896 if (find_src
&& !query
->dst
)
897 BUG("query_refspecs_multiple: need either src or dst");
899 if (query_matches_negative_refspec(rs
, query
))
902 for (i
= 0; i
< rs
->nr
; i
++) {
903 struct refspec_item
*refspec
= &rs
->items
[i
];
904 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
905 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
906 const char *needle
= find_src
? query
->dst
: query
->src
;
907 char **result
= find_src
? &query
->src
: &query
->dst
;
909 if (!refspec
->dst
|| refspec
->negative
)
911 if (refspec
->pattern
) {
912 if (match_name_with_pattern(key
, needle
, value
, result
))
913 string_list_append_nodup(results
, *result
);
914 } else if (!strcmp(needle
, key
)) {
915 string_list_append(results
, value
);
920 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
923 int find_src
= !query
->src
;
924 const char *needle
= find_src
? query
->dst
: query
->src
;
925 char **result
= find_src
? &query
->src
: &query
->dst
;
927 if (find_src
&& !query
->dst
)
928 BUG("query_refspecs: need either src or dst");
930 if (query_matches_negative_refspec(rs
, query
))
933 for (i
= 0; i
< rs
->nr
; i
++) {
934 struct refspec_item
*refspec
= &rs
->items
[i
];
935 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
936 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
938 if (!refspec
->dst
|| refspec
->negative
)
940 if (refspec
->pattern
) {
941 if (match_name_with_pattern(key
, needle
, value
, result
)) {
942 query
->force
= refspec
->force
;
945 } else if (!strcmp(needle
, key
)) {
946 *result
= xstrdup(value
);
947 query
->force
= refspec
->force
;
954 char *apply_refspecs(struct refspec
*rs
, const char *name
)
956 struct refspec_item query
;
958 memset(&query
, 0, sizeof(struct refspec_item
));
959 query
.src
= (char *)name
;
961 if (query_refspecs(rs
, &query
))
967 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
969 return query_refspecs(&remote
->fetch
, refspec
);
972 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
975 size_t len
= strlen(name
);
976 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
977 memcpy(ref
->name
, prefix
, prefixlen
);
978 memcpy(ref
->name
+ prefixlen
, name
, len
);
982 struct ref
*alloc_ref(const char *name
)
984 return alloc_ref_with_prefix("", 0, name
);
987 struct ref
*copy_ref(const struct ref
*ref
)
993 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
995 memcpy(cpy
, ref
, len
);
997 cpy
->symref
= xstrdup_or_null(ref
->symref
);
998 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
999 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
1003 struct ref
*copy_ref_list(const struct ref
*ref
)
1005 struct ref
*ret
= NULL
;
1006 struct ref
**tail
= &ret
;
1008 *tail
= copy_ref(ref
);
1010 tail
= &((*tail
)->next
);
1015 void free_one_ref(struct ref
*ref
)
1019 free_one_ref(ref
->peer_ref
);
1020 free(ref
->remote_status
);
1025 void free_refs(struct ref
*ref
)
1035 int ref_compare_name(const void *va
, const void *vb
)
1037 const struct ref
*a
= va
, *b
= vb
;
1038 return strcmp(a
->name
, b
->name
);
1041 static void *ref_list_get_next(const void *a
)
1043 return ((const struct ref
*)a
)->next
;
1046 static void ref_list_set_next(void *a
, void *next
)
1048 ((struct ref
*)a
)->next
= next
;
1051 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1053 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1056 int count_refspec_match(const char *pattern
,
1058 struct ref
**matched_ref
)
1060 int patlen
= strlen(pattern
);
1061 struct ref
*matched_weak
= NULL
;
1062 struct ref
*matched
= NULL
;
1066 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1067 char *name
= refs
->name
;
1068 int namelen
= strlen(name
);
1070 if (!refname_match(pattern
, name
))
1073 /* A match is "weak" if it is with refs outside
1074 * heads or tags, and did not specify the pattern
1075 * in full (e.g. "refs/remotes/origin/master") or at
1076 * least from the toplevel (e.g. "remotes/origin/master");
1077 * otherwise "git push $URL master" would result in
1078 * ambiguity between remotes/origin/master and heads/master
1079 * at the remote site.
1081 if (namelen
!= patlen
&&
1082 patlen
!= namelen
- 5 &&
1083 !starts_with(name
, "refs/heads/") &&
1084 !starts_with(name
, "refs/tags/")) {
1085 /* We want to catch the case where only weak
1086 * matches are found and there are multiple
1087 * matches, and where more than one strong
1088 * matches are found, as ambiguous. One
1089 * strong match with zero or more weak matches
1090 * are acceptable as a unique match.
1092 matched_weak
= refs
;
1102 *matched_ref
= matched_weak
;
1107 *matched_ref
= matched
;
1112 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1120 static struct ref
*alloc_delete_ref(void)
1122 struct ref
*ref
= alloc_ref("(delete)");
1123 oidclr(&ref
->new_oid
);
1127 static int try_explicit_object_name(const char *name
,
1130 struct object_id oid
;
1134 *match
= alloc_delete_ref();
1138 if (get_oid(name
, &oid
))
1142 *match
= alloc_ref(name
);
1143 oidcpy(&(*match
)->new_oid
, &oid
);
1148 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1150 struct ref
*ret
= alloc_ref(name
);
1151 tail_link_ref(ret
, tail
);
1155 static char *guess_ref(const char *name
, struct ref
*peer
)
1157 struct strbuf buf
= STRBUF_INIT
;
1159 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1164 if (starts_with(r
, "refs/heads/")) {
1165 strbuf_addstr(&buf
, "refs/heads/");
1166 } else if (starts_with(r
, "refs/tags/")) {
1167 strbuf_addstr(&buf
, "refs/tags/");
1172 strbuf_addstr(&buf
, name
);
1173 return strbuf_detach(&buf
, NULL
);
1176 static int match_explicit_lhs(struct ref
*src
,
1177 struct refspec_item
*rs
,
1179 int *allocated_match
)
1181 switch (count_refspec_match(rs
->src
, src
, match
)) {
1183 if (allocated_match
)
1184 *allocated_match
= 0;
1187 /* The source could be in the get_sha1() format
1188 * not a reference name. :refs/other is a
1189 * way to delete 'other' ref at the remote end.
1191 if (try_explicit_object_name(rs
->src
, match
) < 0)
1192 return error(_("src refspec %s does not match any"), rs
->src
);
1193 if (allocated_match
)
1194 *allocated_match
= 1;
1197 return error(_("src refspec %s matches more than one"), rs
->src
);
1201 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1202 const char *matched_src_name
)
1204 struct object_id oid
;
1205 enum object_type type
;
1208 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1209 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1212 error(_("The destination you provided is not a full refname (i.e.,\n"
1213 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1215 "- Looking for a ref that matches '%s' on the remote side.\n"
1216 "- Checking if the <src> being pushed ('%s')\n"
1217 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1218 " refs/{heads,tags}/ prefix on the remote side.\n"
1220 "Neither worked, so we gave up. You must fully qualify the ref."),
1221 dst_value
, matched_src_name
);
1223 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1226 if (get_oid(matched_src_name
, &oid
))
1227 BUG("'%s' is not a valid object, "
1228 "match_explicit_lhs() should catch this!",
1230 type
= oid_object_info(the_repository
, &oid
, NULL
);
1231 if (type
== OBJ_COMMIT
) {
1232 advise(_("The <src> part of the refspec is a commit object.\n"
1233 "Did you mean to create a new branch by pushing to\n"
1234 "'%s:refs/heads/%s'?"),
1235 matched_src_name
, dst_value
);
1236 } else if (type
== OBJ_TAG
) {
1237 advise(_("The <src> part of the refspec is a tag object.\n"
1238 "Did you mean to create a new tag by pushing to\n"
1239 "'%s:refs/tags/%s'?"),
1240 matched_src_name
, dst_value
);
1241 } else if (type
== OBJ_TREE
) {
1242 advise(_("The <src> part of the refspec is a tree object.\n"
1243 "Did you mean to tag a new tree by pushing to\n"
1244 "'%s:refs/tags/%s'?"),
1245 matched_src_name
, dst_value
);
1246 } else if (type
== OBJ_BLOB
) {
1247 advise(_("The <src> part of the refspec is a blob object.\n"
1248 "Did you mean to tag a new blob by pushing to\n"
1249 "'%s:refs/tags/%s'?"),
1250 matched_src_name
, dst_value
);
1252 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1253 matched_src_name
, type
);
1257 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1258 struct ref
***dst_tail
,
1259 struct refspec_item
*rs
)
1261 struct ref
*matched_src
, *matched_dst
;
1264 const char *dst_value
= rs
->dst
;
1267 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1270 matched_src
= matched_dst
= NULL
;
1271 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1277 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1278 RESOLVE_REF_READING
,
1281 ((flag
& REF_ISSYMREF
) &&
1282 !starts_with(dst_value
, "refs/heads/")))
1283 die(_("%s cannot be resolved to branch"),
1287 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1291 if (starts_with(dst_value
, "refs/")) {
1292 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1293 } else if (is_null_oid(&matched_src
->new_oid
)) {
1294 error(_("unable to delete '%s': remote ref does not exist"),
1296 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1297 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1300 show_push_unqualified_ref_name_error(dst_value
,
1306 error(_("dst refspec %s matches more than one"),
1312 if (matched_dst
->peer_ref
)
1313 return error(_("dst ref %s receives from more than one src"),
1316 matched_dst
->peer_ref
= allocated_src
?
1318 copy_ref(matched_src
);
1319 matched_dst
->force
= rs
->force
;
1324 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1325 struct ref
***dst_tail
, struct refspec
*rs
)
1328 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1329 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1333 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1334 int send_mirror
, int direction
,
1335 const struct refspec_item
**ret_pat
)
1337 const struct refspec_item
*pat
;
1340 int matching_refs
= -1;
1341 for (i
= 0; i
< rs
->nr
; i
++) {
1342 const struct refspec_item
*item
= &rs
->items
[i
];
1347 if (item
->matching
&&
1348 (matching_refs
== -1 || item
->force
)) {
1353 if (item
->pattern
) {
1354 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1356 if (direction
== FROM_SRC
)
1357 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1359 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1366 if (matching_refs
== -1)
1369 pat
= &rs
->items
[matching_refs
];
1370 if (pat
->matching
) {
1372 * "matching refs"; traditionally we pushed everything
1373 * including refs outside refs/heads/ hierarchy, but
1374 * that does not make much sense these days.
1376 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1378 name
= xstrdup(ref
->name
);
1385 static struct ref
**tail_ref(struct ref
**head
)
1387 struct ref
**tail
= head
;
1389 tail
= &((*tail
)->next
);
1394 struct commit
**tip
;
1398 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1400 struct commit
*commit
;
1402 if (is_null_oid(oid
))
1404 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1405 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1407 commit
->object
.flags
|= TMP_MARK
;
1408 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1409 tips
->tip
[tips
->nr
++] = commit
;
1412 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1414 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1415 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1416 struct string_list_item
*item
;
1418 struct tips sent_tips
;
1421 * Collect everything we know they would have at the end of
1422 * this push, and collect all tags they have.
1424 memset(&sent_tips
, 0, sizeof(sent_tips
));
1425 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1426 if (ref
->peer_ref
&&
1427 !is_null_oid(&ref
->peer_ref
->new_oid
))
1428 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1430 add_to_tips(&sent_tips
, &ref
->old_oid
);
1431 if (starts_with(ref
->name
, "refs/tags/"))
1432 string_list_append(&dst_tag
, ref
->name
);
1434 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1436 string_list_sort(&dst_tag
);
1438 /* Collect tags they do not have. */
1439 for (ref
= src
; ref
; ref
= ref
->next
) {
1440 if (!starts_with(ref
->name
, "refs/tags/"))
1441 continue; /* not a tag */
1442 if (string_list_has_string(&dst_tag
, ref
->name
))
1443 continue; /* they already have it */
1444 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1445 continue; /* be conservative */
1446 item
= string_list_append(&src_tag
, ref
->name
);
1449 string_list_clear(&dst_tag
, 0);
1452 * At this point, src_tag lists tags that are missing from
1453 * dst, and sent_tips lists the tips we are pushing or those
1454 * that we know they already have. An element in the src_tag
1455 * that is an ancestor of any of the sent_tips needs to be
1456 * sent to the other side.
1459 const int reachable_flag
= 1;
1460 struct commit_list
*found_commits
;
1461 struct commit
**src_commits
;
1462 int nr_src_commits
= 0, alloc_src_commits
= 16;
1463 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1465 for_each_string_list_item(item
, &src_tag
) {
1466 struct ref
*ref
= item
->util
;
1467 struct commit
*commit
;
1469 if (is_null_oid(&ref
->new_oid
))
1471 commit
= lookup_commit_reference_gently(the_repository
,
1475 /* not pushing a commit, which is not an error */
1478 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1479 src_commits
[nr_src_commits
++] = commit
;
1482 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1483 src_commits
, nr_src_commits
,
1486 for_each_string_list_item(item
, &src_tag
) {
1487 struct ref
*dst_ref
;
1488 struct ref
*ref
= item
->util
;
1489 struct commit
*commit
;
1491 if (is_null_oid(&ref
->new_oid
))
1493 commit
= lookup_commit_reference_gently(the_repository
,
1497 /* not pushing a commit, which is not an error */
1501 * Is this tag, which they do not have, reachable from
1502 * any of the commits we are sending?
1504 if (!(commit
->object
.flags
& reachable_flag
))
1508 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1509 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1510 dst_ref
->peer_ref
= copy_ref(ref
);
1513 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1515 free_commit_list(found_commits
);
1518 string_list_clear(&src_tag
, 0);
1519 free(sent_tips
.tip
);
1522 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1524 for ( ; list
; list
= list
->next
)
1525 if (!strcmp(list
->name
, name
))
1526 return (struct ref
*)list
;
1530 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1532 for ( ; ref
; ref
= ref
->next
)
1533 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1535 string_list_sort(ref_index
);
1539 * Given only the set of local refs, sanity-check the set of push
1540 * refspecs. We can't catch all errors that match_push_refs would,
1541 * but we can catch some errors early before even talking to the
1544 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1549 for (i
= 0; i
< rs
->nr
; i
++) {
1550 struct refspec_item
*item
= &rs
->items
[i
];
1552 if (item
->pattern
|| item
->matching
|| item
->negative
)
1555 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1562 * Given the set of refs the local repository has, the set of refs the
1563 * remote repository has, and the refspec used for push, determine
1564 * what remote refs we will update and with what value by setting
1565 * peer_ref (which object is being pushed) and force (if the push is
1566 * forced) in elements of "dst". The function may add new elements to
1567 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1569 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1570 struct refspec
*rs
, int flags
)
1572 int send_all
= flags
& MATCH_REFS_ALL
;
1573 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1574 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1576 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1577 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1579 /* If no refspec is provided, use the default ":" */
1581 refspec_append(rs
, ":");
1583 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1585 /* pick the remainder */
1586 for (ref
= src
; ref
; ref
= ref
->next
) {
1587 struct string_list_item
*dst_item
;
1588 struct ref
*dst_peer
;
1589 const struct refspec_item
*pat
= NULL
;
1592 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1596 if (!dst_ref_index
.nr
)
1597 prepare_ref_index(&dst_ref_index
, *dst
);
1599 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1600 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1602 if (dst_peer
->peer_ref
)
1603 /* We're already sending something to this ref. */
1606 if (pat
->matching
&& !(send_all
|| send_mirror
))
1608 * Remote doesn't have it, and we have no
1609 * explicit pattern, and we don't have
1610 * --all or --mirror.
1614 /* Create a new one and link it */
1615 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1616 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1617 string_list_insert(&dst_ref_index
,
1618 dst_peer
->name
)->util
= dst_peer
;
1620 dst_peer
->peer_ref
= copy_ref(ref
);
1621 dst_peer
->force
= pat
->force
;
1626 string_list_clear(&dst_ref_index
, 0);
1628 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1629 add_missing_tags(src
, dst
, &dst_tail
);
1632 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1633 /* check for missing refs on the remote */
1634 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1638 /* We're already sending something to this ref. */
1641 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1643 if (!src_ref_index
.nr
)
1644 prepare_ref_index(&src_ref_index
, src
);
1645 if (!string_list_has_string(&src_ref_index
,
1647 ref
->peer_ref
= alloc_delete_ref();
1651 string_list_clear(&src_ref_index
, 0);
1654 *dst
= apply_negative_refspecs(*dst
, rs
);
1661 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1666 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1667 int force_ref_update
= ref
->force
|| force_update
;
1668 int reject_reason
= 0;
1671 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1672 else if (!send_mirror
)
1675 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1676 if (!ref
->deletion
&&
1677 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1678 ref
->status
= REF_STATUS_UPTODATE
;
1683 * If the remote ref has moved and is now different
1684 * from what we expect, reject any push.
1686 * It also is an error if the user told us to check
1687 * with the remote-tracking branch to find the value
1688 * to expect, but we did not have such a tracking
1691 * If the tip of the remote-tracking ref is unreachable
1692 * from any reflog entry of its local ref indicating a
1693 * possible update since checkout; reject the push.
1695 if (ref
->expect_old_sha1
) {
1696 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1697 reject_reason
= REF_STATUS_REJECT_STALE
;
1698 else if (ref
->check_reachable
&& ref
->unreachable
)
1700 REF_STATUS_REJECT_REMOTE_UPDATED
;
1703 * If the ref isn't stale, and is reachable
1704 * from one of the reflog entries of
1705 * the local branch, force the update.
1707 force_ref_update
= 1;
1711 * If the update isn't already rejected then check
1712 * the usual "must fast-forward" rules.
1714 * Decide whether an individual refspec A:B can be
1715 * pushed. The push will succeed if any of the
1716 * following are true:
1718 * (1) the remote reference B does not exist
1720 * (2) the remote reference B is being removed (i.e.,
1721 * pushing :B where no source is specified)
1723 * (3) the destination is not under refs/tags/, and
1724 * if the old and new value is a commit, the new
1725 * is a descendant of the old.
1727 * (4) it is forced using the +A:B notation, or by
1728 * passing the --force argument
1731 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1732 if (starts_with(ref
->name
, "refs/tags/"))
1733 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1734 else if (!has_object_file(&ref
->old_oid
))
1735 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1736 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1737 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1738 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1739 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1740 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1744 * "--force" will defeat any rejection implemented
1745 * by the rules above.
1747 if (!force_ref_update
)
1748 ref
->status
= reject_reason
;
1749 else if (reject_reason
)
1750 ref
->forced_update
= 1;
1754 static void set_merge(struct remote_state
*remote_state
, struct branch
*ret
)
1756 struct remote
*remote
;
1758 struct object_id oid
;
1762 return; /* no branch */
1764 return; /* already run */
1765 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1767 * no merge config; let's make sure we don't confuse callers
1768 * with a non-zero merge_nr but a NULL merge
1774 remote
= remotes_remote_get(remote_state
, ret
->remote_name
);
1776 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1777 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1778 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1779 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1780 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1781 strcmp(ret
->remote_name
, "."))
1783 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1784 &oid
, &ref
, 0) == 1)
1785 ret
->merge
[i
]->dst
= ref
;
1787 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1791 struct branch
*branch_get(const char *name
)
1795 read_config(the_repository
);
1796 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1797 ret
= the_repository
->remote_state
->current_branch
;
1799 ret
= make_branch(the_repository
->remote_state
, name
,
1801 set_merge(the_repository
->remote_state
, ret
);
1805 int branch_has_merge_config(struct branch
*branch
)
1807 return branch
&& !!branch
->merge
;
1810 int branch_merge_matches(struct branch
*branch
,
1812 const char *refname
)
1814 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1816 return refname_match(branch
->merge
[i
]->src
, refname
);
1819 __attribute__((format (printf
,2,3)))
1820 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1825 strbuf_vaddf(err
, fmt
, ap
);
1831 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1834 return error_buf(err
, _("HEAD does not point to a branch"));
1836 if (!branch
->merge
|| !branch
->merge
[0]) {
1838 * no merge config; is it because the user didn't define any,
1839 * or because it is not a real branch, and get_branch
1842 if (!ref_exists(branch
->refname
))
1843 return error_buf(err
, _("no such branch: '%s'"),
1845 return error_buf(err
,
1846 _("no upstream configured for branch '%s'"),
1850 if (!branch
->merge
[0]->dst
)
1851 return error_buf(err
,
1852 _("upstream branch '%s' not stored as a remote-tracking branch"),
1853 branch
->merge
[0]->src
);
1855 return branch
->merge
[0]->dst
;
1858 static const char *tracking_for_push_dest(struct remote
*remote
,
1859 const char *refname
,
1864 ret
= apply_refspecs(&remote
->fetch
, refname
);
1866 return error_buf(err
,
1867 _("push destination '%s' on remote '%s' has no local tracking branch"),
1868 refname
, remote
->name
);
1872 static const char *branch_get_push_1(struct remote_state
*remote_state
,
1873 struct branch
*branch
, struct strbuf
*err
)
1875 struct remote
*remote
;
1877 remote
= remotes_remote_get(
1879 remotes_pushremote_for_branch(remote_state
, branch
, NULL
));
1881 return error_buf(err
,
1882 _("branch '%s' has no remote for pushing"),
1885 if (remote
->push
.nr
) {
1889 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1891 return error_buf(err
,
1892 _("push refspecs for '%s' do not include '%s'"),
1893 remote
->name
, branch
->name
);
1895 ret
= tracking_for_push_dest(remote
, dst
, err
);
1901 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1903 switch (push_default
) {
1904 case PUSH_DEFAULT_NOTHING
:
1905 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1907 case PUSH_DEFAULT_MATCHING
:
1908 case PUSH_DEFAULT_CURRENT
:
1909 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1911 case PUSH_DEFAULT_UPSTREAM
:
1912 return branch_get_upstream(branch
, err
);
1914 case PUSH_DEFAULT_UNSPECIFIED
:
1915 case PUSH_DEFAULT_SIMPLE
:
1917 const char *up
, *cur
;
1919 up
= branch_get_upstream(branch
, err
);
1922 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1925 if (strcmp(cur
, up
))
1926 return error_buf(err
,
1927 _("cannot resolve 'simple' push to a single destination"));
1932 BUG("unhandled push situation");
1935 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1937 read_config(the_repository
);
1938 die_on_missing_branch(the_repository
, branch
);
1941 return error_buf(err
, _("HEAD does not point to a branch"));
1943 if (!branch
->push_tracking_ref
)
1944 branch
->push_tracking_ref
= branch_get_push_1(
1945 the_repository
->remote_state
, branch
, err
);
1946 return branch
->push_tracking_ref
;
1949 static int ignore_symref_update(const char *refname
)
1953 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1954 return 0; /* non-existing refs are OK */
1955 return (flag
& REF_ISSYMREF
);
1959 * Create and return a list of (struct ref) consisting of copies of
1960 * each remote_ref that matches refspec. refspec must be a pattern.
1961 * Fill in the copies' peer_ref to describe the local tracking refs to
1962 * which they map. Omit any references that would map to an existing
1963 * local symbolic ref.
1965 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1966 const struct refspec_item
*refspec
)
1968 const struct ref
*ref
;
1969 struct ref
*ret
= NULL
;
1970 struct ref
**tail
= &ret
;
1972 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1973 char *expn_name
= NULL
;
1975 if (strchr(ref
->name
, '^'))
1976 continue; /* a dereference item */
1977 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1978 refspec
->dst
, &expn_name
) &&
1979 !ignore_symref_update(expn_name
)) {
1980 struct ref
*cpy
= copy_ref(ref
);
1982 cpy
->peer_ref
= alloc_ref(expn_name
);
1984 cpy
->peer_ref
->force
= 1;
1994 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1996 const struct ref
*ref
;
1997 const struct ref
*best_match
= NULL
;
2000 for (ref
= refs
; ref
; ref
= ref
->next
) {
2001 int score
= refname_match(name
, ref
->name
);
2003 if (best_score
< score
) {
2011 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
2013 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
2018 return copy_ref(ref
);
2021 static struct ref
*get_local_ref(const char *name
)
2023 if (!name
|| name
[0] == '\0')
2026 if (starts_with(name
, "refs/"))
2027 return alloc_ref(name
);
2029 if (starts_with(name
, "heads/") ||
2030 starts_with(name
, "tags/") ||
2031 starts_with(name
, "remotes/"))
2032 return alloc_ref_with_prefix("refs/", 5, name
);
2034 return alloc_ref_with_prefix("refs/heads/", 11, name
);
2037 int get_fetch_map(const struct ref
*remote_refs
,
2038 const struct refspec_item
*refspec
,
2042 struct ref
*ref_map
, **rmp
;
2044 if (refspec
->negative
)
2047 if (refspec
->pattern
) {
2048 ref_map
= get_expanded_map(remote_refs
, refspec
);
2050 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
2052 if (refspec
->exact_sha1
) {
2053 ref_map
= alloc_ref(name
);
2054 get_oid_hex(name
, &ref_map
->old_oid
);
2055 ref_map
->exact_oid
= 1;
2057 ref_map
= get_remote_ref(remote_refs
, name
);
2059 if (!missing_ok
&& !ref_map
)
2060 die(_("couldn't find remote ref %s"), name
);
2062 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
2063 if (ref_map
->peer_ref
&& refspec
->force
)
2064 ref_map
->peer_ref
->force
= 1;
2068 for (rmp
= &ref_map
; *rmp
; ) {
2069 if ((*rmp
)->peer_ref
) {
2070 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
2071 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
2072 struct ref
*ignore
= *rmp
;
2073 error(_("* Ignoring funny ref '%s' locally"),
2074 (*rmp
)->peer_ref
->name
);
2075 *rmp
= (*rmp
)->next
;
2076 free(ignore
->peer_ref
);
2081 rmp
= &((*rmp
)->next
);
2085 tail_link_ref(ref_map
, tail
);
2090 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
2094 for (; list
; list
= list
->next
)
2095 if (!strcmp(ref
->symref
, list
->name
)) {
2096 oidcpy(&ref
->old_oid
, &list
->old_oid
);
2103 * Compute the commit ahead/behind values for the pair branch_name, base.
2105 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2106 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2107 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2110 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2111 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2112 * commits are different.
2115 static int stat_branch_pair(const char *branch_name
, const char *base
,
2116 int *num_ours
, int *num_theirs
,
2117 enum ahead_behind_flags abf
)
2119 struct object_id oid
;
2120 struct commit
*ours
, *theirs
;
2121 struct rev_info revs
;
2122 struct strvec argv
= STRVEC_INIT
;
2124 /* Cannot stat if what we used to build on no longer exists */
2125 if (read_ref(base
, &oid
))
2127 theirs
= lookup_commit_reference(the_repository
, &oid
);
2131 if (read_ref(branch_name
, &oid
))
2133 ours
= lookup_commit_reference(the_repository
, &oid
);
2137 *num_theirs
= *num_ours
= 0;
2139 /* are we the same? */
2142 if (abf
== AHEAD_BEHIND_QUICK
)
2144 if (abf
!= AHEAD_BEHIND_FULL
)
2145 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2147 /* Run "rev-list --left-right ours...theirs" internally... */
2148 strvec_push(&argv
, ""); /* ignored */
2149 strvec_push(&argv
, "--left-right");
2150 strvec_pushf(&argv
, "%s...%s",
2151 oid_to_hex(&ours
->object
.oid
),
2152 oid_to_hex(&theirs
->object
.oid
));
2153 strvec_push(&argv
, "--");
2155 repo_init_revisions(the_repository
, &revs
, NULL
);
2156 setup_revisions(argv
.nr
, argv
.v
, &revs
, NULL
);
2157 if (prepare_revision_walk(&revs
))
2158 die(_("revision walk setup failed"));
2160 /* ... and count the commits on each side. */
2162 struct commit
*c
= get_revision(&revs
);
2165 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2171 /* clear object flags smudged by the above traversal */
2172 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2173 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2175 strvec_clear(&argv
);
2180 * Lookup the tracking branch for the given branch and if present, optionally
2181 * compute the commit ahead/behind values for the pair.
2183 * If for_push is true, the tracking branch refers to the push branch,
2184 * otherwise it refers to the upstream branch.
2186 * The name of the tracking branch (or NULL if it is not defined) is
2187 * returned via *tracking_name, if it is not itself NULL.
2189 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2190 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2191 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2194 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2195 * upstream defined, or ref does not exist). Returns 0 if the commits are
2196 * identical. Returns 1 if commits are different.
2198 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2199 const char **tracking_name
, int for_push
,
2200 enum ahead_behind_flags abf
)
2204 /* Cannot stat unless we are marked to build on top of somebody else. */
2205 base
= for_push
? branch_get_push(branch
, NULL
) :
2206 branch_get_upstream(branch
, NULL
);
2208 *tracking_name
= base
;
2212 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2216 * Return true when there is anything to report, otherwise false.
2218 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2219 enum ahead_behind_flags abf
)
2221 int ours
, theirs
, sti
;
2222 const char *full_base
;
2224 int upstream_is_gone
= 0;
2226 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2230 upstream_is_gone
= 1;
2233 base
= shorten_unambiguous_ref(full_base
, 0);
2234 if (upstream_is_gone
) {
2236 _("Your branch is based on '%s', but the upstream is gone.\n"),
2238 if (advice_enabled(ADVICE_STATUS_HINTS
))
2240 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2243 _("Your branch is up to date with '%s'.\n"),
2245 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2247 _("Your branch and '%s' refer to different commits.\n"),
2249 if (advice_enabled(ADVICE_STATUS_HINTS
))
2250 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2251 "git status --ahead-behind");
2252 } else if (!theirs
) {
2254 Q_("Your branch is ahead of '%s' by %d commit.\n",
2255 "Your branch is ahead of '%s' by %d commits.\n",
2258 if (advice_enabled(ADVICE_STATUS_HINTS
))
2260 _(" (use \"git push\" to publish your local commits)\n"));
2263 Q_("Your branch is behind '%s' by %d commit, "
2264 "and can be fast-forwarded.\n",
2265 "Your branch is behind '%s' by %d commits, "
2266 "and can be fast-forwarded.\n",
2269 if (advice_enabled(ADVICE_STATUS_HINTS
))
2271 _(" (use \"git pull\" to update your local branch)\n"));
2274 Q_("Your branch and '%s' have diverged,\n"
2275 "and have %d and %d different commit each, "
2277 "Your branch and '%s' have diverged,\n"
2278 "and have %d and %d different commits each, "
2281 base
, ours
, theirs
);
2282 if (advice_enabled(ADVICE_STATUS_HINTS
))
2284 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2290 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2291 int flag
, void *cb_data
)
2293 struct ref
***local_tail
= cb_data
;
2296 /* we already know it starts with refs/ to get here */
2297 if (check_refname_format(refname
+ 5, 0))
2300 ref
= alloc_ref(refname
);
2301 oidcpy(&ref
->new_oid
, oid
);
2303 *local_tail
= &ref
->next
;
2307 struct ref
*get_local_heads(void)
2309 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2311 for_each_ref(one_local_ref
, &local_tail
);
2315 struct ref
*guess_remote_head(const struct ref
*head
,
2316 const struct ref
*refs
,
2319 const struct ref
*r
;
2320 struct ref
*list
= NULL
;
2321 struct ref
**tail
= &list
;
2327 * Some transports support directly peeking at
2328 * where HEAD points; if that is the case, then
2329 * we don't have to guess.
2332 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2334 /* If a remote branch exists with the default branch name, let's use it. */
2336 char *ref
= xstrfmt("refs/heads/%s",
2337 git_default_branch_name(0));
2339 r
= find_ref_by_name(refs
, ref
);
2341 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2344 /* Fall back to the hard-coded historical default */
2345 r
= find_ref_by_name(refs
, "refs/heads/master");
2346 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2350 /* Look for another ref that points there */
2351 for (r
= refs
; r
; r
= r
->next
) {
2353 starts_with(r
->name
, "refs/heads/") &&
2354 oideq(&r
->old_oid
, &head
->old_oid
)) {
2355 *tail
= copy_ref(r
);
2356 tail
= &((*tail
)->next
);
2365 struct stale_heads_info
{
2366 struct string_list
*ref_names
;
2367 struct ref
**stale_refs_tail
;
2371 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2372 int flags
, void *cb_data
)
2374 struct stale_heads_info
*info
= cb_data
;
2375 struct string_list matches
= STRING_LIST_INIT_DUP
;
2376 struct refspec_item query
;
2378 memset(&query
, 0, sizeof(struct refspec_item
));
2379 query
.dst
= (char *)refname
;
2381 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2382 if (matches
.nr
== 0)
2383 goto clean_exit
; /* No matches */
2386 * If we did find a suitable refspec and it's not a symref and
2387 * it's not in the list of refs that currently exist in that
2388 * remote, we consider it to be stale. In order to deal with
2389 * overlapping refspecs, we need to go over all of the
2392 if (flags
& REF_ISSYMREF
)
2395 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2396 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2400 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2401 oidcpy(&ref
->new_oid
, oid
);
2405 string_list_clear(&matches
, 0);
2409 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2411 struct ref
*ref
, *stale_refs
= NULL
;
2412 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2413 struct stale_heads_info info
;
2415 info
.ref_names
= &ref_names
;
2416 info
.stale_refs_tail
= &stale_refs
;
2418 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2419 string_list_append(&ref_names
, ref
->name
);
2420 string_list_sort(&ref_names
);
2421 for_each_ref(get_stale_heads_cb
, &info
);
2422 string_list_clear(&ref_names
, 0);
2429 static void clear_cas_option(struct push_cas_option
*cas
)
2433 for (i
= 0; i
< cas
->nr
; i
++)
2434 free(cas
->entry
[i
].refname
);
2436 memset(cas
, 0, sizeof(*cas
));
2439 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2440 const char *refname
,
2443 struct push_cas
*entry
;
2444 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2445 entry
= &cas
->entry
[cas
->nr
++];
2446 memset(entry
, 0, sizeof(*entry
));
2447 entry
->refname
= xmemdupz(refname
, refnamelen
);
2451 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2454 struct push_cas
*entry
;
2457 /* "--no-<option>" */
2458 clear_cas_option(cas
);
2463 /* just "--<option>" */
2464 cas
->use_tracking_for_rest
= 1;
2468 /* "--<option>=refname" or "--<option>=refname:value" */
2469 colon
= strchrnul(arg
, ':');
2470 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2472 entry
->use_tracking
= 1;
2474 oidclr(&entry
->expect
);
2475 else if (get_oid(colon
+ 1, &entry
->expect
))
2476 return error(_("cannot parse expected object name '%s'"),
2481 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2483 return parse_push_cas_option(opt
->value
, arg
, unset
);
2486 int is_empty_cas(const struct push_cas_option
*cas
)
2488 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2492 * Look at remote.fetch refspec and see if we have a remote
2493 * tracking branch for the refname there. Fill the name of
2494 * the remote-tracking branch in *dst_refname, and the name
2495 * of the commit object at its tip in oid[].
2496 * If we cannot do so, return negative to signal an error.
2498 static int remote_tracking(struct remote
*remote
, const char *refname
,
2499 struct object_id
*oid
, char **dst_refname
)
2503 dst
= apply_refspecs(&remote
->fetch
, refname
);
2505 return -1; /* no tracking ref for refname at remote */
2506 if (read_ref(dst
, oid
))
2507 return -1; /* we know what the tracking ref is but we cannot read it */
2514 * The struct "reflog_commit_array" and related helper functions
2515 * are used for collecting commits into an array during reflog
2516 * traversals in "check_and_collect_until()".
2518 struct reflog_commit_array
{
2519 struct commit
**item
;
2523 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2525 /* Append a commit to the array. */
2526 static void append_commit(struct reflog_commit_array
*arr
,
2527 struct commit
*commit
)
2529 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2530 arr
->item
[arr
->nr
++] = commit
;
2533 /* Free and reset the array. */
2534 static void free_commit_array(struct reflog_commit_array
*arr
)
2536 FREE_AND_NULL(arr
->item
);
2537 arr
->nr
= arr
->alloc
= 0;
2540 struct check_and_collect_until_cb_data
{
2541 struct commit
*remote_commit
;
2542 struct reflog_commit_array
*local_commits
;
2543 timestamp_t remote_reflog_timestamp
;
2546 /* Get the timestamp of the latest entry. */
2547 static int peek_reflog(struct object_id
*o_oid
, struct object_id
*n_oid
,
2548 const char *ident
, timestamp_t timestamp
,
2549 int tz
, const char *message
, void *cb_data
)
2551 timestamp_t
*ts
= cb_data
;
2556 static int check_and_collect_until(struct object_id
*o_oid
,
2557 struct object_id
*n_oid
,
2558 const char *ident
, timestamp_t timestamp
,
2559 int tz
, const char *message
, void *cb_data
)
2561 struct commit
*commit
;
2562 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2564 /* An entry was found. */
2565 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2568 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2569 append_commit(cb
->local_commits
, commit
);
2572 * If the reflog entry timestamp is older than the remote ref's
2573 * latest reflog entry, there is no need to check or collect
2574 * entries older than this one.
2576 if (timestamp
< cb
->remote_reflog_timestamp
)
2582 #define MERGE_BASES_BATCH_SIZE 8
2585 * Iterate through the reflog of the local ref to check if there is an entry
2586 * for the given remote-tracking ref; runs until the timestamp of an entry is
2587 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2588 * are that seen along the way are collected into an array to check if the
2589 * remote-tracking ref is reachable from any of them.
2591 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2594 struct commit
*commit
;
2595 struct commit
**chunk
;
2596 struct check_and_collect_until_cb_data cb
;
2597 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2601 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2603 goto cleanup_return
;
2606 * Get the timestamp from the latest entry
2607 * of the remote-tracking ref's reflog.
2609 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2611 cb
.remote_commit
= commit
;
2612 cb
.local_commits
= &arr
;
2613 cb
.remote_reflog_timestamp
= date
;
2614 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2616 /* We found an entry in the reflog. */
2618 goto cleanup_return
;
2621 * Check if the remote commit is reachable from any
2622 * of the commits in the collected array, in batches.
2624 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2625 size
= arr
.item
+ arr
.nr
- chunk
;
2626 if (MERGE_BASES_BATCH_SIZE
< size
)
2627 size
= MERGE_BASES_BATCH_SIZE
;
2629 if ((ret
= in_merge_bases_many(commit
, size
, chunk
)))
2634 free_commit_array(&arr
);
2639 * Check for reachability of a remote-tracking
2640 * ref in the reflog entries of its local ref.
2642 static void check_if_includes_upstream(struct ref
*remote
)
2644 struct ref
*local
= get_local_ref(remote
->name
);
2648 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2649 remote
->unreachable
= 1;
2652 static void apply_cas(struct push_cas_option
*cas
,
2653 struct remote
*remote
,
2658 /* Find an explicit --<option>=<name>[:<value>] entry */
2659 for (i
= 0; i
< cas
->nr
; i
++) {
2660 struct push_cas
*entry
= &cas
->entry
[i
];
2661 if (!refname_match(entry
->refname
, ref
->name
))
2663 ref
->expect_old_sha1
= 1;
2664 if (!entry
->use_tracking
)
2665 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2666 else if (remote_tracking(remote
, ref
->name
,
2667 &ref
->old_oid_expect
,
2668 &ref
->tracking_ref
))
2669 oidclr(&ref
->old_oid_expect
);
2671 ref
->check_reachable
= cas
->use_force_if_includes
;
2675 /* Are we using "--<option>" to cover all? */
2676 if (!cas
->use_tracking_for_rest
)
2679 ref
->expect_old_sha1
= 1;
2680 if (remote_tracking(remote
, ref
->name
,
2681 &ref
->old_oid_expect
,
2682 &ref
->tracking_ref
))
2683 oidclr(&ref
->old_oid_expect
);
2685 ref
->check_reachable
= cas
->use_force_if_includes
;
2688 void apply_push_cas(struct push_cas_option
*cas
,
2689 struct remote
*remote
,
2690 struct ref
*remote_refs
)
2693 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2694 apply_cas(cas
, remote
, ref
);
2697 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2698 * mode, and if "--force-if-includes" was specified, run
2701 if (ref
->check_reachable
)
2702 check_if_includes_upstream(ref
);
2706 struct remote_state
*remote_state_new(void)
2708 struct remote_state
*r
= xmalloc(sizeof(*r
));
2710 memset(r
, 0, sizeof(*r
));
2712 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2713 hashmap_init(&r
->branches_hash
, branches_hash_cmp
, NULL
, 0);
2717 void remote_state_clear(struct remote_state
*remote_state
)
2721 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
2722 remote_clear(remote_state
->remotes
[i
]);
2724 FREE_AND_NULL(remote_state
->remotes
);
2725 remote_state
->remotes_alloc
= 0;
2726 remote_state
->remotes_nr
= 0;
2728 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2729 hashmap_clear_and_free(&remote_state
->branches_hash
, struct remote
, ent
);