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 static struct branch
*make_branch(struct remote_state
*remote_state
,
170 const char *name
, size_t len
)
175 for (i
= 0; i
< remote_state
->branches_nr
; i
++) {
176 if (!strncmp(name
, remote_state
->branches
[i
]->name
, len
) &&
177 !remote_state
->branches
[i
]->name
[len
])
178 return remote_state
->branches
[i
];
181 ALLOC_GROW(remote_state
->branches
, remote_state
->branches_nr
+ 1,
182 remote_state
->branches_alloc
);
183 CALLOC_ARRAY(ret
, 1);
184 remote_state
->branches
[remote_state
->branches_nr
++] = ret
;
185 ret
->name
= xstrndup(name
, len
);
186 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
191 static struct rewrite
*make_rewrite(struct rewrites
*r
,
192 const char *base
, size_t len
)
197 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
198 if (len
== r
->rewrite
[i
]->baselen
&&
199 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
200 return r
->rewrite
[i
];
203 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
204 CALLOC_ARRAY(ret
, 1);
205 r
->rewrite
[r
->rewrite_nr
++] = ret
;
206 ret
->base
= xstrndup(base
, len
);
211 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
213 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
214 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
215 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
216 rewrite
->instead_of_nr
++;
219 static const char *skip_spaces(const char *s
)
226 static void read_remotes_file(struct remote_state
*remote_state
,
227 struct remote
*remote
)
229 struct strbuf buf
= STRBUF_INIT
;
230 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
234 remote
->configured_in_repo
= 1;
235 remote
->origin
= REMOTE_REMOTES
;
236 while (strbuf_getline(&buf
, f
) != EOF
) {
241 if (skip_prefix(buf
.buf
, "URL:", &v
))
242 add_url_alias(remote_state
, remote
,
243 xstrdup(skip_spaces(v
)));
244 else if (skip_prefix(buf
.buf
, "Push:", &v
))
245 refspec_append(&remote
->push
, skip_spaces(v
));
246 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
247 refspec_append(&remote
->fetch
, skip_spaces(v
));
249 strbuf_release(&buf
);
253 static void read_branches_file(struct remote_state
*remote_state
,
254 struct remote
*remote
)
257 struct strbuf buf
= STRBUF_INIT
;
258 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
263 strbuf_getline_lf(&buf
, f
);
267 strbuf_release(&buf
);
271 remote
->configured_in_repo
= 1;
272 remote
->origin
= REMOTE_BRANCHES
;
275 * The branches file would have URL and optionally
276 * #branch specified. The default (or specified) branch is
277 * fetched and stored in the local branch matching the
280 frag
= strchr(buf
.buf
, '#');
284 frag
= (char *)git_default_branch_name(0);
286 add_url_alias(remote_state
, remote
, strbuf_detach(&buf
, NULL
));
287 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
291 * Cogito compatible push: push current HEAD to remote #branch
292 * (master if missing)
294 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
295 remote
->fetch_tags
= 1; /* always auto-follow */
298 static int handle_config(const char *key
, const char *value
, void *cb
)
303 struct remote
*remote
;
304 struct branch
*branch
;
305 struct remote_state
*remote_state
= cb
;
307 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
310 branch
= make_branch(remote_state
, name
, namelen
);
311 if (!strcmp(subkey
, "remote")) {
312 return git_config_string(&branch
->remote_name
, key
, value
);
313 } else if (!strcmp(subkey
, "pushremote")) {
314 return git_config_string(&branch
->pushremote_name
, key
, value
);
315 } else if (!strcmp(subkey
, "merge")) {
317 return config_error_nonbool(key
);
318 add_merge(branch
, xstrdup(value
));
322 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
323 struct rewrite
*rewrite
;
326 if (!strcmp(subkey
, "insteadof")) {
328 return config_error_nonbool(key
);
329 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
331 add_instead_of(rewrite
, xstrdup(value
));
332 } else if (!strcmp(subkey
, "pushinsteadof")) {
334 return config_error_nonbool(key
);
335 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
337 add_instead_of(rewrite
, xstrdup(value
));
341 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
344 /* Handle remote.* variables */
345 if (!name
&& !strcmp(subkey
, "pushdefault"))
346 return git_config_string(&remote_state
->pushremote_name
, key
,
351 /* Handle remote.<name>.* variables */
353 warning(_("config remote shorthand cannot begin with '/': %s"),
357 remote
= make_remote(remote_state
, name
, namelen
);
358 remote
->origin
= REMOTE_CONFIG
;
359 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
360 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
361 remote
->configured_in_repo
= 1;
362 if (!strcmp(subkey
, "mirror"))
363 remote
->mirror
= git_config_bool(key
, value
);
364 else if (!strcmp(subkey
, "skipdefaultupdate"))
365 remote
->skip_default_update
= git_config_bool(key
, value
);
366 else if (!strcmp(subkey
, "skipfetchall"))
367 remote
->skip_default_update
= git_config_bool(key
, value
);
368 else if (!strcmp(subkey
, "prune"))
369 remote
->prune
= git_config_bool(key
, value
);
370 else if (!strcmp(subkey
, "prunetags"))
371 remote
->prune_tags
= git_config_bool(key
, value
);
372 else if (!strcmp(subkey
, "url")) {
374 if (git_config_string(&v
, key
, value
))
377 } else if (!strcmp(subkey
, "pushurl")) {
379 if (git_config_string(&v
, key
, value
))
381 add_pushurl(remote
, v
);
382 } else if (!strcmp(subkey
, "push")) {
384 if (git_config_string(&v
, key
, value
))
386 refspec_append(&remote
->push
, v
);
388 } else if (!strcmp(subkey
, "fetch")) {
390 if (git_config_string(&v
, key
, value
))
392 refspec_append(&remote
->fetch
, v
);
394 } else if (!strcmp(subkey
, "receivepack")) {
396 if (git_config_string(&v
, key
, value
))
398 if (!remote
->receivepack
)
399 remote
->receivepack
= v
;
401 error(_("more than one receivepack given, using the first"));
402 } else if (!strcmp(subkey
, "uploadpack")) {
404 if (git_config_string(&v
, key
, value
))
406 if (!remote
->uploadpack
)
407 remote
->uploadpack
= v
;
409 error(_("more than one uploadpack given, using the first"));
410 } else if (!strcmp(subkey
, "tagopt")) {
411 if (!strcmp(value
, "--no-tags"))
412 remote
->fetch_tags
= -1;
413 else if (!strcmp(value
, "--tags"))
414 remote
->fetch_tags
= 2;
415 } else if (!strcmp(subkey
, "proxy")) {
416 return git_config_string((const char **)&remote
->http_proxy
,
418 } else if (!strcmp(subkey
, "proxyauthmethod")) {
419 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
421 } else if (!strcmp(subkey
, "vcs")) {
422 return git_config_string(&remote
->foreign_vcs
, key
, value
);
427 static void alias_all_urls(struct remote_state
*remote_state
)
430 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
431 int add_pushurl_aliases
;
432 if (!remote_state
->remotes
[i
])
434 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
435 remote_state
->remotes
[i
]->pushurl
[j
] =
436 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
437 &remote_state
->rewrites
);
439 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
440 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
441 if (add_pushurl_aliases
)
443 remote_state
, remote_state
->remotes
[i
],
444 remote_state
->remotes
[i
]->url
[j
]);
445 remote_state
->remotes
[i
]->url
[j
] =
446 alias_url(remote_state
->remotes
[i
]->url
[j
],
447 &remote_state
->rewrites
);
452 static void read_config(struct repository
*repo
)
456 if (repo
->remote_state
->initialized
)
458 repo
->remote_state
->initialized
= 1;
460 repo
->remote_state
->current_branch
= NULL
;
461 if (startup_info
->have_repository
) {
462 const char *head_ref
= refs_resolve_ref_unsafe(
463 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
);
464 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
465 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
466 repo
->remote_state
->current_branch
= make_branch(
467 repo
->remote_state
, head_ref
, strlen(head_ref
));
470 repo_config(repo
, handle_config
, repo
->remote_state
);
471 alias_all_urls(repo
->remote_state
);
474 static int valid_remote_nick(const char *name
)
476 if (!name
[0] || is_dot_or_dotdot(name
))
479 /* remote nicknames cannot contain slashes */
481 if (is_dir_sep(*name
++))
486 const char *remote_for_branch(struct branch
*branch
, int *explicit)
488 if (branch
&& branch
->remote_name
) {
491 return branch
->remote_name
;
498 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
500 if (branch
&& branch
->pushremote_name
) {
503 return branch
->pushremote_name
;
505 if (the_repository
->remote_state
->pushremote_name
) {
508 return the_repository
->remote_state
->pushremote_name
;
510 return remote_for_branch(branch
, explicit);
513 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
517 if (branch
->merge_nr
) {
518 return branch
->merge_name
[0];
521 const char *dst
, *remote_name
=
522 pushremote_for_branch(branch
, NULL
);
523 struct remote
*remote
= remote_get(remote_name
);
525 if (remote
&& remote
->push
.nr
&&
526 (dst
= apply_refspecs(&remote
->push
,
535 static struct remote
*remote_get_1(const char *name
,
536 const char *(*get_default
)(struct branch
*, int *))
541 read_config(the_repository
);
546 name
= get_default(the_repository
->remote_state
->current_branch
,
549 ret
= make_remote(the_repository
->remote_state
, name
, 0);
550 if (valid_remote_nick(name
) && have_git_dir()) {
551 if (!valid_remote(ret
))
552 read_remotes_file(the_repository
->remote_state
, ret
);
553 if (!valid_remote(ret
))
554 read_branches_file(the_repository
->remote_state
, ret
);
556 if (name_given
&& !valid_remote(ret
))
557 add_url_alias(the_repository
->remote_state
, ret
, name
);
558 if (!valid_remote(ret
))
563 struct remote
*remote_get(const char *name
)
565 return remote_get_1(name
, remote_for_branch
);
568 struct remote
*pushremote_get(const char *name
)
570 return remote_get_1(name
, pushremote_for_branch
);
573 int remote_is_configured(struct remote
*remote
, int in_repo
)
578 return remote
->configured_in_repo
;
579 return !!remote
->origin
;
582 int for_each_remote(each_remote_fn fn
, void *priv
)
585 read_config(the_repository
);
586 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
588 struct remote
*remote
=
589 the_repository
->remote_state
->remotes
[i
];
592 result
= fn(remote
, priv
);
597 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
599 if (strcmp(ref1
->name
, ref2
->name
)) {
600 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
601 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
602 die(_("Cannot fetch both %s and %s to %s"),
603 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
604 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
605 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
606 warning(_("%s usually tracks %s, not %s"),
607 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
608 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
609 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
610 die(_("%s tracks both %s and %s"),
611 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
614 * This last possibility doesn't occur because
615 * FETCH_HEAD_IGNORE entries always appear at
616 * the end of the list.
618 BUG("Internal error");
621 free(ref2
->peer_ref
);
625 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
627 struct string_list refs
= STRING_LIST_INIT_NODUP
;
628 struct ref
*retval
= NULL
;
629 struct ref
**p
= &retval
;
632 struct ref
*ref
= ref_map
;
634 ref_map
= ref_map
->next
;
637 if (!ref
->peer_ref
) {
641 struct string_list_item
*item
=
642 string_list_insert(&refs
, ref
->peer_ref
->name
);
645 /* Entry already existed */
646 handle_duplicate((struct ref
*)item
->util
, ref
);
655 string_list_clear(&refs
, 0);
659 int remote_has_url(struct remote
*remote
, const char *url
)
662 for (i
= 0; i
< remote
->url_nr
; i
++) {
663 if (!strcmp(remote
->url
[i
], url
))
669 static int match_name_with_pattern(const char *key
, const char *name
,
670 const char *value
, char **result
)
672 const char *kstar
= strchr(key
, '*');
678 die(_("key '%s' of pattern had no '*'"), key
);
680 ksuffixlen
= strlen(kstar
+ 1);
681 namelen
= strlen(name
);
682 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
683 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
685 struct strbuf sb
= STRBUF_INIT
;
686 const char *vstar
= strchr(value
, '*');
688 die(_("value '%s' of pattern has no '*'"), value
);
689 strbuf_add(&sb
, value
, vstar
- value
);
690 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
691 strbuf_addstr(&sb
, vstar
+ 1);
692 *result
= strbuf_detach(&sb
, NULL
);
697 static int refspec_match(const struct refspec_item
*refspec
,
700 if (refspec
->pattern
)
701 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
703 return !strcmp(refspec
->src
, name
);
706 static int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
710 for (i
= 0; i
< rs
->nr
; i
++) {
711 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
717 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
721 for (tail
= &ref_map
; *tail
; ) {
722 struct ref
*ref
= *tail
;
724 if (omit_name_by_refspec(ref
->name
, rs
)) {
735 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
737 int i
, matched_negative
= 0;
738 int find_src
= !query
->src
;
739 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
740 const char *needle
= find_src
? query
->dst
: query
->src
;
743 * Check whether the queried ref matches any negative refpsec. If so,
744 * then we should ultimately treat this as not matching the query at
747 * Note that negative refspecs always match the source, but the query
748 * item uses the destination. To handle this, we apply pattern
749 * refspecs in reverse to figure out if the query source matches any
750 * of the negative refspecs.
752 * The first loop finds and expands all positive refspecs
753 * matched by the queried ref.
755 * The second loop checks if any of the results of the first loop
756 * match any negative refspec.
758 for (i
= 0; i
< rs
->nr
; i
++) {
759 struct refspec_item
*refspec
= &rs
->items
[i
];
762 if (refspec
->negative
)
765 /* Note the reversal of src and dst */
766 if (refspec
->pattern
) {
767 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
768 const char *value
= refspec
->src
;
770 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
771 string_list_append_nodup(&reversed
, expn_name
);
772 } else if (refspec
->matching
) {
773 /* For the special matching refspec, any query should match */
774 string_list_append(&reversed
, needle
);
775 } else if (!refspec
->src
) {
776 BUG("refspec->src should not be null here");
777 } else if (!strcmp(needle
, refspec
->src
)) {
778 string_list_append(&reversed
, refspec
->src
);
782 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
783 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
784 matched_negative
= 1;
787 string_list_clear(&reversed
, 0);
789 return matched_negative
;
792 static void query_refspecs_multiple(struct refspec
*rs
,
793 struct refspec_item
*query
,
794 struct string_list
*results
)
797 int find_src
= !query
->src
;
799 if (find_src
&& !query
->dst
)
800 BUG("query_refspecs_multiple: need either src or dst");
802 if (query_matches_negative_refspec(rs
, query
))
805 for (i
= 0; i
< rs
->nr
; i
++) {
806 struct refspec_item
*refspec
= &rs
->items
[i
];
807 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
808 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
809 const char *needle
= find_src
? query
->dst
: query
->src
;
810 char **result
= find_src
? &query
->src
: &query
->dst
;
812 if (!refspec
->dst
|| refspec
->negative
)
814 if (refspec
->pattern
) {
815 if (match_name_with_pattern(key
, needle
, value
, result
))
816 string_list_append_nodup(results
, *result
);
817 } else if (!strcmp(needle
, key
)) {
818 string_list_append(results
, value
);
823 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
826 int find_src
= !query
->src
;
827 const char *needle
= find_src
? query
->dst
: query
->src
;
828 char **result
= find_src
? &query
->src
: &query
->dst
;
830 if (find_src
&& !query
->dst
)
831 BUG("query_refspecs: need either src or dst");
833 if (query_matches_negative_refspec(rs
, query
))
836 for (i
= 0; i
< rs
->nr
; i
++) {
837 struct refspec_item
*refspec
= &rs
->items
[i
];
838 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
839 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
841 if (!refspec
->dst
|| refspec
->negative
)
843 if (refspec
->pattern
) {
844 if (match_name_with_pattern(key
, needle
, value
, result
)) {
845 query
->force
= refspec
->force
;
848 } else if (!strcmp(needle
, key
)) {
849 *result
= xstrdup(value
);
850 query
->force
= refspec
->force
;
857 char *apply_refspecs(struct refspec
*rs
, const char *name
)
859 struct refspec_item query
;
861 memset(&query
, 0, sizeof(struct refspec_item
));
862 query
.src
= (char *)name
;
864 if (query_refspecs(rs
, &query
))
870 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
872 return query_refspecs(&remote
->fetch
, refspec
);
875 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
878 size_t len
= strlen(name
);
879 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
880 memcpy(ref
->name
, prefix
, prefixlen
);
881 memcpy(ref
->name
+ prefixlen
, name
, len
);
885 struct ref
*alloc_ref(const char *name
)
887 return alloc_ref_with_prefix("", 0, name
);
890 struct ref
*copy_ref(const struct ref
*ref
)
896 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
898 memcpy(cpy
, ref
, len
);
900 cpy
->symref
= xstrdup_or_null(ref
->symref
);
901 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
902 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
906 struct ref
*copy_ref_list(const struct ref
*ref
)
908 struct ref
*ret
= NULL
;
909 struct ref
**tail
= &ret
;
911 *tail
= copy_ref(ref
);
913 tail
= &((*tail
)->next
);
918 void free_one_ref(struct ref
*ref
)
922 free_one_ref(ref
->peer_ref
);
923 free(ref
->remote_status
);
928 void free_refs(struct ref
*ref
)
938 int ref_compare_name(const void *va
, const void *vb
)
940 const struct ref
*a
= va
, *b
= vb
;
941 return strcmp(a
->name
, b
->name
);
944 static void *ref_list_get_next(const void *a
)
946 return ((const struct ref
*)a
)->next
;
949 static void ref_list_set_next(void *a
, void *next
)
951 ((struct ref
*)a
)->next
= next
;
954 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
956 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
959 int count_refspec_match(const char *pattern
,
961 struct ref
**matched_ref
)
963 int patlen
= strlen(pattern
);
964 struct ref
*matched_weak
= NULL
;
965 struct ref
*matched
= NULL
;
969 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
970 char *name
= refs
->name
;
971 int namelen
= strlen(name
);
973 if (!refname_match(pattern
, name
))
976 /* A match is "weak" if it is with refs outside
977 * heads or tags, and did not specify the pattern
978 * in full (e.g. "refs/remotes/origin/master") or at
979 * least from the toplevel (e.g. "remotes/origin/master");
980 * otherwise "git push $URL master" would result in
981 * ambiguity between remotes/origin/master and heads/master
982 * at the remote site.
984 if (namelen
!= patlen
&&
985 patlen
!= namelen
- 5 &&
986 !starts_with(name
, "refs/heads/") &&
987 !starts_with(name
, "refs/tags/")) {
988 /* We want to catch the case where only weak
989 * matches are found and there are multiple
990 * matches, and where more than one strong
991 * matches are found, as ambiguous. One
992 * strong match with zero or more weak matches
993 * are acceptable as a unique match.
1005 *matched_ref
= matched_weak
;
1010 *matched_ref
= matched
;
1015 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1023 static struct ref
*alloc_delete_ref(void)
1025 struct ref
*ref
= alloc_ref("(delete)");
1026 oidclr(&ref
->new_oid
);
1030 static int try_explicit_object_name(const char *name
,
1033 struct object_id oid
;
1037 *match
= alloc_delete_ref();
1041 if (get_oid(name
, &oid
))
1045 *match
= alloc_ref(name
);
1046 oidcpy(&(*match
)->new_oid
, &oid
);
1051 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1053 struct ref
*ret
= alloc_ref(name
);
1054 tail_link_ref(ret
, tail
);
1058 static char *guess_ref(const char *name
, struct ref
*peer
)
1060 struct strbuf buf
= STRBUF_INIT
;
1062 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1067 if (starts_with(r
, "refs/heads/")) {
1068 strbuf_addstr(&buf
, "refs/heads/");
1069 } else if (starts_with(r
, "refs/tags/")) {
1070 strbuf_addstr(&buf
, "refs/tags/");
1075 strbuf_addstr(&buf
, name
);
1076 return strbuf_detach(&buf
, NULL
);
1079 static int match_explicit_lhs(struct ref
*src
,
1080 struct refspec_item
*rs
,
1082 int *allocated_match
)
1084 switch (count_refspec_match(rs
->src
, src
, match
)) {
1086 if (allocated_match
)
1087 *allocated_match
= 0;
1090 /* The source could be in the get_sha1() format
1091 * not a reference name. :refs/other is a
1092 * way to delete 'other' ref at the remote end.
1094 if (try_explicit_object_name(rs
->src
, match
) < 0)
1095 return error(_("src refspec %s does not match any"), rs
->src
);
1096 if (allocated_match
)
1097 *allocated_match
= 1;
1100 return error(_("src refspec %s matches more than one"), rs
->src
);
1104 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1105 const char *matched_src_name
)
1107 struct object_id oid
;
1108 enum object_type type
;
1111 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1112 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1115 error(_("The destination you provided is not a full refname (i.e.,\n"
1116 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1118 "- Looking for a ref that matches '%s' on the remote side.\n"
1119 "- Checking if the <src> being pushed ('%s')\n"
1120 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1121 " refs/{heads,tags}/ prefix on the remote side.\n"
1123 "Neither worked, so we gave up. You must fully qualify the ref."),
1124 dst_value
, matched_src_name
);
1126 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1129 if (get_oid(matched_src_name
, &oid
))
1130 BUG("'%s' is not a valid object, "
1131 "match_explicit_lhs() should catch this!",
1133 type
= oid_object_info(the_repository
, &oid
, NULL
);
1134 if (type
== OBJ_COMMIT
) {
1135 advise(_("The <src> part of the refspec is a commit object.\n"
1136 "Did you mean to create a new branch by pushing to\n"
1137 "'%s:refs/heads/%s'?"),
1138 matched_src_name
, dst_value
);
1139 } else if (type
== OBJ_TAG
) {
1140 advise(_("The <src> part of the refspec is a tag object.\n"
1141 "Did you mean to create a new tag by pushing to\n"
1142 "'%s:refs/tags/%s'?"),
1143 matched_src_name
, dst_value
);
1144 } else if (type
== OBJ_TREE
) {
1145 advise(_("The <src> part of the refspec is a tree object.\n"
1146 "Did you mean to tag a new tree by pushing to\n"
1147 "'%s:refs/tags/%s'?"),
1148 matched_src_name
, dst_value
);
1149 } else if (type
== OBJ_BLOB
) {
1150 advise(_("The <src> part of the refspec is a blob object.\n"
1151 "Did you mean to tag a new blob by pushing to\n"
1152 "'%s:refs/tags/%s'?"),
1153 matched_src_name
, dst_value
);
1155 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1156 matched_src_name
, type
);
1160 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1161 struct ref
***dst_tail
,
1162 struct refspec_item
*rs
)
1164 struct ref
*matched_src
, *matched_dst
;
1167 const char *dst_value
= rs
->dst
;
1170 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1173 matched_src
= matched_dst
= NULL
;
1174 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1180 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1181 RESOLVE_REF_READING
,
1184 ((flag
& REF_ISSYMREF
) &&
1185 !starts_with(dst_value
, "refs/heads/")))
1186 die(_("%s cannot be resolved to branch"),
1190 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1194 if (starts_with(dst_value
, "refs/")) {
1195 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1196 } else if (is_null_oid(&matched_src
->new_oid
)) {
1197 error(_("unable to delete '%s': remote ref does not exist"),
1199 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1200 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1203 show_push_unqualified_ref_name_error(dst_value
,
1209 error(_("dst refspec %s matches more than one"),
1215 if (matched_dst
->peer_ref
)
1216 return error(_("dst ref %s receives from more than one src"),
1219 matched_dst
->peer_ref
= allocated_src
?
1221 copy_ref(matched_src
);
1222 matched_dst
->force
= rs
->force
;
1227 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1228 struct ref
***dst_tail
, struct refspec
*rs
)
1231 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1232 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1236 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1237 int send_mirror
, int direction
,
1238 const struct refspec_item
**ret_pat
)
1240 const struct refspec_item
*pat
;
1243 int matching_refs
= -1;
1244 for (i
= 0; i
< rs
->nr
; i
++) {
1245 const struct refspec_item
*item
= &rs
->items
[i
];
1250 if (item
->matching
&&
1251 (matching_refs
== -1 || item
->force
)) {
1256 if (item
->pattern
) {
1257 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1259 if (direction
== FROM_SRC
)
1260 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1262 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1269 if (matching_refs
== -1)
1272 pat
= &rs
->items
[matching_refs
];
1273 if (pat
->matching
) {
1275 * "matching refs"; traditionally we pushed everything
1276 * including refs outside refs/heads/ hierarchy, but
1277 * that does not make much sense these days.
1279 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1281 name
= xstrdup(ref
->name
);
1288 static struct ref
**tail_ref(struct ref
**head
)
1290 struct ref
**tail
= head
;
1292 tail
= &((*tail
)->next
);
1297 struct commit
**tip
;
1301 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1303 struct commit
*commit
;
1305 if (is_null_oid(oid
))
1307 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1308 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1310 commit
->object
.flags
|= TMP_MARK
;
1311 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1312 tips
->tip
[tips
->nr
++] = commit
;
1315 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1317 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1318 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1319 struct string_list_item
*item
;
1321 struct tips sent_tips
;
1324 * Collect everything we know they would have at the end of
1325 * this push, and collect all tags they have.
1327 memset(&sent_tips
, 0, sizeof(sent_tips
));
1328 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1329 if (ref
->peer_ref
&&
1330 !is_null_oid(&ref
->peer_ref
->new_oid
))
1331 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1333 add_to_tips(&sent_tips
, &ref
->old_oid
);
1334 if (starts_with(ref
->name
, "refs/tags/"))
1335 string_list_append(&dst_tag
, ref
->name
);
1337 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1339 string_list_sort(&dst_tag
);
1341 /* Collect tags they do not have. */
1342 for (ref
= src
; ref
; ref
= ref
->next
) {
1343 if (!starts_with(ref
->name
, "refs/tags/"))
1344 continue; /* not a tag */
1345 if (string_list_has_string(&dst_tag
, ref
->name
))
1346 continue; /* they already have it */
1347 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1348 continue; /* be conservative */
1349 item
= string_list_append(&src_tag
, ref
->name
);
1352 string_list_clear(&dst_tag
, 0);
1355 * At this point, src_tag lists tags that are missing from
1356 * dst, and sent_tips lists the tips we are pushing or those
1357 * that we know they already have. An element in the src_tag
1358 * that is an ancestor of any of the sent_tips needs to be
1359 * sent to the other side.
1362 const int reachable_flag
= 1;
1363 struct commit_list
*found_commits
;
1364 struct commit
**src_commits
;
1365 int nr_src_commits
= 0, alloc_src_commits
= 16;
1366 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1368 for_each_string_list_item(item
, &src_tag
) {
1369 struct ref
*ref
= item
->util
;
1370 struct commit
*commit
;
1372 if (is_null_oid(&ref
->new_oid
))
1374 commit
= lookup_commit_reference_gently(the_repository
,
1378 /* not pushing a commit, which is not an error */
1381 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1382 src_commits
[nr_src_commits
++] = commit
;
1385 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1386 src_commits
, nr_src_commits
,
1389 for_each_string_list_item(item
, &src_tag
) {
1390 struct ref
*dst_ref
;
1391 struct ref
*ref
= item
->util
;
1392 struct commit
*commit
;
1394 if (is_null_oid(&ref
->new_oid
))
1396 commit
= lookup_commit_reference_gently(the_repository
,
1400 /* not pushing a commit, which is not an error */
1404 * Is this tag, which they do not have, reachable from
1405 * any of the commits we are sending?
1407 if (!(commit
->object
.flags
& reachable_flag
))
1411 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1412 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1413 dst_ref
->peer_ref
= copy_ref(ref
);
1416 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1418 free_commit_list(found_commits
);
1421 string_list_clear(&src_tag
, 0);
1422 free(sent_tips
.tip
);
1425 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1427 for ( ; list
; list
= list
->next
)
1428 if (!strcmp(list
->name
, name
))
1429 return (struct ref
*)list
;
1433 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1435 for ( ; ref
; ref
= ref
->next
)
1436 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1438 string_list_sort(ref_index
);
1442 * Given only the set of local refs, sanity-check the set of push
1443 * refspecs. We can't catch all errors that match_push_refs would,
1444 * but we can catch some errors early before even talking to the
1447 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1452 for (i
= 0; i
< rs
->nr
; i
++) {
1453 struct refspec_item
*item
= &rs
->items
[i
];
1455 if (item
->pattern
|| item
->matching
|| item
->negative
)
1458 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1465 * Given the set of refs the local repository has, the set of refs the
1466 * remote repository has, and the refspec used for push, determine
1467 * what remote refs we will update and with what value by setting
1468 * peer_ref (which object is being pushed) and force (if the push is
1469 * forced) in elements of "dst". The function may add new elements to
1470 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1472 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1473 struct refspec
*rs
, int flags
)
1475 int send_all
= flags
& MATCH_REFS_ALL
;
1476 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1477 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1479 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1480 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1482 /* If no refspec is provided, use the default ":" */
1484 refspec_append(rs
, ":");
1486 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1488 /* pick the remainder */
1489 for (ref
= src
; ref
; ref
= ref
->next
) {
1490 struct string_list_item
*dst_item
;
1491 struct ref
*dst_peer
;
1492 const struct refspec_item
*pat
= NULL
;
1495 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1499 if (!dst_ref_index
.nr
)
1500 prepare_ref_index(&dst_ref_index
, *dst
);
1502 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1503 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1505 if (dst_peer
->peer_ref
)
1506 /* We're already sending something to this ref. */
1509 if (pat
->matching
&& !(send_all
|| send_mirror
))
1511 * Remote doesn't have it, and we have no
1512 * explicit pattern, and we don't have
1513 * --all or --mirror.
1517 /* Create a new one and link it */
1518 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1519 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1520 string_list_insert(&dst_ref_index
,
1521 dst_peer
->name
)->util
= dst_peer
;
1523 dst_peer
->peer_ref
= copy_ref(ref
);
1524 dst_peer
->force
= pat
->force
;
1529 string_list_clear(&dst_ref_index
, 0);
1531 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1532 add_missing_tags(src
, dst
, &dst_tail
);
1535 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1536 /* check for missing refs on the remote */
1537 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1541 /* We're already sending something to this ref. */
1544 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1546 if (!src_ref_index
.nr
)
1547 prepare_ref_index(&src_ref_index
, src
);
1548 if (!string_list_has_string(&src_ref_index
,
1550 ref
->peer_ref
= alloc_delete_ref();
1554 string_list_clear(&src_ref_index
, 0);
1557 *dst
= apply_negative_refspecs(*dst
, rs
);
1564 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1569 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1570 int force_ref_update
= ref
->force
|| force_update
;
1571 int reject_reason
= 0;
1574 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1575 else if (!send_mirror
)
1578 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1579 if (!ref
->deletion
&&
1580 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1581 ref
->status
= REF_STATUS_UPTODATE
;
1586 * If the remote ref has moved and is now different
1587 * from what we expect, reject any push.
1589 * It also is an error if the user told us to check
1590 * with the remote-tracking branch to find the value
1591 * to expect, but we did not have such a tracking
1594 * If the tip of the remote-tracking ref is unreachable
1595 * from any reflog entry of its local ref indicating a
1596 * possible update since checkout; reject the push.
1598 if (ref
->expect_old_sha1
) {
1599 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1600 reject_reason
= REF_STATUS_REJECT_STALE
;
1601 else if (ref
->check_reachable
&& ref
->unreachable
)
1603 REF_STATUS_REJECT_REMOTE_UPDATED
;
1606 * If the ref isn't stale, and is reachable
1607 * from one of the reflog entries of
1608 * the local branch, force the update.
1610 force_ref_update
= 1;
1614 * If the update isn't already rejected then check
1615 * the usual "must fast-forward" rules.
1617 * Decide whether an individual refspec A:B can be
1618 * pushed. The push will succeed if any of the
1619 * following are true:
1621 * (1) the remote reference B does not exist
1623 * (2) the remote reference B is being removed (i.e.,
1624 * pushing :B where no source is specified)
1626 * (3) the destination is not under refs/tags/, and
1627 * if the old and new value is a commit, the new
1628 * is a descendant of the old.
1630 * (4) it is forced using the +A:B notation, or by
1631 * passing the --force argument
1634 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1635 if (starts_with(ref
->name
, "refs/tags/"))
1636 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1637 else if (!has_object_file(&ref
->old_oid
))
1638 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1639 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1640 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1641 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1642 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1643 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1647 * "--force" will defeat any rejection implemented
1648 * by the rules above.
1650 if (!force_ref_update
)
1651 ref
->status
= reject_reason
;
1652 else if (reject_reason
)
1653 ref
->forced_update
= 1;
1657 static void set_merge(struct branch
*ret
)
1659 struct remote
*remote
;
1661 struct object_id oid
;
1665 return; /* no branch */
1667 return; /* already run */
1668 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1670 * no merge config; let's make sure we don't confuse callers
1671 * with a non-zero merge_nr but a NULL merge
1677 remote
= remote_get(ret
->remote_name
);
1679 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1680 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1681 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1682 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1683 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1684 strcmp(ret
->remote_name
, "."))
1686 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1687 &oid
, &ref
, 0) == 1)
1688 ret
->merge
[i
]->dst
= ref
;
1690 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1694 struct branch
*branch_get(const char *name
)
1698 read_config(the_repository
);
1699 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1700 ret
= the_repository
->remote_state
->current_branch
;
1702 ret
= make_branch(the_repository
->remote_state
, name
,
1708 int branch_has_merge_config(struct branch
*branch
)
1710 return branch
&& !!branch
->merge
;
1713 int branch_merge_matches(struct branch
*branch
,
1715 const char *refname
)
1717 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1719 return refname_match(branch
->merge
[i
]->src
, refname
);
1722 __attribute__((format (printf
,2,3)))
1723 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1728 strbuf_vaddf(err
, fmt
, ap
);
1734 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1737 return error_buf(err
, _("HEAD does not point to a branch"));
1739 if (!branch
->merge
|| !branch
->merge
[0]) {
1741 * no merge config; is it because the user didn't define any,
1742 * or because it is not a real branch, and get_branch
1745 if (!ref_exists(branch
->refname
))
1746 return error_buf(err
, _("no such branch: '%s'"),
1748 return error_buf(err
,
1749 _("no upstream configured for branch '%s'"),
1753 if (!branch
->merge
[0]->dst
)
1754 return error_buf(err
,
1755 _("upstream branch '%s' not stored as a remote-tracking branch"),
1756 branch
->merge
[0]->src
);
1758 return branch
->merge
[0]->dst
;
1761 static const char *tracking_for_push_dest(struct remote
*remote
,
1762 const char *refname
,
1767 ret
= apply_refspecs(&remote
->fetch
, refname
);
1769 return error_buf(err
,
1770 _("push destination '%s' on remote '%s' has no local tracking branch"),
1771 refname
, remote
->name
);
1775 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1777 struct remote
*remote
;
1779 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1781 return error_buf(err
,
1782 _("branch '%s' has no remote for pushing"),
1785 if (remote
->push
.nr
) {
1789 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1791 return error_buf(err
,
1792 _("push refspecs for '%s' do not include '%s'"),
1793 remote
->name
, branch
->name
);
1795 ret
= tracking_for_push_dest(remote
, dst
, err
);
1801 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1803 switch (push_default
) {
1804 case PUSH_DEFAULT_NOTHING
:
1805 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1807 case PUSH_DEFAULT_MATCHING
:
1808 case PUSH_DEFAULT_CURRENT
:
1809 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1811 case PUSH_DEFAULT_UPSTREAM
:
1812 return branch_get_upstream(branch
, err
);
1814 case PUSH_DEFAULT_UNSPECIFIED
:
1815 case PUSH_DEFAULT_SIMPLE
:
1817 const char *up
, *cur
;
1819 up
= branch_get_upstream(branch
, err
);
1822 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1825 if (strcmp(cur
, up
))
1826 return error_buf(err
,
1827 _("cannot resolve 'simple' push to a single destination"));
1832 BUG("unhandled push situation");
1835 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1838 return error_buf(err
, _("HEAD does not point to a branch"));
1840 if (!branch
->push_tracking_ref
)
1841 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1842 return branch
->push_tracking_ref
;
1845 static int ignore_symref_update(const char *refname
)
1849 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1850 return 0; /* non-existing refs are OK */
1851 return (flag
& REF_ISSYMREF
);
1855 * Create and return a list of (struct ref) consisting of copies of
1856 * each remote_ref that matches refspec. refspec must be a pattern.
1857 * Fill in the copies' peer_ref to describe the local tracking refs to
1858 * which they map. Omit any references that would map to an existing
1859 * local symbolic ref.
1861 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1862 const struct refspec_item
*refspec
)
1864 const struct ref
*ref
;
1865 struct ref
*ret
= NULL
;
1866 struct ref
**tail
= &ret
;
1868 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1869 char *expn_name
= NULL
;
1871 if (strchr(ref
->name
, '^'))
1872 continue; /* a dereference item */
1873 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1874 refspec
->dst
, &expn_name
) &&
1875 !ignore_symref_update(expn_name
)) {
1876 struct ref
*cpy
= copy_ref(ref
);
1878 cpy
->peer_ref
= alloc_ref(expn_name
);
1880 cpy
->peer_ref
->force
= 1;
1890 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1892 const struct ref
*ref
;
1893 const struct ref
*best_match
= NULL
;
1896 for (ref
= refs
; ref
; ref
= ref
->next
) {
1897 int score
= refname_match(name
, ref
->name
);
1899 if (best_score
< score
) {
1907 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1909 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1914 return copy_ref(ref
);
1917 static struct ref
*get_local_ref(const char *name
)
1919 if (!name
|| name
[0] == '\0')
1922 if (starts_with(name
, "refs/"))
1923 return alloc_ref(name
);
1925 if (starts_with(name
, "heads/") ||
1926 starts_with(name
, "tags/") ||
1927 starts_with(name
, "remotes/"))
1928 return alloc_ref_with_prefix("refs/", 5, name
);
1930 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1933 int get_fetch_map(const struct ref
*remote_refs
,
1934 const struct refspec_item
*refspec
,
1938 struct ref
*ref_map
, **rmp
;
1940 if (refspec
->negative
)
1943 if (refspec
->pattern
) {
1944 ref_map
= get_expanded_map(remote_refs
, refspec
);
1946 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1948 if (refspec
->exact_sha1
) {
1949 ref_map
= alloc_ref(name
);
1950 get_oid_hex(name
, &ref_map
->old_oid
);
1951 ref_map
->exact_oid
= 1;
1953 ref_map
= get_remote_ref(remote_refs
, name
);
1955 if (!missing_ok
&& !ref_map
)
1956 die(_("couldn't find remote ref %s"), name
);
1958 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1959 if (ref_map
->peer_ref
&& refspec
->force
)
1960 ref_map
->peer_ref
->force
= 1;
1964 for (rmp
= &ref_map
; *rmp
; ) {
1965 if ((*rmp
)->peer_ref
) {
1966 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1967 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1968 struct ref
*ignore
= *rmp
;
1969 error(_("* Ignoring funny ref '%s' locally"),
1970 (*rmp
)->peer_ref
->name
);
1971 *rmp
= (*rmp
)->next
;
1972 free(ignore
->peer_ref
);
1977 rmp
= &((*rmp
)->next
);
1981 tail_link_ref(ref_map
, tail
);
1986 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1990 for (; list
; list
= list
->next
)
1991 if (!strcmp(ref
->symref
, list
->name
)) {
1992 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1999 * Compute the commit ahead/behind values for the pair branch_name, base.
2001 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2002 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2003 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2006 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2007 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2008 * commits are different.
2011 static int stat_branch_pair(const char *branch_name
, const char *base
,
2012 int *num_ours
, int *num_theirs
,
2013 enum ahead_behind_flags abf
)
2015 struct object_id oid
;
2016 struct commit
*ours
, *theirs
;
2017 struct rev_info revs
;
2018 struct strvec argv
= STRVEC_INIT
;
2020 /* Cannot stat if what we used to build on no longer exists */
2021 if (read_ref(base
, &oid
))
2023 theirs
= lookup_commit_reference(the_repository
, &oid
);
2027 if (read_ref(branch_name
, &oid
))
2029 ours
= lookup_commit_reference(the_repository
, &oid
);
2033 *num_theirs
= *num_ours
= 0;
2035 /* are we the same? */
2038 if (abf
== AHEAD_BEHIND_QUICK
)
2040 if (abf
!= AHEAD_BEHIND_FULL
)
2041 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2043 /* Run "rev-list --left-right ours...theirs" internally... */
2044 strvec_push(&argv
, ""); /* ignored */
2045 strvec_push(&argv
, "--left-right");
2046 strvec_pushf(&argv
, "%s...%s",
2047 oid_to_hex(&ours
->object
.oid
),
2048 oid_to_hex(&theirs
->object
.oid
));
2049 strvec_push(&argv
, "--");
2051 repo_init_revisions(the_repository
, &revs
, NULL
);
2052 setup_revisions(argv
.nr
, argv
.v
, &revs
, NULL
);
2053 if (prepare_revision_walk(&revs
))
2054 die(_("revision walk setup failed"));
2056 /* ... and count the commits on each side. */
2058 struct commit
*c
= get_revision(&revs
);
2061 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2067 /* clear object flags smudged by the above traversal */
2068 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2069 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2071 strvec_clear(&argv
);
2076 * Lookup the tracking branch for the given branch and if present, optionally
2077 * compute the commit ahead/behind values for the pair.
2079 * If for_push is true, the tracking branch refers to the push branch,
2080 * otherwise it refers to the upstream branch.
2082 * The name of the tracking branch (or NULL if it is not defined) is
2083 * returned via *tracking_name, if it is not itself NULL.
2085 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2086 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2087 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2090 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2091 * upstream defined, or ref does not exist). Returns 0 if the commits are
2092 * identical. Returns 1 if commits are different.
2094 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2095 const char **tracking_name
, int for_push
,
2096 enum ahead_behind_flags abf
)
2100 /* Cannot stat unless we are marked to build on top of somebody else. */
2101 base
= for_push
? branch_get_push(branch
, NULL
) :
2102 branch_get_upstream(branch
, NULL
);
2104 *tracking_name
= base
;
2108 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2112 * Return true when there is anything to report, otherwise false.
2114 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2115 enum ahead_behind_flags abf
)
2117 int ours
, theirs
, sti
;
2118 const char *full_base
;
2120 int upstream_is_gone
= 0;
2122 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2126 upstream_is_gone
= 1;
2129 base
= shorten_unambiguous_ref(full_base
, 0);
2130 if (upstream_is_gone
) {
2132 _("Your branch is based on '%s', but the upstream is gone.\n"),
2134 if (advice_enabled(ADVICE_STATUS_HINTS
))
2136 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2139 _("Your branch is up to date with '%s'.\n"),
2141 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2143 _("Your branch and '%s' refer to different commits.\n"),
2145 if (advice_enabled(ADVICE_STATUS_HINTS
))
2146 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2147 "git status --ahead-behind");
2148 } else if (!theirs
) {
2150 Q_("Your branch is ahead of '%s' by %d commit.\n",
2151 "Your branch is ahead of '%s' by %d commits.\n",
2154 if (advice_enabled(ADVICE_STATUS_HINTS
))
2156 _(" (use \"git push\" to publish your local commits)\n"));
2159 Q_("Your branch is behind '%s' by %d commit, "
2160 "and can be fast-forwarded.\n",
2161 "Your branch is behind '%s' by %d commits, "
2162 "and can be fast-forwarded.\n",
2165 if (advice_enabled(ADVICE_STATUS_HINTS
))
2167 _(" (use \"git pull\" to update your local branch)\n"));
2170 Q_("Your branch and '%s' have diverged,\n"
2171 "and have %d and %d different commit each, "
2173 "Your branch and '%s' have diverged,\n"
2174 "and have %d and %d different commits each, "
2177 base
, ours
, theirs
);
2178 if (advice_enabled(ADVICE_STATUS_HINTS
))
2180 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2186 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2187 int flag
, void *cb_data
)
2189 struct ref
***local_tail
= cb_data
;
2192 /* we already know it starts with refs/ to get here */
2193 if (check_refname_format(refname
+ 5, 0))
2196 ref
= alloc_ref(refname
);
2197 oidcpy(&ref
->new_oid
, oid
);
2199 *local_tail
= &ref
->next
;
2203 struct ref
*get_local_heads(void)
2205 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2207 for_each_ref(one_local_ref
, &local_tail
);
2211 struct ref
*guess_remote_head(const struct ref
*head
,
2212 const struct ref
*refs
,
2215 const struct ref
*r
;
2216 struct ref
*list
= NULL
;
2217 struct ref
**tail
= &list
;
2223 * Some transports support directly peeking at
2224 * where HEAD points; if that is the case, then
2225 * we don't have to guess.
2228 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2230 /* If a remote branch exists with the default branch name, let's use it. */
2232 char *ref
= xstrfmt("refs/heads/%s",
2233 git_default_branch_name(0));
2235 r
= find_ref_by_name(refs
, ref
);
2237 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2240 /* Fall back to the hard-coded historical default */
2241 r
= find_ref_by_name(refs
, "refs/heads/master");
2242 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2246 /* Look for another ref that points there */
2247 for (r
= refs
; r
; r
= r
->next
) {
2249 starts_with(r
->name
, "refs/heads/") &&
2250 oideq(&r
->old_oid
, &head
->old_oid
)) {
2251 *tail
= copy_ref(r
);
2252 tail
= &((*tail
)->next
);
2261 struct stale_heads_info
{
2262 struct string_list
*ref_names
;
2263 struct ref
**stale_refs_tail
;
2267 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2268 int flags
, void *cb_data
)
2270 struct stale_heads_info
*info
= cb_data
;
2271 struct string_list matches
= STRING_LIST_INIT_DUP
;
2272 struct refspec_item query
;
2274 memset(&query
, 0, sizeof(struct refspec_item
));
2275 query
.dst
= (char *)refname
;
2277 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2278 if (matches
.nr
== 0)
2279 goto clean_exit
; /* No matches */
2282 * If we did find a suitable refspec and it's not a symref and
2283 * it's not in the list of refs that currently exist in that
2284 * remote, we consider it to be stale. In order to deal with
2285 * overlapping refspecs, we need to go over all of the
2288 if (flags
& REF_ISSYMREF
)
2291 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2292 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2296 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2297 oidcpy(&ref
->new_oid
, oid
);
2301 string_list_clear(&matches
, 0);
2305 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2307 struct ref
*ref
, *stale_refs
= NULL
;
2308 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2309 struct stale_heads_info info
;
2311 info
.ref_names
= &ref_names
;
2312 info
.stale_refs_tail
= &stale_refs
;
2314 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2315 string_list_append(&ref_names
, ref
->name
);
2316 string_list_sort(&ref_names
);
2317 for_each_ref(get_stale_heads_cb
, &info
);
2318 string_list_clear(&ref_names
, 0);
2325 static void clear_cas_option(struct push_cas_option
*cas
)
2329 for (i
= 0; i
< cas
->nr
; i
++)
2330 free(cas
->entry
[i
].refname
);
2332 memset(cas
, 0, sizeof(*cas
));
2335 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2336 const char *refname
,
2339 struct push_cas
*entry
;
2340 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2341 entry
= &cas
->entry
[cas
->nr
++];
2342 memset(entry
, 0, sizeof(*entry
));
2343 entry
->refname
= xmemdupz(refname
, refnamelen
);
2347 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2350 struct push_cas
*entry
;
2353 /* "--no-<option>" */
2354 clear_cas_option(cas
);
2359 /* just "--<option>" */
2360 cas
->use_tracking_for_rest
= 1;
2364 /* "--<option>=refname" or "--<option>=refname:value" */
2365 colon
= strchrnul(arg
, ':');
2366 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2368 entry
->use_tracking
= 1;
2370 oidclr(&entry
->expect
);
2371 else if (get_oid(colon
+ 1, &entry
->expect
))
2372 return error(_("cannot parse expected object name '%s'"),
2377 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2379 return parse_push_cas_option(opt
->value
, arg
, unset
);
2382 int is_empty_cas(const struct push_cas_option
*cas
)
2384 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2388 * Look at remote.fetch refspec and see if we have a remote
2389 * tracking branch for the refname there. Fill the name of
2390 * the remote-tracking branch in *dst_refname, and the name
2391 * of the commit object at its tip in oid[].
2392 * If we cannot do so, return negative to signal an error.
2394 static int remote_tracking(struct remote
*remote
, const char *refname
,
2395 struct object_id
*oid
, char **dst_refname
)
2399 dst
= apply_refspecs(&remote
->fetch
, refname
);
2401 return -1; /* no tracking ref for refname at remote */
2402 if (read_ref(dst
, oid
))
2403 return -1; /* we know what the tracking ref is but we cannot read it */
2410 * The struct "reflog_commit_array" and related helper functions
2411 * are used for collecting commits into an array during reflog
2412 * traversals in "check_and_collect_until()".
2414 struct reflog_commit_array
{
2415 struct commit
**item
;
2419 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2421 /* Append a commit to the array. */
2422 static void append_commit(struct reflog_commit_array
*arr
,
2423 struct commit
*commit
)
2425 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2426 arr
->item
[arr
->nr
++] = commit
;
2429 /* Free and reset the array. */
2430 static void free_commit_array(struct reflog_commit_array
*arr
)
2432 FREE_AND_NULL(arr
->item
);
2433 arr
->nr
= arr
->alloc
= 0;
2436 struct check_and_collect_until_cb_data
{
2437 struct commit
*remote_commit
;
2438 struct reflog_commit_array
*local_commits
;
2439 timestamp_t remote_reflog_timestamp
;
2442 /* Get the timestamp of the latest entry. */
2443 static int peek_reflog(struct object_id
*o_oid
, struct object_id
*n_oid
,
2444 const char *ident
, timestamp_t timestamp
,
2445 int tz
, const char *message
, void *cb_data
)
2447 timestamp_t
*ts
= cb_data
;
2452 static int check_and_collect_until(struct object_id
*o_oid
,
2453 struct object_id
*n_oid
,
2454 const char *ident
, timestamp_t timestamp
,
2455 int tz
, const char *message
, void *cb_data
)
2457 struct commit
*commit
;
2458 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2460 /* An entry was found. */
2461 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2464 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2465 append_commit(cb
->local_commits
, commit
);
2468 * If the reflog entry timestamp is older than the remote ref's
2469 * latest reflog entry, there is no need to check or collect
2470 * entries older than this one.
2472 if (timestamp
< cb
->remote_reflog_timestamp
)
2478 #define MERGE_BASES_BATCH_SIZE 8
2481 * Iterate through the reflog of the local ref to check if there is an entry
2482 * for the given remote-tracking ref; runs until the timestamp of an entry is
2483 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2484 * are that seen along the way are collected into an array to check if the
2485 * remote-tracking ref is reachable from any of them.
2487 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2490 struct commit
*commit
;
2491 struct commit
**chunk
;
2492 struct check_and_collect_until_cb_data cb
;
2493 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2497 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2499 goto cleanup_return
;
2502 * Get the timestamp from the latest entry
2503 * of the remote-tracking ref's reflog.
2505 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2507 cb
.remote_commit
= commit
;
2508 cb
.local_commits
= &arr
;
2509 cb
.remote_reflog_timestamp
= date
;
2510 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2512 /* We found an entry in the reflog. */
2514 goto cleanup_return
;
2517 * Check if the remote commit is reachable from any
2518 * of the commits in the collected array, in batches.
2520 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2521 size
= arr
.item
+ arr
.nr
- chunk
;
2522 if (MERGE_BASES_BATCH_SIZE
< size
)
2523 size
= MERGE_BASES_BATCH_SIZE
;
2525 if ((ret
= in_merge_bases_many(commit
, size
, chunk
)))
2530 free_commit_array(&arr
);
2535 * Check for reachability of a remote-tracking
2536 * ref in the reflog entries of its local ref.
2538 static void check_if_includes_upstream(struct ref
*remote
)
2540 struct ref
*local
= get_local_ref(remote
->name
);
2544 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2545 remote
->unreachable
= 1;
2548 static void apply_cas(struct push_cas_option
*cas
,
2549 struct remote
*remote
,
2554 /* Find an explicit --<option>=<name>[:<value>] entry */
2555 for (i
= 0; i
< cas
->nr
; i
++) {
2556 struct push_cas
*entry
= &cas
->entry
[i
];
2557 if (!refname_match(entry
->refname
, ref
->name
))
2559 ref
->expect_old_sha1
= 1;
2560 if (!entry
->use_tracking
)
2561 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2562 else if (remote_tracking(remote
, ref
->name
,
2563 &ref
->old_oid_expect
,
2564 &ref
->tracking_ref
))
2565 oidclr(&ref
->old_oid_expect
);
2567 ref
->check_reachable
= cas
->use_force_if_includes
;
2571 /* Are we using "--<option>" to cover all? */
2572 if (!cas
->use_tracking_for_rest
)
2575 ref
->expect_old_sha1
= 1;
2576 if (remote_tracking(remote
, ref
->name
,
2577 &ref
->old_oid_expect
,
2578 &ref
->tracking_ref
))
2579 oidclr(&ref
->old_oid_expect
);
2581 ref
->check_reachable
= cas
->use_force_if_includes
;
2584 void apply_push_cas(struct push_cas_option
*cas
,
2585 struct remote
*remote
,
2586 struct ref
*remote_refs
)
2589 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2590 apply_cas(cas
, remote
, ref
);
2593 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2594 * mode, and if "--force-if-includes" was specified, run
2597 if (ref
->check_reachable
)
2598 check_if_includes_upstream(ref
);
2602 struct remote_state
*remote_state_new(void)
2604 struct remote_state
*r
= xmalloc(sizeof(*r
));
2606 memset(r
, 0, sizeof(*r
));
2608 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2612 void remote_state_clear(struct remote_state
*remote_state
)
2616 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
2617 remote_clear(remote_state
->remotes
[i
]);
2619 FREE_AND_NULL(remote_state
->remotes
);
2620 remote_state
->remotes_alloc
= 0;
2621 remote_state
->remotes_nr
= 0;
2623 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2625 for (i
= 0; i
< remote_state
->branches_nr
; i
++) {
2626 FREE_AND_NULL(remote_state
->branches
[i
]);
2628 FREE_AND_NULL(remote_state
->branches
);
2629 remote_state
->branches_alloc
= 0;
2630 remote_state
->branches_nr
= 0;