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
{
27 struct counted_string
*instead_of
;
32 struct rewrite
**rewrite
;
37 static struct remote
**remotes
;
38 static int remotes_alloc
;
39 static int remotes_nr
;
40 static struct hashmap remotes_hash
;
42 static struct branch
**branches
;
43 static int branches_alloc
;
44 static int branches_nr
;
46 static struct branch
*current_branch
;
47 static const char *pushremote_name
;
49 static struct rewrites rewrites
;
50 static struct rewrites rewrites_push
;
52 static int valid_remote(const struct remote
*remote
)
54 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
57 static const char *alias_url(const char *url
, struct rewrites
*r
)
60 struct counted_string
*longest
;
65 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
68 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
69 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
71 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
72 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
80 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
83 static void add_url(struct remote
*remote
, const char *url
)
85 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
86 remote
->url
[remote
->url_nr
++] = url
;
89 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
91 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
92 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
95 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
97 const char *pushurl
= alias_url(url
, &rewrites_push
);
99 add_pushurl(remote
, pushurl
);
102 static void add_url_alias(struct remote
*remote
, const char *url
)
104 add_url(remote
, alias_url(url
, &rewrites
));
105 add_pushurl_alias(remote
, url
);
108 struct remotes_hash_key
{
113 static int remotes_hash_cmp(const void *unused_cmp_data
,
114 const struct hashmap_entry
*eptr
,
115 const struct hashmap_entry
*entry_or_key
,
118 const struct remote
*a
, *b
;
119 const struct remotes_hash_key
*key
= keydata
;
121 a
= container_of(eptr
, const struct remote
, ent
);
122 b
= container_of(entry_or_key
, const struct remote
, ent
);
125 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
127 return strcmp(a
->name
, b
->name
);
130 static inline void init_remotes_hash(void)
132 if (!remotes_hash
.cmpfn
)
133 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
136 static struct remote
*make_remote(const char *name
, int len
)
138 struct remote
*ret
, *replaced
;
139 struct remotes_hash_key lookup
;
140 struct hashmap_entry lookup_entry
, *e
;
148 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
150 e
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
);
152 return container_of(e
, struct remote
, ent
);
154 CALLOC_ARRAY(ret
, 1);
155 ret
->prune
= -1; /* unspecified */
156 ret
->prune_tags
= -1; /* unspecified */
157 ret
->name
= xstrndup(name
, len
);
158 refspec_init(&ret
->push
, REFSPEC_PUSH
);
159 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
161 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
162 remotes
[remotes_nr
++] = ret
;
164 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
165 replaced
= hashmap_put_entry(&remotes_hash
, ret
, ent
);
166 assert(replaced
== NULL
); /* no previous entry overwritten */
170 static void add_merge(struct branch
*branch
, const char *name
)
172 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
173 branch
->merge_alloc
);
174 branch
->merge_name
[branch
->merge_nr
++] = name
;
177 static struct branch
*make_branch(const char *name
, size_t len
)
182 for (i
= 0; i
< branches_nr
; i
++) {
183 if (!strncmp(name
, branches
[i
]->name
, len
) &&
184 !branches
[i
]->name
[len
])
188 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
189 CALLOC_ARRAY(ret
, 1);
190 branches
[branches_nr
++] = ret
;
191 ret
->name
= xstrndup(name
, len
);
192 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
197 static struct rewrite
*make_rewrite(struct rewrites
*r
,
198 const char *base
, size_t len
)
203 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
204 if (len
== r
->rewrite
[i
]->baselen
&&
205 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
206 return r
->rewrite
[i
];
209 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
210 CALLOC_ARRAY(ret
, 1);
211 r
->rewrite
[r
->rewrite_nr
++] = ret
;
212 ret
->base
= xstrndup(base
, len
);
217 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
219 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
220 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
221 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
222 rewrite
->instead_of_nr
++;
225 static const char *skip_spaces(const char *s
)
232 static void read_remotes_file(struct remote
*remote
)
234 struct strbuf buf
= STRBUF_INIT
;
235 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
239 remote
->configured_in_repo
= 1;
240 remote
->origin
= REMOTE_REMOTES
;
241 while (strbuf_getline(&buf
, f
) != EOF
) {
246 if (skip_prefix(buf
.buf
, "URL:", &v
))
247 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
248 else if (skip_prefix(buf
.buf
, "Push:", &v
))
249 refspec_append(&remote
->push
, skip_spaces(v
));
250 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
251 refspec_append(&remote
->fetch
, skip_spaces(v
));
253 strbuf_release(&buf
);
257 static void read_branches_file(struct remote
*remote
)
260 struct strbuf buf
= STRBUF_INIT
;
261 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
266 strbuf_getline_lf(&buf
, f
);
270 strbuf_release(&buf
);
274 remote
->configured_in_repo
= 1;
275 remote
->origin
= REMOTE_BRANCHES
;
278 * The branches file would have URL and optionally
279 * #branch specified. The default (or specified) branch is
280 * fetched and stored in the local branch matching the
283 frag
= strchr(buf
.buf
, '#');
287 frag
= (char *)git_default_branch_name(0);
289 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
290 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
294 * Cogito compatible push: push current HEAD to remote #branch
295 * (master if missing)
297 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
298 remote
->fetch_tags
= 1; /* always auto-follow */
301 static int handle_config(const char *key
, const char *value
, void *cb
)
306 struct remote
*remote
;
307 struct branch
*branch
;
308 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
311 branch
= make_branch(name
, namelen
);
312 if (!strcmp(subkey
, "remote")) {
313 return git_config_string(&branch
->remote_name
, key
, value
);
314 } else if (!strcmp(subkey
, "pushremote")) {
315 return git_config_string(&branch
->pushremote_name
, key
, value
);
316 } else if (!strcmp(subkey
, "merge")) {
318 return config_error_nonbool(key
);
319 add_merge(branch
, xstrdup(value
));
323 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
324 struct rewrite
*rewrite
;
327 if (!strcmp(subkey
, "insteadof")) {
329 return config_error_nonbool(key
);
330 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
331 add_instead_of(rewrite
, xstrdup(value
));
332 } else if (!strcmp(subkey
, "pushinsteadof")) {
334 return config_error_nonbool(key
);
335 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
336 add_instead_of(rewrite
, xstrdup(value
));
340 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
343 /* Handle remote.* variables */
344 if (!name
&& !strcmp(subkey
, "pushdefault"))
345 return git_config_string(&pushremote_name
, key
, value
);
349 /* Handle remote.<name>.* variables */
351 warning(_("config remote shorthand cannot begin with '/': %s"),
355 remote
= make_remote(name
, namelen
);
356 remote
->origin
= REMOTE_CONFIG
;
357 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
358 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
359 remote
->configured_in_repo
= 1;
360 if (!strcmp(subkey
, "mirror"))
361 remote
->mirror
= git_config_bool(key
, value
);
362 else if (!strcmp(subkey
, "skipdefaultupdate"))
363 remote
->skip_default_update
= git_config_bool(key
, value
);
364 else if (!strcmp(subkey
, "skipfetchall"))
365 remote
->skip_default_update
= git_config_bool(key
, value
);
366 else if (!strcmp(subkey
, "prune"))
367 remote
->prune
= git_config_bool(key
, value
);
368 else if (!strcmp(subkey
, "prunetags"))
369 remote
->prune_tags
= git_config_bool(key
, value
);
370 else if (!strcmp(subkey
, "url")) {
372 if (git_config_string(&v
, key
, value
))
375 } else if (!strcmp(subkey
, "pushurl")) {
377 if (git_config_string(&v
, key
, value
))
379 add_pushurl(remote
, v
);
380 } else if (!strcmp(subkey
, "push")) {
382 if (git_config_string(&v
, key
, value
))
384 refspec_append(&remote
->push
, v
);
386 } else if (!strcmp(subkey
, "fetch")) {
388 if (git_config_string(&v
, key
, value
))
390 refspec_append(&remote
->fetch
, v
);
392 } else if (!strcmp(subkey
, "receivepack")) {
394 if (git_config_string(&v
, key
, value
))
396 if (!remote
->receivepack
)
397 remote
->receivepack
= v
;
399 error(_("more than one receivepack given, using the first"));
400 } else if (!strcmp(subkey
, "uploadpack")) {
402 if (git_config_string(&v
, key
, value
))
404 if (!remote
->uploadpack
)
405 remote
->uploadpack
= v
;
407 error(_("more than one uploadpack given, using the first"));
408 } else if (!strcmp(subkey
, "tagopt")) {
409 if (!strcmp(value
, "--no-tags"))
410 remote
->fetch_tags
= -1;
411 else if (!strcmp(value
, "--tags"))
412 remote
->fetch_tags
= 2;
413 } else if (!strcmp(subkey
, "proxy")) {
414 return git_config_string((const char **)&remote
->http_proxy
,
416 } else if (!strcmp(subkey
, "proxyauthmethod")) {
417 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
419 } else if (!strcmp(subkey
, "vcs")) {
420 return git_config_string(&remote
->foreign_vcs
, key
, value
);
425 static void alias_all_urls(void)
428 for (i
= 0; i
< remotes_nr
; i
++) {
429 int add_pushurl_aliases
;
432 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
433 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
435 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
436 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
437 if (add_pushurl_aliases
)
438 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
439 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
444 static void read_config(void)
453 current_branch
= NULL
;
454 if (startup_info
->have_repository
) {
455 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
456 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
457 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
458 current_branch
= make_branch(head_ref
, strlen(head_ref
));
461 git_config(handle_config
, NULL
);
465 static int valid_remote_nick(const char *name
)
467 if (!name
[0] || is_dot_or_dotdot(name
))
470 /* remote nicknames cannot contain slashes */
472 if (is_dir_sep(*name
++))
477 const char *remote_for_branch(struct branch
*branch
, int *explicit)
479 if (branch
&& branch
->remote_name
) {
482 return branch
->remote_name
;
489 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
491 if (branch
&& branch
->pushremote_name
) {
494 return branch
->pushremote_name
;
496 if (pushremote_name
) {
499 return pushremote_name
;
501 return remote_for_branch(branch
, explicit);
504 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
508 if (branch
->merge_nr
) {
509 return branch
->merge_name
[0];
512 const char *dst
, *remote_name
=
513 pushremote_for_branch(branch
, NULL
);
514 struct remote
*remote
= remote_get(remote_name
);
516 if (remote
&& remote
->push
.nr
&&
517 (dst
= apply_refspecs(&remote
->push
,
526 static struct remote
*remote_get_1(const char *name
,
527 const char *(*get_default
)(struct branch
*, int *))
537 name
= get_default(current_branch
, &name_given
);
539 ret
= make_remote(name
, 0);
540 if (valid_remote_nick(name
) && have_git_dir()) {
541 if (!valid_remote(ret
))
542 read_remotes_file(ret
);
543 if (!valid_remote(ret
))
544 read_branches_file(ret
);
546 if (name_given
&& !valid_remote(ret
))
547 add_url_alias(ret
, name
);
548 if (!valid_remote(ret
))
553 struct remote
*remote_get(const char *name
)
555 return remote_get_1(name
, remote_for_branch
);
558 struct remote
*pushremote_get(const char *name
)
560 return remote_get_1(name
, pushremote_for_branch
);
563 int remote_is_configured(struct remote
*remote
, int in_repo
)
568 return remote
->configured_in_repo
;
569 return !!remote
->origin
;
572 int for_each_remote(each_remote_fn fn
, void *priv
)
576 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
577 struct remote
*r
= remotes
[i
];
580 result
= fn(r
, priv
);
585 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
587 if (strcmp(ref1
->name
, ref2
->name
)) {
588 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
589 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
590 die(_("Cannot fetch both %s and %s to %s"),
591 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
592 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
593 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
594 warning(_("%s usually tracks %s, not %s"),
595 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
596 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
597 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
598 die(_("%s tracks both %s and %s"),
599 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
602 * This last possibility doesn't occur because
603 * FETCH_HEAD_IGNORE entries always appear at
604 * the end of the list.
606 BUG("Internal error");
609 free(ref2
->peer_ref
);
613 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
615 struct string_list refs
= STRING_LIST_INIT_NODUP
;
616 struct ref
*retval
= NULL
;
617 struct ref
**p
= &retval
;
620 struct ref
*ref
= ref_map
;
622 ref_map
= ref_map
->next
;
625 if (!ref
->peer_ref
) {
629 struct string_list_item
*item
=
630 string_list_insert(&refs
, ref
->peer_ref
->name
);
633 /* Entry already existed */
634 handle_duplicate((struct ref
*)item
->util
, ref
);
643 string_list_clear(&refs
, 0);
647 int remote_has_url(struct remote
*remote
, const char *url
)
650 for (i
= 0; i
< remote
->url_nr
; i
++) {
651 if (!strcmp(remote
->url
[i
], url
))
657 static int match_name_with_pattern(const char *key
, const char *name
,
658 const char *value
, char **result
)
660 const char *kstar
= strchr(key
, '*');
666 die(_("key '%s' of pattern had no '*'"), key
);
668 ksuffixlen
= strlen(kstar
+ 1);
669 namelen
= strlen(name
);
670 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
671 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
673 struct strbuf sb
= STRBUF_INIT
;
674 const char *vstar
= strchr(value
, '*');
676 die(_("value '%s' of pattern has no '*'"), value
);
677 strbuf_add(&sb
, value
, vstar
- value
);
678 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
679 strbuf_addstr(&sb
, vstar
+ 1);
680 *result
= strbuf_detach(&sb
, NULL
);
685 static int refspec_match(const struct refspec_item
*refspec
,
688 if (refspec
->pattern
)
689 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
691 return !strcmp(refspec
->src
, name
);
694 static int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
698 for (i
= 0; i
< rs
->nr
; i
++) {
699 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
705 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
709 for (tail
= &ref_map
; *tail
; ) {
710 struct ref
*ref
= *tail
;
712 if (omit_name_by_refspec(ref
->name
, rs
)) {
723 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
725 int i
, matched_negative
= 0;
726 int find_src
= !query
->src
;
727 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
728 const char *needle
= find_src
? query
->dst
: query
->src
;
731 * Check whether the queried ref matches any negative refpsec. If so,
732 * then we should ultimately treat this as not matching the query at
735 * Note that negative refspecs always match the source, but the query
736 * item uses the destination. To handle this, we apply pattern
737 * refspecs in reverse to figure out if the query source matches any
738 * of the negative refspecs.
740 * The first loop finds and expands all positive refspecs
741 * matched by the queried ref.
743 * The second loop checks if any of the results of the first loop
744 * match any negative refspec.
746 for (i
= 0; i
< rs
->nr
; i
++) {
747 struct refspec_item
*refspec
= &rs
->items
[i
];
750 if (refspec
->negative
)
753 /* Note the reversal of src and dst */
754 if (refspec
->pattern
) {
755 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
756 const char *value
= refspec
->src
;
758 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
759 string_list_append_nodup(&reversed
, expn_name
);
760 } else if (refspec
->matching
) {
761 /* For the special matching refspec, any query should match */
762 string_list_append(&reversed
, needle
);
763 } else if (!refspec
->src
) {
764 BUG("refspec->src should not be null here");
765 } else if (!strcmp(needle
, refspec
->src
)) {
766 string_list_append(&reversed
, refspec
->src
);
770 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
771 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
772 matched_negative
= 1;
775 string_list_clear(&reversed
, 0);
777 return matched_negative
;
780 static void query_refspecs_multiple(struct refspec
*rs
,
781 struct refspec_item
*query
,
782 struct string_list
*results
)
785 int find_src
= !query
->src
;
787 if (find_src
&& !query
->dst
)
788 BUG("query_refspecs_multiple: need either src or dst");
790 if (query_matches_negative_refspec(rs
, query
))
793 for (i
= 0; i
< rs
->nr
; i
++) {
794 struct refspec_item
*refspec
= &rs
->items
[i
];
795 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
796 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
797 const char *needle
= find_src
? query
->dst
: query
->src
;
798 char **result
= find_src
? &query
->src
: &query
->dst
;
800 if (!refspec
->dst
|| refspec
->negative
)
802 if (refspec
->pattern
) {
803 if (match_name_with_pattern(key
, needle
, value
, result
))
804 string_list_append_nodup(results
, *result
);
805 } else if (!strcmp(needle
, key
)) {
806 string_list_append(results
, value
);
811 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
814 int find_src
= !query
->src
;
815 const char *needle
= find_src
? query
->dst
: query
->src
;
816 char **result
= find_src
? &query
->src
: &query
->dst
;
818 if (find_src
&& !query
->dst
)
819 BUG("query_refspecs: need either src or dst");
821 if (query_matches_negative_refspec(rs
, query
))
824 for (i
= 0; i
< rs
->nr
; i
++) {
825 struct refspec_item
*refspec
= &rs
->items
[i
];
826 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
827 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
829 if (!refspec
->dst
|| refspec
->negative
)
831 if (refspec
->pattern
) {
832 if (match_name_with_pattern(key
, needle
, value
, result
)) {
833 query
->force
= refspec
->force
;
836 } else if (!strcmp(needle
, key
)) {
837 *result
= xstrdup(value
);
838 query
->force
= refspec
->force
;
845 char *apply_refspecs(struct refspec
*rs
, const char *name
)
847 struct refspec_item query
;
849 memset(&query
, 0, sizeof(struct refspec_item
));
850 query
.src
= (char *)name
;
852 if (query_refspecs(rs
, &query
))
858 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
860 return query_refspecs(&remote
->fetch
, refspec
);
863 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
866 size_t len
= strlen(name
);
867 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
868 memcpy(ref
->name
, prefix
, prefixlen
);
869 memcpy(ref
->name
+ prefixlen
, name
, len
);
873 struct ref
*alloc_ref(const char *name
)
875 return alloc_ref_with_prefix("", 0, name
);
878 struct ref
*copy_ref(const struct ref
*ref
)
884 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
886 memcpy(cpy
, ref
, len
);
888 cpy
->symref
= xstrdup_or_null(ref
->symref
);
889 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
890 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
894 struct ref
*copy_ref_list(const struct ref
*ref
)
896 struct ref
*ret
= NULL
;
897 struct ref
**tail
= &ret
;
899 *tail
= copy_ref(ref
);
901 tail
= &((*tail
)->next
);
906 void free_one_ref(struct ref
*ref
)
910 free_one_ref(ref
->peer_ref
);
911 free(ref
->remote_status
);
916 void free_refs(struct ref
*ref
)
926 int ref_compare_name(const void *va
, const void *vb
)
928 const struct ref
*a
= va
, *b
= vb
;
929 return strcmp(a
->name
, b
->name
);
932 static void *ref_list_get_next(const void *a
)
934 return ((const struct ref
*)a
)->next
;
937 static void ref_list_set_next(void *a
, void *next
)
939 ((struct ref
*)a
)->next
= next
;
942 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
944 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
947 int count_refspec_match(const char *pattern
,
949 struct ref
**matched_ref
)
951 int patlen
= strlen(pattern
);
952 struct ref
*matched_weak
= NULL
;
953 struct ref
*matched
= NULL
;
957 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
958 char *name
= refs
->name
;
959 int namelen
= strlen(name
);
961 if (!refname_match(pattern
, name
))
964 /* A match is "weak" if it is with refs outside
965 * heads or tags, and did not specify the pattern
966 * in full (e.g. "refs/remotes/origin/master") or at
967 * least from the toplevel (e.g. "remotes/origin/master");
968 * otherwise "git push $URL master" would result in
969 * ambiguity between remotes/origin/master and heads/master
970 * at the remote site.
972 if (namelen
!= patlen
&&
973 patlen
!= namelen
- 5 &&
974 !starts_with(name
, "refs/heads/") &&
975 !starts_with(name
, "refs/tags/")) {
976 /* We want to catch the case where only weak
977 * matches are found and there are multiple
978 * matches, and where more than one strong
979 * matches are found, as ambiguous. One
980 * strong match with zero or more weak matches
981 * are acceptable as a unique match.
993 *matched_ref
= matched_weak
;
998 *matched_ref
= matched
;
1003 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1011 static struct ref
*alloc_delete_ref(void)
1013 struct ref
*ref
= alloc_ref("(delete)");
1014 oidclr(&ref
->new_oid
);
1018 static int try_explicit_object_name(const char *name
,
1021 struct object_id oid
;
1025 *match
= alloc_delete_ref();
1029 if (get_oid(name
, &oid
))
1033 *match
= alloc_ref(name
);
1034 oidcpy(&(*match
)->new_oid
, &oid
);
1039 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1041 struct ref
*ret
= alloc_ref(name
);
1042 tail_link_ref(ret
, tail
);
1046 static char *guess_ref(const char *name
, struct ref
*peer
)
1048 struct strbuf buf
= STRBUF_INIT
;
1050 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1055 if (starts_with(r
, "refs/heads/")) {
1056 strbuf_addstr(&buf
, "refs/heads/");
1057 } else if (starts_with(r
, "refs/tags/")) {
1058 strbuf_addstr(&buf
, "refs/tags/");
1063 strbuf_addstr(&buf
, name
);
1064 return strbuf_detach(&buf
, NULL
);
1067 static int match_explicit_lhs(struct ref
*src
,
1068 struct refspec_item
*rs
,
1070 int *allocated_match
)
1072 switch (count_refspec_match(rs
->src
, src
, match
)) {
1074 if (allocated_match
)
1075 *allocated_match
= 0;
1078 /* The source could be in the get_sha1() format
1079 * not a reference name. :refs/other is a
1080 * way to delete 'other' ref at the remote end.
1082 if (try_explicit_object_name(rs
->src
, match
) < 0)
1083 return error(_("src refspec %s does not match any"), rs
->src
);
1084 if (allocated_match
)
1085 *allocated_match
= 1;
1088 return error(_("src refspec %s matches more than one"), rs
->src
);
1092 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1093 const char *matched_src_name
)
1095 struct object_id oid
;
1096 enum object_type type
;
1099 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1100 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1103 error(_("The destination you provided is not a full refname (i.e.,\n"
1104 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1106 "- Looking for a ref that matches '%s' on the remote side.\n"
1107 "- Checking if the <src> being pushed ('%s')\n"
1108 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1109 " refs/{heads,tags}/ prefix on the remote side.\n"
1111 "Neither worked, so we gave up. You must fully qualify the ref."),
1112 dst_value
, matched_src_name
);
1114 if (!advice_push_unqualified_ref_name
)
1117 if (get_oid(matched_src_name
, &oid
))
1118 BUG("'%s' is not a valid object, "
1119 "match_explicit_lhs() should catch this!",
1121 type
= oid_object_info(the_repository
, &oid
, NULL
);
1122 if (type
== OBJ_COMMIT
) {
1123 advise(_("The <src> part of the refspec is a commit object.\n"
1124 "Did you mean to create a new branch by pushing to\n"
1125 "'%s:refs/heads/%s'?"),
1126 matched_src_name
, dst_value
);
1127 } else if (type
== OBJ_TAG
) {
1128 advise(_("The <src> part of the refspec is a tag object.\n"
1129 "Did you mean to create a new tag by pushing to\n"
1130 "'%s:refs/tags/%s'?"),
1131 matched_src_name
, dst_value
);
1132 } else if (type
== OBJ_TREE
) {
1133 advise(_("The <src> part of the refspec is a tree object.\n"
1134 "Did you mean to tag a new tree by pushing to\n"
1135 "'%s:refs/tags/%s'?"),
1136 matched_src_name
, dst_value
);
1137 } else if (type
== OBJ_BLOB
) {
1138 advise(_("The <src> part of the refspec is a blob object.\n"
1139 "Did you mean to tag a new blob by pushing to\n"
1140 "'%s:refs/tags/%s'?"),
1141 matched_src_name
, dst_value
);
1143 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1144 matched_src_name
, type
);
1148 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1149 struct ref
***dst_tail
,
1150 struct refspec_item
*rs
)
1152 struct ref
*matched_src
, *matched_dst
;
1155 const char *dst_value
= rs
->dst
;
1158 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1161 matched_src
= matched_dst
= NULL
;
1162 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1168 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1169 RESOLVE_REF_READING
,
1172 ((flag
& REF_ISSYMREF
) &&
1173 !starts_with(dst_value
, "refs/heads/")))
1174 die(_("%s cannot be resolved to branch"),
1178 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1182 if (starts_with(dst_value
, "refs/")) {
1183 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1184 } else if (is_null_oid(&matched_src
->new_oid
)) {
1185 error(_("unable to delete '%s': remote ref does not exist"),
1187 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1188 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1191 show_push_unqualified_ref_name_error(dst_value
,
1197 error(_("dst refspec %s matches more than one"),
1203 if (matched_dst
->peer_ref
)
1204 return error(_("dst ref %s receives from more than one src"),
1207 matched_dst
->peer_ref
= allocated_src
?
1209 copy_ref(matched_src
);
1210 matched_dst
->force
= rs
->force
;
1215 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1216 struct ref
***dst_tail
, struct refspec
*rs
)
1219 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1220 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1224 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1225 int send_mirror
, int direction
,
1226 const struct refspec_item
**ret_pat
)
1228 const struct refspec_item
*pat
;
1231 int matching_refs
= -1;
1232 for (i
= 0; i
< rs
->nr
; i
++) {
1233 const struct refspec_item
*item
= &rs
->items
[i
];
1238 if (item
->matching
&&
1239 (matching_refs
== -1 || item
->force
)) {
1244 if (item
->pattern
) {
1245 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1247 if (direction
== FROM_SRC
)
1248 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1250 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1257 if (matching_refs
== -1)
1260 pat
= &rs
->items
[matching_refs
];
1261 if (pat
->matching
) {
1263 * "matching refs"; traditionally we pushed everything
1264 * including refs outside refs/heads/ hierarchy, but
1265 * that does not make much sense these days.
1267 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1269 name
= xstrdup(ref
->name
);
1276 static struct ref
**tail_ref(struct ref
**head
)
1278 struct ref
**tail
= head
;
1280 tail
= &((*tail
)->next
);
1285 struct commit
**tip
;
1289 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1291 struct commit
*commit
;
1293 if (is_null_oid(oid
))
1295 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1296 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1298 commit
->object
.flags
|= TMP_MARK
;
1299 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1300 tips
->tip
[tips
->nr
++] = commit
;
1303 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1305 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1306 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1307 struct string_list_item
*item
;
1309 struct tips sent_tips
;
1312 * Collect everything we know they would have at the end of
1313 * this push, and collect all tags they have.
1315 memset(&sent_tips
, 0, sizeof(sent_tips
));
1316 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1317 if (ref
->peer_ref
&&
1318 !is_null_oid(&ref
->peer_ref
->new_oid
))
1319 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1321 add_to_tips(&sent_tips
, &ref
->old_oid
);
1322 if (starts_with(ref
->name
, "refs/tags/"))
1323 string_list_append(&dst_tag
, ref
->name
);
1325 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1327 string_list_sort(&dst_tag
);
1329 /* Collect tags they do not have. */
1330 for (ref
= src
; ref
; ref
= ref
->next
) {
1331 if (!starts_with(ref
->name
, "refs/tags/"))
1332 continue; /* not a tag */
1333 if (string_list_has_string(&dst_tag
, ref
->name
))
1334 continue; /* they already have it */
1335 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1336 continue; /* be conservative */
1337 item
= string_list_append(&src_tag
, ref
->name
);
1340 string_list_clear(&dst_tag
, 0);
1343 * At this point, src_tag lists tags that are missing from
1344 * dst, and sent_tips lists the tips we are pushing or those
1345 * that we know they already have. An element in the src_tag
1346 * that is an ancestor of any of the sent_tips needs to be
1347 * sent to the other side.
1350 const int reachable_flag
= 1;
1351 struct commit_list
*found_commits
;
1352 struct commit
**src_commits
;
1353 int nr_src_commits
= 0, alloc_src_commits
= 16;
1354 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1356 for_each_string_list_item(item
, &src_tag
) {
1357 struct ref
*ref
= item
->util
;
1358 struct commit
*commit
;
1360 if (is_null_oid(&ref
->new_oid
))
1362 commit
= lookup_commit_reference_gently(the_repository
,
1366 /* not pushing a commit, which is not an error */
1369 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1370 src_commits
[nr_src_commits
++] = commit
;
1373 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1374 src_commits
, nr_src_commits
,
1377 for_each_string_list_item(item
, &src_tag
) {
1378 struct ref
*dst_ref
;
1379 struct ref
*ref
= item
->util
;
1380 struct commit
*commit
;
1382 if (is_null_oid(&ref
->new_oid
))
1384 commit
= lookup_commit_reference_gently(the_repository
,
1388 /* not pushing a commit, which is not an error */
1392 * Is this tag, which they do not have, reachable from
1393 * any of the commits we are sending?
1395 if (!(commit
->object
.flags
& reachable_flag
))
1399 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1400 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1401 dst_ref
->peer_ref
= copy_ref(ref
);
1404 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1406 free_commit_list(found_commits
);
1409 string_list_clear(&src_tag
, 0);
1410 free(sent_tips
.tip
);
1413 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1415 for ( ; list
; list
= list
->next
)
1416 if (!strcmp(list
->name
, name
))
1417 return (struct ref
*)list
;
1421 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1423 for ( ; ref
; ref
= ref
->next
)
1424 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1426 string_list_sort(ref_index
);
1430 * Given only the set of local refs, sanity-check the set of push
1431 * refspecs. We can't catch all errors that match_push_refs would,
1432 * but we can catch some errors early before even talking to the
1435 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1440 for (i
= 0; i
< rs
->nr
; i
++) {
1441 struct refspec_item
*item
= &rs
->items
[i
];
1443 if (item
->pattern
|| item
->matching
|| item
->negative
)
1446 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1453 * Given the set of refs the local repository has, the set of refs the
1454 * remote repository has, and the refspec used for push, determine
1455 * what remote refs we will update and with what value by setting
1456 * peer_ref (which object is being pushed) and force (if the push is
1457 * forced) in elements of "dst". The function may add new elements to
1458 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1460 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1461 struct refspec
*rs
, int flags
)
1463 int send_all
= flags
& MATCH_REFS_ALL
;
1464 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1465 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1467 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1468 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1470 /* If no refspec is provided, use the default ":" */
1472 refspec_append(rs
, ":");
1474 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1476 /* pick the remainder */
1477 for (ref
= src
; ref
; ref
= ref
->next
) {
1478 struct string_list_item
*dst_item
;
1479 struct ref
*dst_peer
;
1480 const struct refspec_item
*pat
= NULL
;
1483 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1487 if (!dst_ref_index
.nr
)
1488 prepare_ref_index(&dst_ref_index
, *dst
);
1490 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1491 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1493 if (dst_peer
->peer_ref
)
1494 /* We're already sending something to this ref. */
1497 if (pat
->matching
&& !(send_all
|| send_mirror
))
1499 * Remote doesn't have it, and we have no
1500 * explicit pattern, and we don't have
1501 * --all or --mirror.
1505 /* Create a new one and link it */
1506 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1507 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1508 string_list_insert(&dst_ref_index
,
1509 dst_peer
->name
)->util
= dst_peer
;
1511 dst_peer
->peer_ref
= copy_ref(ref
);
1512 dst_peer
->force
= pat
->force
;
1517 string_list_clear(&dst_ref_index
, 0);
1519 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1520 add_missing_tags(src
, dst
, &dst_tail
);
1523 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1524 /* check for missing refs on the remote */
1525 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1529 /* We're already sending something to this ref. */
1532 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1534 if (!src_ref_index
.nr
)
1535 prepare_ref_index(&src_ref_index
, src
);
1536 if (!string_list_has_string(&src_ref_index
,
1538 ref
->peer_ref
= alloc_delete_ref();
1542 string_list_clear(&src_ref_index
, 0);
1545 *dst
= apply_negative_refspecs(*dst
, rs
);
1552 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1557 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1558 int force_ref_update
= ref
->force
|| force_update
;
1559 int reject_reason
= 0;
1562 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1563 else if (!send_mirror
)
1566 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1567 if (!ref
->deletion
&&
1568 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1569 ref
->status
= REF_STATUS_UPTODATE
;
1574 * If the remote ref has moved and is now different
1575 * from what we expect, reject any push.
1577 * It also is an error if the user told us to check
1578 * with the remote-tracking branch to find the value
1579 * to expect, but we did not have such a tracking
1582 * If the tip of the remote-tracking ref is unreachable
1583 * from any reflog entry of its local ref indicating a
1584 * possible update since checkout; reject the push.
1586 if (ref
->expect_old_sha1
) {
1587 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1588 reject_reason
= REF_STATUS_REJECT_STALE
;
1589 else if (ref
->check_reachable
&& ref
->unreachable
)
1591 REF_STATUS_REJECT_REMOTE_UPDATED
;
1594 * If the ref isn't stale, and is reachable
1595 * from from one of the reflog entries of
1596 * the local branch, force the update.
1598 force_ref_update
= 1;
1602 * If the update isn't already rejected then check
1603 * the usual "must fast-forward" rules.
1605 * Decide whether an individual refspec A:B can be
1606 * pushed. The push will succeed if any of the
1607 * following are true:
1609 * (1) the remote reference B does not exist
1611 * (2) the remote reference B is being removed (i.e.,
1612 * pushing :B where no source is specified)
1614 * (3) the destination is not under refs/tags/, and
1615 * if the old and new value is a commit, the new
1616 * is a descendant of the old.
1618 * (4) it is forced using the +A:B notation, or by
1619 * passing the --force argument
1622 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1623 if (starts_with(ref
->name
, "refs/tags/"))
1624 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1625 else if (!has_object_file(&ref
->old_oid
))
1626 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1627 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1628 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1629 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1630 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1631 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1635 * "--force" will defeat any rejection implemented
1636 * by the rules above.
1638 if (!force_ref_update
)
1639 ref
->status
= reject_reason
;
1640 else if (reject_reason
)
1641 ref
->forced_update
= 1;
1645 static void set_merge(struct branch
*ret
)
1647 struct remote
*remote
;
1649 struct object_id oid
;
1653 return; /* no branch */
1655 return; /* already run */
1656 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1658 * no merge config; let's make sure we don't confuse callers
1659 * with a non-zero merge_nr but a NULL merge
1665 remote
= remote_get(ret
->remote_name
);
1667 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1668 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1669 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1670 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1671 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1672 strcmp(ret
->remote_name
, "."))
1674 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1675 &oid
, &ref
, 0) == 1)
1676 ret
->merge
[i
]->dst
= ref
;
1678 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1682 struct branch
*branch_get(const char *name
)
1687 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1688 ret
= current_branch
;
1690 ret
= make_branch(name
, strlen(name
));
1695 int branch_has_merge_config(struct branch
*branch
)
1697 return branch
&& !!branch
->merge
;
1700 int branch_merge_matches(struct branch
*branch
,
1702 const char *refname
)
1704 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1706 return refname_match(branch
->merge
[i
]->src
, refname
);
1709 __attribute__((format (printf
,2,3)))
1710 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1715 strbuf_vaddf(err
, fmt
, ap
);
1721 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1724 return error_buf(err
, _("HEAD does not point to a branch"));
1726 if (!branch
->merge
|| !branch
->merge
[0]) {
1728 * no merge config; is it because the user didn't define any,
1729 * or because it is not a real branch, and get_branch
1732 if (!ref_exists(branch
->refname
))
1733 return error_buf(err
, _("no such branch: '%s'"),
1735 return error_buf(err
,
1736 _("no upstream configured for branch '%s'"),
1740 if (!branch
->merge
[0]->dst
)
1741 return error_buf(err
,
1742 _("upstream branch '%s' not stored as a remote-tracking branch"),
1743 branch
->merge
[0]->src
);
1745 return branch
->merge
[0]->dst
;
1748 static const char *tracking_for_push_dest(struct remote
*remote
,
1749 const char *refname
,
1754 ret
= apply_refspecs(&remote
->fetch
, refname
);
1756 return error_buf(err
,
1757 _("push destination '%s' on remote '%s' has no local tracking branch"),
1758 refname
, remote
->name
);
1762 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1764 struct remote
*remote
;
1766 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1768 return error_buf(err
,
1769 _("branch '%s' has no remote for pushing"),
1772 if (remote
->push
.nr
) {
1776 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1778 return error_buf(err
,
1779 _("push refspecs for '%s' do not include '%s'"),
1780 remote
->name
, branch
->name
);
1782 ret
= tracking_for_push_dest(remote
, dst
, err
);
1788 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1790 switch (push_default
) {
1791 case PUSH_DEFAULT_NOTHING
:
1792 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1794 case PUSH_DEFAULT_MATCHING
:
1795 case PUSH_DEFAULT_CURRENT
:
1796 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1798 case PUSH_DEFAULT_UPSTREAM
:
1799 return branch_get_upstream(branch
, err
);
1801 case PUSH_DEFAULT_UNSPECIFIED
:
1802 case PUSH_DEFAULT_SIMPLE
:
1804 const char *up
, *cur
;
1806 up
= branch_get_upstream(branch
, err
);
1809 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1812 if (strcmp(cur
, up
))
1813 return error_buf(err
,
1814 _("cannot resolve 'simple' push to a single destination"));
1819 BUG("unhandled push situation");
1822 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1825 return error_buf(err
, _("HEAD does not point to a branch"));
1827 if (!branch
->push_tracking_ref
)
1828 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1829 return branch
->push_tracking_ref
;
1832 static int ignore_symref_update(const char *refname
)
1836 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1837 return 0; /* non-existing refs are OK */
1838 return (flag
& REF_ISSYMREF
);
1842 * Create and return a list of (struct ref) consisting of copies of
1843 * each remote_ref that matches refspec. refspec must be a pattern.
1844 * Fill in the copies' peer_ref to describe the local tracking refs to
1845 * which they map. Omit any references that would map to an existing
1846 * local symbolic ref.
1848 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1849 const struct refspec_item
*refspec
)
1851 const struct ref
*ref
;
1852 struct ref
*ret
= NULL
;
1853 struct ref
**tail
= &ret
;
1855 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1856 char *expn_name
= NULL
;
1858 if (strchr(ref
->name
, '^'))
1859 continue; /* a dereference item */
1860 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1861 refspec
->dst
, &expn_name
) &&
1862 !ignore_symref_update(expn_name
)) {
1863 struct ref
*cpy
= copy_ref(ref
);
1865 cpy
->peer_ref
= alloc_ref(expn_name
);
1867 cpy
->peer_ref
->force
= 1;
1877 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1879 const struct ref
*ref
;
1880 const struct ref
*best_match
= NULL
;
1883 for (ref
= refs
; ref
; ref
= ref
->next
) {
1884 int score
= refname_match(name
, ref
->name
);
1886 if (best_score
< score
) {
1894 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1896 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1901 return copy_ref(ref
);
1904 static struct ref
*get_local_ref(const char *name
)
1906 if (!name
|| name
[0] == '\0')
1909 if (starts_with(name
, "refs/"))
1910 return alloc_ref(name
);
1912 if (starts_with(name
, "heads/") ||
1913 starts_with(name
, "tags/") ||
1914 starts_with(name
, "remotes/"))
1915 return alloc_ref_with_prefix("refs/", 5, name
);
1917 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1920 int get_fetch_map(const struct ref
*remote_refs
,
1921 const struct refspec_item
*refspec
,
1925 struct ref
*ref_map
, **rmp
;
1927 if (refspec
->negative
)
1930 if (refspec
->pattern
) {
1931 ref_map
= get_expanded_map(remote_refs
, refspec
);
1933 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1935 if (refspec
->exact_sha1
) {
1936 ref_map
= alloc_ref(name
);
1937 get_oid_hex(name
, &ref_map
->old_oid
);
1938 ref_map
->exact_oid
= 1;
1940 ref_map
= get_remote_ref(remote_refs
, name
);
1942 if (!missing_ok
&& !ref_map
)
1943 die(_("couldn't find remote ref %s"), name
);
1945 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1946 if (ref_map
->peer_ref
&& refspec
->force
)
1947 ref_map
->peer_ref
->force
= 1;
1951 for (rmp
= &ref_map
; *rmp
; ) {
1952 if ((*rmp
)->peer_ref
) {
1953 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1954 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1955 struct ref
*ignore
= *rmp
;
1956 error(_("* Ignoring funny ref '%s' locally"),
1957 (*rmp
)->peer_ref
->name
);
1958 *rmp
= (*rmp
)->next
;
1959 free(ignore
->peer_ref
);
1964 rmp
= &((*rmp
)->next
);
1968 tail_link_ref(ref_map
, tail
);
1973 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1977 for (; list
; list
= list
->next
)
1978 if (!strcmp(ref
->symref
, list
->name
)) {
1979 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1986 * Compute the commit ahead/behind values for the pair branch_name, base.
1988 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1989 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1990 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1993 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1994 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1995 * commits are different.
1998 static int stat_branch_pair(const char *branch_name
, const char *base
,
1999 int *num_ours
, int *num_theirs
,
2000 enum ahead_behind_flags abf
)
2002 struct object_id oid
;
2003 struct commit
*ours
, *theirs
;
2004 struct rev_info revs
;
2005 struct strvec argv
= STRVEC_INIT
;
2007 /* Cannot stat if what we used to build on no longer exists */
2008 if (read_ref(base
, &oid
))
2010 theirs
= lookup_commit_reference(the_repository
, &oid
);
2014 if (read_ref(branch_name
, &oid
))
2016 ours
= lookup_commit_reference(the_repository
, &oid
);
2020 *num_theirs
= *num_ours
= 0;
2022 /* are we the same? */
2025 if (abf
== AHEAD_BEHIND_QUICK
)
2027 if (abf
!= AHEAD_BEHIND_FULL
)
2028 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2030 /* Run "rev-list --left-right ours...theirs" internally... */
2031 strvec_push(&argv
, ""); /* ignored */
2032 strvec_push(&argv
, "--left-right");
2033 strvec_pushf(&argv
, "%s...%s",
2034 oid_to_hex(&ours
->object
.oid
),
2035 oid_to_hex(&theirs
->object
.oid
));
2036 strvec_push(&argv
, "--");
2038 repo_init_revisions(the_repository
, &revs
, NULL
);
2039 setup_revisions(argv
.nr
, argv
.v
, &revs
, NULL
);
2040 if (prepare_revision_walk(&revs
))
2041 die(_("revision walk setup failed"));
2043 /* ... and count the commits on each side. */
2045 struct commit
*c
= get_revision(&revs
);
2048 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2054 /* clear object flags smudged by the above traversal */
2055 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2056 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2058 strvec_clear(&argv
);
2063 * Lookup the tracking branch for the given branch and if present, optionally
2064 * compute the commit ahead/behind values for the pair.
2066 * If for_push is true, the tracking branch refers to the push branch,
2067 * otherwise it refers to the upstream branch.
2069 * The name of the tracking branch (or NULL if it is not defined) is
2070 * returned via *tracking_name, if it is not itself NULL.
2072 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2073 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2074 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2077 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2078 * upstream defined, or ref does not exist). Returns 0 if the commits are
2079 * identical. Returns 1 if commits are different.
2081 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2082 const char **tracking_name
, int for_push
,
2083 enum ahead_behind_flags abf
)
2087 /* Cannot stat unless we are marked to build on top of somebody else. */
2088 base
= for_push
? branch_get_push(branch
, NULL
) :
2089 branch_get_upstream(branch
, NULL
);
2091 *tracking_name
= base
;
2095 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2099 * Return true when there is anything to report, otherwise false.
2101 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2102 enum ahead_behind_flags abf
)
2104 int ours
, theirs
, sti
;
2105 const char *full_base
;
2107 int upstream_is_gone
= 0;
2109 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2113 upstream_is_gone
= 1;
2116 base
= shorten_unambiguous_ref(full_base
, 0);
2117 if (upstream_is_gone
) {
2119 _("Your branch is based on '%s', but the upstream is gone.\n"),
2121 if (advice_status_hints
)
2123 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2126 _("Your branch is up to date with '%s'.\n"),
2128 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2130 _("Your branch and '%s' refer to different commits.\n"),
2132 if (advice_status_hints
)
2133 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2134 "git status --ahead-behind");
2135 } else if (!theirs
) {
2137 Q_("Your branch is ahead of '%s' by %d commit.\n",
2138 "Your branch is ahead of '%s' by %d commits.\n",
2141 if (advice_status_hints
)
2143 _(" (use \"git push\" to publish your local commits)\n"));
2146 Q_("Your branch is behind '%s' by %d commit, "
2147 "and can be fast-forwarded.\n",
2148 "Your branch is behind '%s' by %d commits, "
2149 "and can be fast-forwarded.\n",
2152 if (advice_status_hints
)
2154 _(" (use \"git pull\" to update your local branch)\n"));
2157 Q_("Your branch and '%s' have diverged,\n"
2158 "and have %d and %d different commit each, "
2160 "Your branch and '%s' have diverged,\n"
2161 "and have %d and %d different commits each, "
2164 base
, ours
, theirs
);
2165 if (advice_status_hints
)
2167 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2173 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2174 int flag
, void *cb_data
)
2176 struct ref
***local_tail
= cb_data
;
2179 /* we already know it starts with refs/ to get here */
2180 if (check_refname_format(refname
+ 5, 0))
2183 ref
= alloc_ref(refname
);
2184 oidcpy(&ref
->new_oid
, oid
);
2186 *local_tail
= &ref
->next
;
2190 struct ref
*get_local_heads(void)
2192 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2194 for_each_ref(one_local_ref
, &local_tail
);
2198 struct ref
*guess_remote_head(const struct ref
*head
,
2199 const struct ref
*refs
,
2202 const struct ref
*r
;
2203 struct ref
*list
= NULL
;
2204 struct ref
**tail
= &list
;
2210 * Some transports support directly peeking at
2211 * where HEAD points; if that is the case, then
2212 * we don't have to guess.
2215 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2217 /* If a remote branch exists with the default branch name, let's use it. */
2219 char *ref
= xstrfmt("refs/heads/%s",
2220 git_default_branch_name(0));
2222 r
= find_ref_by_name(refs
, ref
);
2224 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2227 /* Fall back to the hard-coded historical default */
2228 r
= find_ref_by_name(refs
, "refs/heads/master");
2229 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2233 /* Look for another ref that points there */
2234 for (r
= refs
; r
; r
= r
->next
) {
2236 starts_with(r
->name
, "refs/heads/") &&
2237 oideq(&r
->old_oid
, &head
->old_oid
)) {
2238 *tail
= copy_ref(r
);
2239 tail
= &((*tail
)->next
);
2248 struct stale_heads_info
{
2249 struct string_list
*ref_names
;
2250 struct ref
**stale_refs_tail
;
2254 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2255 int flags
, void *cb_data
)
2257 struct stale_heads_info
*info
= cb_data
;
2258 struct string_list matches
= STRING_LIST_INIT_DUP
;
2259 struct refspec_item query
;
2261 memset(&query
, 0, sizeof(struct refspec_item
));
2262 query
.dst
= (char *)refname
;
2264 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2265 if (matches
.nr
== 0)
2266 goto clean_exit
; /* No matches */
2269 * If we did find a suitable refspec and it's not a symref and
2270 * it's not in the list of refs that currently exist in that
2271 * remote, we consider it to be stale. In order to deal with
2272 * overlapping refspecs, we need to go over all of the
2275 if (flags
& REF_ISSYMREF
)
2278 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2279 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2283 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2284 oidcpy(&ref
->new_oid
, oid
);
2288 string_list_clear(&matches
, 0);
2292 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2294 struct ref
*ref
, *stale_refs
= NULL
;
2295 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2296 struct stale_heads_info info
;
2298 info
.ref_names
= &ref_names
;
2299 info
.stale_refs_tail
= &stale_refs
;
2301 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2302 string_list_append(&ref_names
, ref
->name
);
2303 string_list_sort(&ref_names
);
2304 for_each_ref(get_stale_heads_cb
, &info
);
2305 string_list_clear(&ref_names
, 0);
2312 static void clear_cas_option(struct push_cas_option
*cas
)
2316 for (i
= 0; i
< cas
->nr
; i
++)
2317 free(cas
->entry
[i
].refname
);
2319 memset(cas
, 0, sizeof(*cas
));
2322 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2323 const char *refname
,
2326 struct push_cas
*entry
;
2327 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2328 entry
= &cas
->entry
[cas
->nr
++];
2329 memset(entry
, 0, sizeof(*entry
));
2330 entry
->refname
= xmemdupz(refname
, refnamelen
);
2334 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2337 struct push_cas
*entry
;
2340 /* "--no-<option>" */
2341 clear_cas_option(cas
);
2346 /* just "--<option>" */
2347 cas
->use_tracking_for_rest
= 1;
2351 /* "--<option>=refname" or "--<option>=refname:value" */
2352 colon
= strchrnul(arg
, ':');
2353 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2355 entry
->use_tracking
= 1;
2357 oidclr(&entry
->expect
);
2358 else if (get_oid(colon
+ 1, &entry
->expect
))
2359 return error(_("cannot parse expected object name '%s'"),
2364 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2366 return parse_push_cas_option(opt
->value
, arg
, unset
);
2369 int is_empty_cas(const struct push_cas_option
*cas
)
2371 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2375 * Look at remote.fetch refspec and see if we have a remote
2376 * tracking branch for the refname there. Fill the name of
2377 * the remote-tracking branch in *dst_refname, and the name
2378 * of the commit object at its tip in oid[].
2379 * If we cannot do so, return negative to signal an error.
2381 static int remote_tracking(struct remote
*remote
, const char *refname
,
2382 struct object_id
*oid
, char **dst_refname
)
2386 dst
= apply_refspecs(&remote
->fetch
, refname
);
2388 return -1; /* no tracking ref for refname at remote */
2389 if (read_ref(dst
, oid
))
2390 return -1; /* we know what the tracking ref is but we cannot read it */
2397 * The struct "reflog_commit_array" and related helper functions
2398 * are used for collecting commits into an array during reflog
2399 * traversals in "check_and_collect_until()".
2401 struct reflog_commit_array
{
2402 struct commit
**item
;
2406 #define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
2408 /* Append a commit to the array. */
2409 static void append_commit(struct reflog_commit_array
*arr
,
2410 struct commit
*commit
)
2412 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2413 arr
->item
[arr
->nr
++] = commit
;
2416 /* Free and reset the array. */
2417 static void free_commit_array(struct reflog_commit_array
*arr
)
2419 FREE_AND_NULL(arr
->item
);
2420 arr
->nr
= arr
->alloc
= 0;
2423 struct check_and_collect_until_cb_data
{
2424 struct commit
*remote_commit
;
2425 struct reflog_commit_array
*local_commits
;
2426 timestamp_t remote_reflog_timestamp
;
2429 /* Get the timestamp of the latest entry. */
2430 static int peek_reflog(struct object_id
*o_oid
, struct object_id
*n_oid
,
2431 const char *ident
, timestamp_t timestamp
,
2432 int tz
, const char *message
, void *cb_data
)
2434 timestamp_t
*ts
= cb_data
;
2439 static int check_and_collect_until(struct object_id
*o_oid
,
2440 struct object_id
*n_oid
,
2441 const char *ident
, timestamp_t timestamp
,
2442 int tz
, const char *message
, void *cb_data
)
2444 struct commit
*commit
;
2445 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2447 /* An entry was found. */
2448 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2451 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2452 append_commit(cb
->local_commits
, commit
);
2455 * If the reflog entry timestamp is older than the remote ref's
2456 * latest reflog entry, there is no need to check or collect
2457 * entries older than this one.
2459 if (timestamp
< cb
->remote_reflog_timestamp
)
2465 #define MERGE_BASES_BATCH_SIZE 8
2468 * Iterate through the reflog of the local ref to check if there is an entry
2469 * for the given remote-tracking ref; runs until the timestamp of an entry is
2470 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2471 * are that seen along the way are collected into an array to check if the
2472 * remote-tracking ref is reachable from any of them.
2474 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2477 struct commit
*commit
;
2478 struct commit
**chunk
;
2479 struct check_and_collect_until_cb_data cb
;
2480 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2484 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2486 goto cleanup_return
;
2489 * Get the timestamp from the latest entry
2490 * of the remote-tracking ref's reflog.
2492 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2494 cb
.remote_commit
= commit
;
2495 cb
.local_commits
= &arr
;
2496 cb
.remote_reflog_timestamp
= date
;
2497 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2499 /* We found an entry in the reflog. */
2501 goto cleanup_return
;
2504 * Check if the remote commit is reachable from any
2505 * of the commits in the collected array, in batches.
2507 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2508 size
= arr
.item
+ arr
.nr
- chunk
;
2509 if (MERGE_BASES_BATCH_SIZE
< size
)
2510 size
= MERGE_BASES_BATCH_SIZE
;
2512 if ((ret
= in_merge_bases_many(commit
, size
, chunk
)))
2517 free_commit_array(&arr
);
2522 * Check for reachability of a remote-tracking
2523 * ref in the reflog entries of its local ref.
2525 static void check_if_includes_upstream(struct ref
*remote
)
2527 struct ref
*local
= get_local_ref(remote
->name
);
2531 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2532 remote
->unreachable
= 1;
2535 static void apply_cas(struct push_cas_option
*cas
,
2536 struct remote
*remote
,
2541 /* Find an explicit --<option>=<name>[:<value>] entry */
2542 for (i
= 0; i
< cas
->nr
; i
++) {
2543 struct push_cas
*entry
= &cas
->entry
[i
];
2544 if (!refname_match(entry
->refname
, ref
->name
))
2546 ref
->expect_old_sha1
= 1;
2547 if (!entry
->use_tracking
)
2548 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2549 else if (remote_tracking(remote
, ref
->name
,
2550 &ref
->old_oid_expect
,
2551 &ref
->tracking_ref
))
2552 oidclr(&ref
->old_oid_expect
);
2554 ref
->check_reachable
= cas
->use_force_if_includes
;
2558 /* Are we using "--<option>" to cover all? */
2559 if (!cas
->use_tracking_for_rest
)
2562 ref
->expect_old_sha1
= 1;
2563 if (remote_tracking(remote
, ref
->name
,
2564 &ref
->old_oid_expect
,
2565 &ref
->tracking_ref
))
2566 oidclr(&ref
->old_oid_expect
);
2568 ref
->check_reachable
= cas
->use_force_if_includes
;
2571 void apply_push_cas(struct push_cas_option
*cas
,
2572 struct remote
*remote
,
2573 struct ref
*remote_refs
)
2576 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2577 apply_cas(cas
, remote
, ref
);
2580 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2581 * mode, and if "--force-if-includes" was specified, run
2584 if (ref
->check_reachable
)
2585 check_if_includes_upstream(ref
);