5 #include "environment.h"
12 #include "object-store.h"
18 #include "string-list.h"
20 #include "commit-reach.h"
24 enum map_direction
{ FROM_SRC
, FROM_DST
};
26 struct counted_string
{
31 static int valid_remote(const struct remote
*remote
)
33 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
36 static const char *alias_url(const char *url
, struct rewrites
*r
)
39 struct counted_string
*longest
;
44 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
47 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
48 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
50 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
51 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
59 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
62 static void add_url(struct remote
*remote
, const char *url
)
64 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
65 remote
->url
[remote
->url_nr
++] = url
;
68 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
70 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
71 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
74 static void add_pushurl_alias(struct remote_state
*remote_state
,
75 struct remote
*remote
, const char *url
)
77 const char *pushurl
= alias_url(url
, &remote_state
->rewrites_push
);
79 add_pushurl(remote
, pushurl
);
82 static void add_url_alias(struct remote_state
*remote_state
,
83 struct remote
*remote
, const char *url
)
85 add_url(remote
, alias_url(url
, &remote_state
->rewrites
));
86 add_pushurl_alias(remote_state
, remote
, url
);
89 struct remotes_hash_key
{
94 static int remotes_hash_cmp(const void *cmp_data UNUSED
,
95 const struct hashmap_entry
*eptr
,
96 const struct hashmap_entry
*entry_or_key
,
99 const struct remote
*a
, *b
;
100 const struct remotes_hash_key
*key
= keydata
;
102 a
= container_of(eptr
, const struct remote
, ent
);
103 b
= container_of(entry_or_key
, const struct remote
, ent
);
106 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
108 return strcmp(a
->name
, b
->name
);
111 static struct remote
*make_remote(struct remote_state
*remote_state
,
112 const char *name
, int len
)
115 struct remotes_hash_key lookup
;
116 struct hashmap_entry lookup_entry
, *e
;
123 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
125 e
= hashmap_get(&remote_state
->remotes_hash
, &lookup_entry
, &lookup
);
127 return container_of(e
, struct remote
, ent
);
129 CALLOC_ARRAY(ret
, 1);
130 ret
->prune
= -1; /* unspecified */
131 ret
->prune_tags
= -1; /* unspecified */
132 ret
->name
= xstrndup(name
, len
);
133 refspec_init(&ret
->push
, REFSPEC_PUSH
);
134 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
136 ALLOC_GROW(remote_state
->remotes
, remote_state
->remotes_nr
+ 1,
137 remote_state
->remotes_alloc
);
138 remote_state
->remotes
[remote_state
->remotes_nr
++] = ret
;
140 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
141 if (hashmap_put_entry(&remote_state
->remotes_hash
, ret
, ent
))
142 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
146 static void remote_clear(struct remote
*remote
)
150 free((char *)remote
->name
);
151 free((char *)remote
->foreign_vcs
);
153 for (i
= 0; i
< remote
->url_nr
; i
++)
154 free((char *)remote
->url
[i
]);
155 FREE_AND_NULL(remote
->url
);
157 for (i
= 0; i
< remote
->pushurl_nr
; i
++)
158 free((char *)remote
->pushurl
[i
]);
159 FREE_AND_NULL(remote
->pushurl
);
160 free((char *)remote
->receivepack
);
161 free((char *)remote
->uploadpack
);
162 FREE_AND_NULL(remote
->http_proxy
);
163 FREE_AND_NULL(remote
->http_proxy_authmethod
);
166 static void add_merge(struct branch
*branch
, const char *name
)
168 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
169 branch
->merge_alloc
);
170 branch
->merge_name
[branch
->merge_nr
++] = name
;
173 struct branches_hash_key
{
178 static int branches_hash_cmp(const void *cmp_data UNUSED
,
179 const struct hashmap_entry
*eptr
,
180 const struct hashmap_entry
*entry_or_key
,
183 const struct branch
*a
, *b
;
184 const struct branches_hash_key
*key
= keydata
;
186 a
= container_of(eptr
, const struct branch
, ent
);
187 b
= container_of(entry_or_key
, const struct branch
, ent
);
190 return strncmp(a
->name
, key
->str
, key
->len
) ||
193 return strcmp(a
->name
, b
->name
);
196 static struct branch
*find_branch(struct remote_state
*remote_state
,
197 const char *name
, size_t len
)
199 struct branches_hash_key lookup
;
200 struct hashmap_entry lookup_entry
, *e
;
204 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
206 e
= hashmap_get(&remote_state
->branches_hash
, &lookup_entry
, &lookup
);
208 return container_of(e
, struct branch
, ent
);
213 static void die_on_missing_branch(struct repository
*repo
,
214 struct branch
*branch
)
216 /* branch == NULL is always valid because it represents detached HEAD. */
218 branch
!= find_branch(repo
->remote_state
, branch
->name
,
219 strlen(branch
->name
)))
220 die("branch %s was not found in the repository", branch
->name
);
223 static struct branch
*make_branch(struct remote_state
*remote_state
,
224 const char *name
, size_t len
)
228 ret
= find_branch(remote_state
, name
, len
);
232 CALLOC_ARRAY(ret
, 1);
233 ret
->name
= xstrndup(name
, len
);
234 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
236 hashmap_entry_init(&ret
->ent
, memhash(name
, len
));
237 if (hashmap_put_entry(&remote_state
->branches_hash
, ret
, ent
))
238 BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
242 static struct rewrite
*make_rewrite(struct rewrites
*r
,
243 const char *base
, size_t len
)
248 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
249 if (len
== r
->rewrite
[i
]->baselen
&&
250 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
251 return r
->rewrite
[i
];
254 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
255 CALLOC_ARRAY(ret
, 1);
256 r
->rewrite
[r
->rewrite_nr
++] = ret
;
257 ret
->base
= xstrndup(base
, len
);
262 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
264 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
265 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
266 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
267 rewrite
->instead_of_nr
++;
270 static const char *skip_spaces(const char *s
)
277 static void read_remotes_file(struct remote_state
*remote_state
,
278 struct remote
*remote
)
280 struct strbuf buf
= STRBUF_INIT
;
281 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
285 remote
->configured_in_repo
= 1;
286 remote
->origin
= REMOTE_REMOTES
;
287 while (strbuf_getline(&buf
, f
) != EOF
) {
292 if (skip_prefix(buf
.buf
, "URL:", &v
))
293 add_url_alias(remote_state
, remote
,
294 xstrdup(skip_spaces(v
)));
295 else if (skip_prefix(buf
.buf
, "Push:", &v
))
296 refspec_append(&remote
->push
, skip_spaces(v
));
297 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
298 refspec_append(&remote
->fetch
, skip_spaces(v
));
300 strbuf_release(&buf
);
304 static void read_branches_file(struct remote_state
*remote_state
,
305 struct remote
*remote
)
308 struct strbuf buf
= STRBUF_INIT
;
309 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
314 strbuf_getline_lf(&buf
, f
);
318 strbuf_release(&buf
);
322 remote
->configured_in_repo
= 1;
323 remote
->origin
= REMOTE_BRANCHES
;
326 * The branches file would have URL and optionally
327 * #branch specified. The default (or specified) branch is
328 * fetched and stored in the local branch matching the
331 frag
= strchr(buf
.buf
, '#');
335 frag
= (char *)git_default_branch_name(0);
337 add_url_alias(remote_state
, remote
, strbuf_detach(&buf
, NULL
));
338 refspec_appendf(&remote
->fetch
, "refs/heads/%s:refs/heads/%s",
342 * Cogito compatible push: push current HEAD to remote #branch
343 * (master if missing)
345 refspec_appendf(&remote
->push
, "HEAD:refs/heads/%s", frag
);
346 remote
->fetch_tags
= 1; /* always auto-follow */
349 static int handle_config(const char *key
, const char *value
, void *cb
)
354 struct remote
*remote
;
355 struct branch
*branch
;
356 struct remote_state
*remote_state
= cb
;
358 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
359 /* There is no subsection. */
362 /* There is a subsection, but it is empty. */
365 branch
= make_branch(remote_state
, name
, namelen
);
366 if (!strcmp(subkey
, "remote")) {
367 return git_config_string(&branch
->remote_name
, key
, value
);
368 } else if (!strcmp(subkey
, "pushremote")) {
369 return git_config_string(&branch
->pushremote_name
, key
, value
);
370 } else if (!strcmp(subkey
, "merge")) {
372 return config_error_nonbool(key
);
373 add_merge(branch
, xstrdup(value
));
377 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
378 struct rewrite
*rewrite
;
381 if (!strcmp(subkey
, "insteadof")) {
383 return config_error_nonbool(key
);
384 rewrite
= make_rewrite(&remote_state
->rewrites
, name
,
386 add_instead_of(rewrite
, xstrdup(value
));
387 } else if (!strcmp(subkey
, "pushinsteadof")) {
389 return config_error_nonbool(key
);
390 rewrite
= make_rewrite(&remote_state
->rewrites_push
,
392 add_instead_of(rewrite
, xstrdup(value
));
396 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
399 /* Handle remote.* variables */
400 if (!name
&& !strcmp(subkey
, "pushdefault"))
401 return git_config_string(&remote_state
->pushremote_name
, key
,
406 /* Handle remote.<name>.* variables */
408 warning(_("config remote shorthand cannot begin with '/': %s"),
412 remote
= make_remote(remote_state
, name
, namelen
);
413 remote
->origin
= REMOTE_CONFIG
;
414 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
415 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
416 remote
->configured_in_repo
= 1;
417 if (!strcmp(subkey
, "mirror"))
418 remote
->mirror
= git_config_bool(key
, value
);
419 else if (!strcmp(subkey
, "skipdefaultupdate"))
420 remote
->skip_default_update
= git_config_bool(key
, value
);
421 else if (!strcmp(subkey
, "skipfetchall"))
422 remote
->skip_default_update
= git_config_bool(key
, value
);
423 else if (!strcmp(subkey
, "prune"))
424 remote
->prune
= git_config_bool(key
, value
);
425 else if (!strcmp(subkey
, "prunetags"))
426 remote
->prune_tags
= git_config_bool(key
, value
);
427 else if (!strcmp(subkey
, "url")) {
429 if (git_config_string(&v
, key
, value
))
432 } else if (!strcmp(subkey
, "pushurl")) {
434 if (git_config_string(&v
, key
, value
))
436 add_pushurl(remote
, v
);
437 } else if (!strcmp(subkey
, "push")) {
439 if (git_config_string(&v
, key
, value
))
441 refspec_append(&remote
->push
, v
);
443 } else if (!strcmp(subkey
, "fetch")) {
445 if (git_config_string(&v
, key
, value
))
447 refspec_append(&remote
->fetch
, v
);
449 } else if (!strcmp(subkey
, "receivepack")) {
451 if (git_config_string(&v
, key
, value
))
453 if (!remote
->receivepack
)
454 remote
->receivepack
= v
;
456 error(_("more than one receivepack given, using the first"));
457 } else if (!strcmp(subkey
, "uploadpack")) {
459 if (git_config_string(&v
, key
, value
))
461 if (!remote
->uploadpack
)
462 remote
->uploadpack
= v
;
464 error(_("more than one uploadpack given, using the first"));
465 } else if (!strcmp(subkey
, "tagopt")) {
466 if (!strcmp(value
, "--no-tags"))
467 remote
->fetch_tags
= -1;
468 else if (!strcmp(value
, "--tags"))
469 remote
->fetch_tags
= 2;
470 } else if (!strcmp(subkey
, "proxy")) {
471 return git_config_string((const char **)&remote
->http_proxy
,
473 } else if (!strcmp(subkey
, "proxyauthmethod")) {
474 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
476 } else if (!strcmp(subkey
, "vcs")) {
477 return git_config_string(&remote
->foreign_vcs
, key
, value
);
482 static void alias_all_urls(struct remote_state
*remote_state
)
485 for (i
= 0; i
< remote_state
->remotes_nr
; i
++) {
486 int add_pushurl_aliases
;
487 if (!remote_state
->remotes
[i
])
489 for (j
= 0; j
< remote_state
->remotes
[i
]->pushurl_nr
; j
++) {
490 remote_state
->remotes
[i
]->pushurl
[j
] =
491 alias_url(remote_state
->remotes
[i
]->pushurl
[j
],
492 &remote_state
->rewrites
);
494 add_pushurl_aliases
= remote_state
->remotes
[i
]->pushurl_nr
== 0;
495 for (j
= 0; j
< remote_state
->remotes
[i
]->url_nr
; j
++) {
496 if (add_pushurl_aliases
)
498 remote_state
, remote_state
->remotes
[i
],
499 remote_state
->remotes
[i
]->url
[j
]);
500 remote_state
->remotes
[i
]->url
[j
] =
501 alias_url(remote_state
->remotes
[i
]->url
[j
],
502 &remote_state
->rewrites
);
507 static void read_config(struct repository
*repo
)
511 if (repo
->remote_state
->initialized
)
513 repo
->remote_state
->initialized
= 1;
515 repo
->remote_state
->current_branch
= NULL
;
516 if (startup_info
->have_repository
) {
517 const char *head_ref
= refs_resolve_ref_unsafe(
518 get_main_ref_store(repo
), "HEAD", 0, NULL
, &flag
);
519 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
520 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
521 repo
->remote_state
->current_branch
= make_branch(
522 repo
->remote_state
, head_ref
, strlen(head_ref
));
525 repo_config(repo
, handle_config
, repo
->remote_state
);
526 alias_all_urls(repo
->remote_state
);
529 static int valid_remote_nick(const char *name
)
531 if (!name
[0] || is_dot_or_dotdot(name
))
534 /* remote nicknames cannot contain slashes */
536 if (is_dir_sep(*name
++))
541 static const char *remotes_remote_for_branch(struct remote_state
*remote_state
,
542 struct branch
*branch
,
545 if (branch
&& branch
->remote_name
) {
548 return branch
->remote_name
;
552 if (remote_state
->remotes_nr
== 1)
553 return remote_state
->remotes
[0]->name
;
557 const char *remote_for_branch(struct branch
*branch
, int *explicit)
559 read_config(the_repository
);
560 die_on_missing_branch(the_repository
, branch
);
562 return remotes_remote_for_branch(the_repository
->remote_state
, branch
,
567 remotes_pushremote_for_branch(struct remote_state
*remote_state
,
568 struct branch
*branch
, int *explicit)
570 if (branch
&& branch
->pushremote_name
) {
573 return branch
->pushremote_name
;
575 if (remote_state
->pushremote_name
) {
578 return remote_state
->pushremote_name
;
580 return remotes_remote_for_branch(remote_state
, branch
, explicit);
583 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
585 read_config(the_repository
);
586 die_on_missing_branch(the_repository
, branch
);
588 return remotes_pushremote_for_branch(the_repository
->remote_state
,
592 static struct remote
*remotes_remote_get(struct remote_state
*remote_state
,
595 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
597 read_config(the_repository
);
598 die_on_missing_branch(the_repository
, branch
);
602 if (branch
->merge_nr
) {
603 return branch
->merge_name
[0];
607 *remote_name
= remotes_pushremote_for_branch(
608 the_repository
->remote_state
, branch
,
610 struct remote
*remote
= remotes_remote_get(
611 the_repository
->remote_state
, remote_name
);
613 if (remote
&& remote
->push
.nr
&&
614 (dst
= apply_refspecs(&remote
->push
,
623 static void validate_remote_url(struct remote
*remote
)
627 struct strbuf redacted
= STRBUF_INIT
;
630 if (git_config_get_string_tmp("transfer.credentialsinurl", &value
))
633 if (!strcmp("warn", value
))
635 else if (!strcmp("die", value
))
637 else if (!strcmp("allow", value
))
640 die(_("unrecognized value transfer.credentialsInUrl: '%s'"), value
);
642 for (i
= 0; i
< remote
->url_nr
; i
++) {
643 struct url_info url_info
= { 0 };
645 if (!url_normalize(remote
->url
[i
], &url_info
) ||
646 !url_info
.passwd_off
)
649 strbuf_reset(&redacted
);
650 strbuf_add(&redacted
, url_info
.url
, url_info
.passwd_off
);
651 strbuf_addstr(&redacted
, "<redacted>");
652 strbuf_addstr(&redacted
,
653 url_info
.url
+ url_info
.passwd_off
+ url_info
.passwd_len
);
656 warning(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
658 die(_("URL '%s' uses plaintext credentials"), redacted
.buf
);
664 strbuf_release(&redacted
);
667 static struct remote
*
668 remotes_remote_get_1(struct remote_state
*remote_state
, const char *name
,
669 const char *(*get_default
)(struct remote_state
*,
670 struct branch
*, int *))
678 name
= get_default(remote_state
, remote_state
->current_branch
,
681 ret
= make_remote(remote_state
, name
, 0);
682 if (valid_remote_nick(name
) && have_git_dir()) {
683 if (!valid_remote(ret
))
684 read_remotes_file(remote_state
, ret
);
685 if (!valid_remote(ret
))
686 read_branches_file(remote_state
, ret
);
688 if (name_given
&& !valid_remote(ret
))
689 add_url_alias(remote_state
, ret
, name
);
690 if (!valid_remote(ret
))
693 validate_remote_url(ret
);
698 static inline struct remote
*
699 remotes_remote_get(struct remote_state
*remote_state
, const char *name
)
701 return remotes_remote_get_1(remote_state
, name
,
702 remotes_remote_for_branch
);
705 struct remote
*remote_get(const char *name
)
707 read_config(the_repository
);
708 return remotes_remote_get(the_repository
->remote_state
, name
);
711 static inline struct remote
*
712 remotes_pushremote_get(struct remote_state
*remote_state
, const char *name
)
714 return remotes_remote_get_1(remote_state
, name
,
715 remotes_pushremote_for_branch
);
718 struct remote
*pushremote_get(const char *name
)
720 read_config(the_repository
);
721 return remotes_pushremote_get(the_repository
->remote_state
, name
);
724 int remote_is_configured(struct remote
*remote
, int in_repo
)
729 return remote
->configured_in_repo
;
730 return !!remote
->origin
;
733 int for_each_remote(each_remote_fn fn
, void *priv
)
736 read_config(the_repository
);
737 for (i
= 0; i
< the_repository
->remote_state
->remotes_nr
&& !result
;
739 struct remote
*remote
=
740 the_repository
->remote_state
->remotes
[i
];
743 result
= fn(remote
, priv
);
748 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
750 if (strcmp(ref1
->name
, ref2
->name
)) {
751 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
752 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
753 die(_("Cannot fetch both %s and %s to %s"),
754 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
755 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
756 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
757 warning(_("%s usually tracks %s, not %s"),
758 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
759 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
760 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
761 die(_("%s tracks both %s and %s"),
762 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
765 * This last possibility doesn't occur because
766 * FETCH_HEAD_IGNORE entries always appear at
767 * the end of the list.
769 BUG("Internal error");
772 free(ref2
->peer_ref
);
776 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
778 struct string_list refs
= STRING_LIST_INIT_NODUP
;
779 struct ref
*retval
= NULL
;
780 struct ref
**p
= &retval
;
783 struct ref
*ref
= ref_map
;
785 ref_map
= ref_map
->next
;
788 if (!ref
->peer_ref
) {
792 struct string_list_item
*item
=
793 string_list_insert(&refs
, ref
->peer_ref
->name
);
796 /* Entry already existed */
797 handle_duplicate((struct ref
*)item
->util
, ref
);
806 string_list_clear(&refs
, 0);
810 int remote_has_url(struct remote
*remote
, const char *url
)
813 for (i
= 0; i
< remote
->url_nr
; i
++) {
814 if (!strcmp(remote
->url
[i
], url
))
820 static int match_name_with_pattern(const char *key
, const char *name
,
821 const char *value
, char **result
)
823 const char *kstar
= strchr(key
, '*');
829 die(_("key '%s' of pattern had no '*'"), key
);
831 ksuffixlen
= strlen(kstar
+ 1);
832 namelen
= strlen(name
);
833 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
834 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
836 struct strbuf sb
= STRBUF_INIT
;
837 const char *vstar
= strchr(value
, '*');
839 die(_("value '%s' of pattern has no '*'"), value
);
840 strbuf_add(&sb
, value
, vstar
- value
);
841 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
842 strbuf_addstr(&sb
, vstar
+ 1);
843 *result
= strbuf_detach(&sb
, NULL
);
848 static int refspec_match(const struct refspec_item
*refspec
,
851 if (refspec
->pattern
)
852 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
854 return !strcmp(refspec
->src
, name
);
857 int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
861 for (i
= 0; i
< rs
->nr
; i
++) {
862 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
868 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
872 for (tail
= &ref_map
; *tail
; ) {
873 struct ref
*ref
= *tail
;
875 if (omit_name_by_refspec(ref
->name
, rs
)) {
886 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
888 int i
, matched_negative
= 0;
889 int find_src
= !query
->src
;
890 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
891 const char *needle
= find_src
? query
->dst
: query
->src
;
894 * Check whether the queried ref matches any negative refpsec. If so,
895 * then we should ultimately treat this as not matching the query at
898 * Note that negative refspecs always match the source, but the query
899 * item uses the destination. To handle this, we apply pattern
900 * refspecs in reverse to figure out if the query source matches any
901 * of the negative refspecs.
903 * The first loop finds and expands all positive refspecs
904 * matched by the queried ref.
906 * The second loop checks if any of the results of the first loop
907 * match any negative refspec.
909 for (i
= 0; i
< rs
->nr
; i
++) {
910 struct refspec_item
*refspec
= &rs
->items
[i
];
913 if (refspec
->negative
)
916 /* Note the reversal of src and dst */
917 if (refspec
->pattern
) {
918 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
919 const char *value
= refspec
->src
;
921 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
922 string_list_append_nodup(&reversed
, expn_name
);
923 } else if (refspec
->matching
) {
924 /* For the special matching refspec, any query should match */
925 string_list_append(&reversed
, needle
);
926 } else if (!refspec
->src
) {
927 BUG("refspec->src should not be null here");
928 } else if (!strcmp(needle
, refspec
->src
)) {
929 string_list_append(&reversed
, refspec
->src
);
933 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
934 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
935 matched_negative
= 1;
938 string_list_clear(&reversed
, 0);
940 return matched_negative
;
943 static void query_refspecs_multiple(struct refspec
*rs
,
944 struct refspec_item
*query
,
945 struct string_list
*results
)
948 int find_src
= !query
->src
;
950 if (find_src
&& !query
->dst
)
951 BUG("query_refspecs_multiple: need either src or dst");
953 if (query_matches_negative_refspec(rs
, query
))
956 for (i
= 0; i
< rs
->nr
; i
++) {
957 struct refspec_item
*refspec
= &rs
->items
[i
];
958 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
959 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
960 const char *needle
= find_src
? query
->dst
: query
->src
;
961 char **result
= find_src
? &query
->src
: &query
->dst
;
963 if (!refspec
->dst
|| refspec
->negative
)
965 if (refspec
->pattern
) {
966 if (match_name_with_pattern(key
, needle
, value
, result
))
967 string_list_append_nodup(results
, *result
);
968 } else if (!strcmp(needle
, key
)) {
969 string_list_append(results
, value
);
974 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
977 int find_src
= !query
->src
;
978 const char *needle
= find_src
? query
->dst
: query
->src
;
979 char **result
= find_src
? &query
->src
: &query
->dst
;
981 if (find_src
&& !query
->dst
)
982 BUG("query_refspecs: need either src or dst");
984 if (query_matches_negative_refspec(rs
, query
))
987 for (i
= 0; i
< rs
->nr
; i
++) {
988 struct refspec_item
*refspec
= &rs
->items
[i
];
989 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
990 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
992 if (!refspec
->dst
|| refspec
->negative
)
994 if (refspec
->pattern
) {
995 if (match_name_with_pattern(key
, needle
, value
, result
)) {
996 query
->force
= refspec
->force
;
999 } else if (!strcmp(needle
, key
)) {
1000 *result
= xstrdup(value
);
1001 query
->force
= refspec
->force
;
1008 char *apply_refspecs(struct refspec
*rs
, const char *name
)
1010 struct refspec_item query
;
1012 memset(&query
, 0, sizeof(struct refspec_item
));
1013 query
.src
= (char *)name
;
1015 if (query_refspecs(rs
, &query
))
1021 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
1023 return query_refspecs(&remote
->fetch
, refspec
);
1026 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
1029 size_t len
= strlen(name
);
1030 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
1031 memcpy(ref
->name
, prefix
, prefixlen
);
1032 memcpy(ref
->name
+ prefixlen
, name
, len
);
1036 struct ref
*alloc_ref(const char *name
)
1038 return alloc_ref_with_prefix("", 0, name
);
1041 struct ref
*copy_ref(const struct ref
*ref
)
1047 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
1049 memcpy(cpy
, ref
, len
);
1051 cpy
->symref
= xstrdup_or_null(ref
->symref
);
1052 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
1053 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
1057 struct ref
*copy_ref_list(const struct ref
*ref
)
1059 struct ref
*ret
= NULL
;
1060 struct ref
**tail
= &ret
;
1062 *tail
= copy_ref(ref
);
1064 tail
= &((*tail
)->next
);
1069 void free_one_ref(struct ref
*ref
)
1073 free_one_ref(ref
->peer_ref
);
1074 free(ref
->remote_status
);
1079 void free_refs(struct ref
*ref
)
1089 int count_refspec_match(const char *pattern
,
1091 struct ref
**matched_ref
)
1093 int patlen
= strlen(pattern
);
1094 struct ref
*matched_weak
= NULL
;
1095 struct ref
*matched
= NULL
;
1099 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1100 char *name
= refs
->name
;
1101 int namelen
= strlen(name
);
1103 if (!refname_match(pattern
, name
))
1106 /* A match is "weak" if it is with refs outside
1107 * heads or tags, and did not specify the pattern
1108 * in full (e.g. "refs/remotes/origin/master") or at
1109 * least from the toplevel (e.g. "remotes/origin/master");
1110 * otherwise "git push $URL master" would result in
1111 * ambiguity between remotes/origin/master and heads/master
1112 * at the remote site.
1114 if (namelen
!= patlen
&&
1115 patlen
!= namelen
- 5 &&
1116 !starts_with(name
, "refs/heads/") &&
1117 !starts_with(name
, "refs/tags/")) {
1118 /* We want to catch the case where only weak
1119 * matches are found and there are multiple
1120 * matches, and where more than one strong
1121 * matches are found, as ambiguous. One
1122 * strong match with zero or more weak matches
1123 * are acceptable as a unique match.
1125 matched_weak
= refs
;
1135 *matched_ref
= matched_weak
;
1140 *matched_ref
= matched
;
1145 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1153 static struct ref
*alloc_delete_ref(void)
1155 struct ref
*ref
= alloc_ref("(delete)");
1156 oidclr(&ref
->new_oid
);
1160 static int try_explicit_object_name(const char *name
,
1163 struct object_id oid
;
1167 *match
= alloc_delete_ref();
1171 if (get_oid(name
, &oid
))
1175 *match
= alloc_ref(name
);
1176 oidcpy(&(*match
)->new_oid
, &oid
);
1181 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1183 struct ref
*ret
= alloc_ref(name
);
1184 tail_link_ref(ret
, tail
);
1188 static char *guess_ref(const char *name
, struct ref
*peer
)
1190 struct strbuf buf
= STRBUF_INIT
;
1192 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1197 if (starts_with(r
, "refs/heads/")) {
1198 strbuf_addstr(&buf
, "refs/heads/");
1199 } else if (starts_with(r
, "refs/tags/")) {
1200 strbuf_addstr(&buf
, "refs/tags/");
1205 strbuf_addstr(&buf
, name
);
1206 return strbuf_detach(&buf
, NULL
);
1209 static int match_explicit_lhs(struct ref
*src
,
1210 struct refspec_item
*rs
,
1212 int *allocated_match
)
1214 switch (count_refspec_match(rs
->src
, src
, match
)) {
1216 if (allocated_match
)
1217 *allocated_match
= 0;
1220 /* The source could be in the get_sha1() format
1221 * not a reference name. :refs/other is a
1222 * way to delete 'other' ref at the remote end.
1224 if (try_explicit_object_name(rs
->src
, match
) < 0)
1225 return error(_("src refspec %s does not match any"), rs
->src
);
1226 if (allocated_match
)
1227 *allocated_match
= 1;
1230 return error(_("src refspec %s matches more than one"), rs
->src
);
1234 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1235 const char *matched_src_name
)
1237 struct object_id oid
;
1238 enum object_type type
;
1241 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1242 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1245 error(_("The destination you provided is not a full refname (i.e.,\n"
1246 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1248 "- Looking for a ref that matches '%s' on the remote side.\n"
1249 "- Checking if the <src> being pushed ('%s')\n"
1250 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1251 " refs/{heads,tags}/ prefix on the remote side.\n"
1253 "Neither worked, so we gave up. You must fully qualify the ref."),
1254 dst_value
, matched_src_name
);
1256 if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME
))
1259 if (get_oid(matched_src_name
, &oid
))
1260 BUG("'%s' is not a valid object, "
1261 "match_explicit_lhs() should catch this!",
1263 type
= oid_object_info(the_repository
, &oid
, NULL
);
1264 if (type
== OBJ_COMMIT
) {
1265 advise(_("The <src> part of the refspec is a commit object.\n"
1266 "Did you mean to create a new branch by pushing to\n"
1267 "'%s:refs/heads/%s'?"),
1268 matched_src_name
, dst_value
);
1269 } else if (type
== OBJ_TAG
) {
1270 advise(_("The <src> part of the refspec is a tag object.\n"
1271 "Did you mean to create a new tag by pushing to\n"
1272 "'%s:refs/tags/%s'?"),
1273 matched_src_name
, dst_value
);
1274 } else if (type
== OBJ_TREE
) {
1275 advise(_("The <src> part of the refspec is a tree object.\n"
1276 "Did you mean to tag a new tree by pushing to\n"
1277 "'%s:refs/tags/%s'?"),
1278 matched_src_name
, dst_value
);
1279 } else if (type
== OBJ_BLOB
) {
1280 advise(_("The <src> part of the refspec is a blob object.\n"
1281 "Did you mean to tag a new blob by pushing to\n"
1282 "'%s:refs/tags/%s'?"),
1283 matched_src_name
, dst_value
);
1285 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1286 matched_src_name
, type
);
1290 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1291 struct ref
***dst_tail
,
1292 struct refspec_item
*rs
)
1294 struct ref
*matched_src
, *matched_dst
;
1297 const char *dst_value
= rs
->dst
;
1300 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1303 matched_src
= matched_dst
= NULL
;
1304 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1310 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1311 RESOLVE_REF_READING
,
1314 ((flag
& REF_ISSYMREF
) &&
1315 !starts_with(dst_value
, "refs/heads/")))
1316 die(_("%s cannot be resolved to branch"),
1320 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1324 if (starts_with(dst_value
, "refs/")) {
1325 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1326 } else if (is_null_oid(&matched_src
->new_oid
)) {
1327 error(_("unable to delete '%s': remote ref does not exist"),
1329 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1330 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1333 show_push_unqualified_ref_name_error(dst_value
,
1339 error(_("dst refspec %s matches more than one"),
1345 if (matched_dst
->peer_ref
)
1346 return error(_("dst ref %s receives from more than one src"),
1349 matched_dst
->peer_ref
= allocated_src
?
1351 copy_ref(matched_src
);
1352 matched_dst
->force
= rs
->force
;
1357 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1358 struct ref
***dst_tail
, struct refspec
*rs
)
1361 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1362 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1366 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1367 int send_mirror
, int direction
,
1368 const struct refspec_item
**ret_pat
)
1370 const struct refspec_item
*pat
;
1373 int matching_refs
= -1;
1374 for (i
= 0; i
< rs
->nr
; i
++) {
1375 const struct refspec_item
*item
= &rs
->items
[i
];
1380 if (item
->matching
&&
1381 (matching_refs
== -1 || item
->force
)) {
1386 if (item
->pattern
) {
1387 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1389 if (direction
== FROM_SRC
)
1390 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1392 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1399 if (matching_refs
== -1)
1402 pat
= &rs
->items
[matching_refs
];
1403 if (pat
->matching
) {
1405 * "matching refs"; traditionally we pushed everything
1406 * including refs outside refs/heads/ hierarchy, but
1407 * that does not make much sense these days.
1409 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1411 name
= xstrdup(ref
->name
);
1418 static struct ref
**tail_ref(struct ref
**head
)
1420 struct ref
**tail
= head
;
1422 tail
= &((*tail
)->next
);
1427 struct commit
**tip
;
1431 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1433 struct commit
*commit
;
1435 if (is_null_oid(oid
))
1437 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1438 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1440 commit
->object
.flags
|= TMP_MARK
;
1441 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1442 tips
->tip
[tips
->nr
++] = commit
;
1445 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1447 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1448 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1449 struct string_list_item
*item
;
1451 struct tips sent_tips
;
1454 * Collect everything we know they would have at the end of
1455 * this push, and collect all tags they have.
1457 memset(&sent_tips
, 0, sizeof(sent_tips
));
1458 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1459 if (ref
->peer_ref
&&
1460 !is_null_oid(&ref
->peer_ref
->new_oid
))
1461 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1463 add_to_tips(&sent_tips
, &ref
->old_oid
);
1464 if (starts_with(ref
->name
, "refs/tags/"))
1465 string_list_append(&dst_tag
, ref
->name
);
1467 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1469 string_list_sort(&dst_tag
);
1471 /* Collect tags they do not have. */
1472 for (ref
= src
; ref
; ref
= ref
->next
) {
1473 if (!starts_with(ref
->name
, "refs/tags/"))
1474 continue; /* not a tag */
1475 if (string_list_has_string(&dst_tag
, ref
->name
))
1476 continue; /* they already have it */
1477 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1478 continue; /* be conservative */
1479 item
= string_list_append(&src_tag
, ref
->name
);
1482 string_list_clear(&dst_tag
, 0);
1485 * At this point, src_tag lists tags that are missing from
1486 * dst, and sent_tips lists the tips we are pushing or those
1487 * that we know they already have. An element in the src_tag
1488 * that is an ancestor of any of the sent_tips needs to be
1489 * sent to the other side.
1492 const int reachable_flag
= 1;
1493 struct commit_list
*found_commits
;
1494 struct commit
**src_commits
;
1495 int nr_src_commits
= 0, alloc_src_commits
= 16;
1496 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1498 for_each_string_list_item(item
, &src_tag
) {
1499 struct ref
*ref
= item
->util
;
1500 struct commit
*commit
;
1502 if (is_null_oid(&ref
->new_oid
))
1504 commit
= lookup_commit_reference_gently(the_repository
,
1508 /* not pushing a commit, which is not an error */
1511 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1512 src_commits
[nr_src_commits
++] = commit
;
1515 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1516 src_commits
, nr_src_commits
,
1519 for_each_string_list_item(item
, &src_tag
) {
1520 struct ref
*dst_ref
;
1521 struct ref
*ref
= item
->util
;
1522 struct commit
*commit
;
1524 if (is_null_oid(&ref
->new_oid
))
1526 commit
= lookup_commit_reference_gently(the_repository
,
1530 /* not pushing a commit, which is not an error */
1534 * Is this tag, which they do not have, reachable from
1535 * any of the commits we are sending?
1537 if (!(commit
->object
.flags
& reachable_flag
))
1541 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1542 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1543 dst_ref
->peer_ref
= copy_ref(ref
);
1546 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1548 free_commit_list(found_commits
);
1551 string_list_clear(&src_tag
, 0);
1552 free(sent_tips
.tip
);
1555 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1557 for ( ; list
; list
= list
->next
)
1558 if (!strcmp(list
->name
, name
))
1559 return (struct ref
*)list
;
1563 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1565 for ( ; ref
; ref
= ref
->next
)
1566 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1568 string_list_sort(ref_index
);
1572 * Given only the set of local refs, sanity-check the set of push
1573 * refspecs. We can't catch all errors that match_push_refs would,
1574 * but we can catch some errors early before even talking to the
1577 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1582 for (i
= 0; i
< rs
->nr
; i
++) {
1583 struct refspec_item
*item
= &rs
->items
[i
];
1585 if (item
->pattern
|| item
->matching
|| item
->negative
)
1588 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1595 * Given the set of refs the local repository has, the set of refs the
1596 * remote repository has, and the refspec used for push, determine
1597 * what remote refs we will update and with what value by setting
1598 * peer_ref (which object is being pushed) and force (if the push is
1599 * forced) in elements of "dst". The function may add new elements to
1600 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1602 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1603 struct refspec
*rs
, int flags
)
1605 int send_all
= flags
& MATCH_REFS_ALL
;
1606 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1607 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1609 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1610 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1612 /* If no refspec is provided, use the default ":" */
1614 refspec_append(rs
, ":");
1616 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1618 /* pick the remainder */
1619 for (ref
= src
; ref
; ref
= ref
->next
) {
1620 struct string_list_item
*dst_item
;
1621 struct ref
*dst_peer
;
1622 const struct refspec_item
*pat
= NULL
;
1625 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1629 if (!dst_ref_index
.nr
)
1630 prepare_ref_index(&dst_ref_index
, *dst
);
1632 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1633 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1635 if (dst_peer
->peer_ref
)
1636 /* We're already sending something to this ref. */
1639 if (pat
->matching
&& !(send_all
|| send_mirror
))
1641 * Remote doesn't have it, and we have no
1642 * explicit pattern, and we don't have
1643 * --all or --mirror.
1647 /* Create a new one and link it */
1648 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1649 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1650 string_list_insert(&dst_ref_index
,
1651 dst_peer
->name
)->util
= dst_peer
;
1653 dst_peer
->peer_ref
= copy_ref(ref
);
1654 dst_peer
->force
= pat
->force
;
1659 string_list_clear(&dst_ref_index
, 0);
1661 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1662 add_missing_tags(src
, dst
, &dst_tail
);
1665 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1666 /* check for missing refs on the remote */
1667 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1671 /* We're already sending something to this ref. */
1674 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1676 if (!src_ref_index
.nr
)
1677 prepare_ref_index(&src_ref_index
, src
);
1678 if (!string_list_has_string(&src_ref_index
,
1680 ref
->peer_ref
= alloc_delete_ref();
1684 string_list_clear(&src_ref_index
, 0);
1687 *dst
= apply_negative_refspecs(*dst
, rs
);
1694 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1699 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1700 int force_ref_update
= ref
->force
|| force_update
;
1701 int reject_reason
= 0;
1704 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1705 else if (!send_mirror
)
1708 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1709 if (!ref
->deletion
&&
1710 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1711 ref
->status
= REF_STATUS_UPTODATE
;
1716 * If the remote ref has moved and is now different
1717 * from what we expect, reject any push.
1719 * It also is an error if the user told us to check
1720 * with the remote-tracking branch to find the value
1721 * to expect, but we did not have such a tracking
1724 * If the tip of the remote-tracking ref is unreachable
1725 * from any reflog entry of its local ref indicating a
1726 * possible update since checkout; reject the push.
1728 if (ref
->expect_old_sha1
) {
1729 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1730 reject_reason
= REF_STATUS_REJECT_STALE
;
1731 else if (ref
->check_reachable
&& ref
->unreachable
)
1733 REF_STATUS_REJECT_REMOTE_UPDATED
;
1736 * If the ref isn't stale, and is reachable
1737 * from one of the reflog entries of
1738 * the local branch, force the update.
1740 force_ref_update
= 1;
1744 * If the update isn't already rejected then check
1745 * the usual "must fast-forward" rules.
1747 * Decide whether an individual refspec A:B can be
1748 * pushed. The push will succeed if any of the
1749 * following are true:
1751 * (1) the remote reference B does not exist
1753 * (2) the remote reference B is being removed (i.e.,
1754 * pushing :B where no source is specified)
1756 * (3) the destination is not under refs/tags/, and
1757 * if the old and new value is a commit, the new
1758 * is a descendant of the old.
1760 * (4) it is forced using the +A:B notation, or by
1761 * passing the --force argument
1764 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1765 if (starts_with(ref
->name
, "refs/tags/"))
1766 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1767 else if (!has_object_file(&ref
->old_oid
))
1768 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1769 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1770 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1771 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1772 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1773 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1777 * "--force" will defeat any rejection implemented
1778 * by the rules above.
1780 if (!force_ref_update
)
1781 ref
->status
= reject_reason
;
1782 else if (reject_reason
)
1783 ref
->forced_update
= 1;
1787 static void set_merge(struct remote_state
*remote_state
, struct branch
*ret
)
1789 struct remote
*remote
;
1791 struct object_id oid
;
1795 return; /* no branch */
1797 return; /* already run */
1798 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1800 * no merge config; let's make sure we don't confuse callers
1801 * with a non-zero merge_nr but a NULL merge
1807 remote
= remotes_remote_get(remote_state
, ret
->remote_name
);
1809 CALLOC_ARRAY(ret
->merge
, ret
->merge_nr
);
1810 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1811 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1812 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1813 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1814 strcmp(ret
->remote_name
, "."))
1816 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1817 &oid
, &ref
, 0) == 1)
1818 ret
->merge
[i
]->dst
= ref
;
1820 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1824 struct branch
*branch_get(const char *name
)
1828 read_config(the_repository
);
1829 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1830 ret
= the_repository
->remote_state
->current_branch
;
1832 ret
= make_branch(the_repository
->remote_state
, name
,
1834 set_merge(the_repository
->remote_state
, ret
);
1838 int branch_has_merge_config(struct branch
*branch
)
1840 return branch
&& !!branch
->merge
;
1843 int branch_merge_matches(struct branch
*branch
,
1845 const char *refname
)
1847 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1849 return refname_match(branch
->merge
[i
]->src
, refname
);
1852 __attribute__((format (printf
,2,3)))
1853 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1858 strbuf_vaddf(err
, fmt
, ap
);
1864 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1867 return error_buf(err
, _("HEAD does not point to a branch"));
1869 if (!branch
->merge
|| !branch
->merge
[0]) {
1871 * no merge config; is it because the user didn't define any,
1872 * or because it is not a real branch, and get_branch
1875 if (!ref_exists(branch
->refname
))
1876 return error_buf(err
, _("no such branch: '%s'"),
1878 return error_buf(err
,
1879 _("no upstream configured for branch '%s'"),
1883 if (!branch
->merge
[0]->dst
)
1884 return error_buf(err
,
1885 _("upstream branch '%s' not stored as a remote-tracking branch"),
1886 branch
->merge
[0]->src
);
1888 return branch
->merge
[0]->dst
;
1891 static const char *tracking_for_push_dest(struct remote
*remote
,
1892 const char *refname
,
1897 ret
= apply_refspecs(&remote
->fetch
, refname
);
1899 return error_buf(err
,
1900 _("push destination '%s' on remote '%s' has no local tracking branch"),
1901 refname
, remote
->name
);
1905 static const char *branch_get_push_1(struct remote_state
*remote_state
,
1906 struct branch
*branch
, struct strbuf
*err
)
1908 struct remote
*remote
;
1910 remote
= remotes_remote_get(
1912 remotes_pushremote_for_branch(remote_state
, branch
, NULL
));
1914 return error_buf(err
,
1915 _("branch '%s' has no remote for pushing"),
1918 if (remote
->push
.nr
) {
1922 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1924 return error_buf(err
,
1925 _("push refspecs for '%s' do not include '%s'"),
1926 remote
->name
, branch
->name
);
1928 ret
= tracking_for_push_dest(remote
, dst
, err
);
1934 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1936 switch (push_default
) {
1937 case PUSH_DEFAULT_NOTHING
:
1938 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1940 case PUSH_DEFAULT_MATCHING
:
1941 case PUSH_DEFAULT_CURRENT
:
1942 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1944 case PUSH_DEFAULT_UPSTREAM
:
1945 return branch_get_upstream(branch
, err
);
1947 case PUSH_DEFAULT_UNSPECIFIED
:
1948 case PUSH_DEFAULT_SIMPLE
:
1950 const char *up
, *cur
;
1952 up
= branch_get_upstream(branch
, err
);
1955 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1958 if (strcmp(cur
, up
))
1959 return error_buf(err
,
1960 _("cannot resolve 'simple' push to a single destination"));
1965 BUG("unhandled push situation");
1968 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1970 read_config(the_repository
);
1971 die_on_missing_branch(the_repository
, branch
);
1974 return error_buf(err
, _("HEAD does not point to a branch"));
1976 if (!branch
->push_tracking_ref
)
1977 branch
->push_tracking_ref
= branch_get_push_1(
1978 the_repository
->remote_state
, branch
, err
);
1979 return branch
->push_tracking_ref
;
1982 static int ignore_symref_update(const char *refname
, struct strbuf
*scratch
)
1984 return !refs_read_symbolic_ref(get_main_ref_store(the_repository
), refname
, scratch
);
1988 * Create and return a list of (struct ref) consisting of copies of
1989 * each remote_ref that matches refspec. refspec must be a pattern.
1990 * Fill in the copies' peer_ref to describe the local tracking refs to
1991 * which they map. Omit any references that would map to an existing
1992 * local symbolic ref.
1994 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1995 const struct refspec_item
*refspec
)
1997 struct strbuf scratch
= STRBUF_INIT
;
1998 const struct ref
*ref
;
1999 struct ref
*ret
= NULL
;
2000 struct ref
**tail
= &ret
;
2002 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2003 char *expn_name
= NULL
;
2005 strbuf_reset(&scratch
);
2007 if (strchr(ref
->name
, '^'))
2008 continue; /* a dereference item */
2009 if (match_name_with_pattern(refspec
->src
, ref
->name
,
2010 refspec
->dst
, &expn_name
) &&
2011 !ignore_symref_update(expn_name
, &scratch
)) {
2012 struct ref
*cpy
= copy_ref(ref
);
2014 cpy
->peer_ref
= alloc_ref(expn_name
);
2016 cpy
->peer_ref
->force
= 1;
2023 strbuf_release(&scratch
);
2027 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
2029 const struct ref
*ref
;
2030 const struct ref
*best_match
= NULL
;
2033 for (ref
= refs
; ref
; ref
= ref
->next
) {
2034 int score
= refname_match(name
, ref
->name
);
2036 if (best_score
< score
) {
2044 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
2046 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
2051 return copy_ref(ref
);
2054 static struct ref
*get_local_ref(const char *name
)
2056 if (!name
|| name
[0] == '\0')
2059 if (starts_with(name
, "refs/"))
2060 return alloc_ref(name
);
2062 if (starts_with(name
, "heads/") ||
2063 starts_with(name
, "tags/") ||
2064 starts_with(name
, "remotes/"))
2065 return alloc_ref_with_prefix("refs/", 5, name
);
2067 return alloc_ref_with_prefix("refs/heads/", 11, name
);
2070 int get_fetch_map(const struct ref
*remote_refs
,
2071 const struct refspec_item
*refspec
,
2075 struct ref
*ref_map
, **rmp
;
2077 if (refspec
->negative
)
2080 if (refspec
->pattern
) {
2081 ref_map
= get_expanded_map(remote_refs
, refspec
);
2083 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
2085 if (refspec
->exact_sha1
) {
2086 ref_map
= alloc_ref(name
);
2087 get_oid_hex(name
, &ref_map
->old_oid
);
2088 ref_map
->exact_oid
= 1;
2090 ref_map
= get_remote_ref(remote_refs
, name
);
2092 if (!missing_ok
&& !ref_map
)
2093 die(_("couldn't find remote ref %s"), name
);
2095 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
2096 if (ref_map
->peer_ref
&& refspec
->force
)
2097 ref_map
->peer_ref
->force
= 1;
2101 for (rmp
= &ref_map
; *rmp
; ) {
2102 if ((*rmp
)->peer_ref
) {
2103 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
2104 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
2105 struct ref
*ignore
= *rmp
;
2106 error(_("* Ignoring funny ref '%s' locally"),
2107 (*rmp
)->peer_ref
->name
);
2108 *rmp
= (*rmp
)->next
;
2109 free(ignore
->peer_ref
);
2114 rmp
= &((*rmp
)->next
);
2118 tail_link_ref(ref_map
, tail
);
2123 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
2127 for (; list
; list
= list
->next
)
2128 if (!strcmp(ref
->symref
, list
->name
)) {
2129 oidcpy(&ref
->old_oid
, &list
->old_oid
);
2136 * Compute the commit ahead/behind values for the pair branch_name, base.
2138 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2139 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2140 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2143 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
2144 * does not exist). Returns 0 if the commits are identical. Returns 1 if
2145 * commits are different.
2148 static int stat_branch_pair(const char *branch_name
, const char *base
,
2149 int *num_ours
, int *num_theirs
,
2150 enum ahead_behind_flags abf
)
2152 struct object_id oid
;
2153 struct commit
*ours
, *theirs
;
2154 struct rev_info revs
;
2155 struct setup_revision_opt opt
= {
2156 .free_removed_argv_elements
= 1,
2158 struct strvec argv
= STRVEC_INIT
;
2160 /* Cannot stat if what we used to build on no longer exists */
2161 if (read_ref(base
, &oid
))
2163 theirs
= lookup_commit_reference(the_repository
, &oid
);
2167 if (read_ref(branch_name
, &oid
))
2169 ours
= lookup_commit_reference(the_repository
, &oid
);
2173 *num_theirs
= *num_ours
= 0;
2175 /* are we the same? */
2178 if (abf
== AHEAD_BEHIND_QUICK
)
2180 if (abf
!= AHEAD_BEHIND_FULL
)
2181 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2183 /* Run "rev-list --left-right ours...theirs" internally... */
2184 strvec_push(&argv
, ""); /* ignored */
2185 strvec_push(&argv
, "--left-right");
2186 strvec_pushf(&argv
, "%s...%s",
2187 oid_to_hex(&ours
->object
.oid
),
2188 oid_to_hex(&theirs
->object
.oid
));
2189 strvec_push(&argv
, "--");
2191 repo_init_revisions(the_repository
, &revs
, NULL
);
2192 setup_revisions(argv
.nr
, argv
.v
, &revs
, &opt
);
2193 if (prepare_revision_walk(&revs
))
2194 die(_("revision walk setup failed"));
2196 /* ... and count the commits on each side. */
2198 struct commit
*c
= get_revision(&revs
);
2201 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2207 /* clear object flags smudged by the above traversal */
2208 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2209 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2211 strvec_clear(&argv
);
2212 release_revisions(&revs
);
2217 * Lookup the tracking branch for the given branch and if present, optionally
2218 * compute the commit ahead/behind values for the pair.
2220 * If for_push is true, the tracking branch refers to the push branch,
2221 * otherwise it refers to the upstream branch.
2223 * The name of the tracking branch (or NULL if it is not defined) is
2224 * returned via *tracking_name, if it is not itself NULL.
2226 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2227 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2228 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2231 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2232 * upstream defined, or ref does not exist). Returns 0 if the commits are
2233 * identical. Returns 1 if commits are different.
2235 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2236 const char **tracking_name
, int for_push
,
2237 enum ahead_behind_flags abf
)
2241 /* Cannot stat unless we are marked to build on top of somebody else. */
2242 base
= for_push
? branch_get_push(branch
, NULL
) :
2243 branch_get_upstream(branch
, NULL
);
2245 *tracking_name
= base
;
2249 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2253 * Return true when there is anything to report, otherwise false.
2255 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2256 enum ahead_behind_flags abf
)
2258 int ours
, theirs
, sti
;
2259 const char *full_base
;
2261 int upstream_is_gone
= 0;
2263 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2267 upstream_is_gone
= 1;
2270 base
= shorten_unambiguous_ref(full_base
, 0);
2271 if (upstream_is_gone
) {
2273 _("Your branch is based on '%s', but the upstream is gone.\n"),
2275 if (advice_enabled(ADVICE_STATUS_HINTS
))
2277 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2280 _("Your branch is up to date with '%s'.\n"),
2282 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2284 _("Your branch and '%s' refer to different commits.\n"),
2286 if (advice_enabled(ADVICE_STATUS_HINTS
))
2287 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2288 "git status --ahead-behind");
2289 } else if (!theirs
) {
2291 Q_("Your branch is ahead of '%s' by %d commit.\n",
2292 "Your branch is ahead of '%s' by %d commits.\n",
2295 if (advice_enabled(ADVICE_STATUS_HINTS
))
2297 _(" (use \"git push\" to publish your local commits)\n"));
2300 Q_("Your branch is behind '%s' by %d commit, "
2301 "and can be fast-forwarded.\n",
2302 "Your branch is behind '%s' by %d commits, "
2303 "and can be fast-forwarded.\n",
2306 if (advice_enabled(ADVICE_STATUS_HINTS
))
2308 _(" (use \"git pull\" to update your local branch)\n"));
2311 Q_("Your branch and '%s' have diverged,\n"
2312 "and have %d and %d different commit each, "
2314 "Your branch and '%s' have diverged,\n"
2315 "and have %d and %d different commits each, "
2318 base
, ours
, theirs
);
2319 if (advice_enabled(ADVICE_STATUS_HINTS
))
2321 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2327 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2331 struct ref
***local_tail
= cb_data
;
2334 /* we already know it starts with refs/ to get here */
2335 if (check_refname_format(refname
+ 5, 0))
2338 ref
= alloc_ref(refname
);
2339 oidcpy(&ref
->new_oid
, oid
);
2341 *local_tail
= &ref
->next
;
2345 struct ref
*get_local_heads(void)
2347 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2349 for_each_ref(one_local_ref
, &local_tail
);
2353 struct ref
*guess_remote_head(const struct ref
*head
,
2354 const struct ref
*refs
,
2357 const struct ref
*r
;
2358 struct ref
*list
= NULL
;
2359 struct ref
**tail
= &list
;
2365 * Some transports support directly peeking at
2366 * where HEAD points; if that is the case, then
2367 * we don't have to guess.
2370 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2372 /* If a remote branch exists with the default branch name, let's use it. */
2374 char *ref
= xstrfmt("refs/heads/%s",
2375 git_default_branch_name(0));
2377 r
= find_ref_by_name(refs
, ref
);
2379 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2382 /* Fall back to the hard-coded historical default */
2383 r
= find_ref_by_name(refs
, "refs/heads/master");
2384 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2388 /* Look for another ref that points there */
2389 for (r
= refs
; r
; r
= r
->next
) {
2391 starts_with(r
->name
, "refs/heads/") &&
2392 oideq(&r
->old_oid
, &head
->old_oid
)) {
2393 *tail
= copy_ref(r
);
2394 tail
= &((*tail
)->next
);
2403 struct stale_heads_info
{
2404 struct string_list
*ref_names
;
2405 struct ref
**stale_refs_tail
;
2409 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2410 int flags
, void *cb_data
)
2412 struct stale_heads_info
*info
= cb_data
;
2413 struct string_list matches
= STRING_LIST_INIT_DUP
;
2414 struct refspec_item query
;
2416 memset(&query
, 0, sizeof(struct refspec_item
));
2417 query
.dst
= (char *)refname
;
2419 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2420 if (matches
.nr
== 0)
2421 goto clean_exit
; /* No matches */
2424 * If we did find a suitable refspec and it's not a symref and
2425 * it's not in the list of refs that currently exist in that
2426 * remote, we consider it to be stale. In order to deal with
2427 * overlapping refspecs, we need to go over all of the
2430 if (flags
& REF_ISSYMREF
)
2433 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2434 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2438 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2439 oidcpy(&ref
->new_oid
, oid
);
2443 string_list_clear(&matches
, 0);
2447 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2449 struct ref
*ref
, *stale_refs
= NULL
;
2450 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2451 struct stale_heads_info info
;
2453 info
.ref_names
= &ref_names
;
2454 info
.stale_refs_tail
= &stale_refs
;
2456 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2457 string_list_append(&ref_names
, ref
->name
);
2458 string_list_sort(&ref_names
);
2459 for_each_ref(get_stale_heads_cb
, &info
);
2460 string_list_clear(&ref_names
, 0);
2467 static void clear_cas_option(struct push_cas_option
*cas
)
2471 for (i
= 0; i
< cas
->nr
; i
++)
2472 free(cas
->entry
[i
].refname
);
2474 memset(cas
, 0, sizeof(*cas
));
2477 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2478 const char *refname
,
2481 struct push_cas
*entry
;
2482 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2483 entry
= &cas
->entry
[cas
->nr
++];
2484 memset(entry
, 0, sizeof(*entry
));
2485 entry
->refname
= xmemdupz(refname
, refnamelen
);
2489 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2492 struct push_cas
*entry
;
2495 /* "--no-<option>" */
2496 clear_cas_option(cas
);
2501 /* just "--<option>" */
2502 cas
->use_tracking_for_rest
= 1;
2506 /* "--<option>=refname" or "--<option>=refname:value" */
2507 colon
= strchrnul(arg
, ':');
2508 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2510 entry
->use_tracking
= 1;
2512 oidclr(&entry
->expect
);
2513 else if (get_oid(colon
+ 1, &entry
->expect
))
2514 return error(_("cannot parse expected object name '%s'"),
2519 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2521 return parse_push_cas_option(opt
->value
, arg
, unset
);
2524 int is_empty_cas(const struct push_cas_option
*cas
)
2526 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2530 * Look at remote.fetch refspec and see if we have a remote
2531 * tracking branch for the refname there. Fill the name of
2532 * the remote-tracking branch in *dst_refname, and the name
2533 * of the commit object at its tip in oid[].
2534 * If we cannot do so, return negative to signal an error.
2536 static int remote_tracking(struct remote
*remote
, const char *refname
,
2537 struct object_id
*oid
, char **dst_refname
)
2541 dst
= apply_refspecs(&remote
->fetch
, refname
);
2543 return -1; /* no tracking ref for refname at remote */
2544 if (read_ref(dst
, oid
))
2545 return -1; /* we know what the tracking ref is but we cannot read it */
2552 * The struct "reflog_commit_array" and related helper functions
2553 * are used for collecting commits into an array during reflog
2554 * traversals in "check_and_collect_until()".
2556 struct reflog_commit_array
{
2557 struct commit
**item
;
2561 #define REFLOG_COMMIT_ARRAY_INIT { 0 }
2563 /* Append a commit to the array. */
2564 static void append_commit(struct reflog_commit_array
*arr
,
2565 struct commit
*commit
)
2567 ALLOC_GROW(arr
->item
, arr
->nr
+ 1, arr
->alloc
);
2568 arr
->item
[arr
->nr
++] = commit
;
2571 /* Free and reset the array. */
2572 static void free_commit_array(struct reflog_commit_array
*arr
)
2574 FREE_AND_NULL(arr
->item
);
2575 arr
->nr
= arr
->alloc
= 0;
2578 struct check_and_collect_until_cb_data
{
2579 struct commit
*remote_commit
;
2580 struct reflog_commit_array
*local_commits
;
2581 timestamp_t remote_reflog_timestamp
;
2584 /* Get the timestamp of the latest entry. */
2585 static int peek_reflog(struct object_id
*o_oid UNUSED
,
2586 struct object_id
*n_oid UNUSED
,
2587 const char *ident UNUSED
,
2588 timestamp_t timestamp
, int tz UNUSED
,
2589 const char *message UNUSED
, void *cb_data
)
2591 timestamp_t
*ts
= cb_data
;
2596 static int check_and_collect_until(struct object_id
*o_oid UNUSED
,
2597 struct object_id
*n_oid
,
2598 const char *ident UNUSED
,
2599 timestamp_t timestamp
, int tz UNUSED
,
2600 const char *message UNUSED
, void *cb_data
)
2602 struct commit
*commit
;
2603 struct check_and_collect_until_cb_data
*cb
= cb_data
;
2605 /* An entry was found. */
2606 if (oideq(n_oid
, &cb
->remote_commit
->object
.oid
))
2609 if ((commit
= lookup_commit_reference(the_repository
, n_oid
)))
2610 append_commit(cb
->local_commits
, commit
);
2613 * If the reflog entry timestamp is older than the remote ref's
2614 * latest reflog entry, there is no need to check or collect
2615 * entries older than this one.
2617 if (timestamp
< cb
->remote_reflog_timestamp
)
2623 #define MERGE_BASES_BATCH_SIZE 8
2626 * Iterate through the reflog of the local ref to check if there is an entry
2627 * for the given remote-tracking ref; runs until the timestamp of an entry is
2628 * older than latest timestamp of remote-tracking ref's reflog. Any commits
2629 * are that seen along the way are collected into an array to check if the
2630 * remote-tracking ref is reachable from any of them.
2632 static int is_reachable_in_reflog(const char *local
, const struct ref
*remote
)
2635 struct commit
*commit
;
2636 struct commit
**chunk
;
2637 struct check_and_collect_until_cb_data cb
;
2638 struct reflog_commit_array arr
= REFLOG_COMMIT_ARRAY_INIT
;
2642 commit
= lookup_commit_reference(the_repository
, &remote
->old_oid
);
2644 goto cleanup_return
;
2647 * Get the timestamp from the latest entry
2648 * of the remote-tracking ref's reflog.
2650 for_each_reflog_ent_reverse(remote
->tracking_ref
, peek_reflog
, &date
);
2652 cb
.remote_commit
= commit
;
2653 cb
.local_commits
= &arr
;
2654 cb
.remote_reflog_timestamp
= date
;
2655 ret
= for_each_reflog_ent_reverse(local
, check_and_collect_until
, &cb
);
2657 /* We found an entry in the reflog. */
2659 goto cleanup_return
;
2662 * Check if the remote commit is reachable from any
2663 * of the commits in the collected array, in batches.
2665 for (chunk
= arr
.item
; chunk
< arr
.item
+ arr
.nr
; chunk
+= size
) {
2666 size
= arr
.item
+ arr
.nr
- chunk
;
2667 if (MERGE_BASES_BATCH_SIZE
< size
)
2668 size
= MERGE_BASES_BATCH_SIZE
;
2670 if ((ret
= in_merge_bases_many(commit
, size
, chunk
)))
2675 free_commit_array(&arr
);
2680 * Check for reachability of a remote-tracking
2681 * ref in the reflog entries of its local ref.
2683 static void check_if_includes_upstream(struct ref
*remote
)
2685 struct ref
*local
= get_local_ref(remote
->name
);
2689 if (is_reachable_in_reflog(local
->name
, remote
) <= 0)
2690 remote
->unreachable
= 1;
2693 static void apply_cas(struct push_cas_option
*cas
,
2694 struct remote
*remote
,
2699 /* Find an explicit --<option>=<name>[:<value>] entry */
2700 for (i
= 0; i
< cas
->nr
; i
++) {
2701 struct push_cas
*entry
= &cas
->entry
[i
];
2702 if (!refname_match(entry
->refname
, ref
->name
))
2704 ref
->expect_old_sha1
= 1;
2705 if (!entry
->use_tracking
)
2706 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2707 else if (remote_tracking(remote
, ref
->name
,
2708 &ref
->old_oid_expect
,
2709 &ref
->tracking_ref
))
2710 oidclr(&ref
->old_oid_expect
);
2712 ref
->check_reachable
= cas
->use_force_if_includes
;
2716 /* Are we using "--<option>" to cover all? */
2717 if (!cas
->use_tracking_for_rest
)
2720 ref
->expect_old_sha1
= 1;
2721 if (remote_tracking(remote
, ref
->name
,
2722 &ref
->old_oid_expect
,
2723 &ref
->tracking_ref
))
2724 oidclr(&ref
->old_oid_expect
);
2726 ref
->check_reachable
= cas
->use_force_if_includes
;
2729 void apply_push_cas(struct push_cas_option
*cas
,
2730 struct remote
*remote
,
2731 struct ref
*remote_refs
)
2734 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2735 apply_cas(cas
, remote
, ref
);
2738 * If "compare-and-swap" is in "use_tracking[_for_rest]"
2739 * mode, and if "--force-if-includes" was specified, run
2742 if (ref
->check_reachable
)
2743 check_if_includes_upstream(ref
);
2747 struct remote_state
*remote_state_new(void)
2749 struct remote_state
*r
= xmalloc(sizeof(*r
));
2751 memset(r
, 0, sizeof(*r
));
2753 hashmap_init(&r
->remotes_hash
, remotes_hash_cmp
, NULL
, 0);
2754 hashmap_init(&r
->branches_hash
, branches_hash_cmp
, NULL
, 0);
2758 void remote_state_clear(struct remote_state
*remote_state
)
2762 for (i
= 0; i
< remote_state
->remotes_nr
; i
++)
2763 remote_clear(remote_state
->remotes
[i
]);
2764 FREE_AND_NULL(remote_state
->remotes
);
2765 remote_state
->remotes_alloc
= 0;
2766 remote_state
->remotes_nr
= 0;
2768 hashmap_clear_and_free(&remote_state
->remotes_hash
, struct remote
, ent
);
2769 hashmap_clear_and_free(&remote_state
->branches_hash
, struct remote
, ent
);
2773 * Returns 1 if it was the last chop before ':'.
2775 static int chop_last_dir(char **remoteurl
, int is_relative
)
2777 char *rfind
= find_last_dir_sep(*remoteurl
);
2783 rfind
= strrchr(*remoteurl
, ':');
2789 if (is_relative
|| !strcmp(".", *remoteurl
))
2790 die(_("cannot strip one component off url '%s'"),
2794 *remoteurl
= xstrdup(".");
2798 char *relative_url(const char *remote_url
, const char *url
,
2799 const char *up_path
)
2801 int is_relative
= 0;
2805 struct strbuf sb
= STRBUF_INIT
;
2808 if (!url_is_local_not_ssh(url
) || is_absolute_path(url
))
2809 return xstrdup(url
);
2811 len
= strlen(remote_url
);
2813 BUG("invalid empty remote_url");
2815 remoteurl
= xstrdup(remote_url
);
2816 if (is_dir_sep(remoteurl
[len
-1]))
2817 remoteurl
[len
-1] = '\0';
2819 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
2824 * Prepend a './' to ensure all relative
2825 * remoteurls start with './' or '../'
2827 if (!starts_with_dot_slash_native(remoteurl
) &&
2828 !starts_with_dot_dot_slash_native(remoteurl
)) {
2830 strbuf_addf(&sb
, "./%s", remoteurl
);
2832 remoteurl
= strbuf_detach(&sb
, NULL
);
2836 * When the url starts with '../', remove that and the
2837 * last directory in remoteurl.
2840 if (starts_with_dot_dot_slash_native(url
)) {
2842 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
2843 } else if (starts_with_dot_slash_native(url
))
2849 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
2850 if (ends_with(url
, "/"))
2851 strbuf_setlen(&sb
, sb
.len
- 1);
2854 if (starts_with_dot_slash_native(sb
.buf
))
2855 out
= xstrdup(sb
.buf
+ 2);
2857 out
= xstrdup(sb
.buf
);
2859 if (!up_path
|| !is_relative
) {
2860 strbuf_release(&sb
);
2865 strbuf_addf(&sb
, "%s%s", up_path
, out
);
2867 return strbuf_detach(&sb
, NULL
);