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 ret
= xcalloc(1, sizeof(struct remote
));
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 ret
= xcalloc(1, sizeof(struct branch
));
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 ret
= xcalloc(1, sizeof(struct rewrite
));
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();
289 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
290 strbuf_addf(&buf
, "refs/heads/%s:refs/heads/%s",
292 refspec_append(&remote
->fetch
, buf
.buf
);
295 * Cogito compatible push: push current HEAD to remote #branch
296 * (master if missing)
299 strbuf_addf(&buf
, "HEAD:refs/heads/%s", frag
);
300 refspec_append(&remote
->push
, buf
.buf
);
301 remote
->fetch_tags
= 1; /* always auto-follow */
302 strbuf_release(&buf
);
305 static int handle_config(const char *key
, const char *value
, void *cb
)
310 struct remote
*remote
;
311 struct branch
*branch
;
312 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
315 branch
= make_branch(name
, namelen
);
316 if (!strcmp(subkey
, "remote")) {
317 return git_config_string(&branch
->remote_name
, key
, value
);
318 } else if (!strcmp(subkey
, "pushremote")) {
319 return git_config_string(&branch
->pushremote_name
, key
, value
);
320 } else if (!strcmp(subkey
, "merge")) {
322 return config_error_nonbool(key
);
323 add_merge(branch
, xstrdup(value
));
327 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
328 struct rewrite
*rewrite
;
331 if (!strcmp(subkey
, "insteadof")) {
333 return config_error_nonbool(key
);
334 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
335 add_instead_of(rewrite
, xstrdup(value
));
336 } else if (!strcmp(subkey
, "pushinsteadof")) {
338 return config_error_nonbool(key
);
339 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
340 add_instead_of(rewrite
, xstrdup(value
));
344 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
347 /* Handle remote.* variables */
348 if (!name
&& !strcmp(subkey
, "pushdefault"))
349 return git_config_string(&pushremote_name
, key
, value
);
353 /* Handle remote.<name>.* variables */
355 warning(_("config remote shorthand cannot begin with '/': %s"),
359 remote
= make_remote(name
, namelen
);
360 remote
->origin
= REMOTE_CONFIG
;
361 if (current_config_scope() == CONFIG_SCOPE_LOCAL
||
362 current_config_scope() == CONFIG_SCOPE_WORKTREE
)
363 remote
->configured_in_repo
= 1;
364 if (!strcmp(subkey
, "mirror"))
365 remote
->mirror
= git_config_bool(key
, value
);
366 else if (!strcmp(subkey
, "skipdefaultupdate"))
367 remote
->skip_default_update
= git_config_bool(key
, value
);
368 else if (!strcmp(subkey
, "skipfetchall"))
369 remote
->skip_default_update
= git_config_bool(key
, value
);
370 else if (!strcmp(subkey
, "prune"))
371 remote
->prune
= git_config_bool(key
, value
);
372 else if (!strcmp(subkey
, "prunetags"))
373 remote
->prune_tags
= git_config_bool(key
, value
);
374 else if (!strcmp(subkey
, "url")) {
376 if (git_config_string(&v
, key
, value
))
379 } else if (!strcmp(subkey
, "pushurl")) {
381 if (git_config_string(&v
, key
, value
))
383 add_pushurl(remote
, v
);
384 } else if (!strcmp(subkey
, "push")) {
386 if (git_config_string(&v
, key
, value
))
388 refspec_append(&remote
->push
, v
);
390 } else if (!strcmp(subkey
, "fetch")) {
392 if (git_config_string(&v
, key
, value
))
394 refspec_append(&remote
->fetch
, v
);
396 } else if (!strcmp(subkey
, "receivepack")) {
398 if (git_config_string(&v
, key
, value
))
400 if (!remote
->receivepack
)
401 remote
->receivepack
= v
;
403 error(_("more than one receivepack given, using the first"));
404 } else if (!strcmp(subkey
, "uploadpack")) {
406 if (git_config_string(&v
, key
, value
))
408 if (!remote
->uploadpack
)
409 remote
->uploadpack
= v
;
411 error(_("more than one uploadpack given, using the first"));
412 } else if (!strcmp(subkey
, "tagopt")) {
413 if (!strcmp(value
, "--no-tags"))
414 remote
->fetch_tags
= -1;
415 else if (!strcmp(value
, "--tags"))
416 remote
->fetch_tags
= 2;
417 } else if (!strcmp(subkey
, "proxy")) {
418 return git_config_string((const char **)&remote
->http_proxy
,
420 } else if (!strcmp(subkey
, "proxyauthmethod")) {
421 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
423 } else if (!strcmp(subkey
, "vcs")) {
424 return git_config_string(&remote
->foreign_vcs
, key
, value
);
429 static void alias_all_urls(void)
432 for (i
= 0; i
< remotes_nr
; i
++) {
433 int add_pushurl_aliases
;
436 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
437 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
439 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
440 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
441 if (add_pushurl_aliases
)
442 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
443 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
448 static void read_config(void)
457 current_branch
= NULL
;
458 if (startup_info
->have_repository
) {
459 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
460 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
461 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
462 current_branch
= make_branch(head_ref
, strlen(head_ref
));
465 git_config(handle_config
, NULL
);
469 static int valid_remote_nick(const char *name
)
471 if (!name
[0] || is_dot_or_dotdot(name
))
474 /* remote nicknames cannot contain slashes */
476 if (is_dir_sep(*name
++))
481 const char *remote_for_branch(struct branch
*branch
, int *explicit)
483 if (branch
&& branch
->remote_name
) {
486 return branch
->remote_name
;
493 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
495 if (branch
&& branch
->pushremote_name
) {
498 return branch
->pushremote_name
;
500 if (pushremote_name
) {
503 return pushremote_name
;
505 return remote_for_branch(branch
, explicit);
508 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
)
512 if (branch
->merge_nr
) {
513 return branch
->merge_name
[0];
516 const char *dst
, *remote_name
=
517 pushremote_for_branch(branch
, NULL
);
518 struct remote
*remote
= remote_get(remote_name
);
520 if (remote
&& remote
->push
.nr
&&
521 (dst
= apply_refspecs(&remote
->push
,
530 static struct remote
*remote_get_1(const char *name
,
531 const char *(*get_default
)(struct branch
*, int *))
541 name
= get_default(current_branch
, &name_given
);
543 ret
= make_remote(name
, 0);
544 if (valid_remote_nick(name
) && have_git_dir()) {
545 if (!valid_remote(ret
))
546 read_remotes_file(ret
);
547 if (!valid_remote(ret
))
548 read_branches_file(ret
);
550 if (name_given
&& !valid_remote(ret
))
551 add_url_alias(ret
, name
);
552 if (!valid_remote(ret
))
557 struct remote
*remote_get(const char *name
)
559 return remote_get_1(name
, remote_for_branch
);
562 struct remote
*pushremote_get(const char *name
)
564 return remote_get_1(name
, pushremote_for_branch
);
567 int remote_is_configured(struct remote
*remote
, int in_repo
)
572 return remote
->configured_in_repo
;
573 return !!remote
->origin
;
576 int for_each_remote(each_remote_fn fn
, void *priv
)
580 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
581 struct remote
*r
= remotes
[i
];
584 result
= fn(r
, priv
);
589 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
591 if (strcmp(ref1
->name
, ref2
->name
)) {
592 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
593 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
594 die(_("Cannot fetch both %s and %s to %s"),
595 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
596 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
597 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
598 warning(_("%s usually tracks %s, not %s"),
599 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
600 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
601 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
602 die(_("%s tracks both %s and %s"),
603 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
606 * This last possibility doesn't occur because
607 * FETCH_HEAD_IGNORE entries always appear at
608 * the end of the list.
610 BUG("Internal error");
613 free(ref2
->peer_ref
);
617 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
619 struct string_list refs
= STRING_LIST_INIT_NODUP
;
620 struct ref
*retval
= NULL
;
621 struct ref
**p
= &retval
;
624 struct ref
*ref
= ref_map
;
626 ref_map
= ref_map
->next
;
629 if (!ref
->peer_ref
) {
633 struct string_list_item
*item
=
634 string_list_insert(&refs
, ref
->peer_ref
->name
);
637 /* Entry already existed */
638 handle_duplicate((struct ref
*)item
->util
, ref
);
647 string_list_clear(&refs
, 0);
651 int remote_has_url(struct remote
*remote
, const char *url
)
654 for (i
= 0; i
< remote
->url_nr
; i
++) {
655 if (!strcmp(remote
->url
[i
], url
))
661 static int match_name_with_pattern(const char *key
, const char *name
,
662 const char *value
, char **result
)
664 const char *kstar
= strchr(key
, '*');
670 die(_("key '%s' of pattern had no '*'"), key
);
672 ksuffixlen
= strlen(kstar
+ 1);
673 namelen
= strlen(name
);
674 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
675 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
677 struct strbuf sb
= STRBUF_INIT
;
678 const char *vstar
= strchr(value
, '*');
680 die(_("value '%s' of pattern has no '*'"), value
);
681 strbuf_add(&sb
, value
, vstar
- value
);
682 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
683 strbuf_addstr(&sb
, vstar
+ 1);
684 *result
= strbuf_detach(&sb
, NULL
);
689 static int refspec_match(const struct refspec_item
*refspec
,
692 if (refspec
->pattern
)
693 return match_name_with_pattern(refspec
->src
, name
, NULL
, NULL
);
695 return !strcmp(refspec
->src
, name
);
698 static int omit_name_by_refspec(const char *name
, struct refspec
*rs
)
702 for (i
= 0; i
< rs
->nr
; i
++) {
703 if (rs
->items
[i
].negative
&& refspec_match(&rs
->items
[i
], name
))
709 struct ref
*apply_negative_refspecs(struct ref
*ref_map
, struct refspec
*rs
)
713 for (tail
= &ref_map
; *tail
; ) {
714 struct ref
*ref
= *tail
;
716 if (omit_name_by_refspec(ref
->name
, rs
)) {
727 static int query_matches_negative_refspec(struct refspec
*rs
, struct refspec_item
*query
)
729 int i
, matched_negative
= 0;
730 int find_src
= !query
->src
;
731 struct string_list reversed
= STRING_LIST_INIT_NODUP
;
732 const char *needle
= find_src
? query
->dst
: query
->src
;
735 * Check whether the queried ref matches any negative refpsec. If so,
736 * then we should ultimately treat this as not matching the query at
739 * Note that negative refspecs always match the source, but the query
740 * item uses the destination. To handle this, we apply pattern
741 * refspecs in reverse to figure out if the query source matches any
742 * of the negative refspecs.
744 * The first loop finds and expands all positive refspecs
745 * matched by the queried ref.
747 * The second loop checks if any of the results of the first loop
748 * match any negative refspec.
750 for (i
= 0; i
< rs
->nr
; i
++) {
751 struct refspec_item
*refspec
= &rs
->items
[i
];
754 if (refspec
->negative
)
757 /* Note the reversal of src and dst */
758 if (refspec
->pattern
) {
759 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
760 const char *value
= refspec
->src
;
762 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
763 string_list_append_nodup(&reversed
, expn_name
);
764 } else if (refspec
->matching
) {
765 /* For the special matching refspec, any query should match */
766 string_list_append(&reversed
, needle
);
767 } else if (!refspec
->src
) {
768 BUG("refspec->src should not be null here");
769 } else if (!strcmp(needle
, refspec
->src
)) {
770 string_list_append(&reversed
, refspec
->src
);
774 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
775 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
776 matched_negative
= 1;
779 string_list_clear(&reversed
, 0);
781 return matched_negative
;
784 static void query_refspecs_multiple(struct refspec
*rs
,
785 struct refspec_item
*query
,
786 struct string_list
*results
)
789 int find_src
= !query
->src
;
791 if (find_src
&& !query
->dst
)
792 BUG("query_refspecs_multiple: need either src or dst");
794 if (query_matches_negative_refspec(rs
, query
))
797 for (i
= 0; i
< rs
->nr
; i
++) {
798 struct refspec_item
*refspec
= &rs
->items
[i
];
799 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
800 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
801 const char *needle
= find_src
? query
->dst
: query
->src
;
802 char **result
= find_src
? &query
->src
: &query
->dst
;
804 if (!refspec
->dst
|| refspec
->negative
)
806 if (refspec
->pattern
) {
807 if (match_name_with_pattern(key
, needle
, value
, result
))
808 string_list_append_nodup(results
, *result
);
809 } else if (!strcmp(needle
, key
)) {
810 string_list_append(results
, value
);
815 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
818 int find_src
= !query
->src
;
819 const char *needle
= find_src
? query
->dst
: query
->src
;
820 char **result
= find_src
? &query
->src
: &query
->dst
;
822 if (find_src
&& !query
->dst
)
823 BUG("query_refspecs: need either src or dst");
825 if (query_matches_negative_refspec(rs
, query
))
828 for (i
= 0; i
< rs
->nr
; i
++) {
829 struct refspec_item
*refspec
= &rs
->items
[i
];
830 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
831 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
833 if (!refspec
->dst
|| refspec
->negative
)
835 if (refspec
->pattern
) {
836 if (match_name_with_pattern(key
, needle
, value
, result
)) {
837 query
->force
= refspec
->force
;
840 } else if (!strcmp(needle
, key
)) {
841 *result
= xstrdup(value
);
842 query
->force
= refspec
->force
;
849 char *apply_refspecs(struct refspec
*rs
, const char *name
)
851 struct refspec_item query
;
853 memset(&query
, 0, sizeof(struct refspec_item
));
854 query
.src
= (char *)name
;
856 if (query_refspecs(rs
, &query
))
862 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
864 return query_refspecs(&remote
->fetch
, refspec
);
867 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
870 size_t len
= strlen(name
);
871 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
872 memcpy(ref
->name
, prefix
, prefixlen
);
873 memcpy(ref
->name
+ prefixlen
, name
, len
);
877 struct ref
*alloc_ref(const char *name
)
879 return alloc_ref_with_prefix("", 0, name
);
882 struct ref
*copy_ref(const struct ref
*ref
)
888 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
890 memcpy(cpy
, ref
, len
);
892 cpy
->symref
= xstrdup_or_null(ref
->symref
);
893 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
894 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
898 struct ref
*copy_ref_list(const struct ref
*ref
)
900 struct ref
*ret
= NULL
;
901 struct ref
**tail
= &ret
;
903 *tail
= copy_ref(ref
);
905 tail
= &((*tail
)->next
);
910 void free_one_ref(struct ref
*ref
)
914 free_one_ref(ref
->peer_ref
);
915 free(ref
->remote_status
);
920 void free_refs(struct ref
*ref
)
930 int ref_compare_name(const void *va
, const void *vb
)
932 const struct ref
*a
= va
, *b
= vb
;
933 return strcmp(a
->name
, b
->name
);
936 static void *ref_list_get_next(const void *a
)
938 return ((const struct ref
*)a
)->next
;
941 static void ref_list_set_next(void *a
, void *next
)
943 ((struct ref
*)a
)->next
= next
;
946 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
948 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
951 int count_refspec_match(const char *pattern
,
953 struct ref
**matched_ref
)
955 int patlen
= strlen(pattern
);
956 struct ref
*matched_weak
= NULL
;
957 struct ref
*matched
= NULL
;
961 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
962 char *name
= refs
->name
;
963 int namelen
= strlen(name
);
965 if (!refname_match(pattern
, name
))
968 /* A match is "weak" if it is with refs outside
969 * heads or tags, and did not specify the pattern
970 * in full (e.g. "refs/remotes/origin/master") or at
971 * least from the toplevel (e.g. "remotes/origin/master");
972 * otherwise "git push $URL master" would result in
973 * ambiguity between remotes/origin/master and heads/master
974 * at the remote site.
976 if (namelen
!= patlen
&&
977 patlen
!= namelen
- 5 &&
978 !starts_with(name
, "refs/heads/") &&
979 !starts_with(name
, "refs/tags/")) {
980 /* We want to catch the case where only weak
981 * matches are found and there are multiple
982 * matches, and where more than one strong
983 * matches are found, as ambiguous. One
984 * strong match with zero or more weak matches
985 * are acceptable as a unique match.
997 *matched_ref
= matched_weak
;
1002 *matched_ref
= matched
;
1007 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1015 static struct ref
*alloc_delete_ref(void)
1017 struct ref
*ref
= alloc_ref("(delete)");
1018 oidclr(&ref
->new_oid
);
1022 static int try_explicit_object_name(const char *name
,
1025 struct object_id oid
;
1029 *match
= alloc_delete_ref();
1033 if (get_oid(name
, &oid
))
1037 *match
= alloc_ref(name
);
1038 oidcpy(&(*match
)->new_oid
, &oid
);
1043 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1045 struct ref
*ret
= alloc_ref(name
);
1046 tail_link_ref(ret
, tail
);
1050 static char *guess_ref(const char *name
, struct ref
*peer
)
1052 struct strbuf buf
= STRBUF_INIT
;
1054 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1059 if (starts_with(r
, "refs/heads/")) {
1060 strbuf_addstr(&buf
, "refs/heads/");
1061 } else if (starts_with(r
, "refs/tags/")) {
1062 strbuf_addstr(&buf
, "refs/tags/");
1067 strbuf_addstr(&buf
, name
);
1068 return strbuf_detach(&buf
, NULL
);
1071 static int match_explicit_lhs(struct ref
*src
,
1072 struct refspec_item
*rs
,
1074 int *allocated_match
)
1076 switch (count_refspec_match(rs
->src
, src
, match
)) {
1078 if (allocated_match
)
1079 *allocated_match
= 0;
1082 /* The source could be in the get_sha1() format
1083 * not a reference name. :refs/other is a
1084 * way to delete 'other' ref at the remote end.
1086 if (try_explicit_object_name(rs
->src
, match
) < 0)
1087 return error(_("src refspec %s does not match any"), rs
->src
);
1088 if (allocated_match
)
1089 *allocated_match
= 1;
1092 return error(_("src refspec %s matches more than one"), rs
->src
);
1096 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1097 const char *matched_src_name
)
1099 struct object_id oid
;
1100 enum object_type type
;
1103 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1104 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1107 error(_("The destination you provided is not a full refname (i.e.,\n"
1108 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1110 "- Looking for a ref that matches '%s' on the remote side.\n"
1111 "- Checking if the <src> being pushed ('%s')\n"
1112 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1113 " refs/{heads,tags}/ prefix on the remote side.\n"
1115 "Neither worked, so we gave up. You must fully qualify the ref."),
1116 dst_value
, matched_src_name
);
1118 if (!advice_push_unqualified_ref_name
)
1121 if (get_oid(matched_src_name
, &oid
))
1122 BUG("'%s' is not a valid object, "
1123 "match_explicit_lhs() should catch this!",
1125 type
= oid_object_info(the_repository
, &oid
, NULL
);
1126 if (type
== OBJ_COMMIT
) {
1127 advise(_("The <src> part of the refspec is a commit object.\n"
1128 "Did you mean to create a new branch by pushing to\n"
1129 "'%s:refs/heads/%s'?"),
1130 matched_src_name
, dst_value
);
1131 } else if (type
== OBJ_TAG
) {
1132 advise(_("The <src> part of the refspec is a tag object.\n"
1133 "Did you mean to create a new tag by pushing to\n"
1134 "'%s:refs/tags/%s'?"),
1135 matched_src_name
, dst_value
);
1136 } else if (type
== OBJ_TREE
) {
1137 advise(_("The <src> part of the refspec is a tree object.\n"
1138 "Did you mean to tag a new tree by pushing to\n"
1139 "'%s:refs/tags/%s'?"),
1140 matched_src_name
, dst_value
);
1141 } else if (type
== OBJ_BLOB
) {
1142 advise(_("The <src> part of the refspec is a blob object.\n"
1143 "Did you mean to tag a new blob by pushing to\n"
1144 "'%s:refs/tags/%s'?"),
1145 matched_src_name
, dst_value
);
1147 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1148 matched_src_name
, type
);
1152 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1153 struct ref
***dst_tail
,
1154 struct refspec_item
*rs
)
1156 struct ref
*matched_src
, *matched_dst
;
1159 const char *dst_value
= rs
->dst
;
1162 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1165 matched_src
= matched_dst
= NULL
;
1166 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1172 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1173 RESOLVE_REF_READING
,
1176 ((flag
& REF_ISSYMREF
) &&
1177 !starts_with(dst_value
, "refs/heads/")))
1178 die(_("%s cannot be resolved to branch"),
1182 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1186 if (starts_with(dst_value
, "refs/")) {
1187 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1188 } else if (is_null_oid(&matched_src
->new_oid
)) {
1189 error(_("unable to delete '%s': remote ref does not exist"),
1191 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1192 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1195 show_push_unqualified_ref_name_error(dst_value
,
1201 error(_("dst refspec %s matches more than one"),
1207 if (matched_dst
->peer_ref
)
1208 return error(_("dst ref %s receives from more than one src"),
1211 matched_dst
->peer_ref
= allocated_src
?
1213 copy_ref(matched_src
);
1214 matched_dst
->force
= rs
->force
;
1219 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1220 struct ref
***dst_tail
, struct refspec
*rs
)
1223 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1224 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1228 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1229 int send_mirror
, int direction
,
1230 const struct refspec_item
**ret_pat
)
1232 const struct refspec_item
*pat
;
1235 int matching_refs
= -1;
1236 for (i
= 0; i
< rs
->nr
; i
++) {
1237 const struct refspec_item
*item
= &rs
->items
[i
];
1242 if (item
->matching
&&
1243 (matching_refs
== -1 || item
->force
)) {
1248 if (item
->pattern
) {
1249 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1251 if (direction
== FROM_SRC
)
1252 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1254 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1261 if (matching_refs
== -1)
1264 pat
= &rs
->items
[matching_refs
];
1265 if (pat
->matching
) {
1267 * "matching refs"; traditionally we pushed everything
1268 * including refs outside refs/heads/ hierarchy, but
1269 * that does not make much sense these days.
1271 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1273 name
= xstrdup(ref
->name
);
1280 static struct ref
**tail_ref(struct ref
**head
)
1282 struct ref
**tail
= head
;
1284 tail
= &((*tail
)->next
);
1289 struct commit
**tip
;
1293 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1295 struct commit
*commit
;
1297 if (is_null_oid(oid
))
1299 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1300 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1302 commit
->object
.flags
|= TMP_MARK
;
1303 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1304 tips
->tip
[tips
->nr
++] = commit
;
1307 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1309 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1310 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1311 struct string_list_item
*item
;
1313 struct tips sent_tips
;
1316 * Collect everything we know they would have at the end of
1317 * this push, and collect all tags they have.
1319 memset(&sent_tips
, 0, sizeof(sent_tips
));
1320 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1321 if (ref
->peer_ref
&&
1322 !is_null_oid(&ref
->peer_ref
->new_oid
))
1323 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1325 add_to_tips(&sent_tips
, &ref
->old_oid
);
1326 if (starts_with(ref
->name
, "refs/tags/"))
1327 string_list_append(&dst_tag
, ref
->name
);
1329 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1331 string_list_sort(&dst_tag
);
1333 /* Collect tags they do not have. */
1334 for (ref
= src
; ref
; ref
= ref
->next
) {
1335 if (!starts_with(ref
->name
, "refs/tags/"))
1336 continue; /* not a tag */
1337 if (string_list_has_string(&dst_tag
, ref
->name
))
1338 continue; /* they already have it */
1339 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1340 continue; /* be conservative */
1341 item
= string_list_append(&src_tag
, ref
->name
);
1344 string_list_clear(&dst_tag
, 0);
1347 * At this point, src_tag lists tags that are missing from
1348 * dst, and sent_tips lists the tips we are pushing or those
1349 * that we know they already have. An element in the src_tag
1350 * that is an ancestor of any of the sent_tips needs to be
1351 * sent to the other side.
1354 const int reachable_flag
= 1;
1355 struct commit_list
*found_commits
;
1356 struct commit
**src_commits
;
1357 int nr_src_commits
= 0, alloc_src_commits
= 16;
1358 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1360 for_each_string_list_item(item
, &src_tag
) {
1361 struct ref
*ref
= item
->util
;
1362 struct commit
*commit
;
1364 if (is_null_oid(&ref
->new_oid
))
1366 commit
= lookup_commit_reference_gently(the_repository
,
1370 /* not pushing a commit, which is not an error */
1373 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1374 src_commits
[nr_src_commits
++] = commit
;
1377 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1378 src_commits
, nr_src_commits
,
1381 for_each_string_list_item(item
, &src_tag
) {
1382 struct ref
*dst_ref
;
1383 struct ref
*ref
= item
->util
;
1384 struct commit
*commit
;
1386 if (is_null_oid(&ref
->new_oid
))
1388 commit
= lookup_commit_reference_gently(the_repository
,
1392 /* not pushing a commit, which is not an error */
1396 * Is this tag, which they do not have, reachable from
1397 * any of the commits we are sending?
1399 if (!(commit
->object
.flags
& reachable_flag
))
1403 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1404 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1405 dst_ref
->peer_ref
= copy_ref(ref
);
1408 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1410 free_commit_list(found_commits
);
1413 string_list_clear(&src_tag
, 0);
1414 free(sent_tips
.tip
);
1417 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1419 for ( ; list
; list
= list
->next
)
1420 if (!strcmp(list
->name
, name
))
1421 return (struct ref
*)list
;
1425 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1427 for ( ; ref
; ref
= ref
->next
)
1428 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1430 string_list_sort(ref_index
);
1434 * Given only the set of local refs, sanity-check the set of push
1435 * refspecs. We can't catch all errors that match_push_refs would,
1436 * but we can catch some errors early before even talking to the
1439 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1444 for (i
= 0; i
< rs
->nr
; i
++) {
1445 struct refspec_item
*item
= &rs
->items
[i
];
1447 if (item
->pattern
|| item
->matching
|| item
->negative
)
1450 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1457 * Given the set of refs the local repository has, the set of refs the
1458 * remote repository has, and the refspec used for push, determine
1459 * what remote refs we will update and with what value by setting
1460 * peer_ref (which object is being pushed) and force (if the push is
1461 * forced) in elements of "dst". The function may add new elements to
1462 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1464 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1465 struct refspec
*rs
, int flags
)
1467 int send_all
= flags
& MATCH_REFS_ALL
;
1468 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1469 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1471 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1472 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1474 /* If no refspec is provided, use the default ":" */
1476 refspec_append(rs
, ":");
1478 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1480 /* pick the remainder */
1481 for (ref
= src
; ref
; ref
= ref
->next
) {
1482 struct string_list_item
*dst_item
;
1483 struct ref
*dst_peer
;
1484 const struct refspec_item
*pat
= NULL
;
1487 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1491 if (!dst_ref_index
.nr
)
1492 prepare_ref_index(&dst_ref_index
, *dst
);
1494 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1495 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1497 if (dst_peer
->peer_ref
)
1498 /* We're already sending something to this ref. */
1501 if (pat
->matching
&& !(send_all
|| send_mirror
))
1503 * Remote doesn't have it, and we have no
1504 * explicit pattern, and we don't have
1505 * --all or --mirror.
1509 /* Create a new one and link it */
1510 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1511 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1512 string_list_insert(&dst_ref_index
,
1513 dst_peer
->name
)->util
= dst_peer
;
1515 dst_peer
->peer_ref
= copy_ref(ref
);
1516 dst_peer
->force
= pat
->force
;
1521 string_list_clear(&dst_ref_index
, 0);
1523 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1524 add_missing_tags(src
, dst
, &dst_tail
);
1527 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1528 /* check for missing refs on the remote */
1529 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1533 /* We're already sending something to this ref. */
1536 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1538 if (!src_ref_index
.nr
)
1539 prepare_ref_index(&src_ref_index
, src
);
1540 if (!string_list_has_string(&src_ref_index
,
1542 ref
->peer_ref
= alloc_delete_ref();
1546 string_list_clear(&src_ref_index
, 0);
1549 *dst
= apply_negative_refspecs(*dst
, rs
);
1556 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1561 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1562 int force_ref_update
= ref
->force
|| force_update
;
1563 int reject_reason
= 0;
1566 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1567 else if (!send_mirror
)
1570 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1571 if (!ref
->deletion
&&
1572 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1573 ref
->status
= REF_STATUS_UPTODATE
;
1578 * If the remote ref has moved and is now different
1579 * from what we expect, reject any push.
1581 * It also is an error if the user told us to check
1582 * with the remote-tracking branch to find the value
1583 * to expect, but we did not have such a tracking
1586 if (ref
->expect_old_sha1
) {
1587 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1588 reject_reason
= REF_STATUS_REJECT_STALE
;
1590 /* If the ref isn't stale then force the update. */
1591 force_ref_update
= 1;
1595 * If the update isn't already rejected then check
1596 * the usual "must fast-forward" rules.
1598 * Decide whether an individual refspec A:B can be
1599 * pushed. The push will succeed if any of the
1600 * following are true:
1602 * (1) the remote reference B does not exist
1604 * (2) the remote reference B is being removed (i.e.,
1605 * pushing :B where no source is specified)
1607 * (3) the destination is not under refs/tags/, and
1608 * if the old and new value is a commit, the new
1609 * is a descendant of the old.
1611 * (4) it is forced using the +A:B notation, or by
1612 * passing the --force argument
1615 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1616 if (starts_with(ref
->name
, "refs/tags/"))
1617 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1618 else if (!has_object_file(&ref
->old_oid
))
1619 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1620 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1621 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1622 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1623 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1624 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1628 * "--force" will defeat any rejection implemented
1629 * by the rules above.
1631 if (!force_ref_update
)
1632 ref
->status
= reject_reason
;
1633 else if (reject_reason
)
1634 ref
->forced_update
= 1;
1638 static void set_merge(struct branch
*ret
)
1640 struct remote
*remote
;
1642 struct object_id oid
;
1646 return; /* no branch */
1648 return; /* already run */
1649 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1651 * no merge config; let's make sure we don't confuse callers
1652 * with a non-zero merge_nr but a NULL merge
1658 remote
= remote_get(ret
->remote_name
);
1660 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1661 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1662 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1663 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1664 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1665 strcmp(ret
->remote_name
, "."))
1667 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1669 ret
->merge
[i
]->dst
= ref
;
1671 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1675 struct branch
*branch_get(const char *name
)
1680 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1681 ret
= current_branch
;
1683 ret
= make_branch(name
, strlen(name
));
1688 int branch_has_merge_config(struct branch
*branch
)
1690 return branch
&& !!branch
->merge
;
1693 int branch_merge_matches(struct branch
*branch
,
1695 const char *refname
)
1697 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1699 return refname_match(branch
->merge
[i
]->src
, refname
);
1702 __attribute__((format (printf
,2,3)))
1703 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1708 strbuf_vaddf(err
, fmt
, ap
);
1714 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1717 return error_buf(err
, _("HEAD does not point to a branch"));
1719 if (!branch
->merge
|| !branch
->merge
[0]) {
1721 * no merge config; is it because the user didn't define any,
1722 * or because it is not a real branch, and get_branch
1725 if (!ref_exists(branch
->refname
))
1726 return error_buf(err
, _("no such branch: '%s'"),
1728 return error_buf(err
,
1729 _("no upstream configured for branch '%s'"),
1733 if (!branch
->merge
[0]->dst
)
1734 return error_buf(err
,
1735 _("upstream branch '%s' not stored as a remote-tracking branch"),
1736 branch
->merge
[0]->src
);
1738 return branch
->merge
[0]->dst
;
1741 static const char *tracking_for_push_dest(struct remote
*remote
,
1742 const char *refname
,
1747 ret
= apply_refspecs(&remote
->fetch
, refname
);
1749 return error_buf(err
,
1750 _("push destination '%s' on remote '%s' has no local tracking branch"),
1751 refname
, remote
->name
);
1755 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1757 struct remote
*remote
;
1759 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1761 return error_buf(err
,
1762 _("branch '%s' has no remote for pushing"),
1765 if (remote
->push
.nr
) {
1769 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1771 return error_buf(err
,
1772 _("push refspecs for '%s' do not include '%s'"),
1773 remote
->name
, branch
->name
);
1775 ret
= tracking_for_push_dest(remote
, dst
, err
);
1781 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1783 switch (push_default
) {
1784 case PUSH_DEFAULT_NOTHING
:
1785 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1787 case PUSH_DEFAULT_MATCHING
:
1788 case PUSH_DEFAULT_CURRENT
:
1789 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1791 case PUSH_DEFAULT_UPSTREAM
:
1792 return branch_get_upstream(branch
, err
);
1794 case PUSH_DEFAULT_UNSPECIFIED
:
1795 case PUSH_DEFAULT_SIMPLE
:
1797 const char *up
, *cur
;
1799 up
= branch_get_upstream(branch
, err
);
1802 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1805 if (strcmp(cur
, up
))
1806 return error_buf(err
,
1807 _("cannot resolve 'simple' push to a single destination"));
1812 BUG("unhandled push situation");
1815 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1818 return error_buf(err
, _("HEAD does not point to a branch"));
1820 if (!branch
->push_tracking_ref
)
1821 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1822 return branch
->push_tracking_ref
;
1825 static int ignore_symref_update(const char *refname
)
1829 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1830 return 0; /* non-existing refs are OK */
1831 return (flag
& REF_ISSYMREF
);
1835 * Create and return a list of (struct ref) consisting of copies of
1836 * each remote_ref that matches refspec. refspec must be a pattern.
1837 * Fill in the copies' peer_ref to describe the local tracking refs to
1838 * which they map. Omit any references that would map to an existing
1839 * local symbolic ref.
1841 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1842 const struct refspec_item
*refspec
)
1844 const struct ref
*ref
;
1845 struct ref
*ret
= NULL
;
1846 struct ref
**tail
= &ret
;
1848 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1849 char *expn_name
= NULL
;
1851 if (strchr(ref
->name
, '^'))
1852 continue; /* a dereference item */
1853 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1854 refspec
->dst
, &expn_name
) &&
1855 !ignore_symref_update(expn_name
)) {
1856 struct ref
*cpy
= copy_ref(ref
);
1858 cpy
->peer_ref
= alloc_ref(expn_name
);
1860 cpy
->peer_ref
->force
= 1;
1870 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1872 const struct ref
*ref
;
1873 const struct ref
*best_match
= NULL
;
1876 for (ref
= refs
; ref
; ref
= ref
->next
) {
1877 int score
= refname_match(name
, ref
->name
);
1879 if (best_score
< score
) {
1887 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1889 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1894 return copy_ref(ref
);
1897 static struct ref
*get_local_ref(const char *name
)
1899 if (!name
|| name
[0] == '\0')
1902 if (starts_with(name
, "refs/"))
1903 return alloc_ref(name
);
1905 if (starts_with(name
, "heads/") ||
1906 starts_with(name
, "tags/") ||
1907 starts_with(name
, "remotes/"))
1908 return alloc_ref_with_prefix("refs/", 5, name
);
1910 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1913 int get_fetch_map(const struct ref
*remote_refs
,
1914 const struct refspec_item
*refspec
,
1918 struct ref
*ref_map
, **rmp
;
1920 if (refspec
->negative
)
1923 if (refspec
->pattern
) {
1924 ref_map
= get_expanded_map(remote_refs
, refspec
);
1926 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1928 if (refspec
->exact_sha1
) {
1929 ref_map
= alloc_ref(name
);
1930 get_oid_hex(name
, &ref_map
->old_oid
);
1931 ref_map
->exact_oid
= 1;
1933 ref_map
= get_remote_ref(remote_refs
, name
);
1935 if (!missing_ok
&& !ref_map
)
1936 die(_("couldn't find remote ref %s"), name
);
1938 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1939 if (ref_map
->peer_ref
&& refspec
->force
)
1940 ref_map
->peer_ref
->force
= 1;
1944 for (rmp
= &ref_map
; *rmp
; ) {
1945 if ((*rmp
)->peer_ref
) {
1946 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1947 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1948 struct ref
*ignore
= *rmp
;
1949 error(_("* Ignoring funny ref '%s' locally"),
1950 (*rmp
)->peer_ref
->name
);
1951 *rmp
= (*rmp
)->next
;
1952 free(ignore
->peer_ref
);
1957 rmp
= &((*rmp
)->next
);
1961 tail_link_ref(ref_map
, tail
);
1966 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1970 for (; list
; list
= list
->next
)
1971 if (!strcmp(ref
->symref
, list
->name
)) {
1972 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1979 * Compute the commit ahead/behind values for the pair branch_name, base.
1981 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1982 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1983 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1986 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1987 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1988 * commits are different.
1991 static int stat_branch_pair(const char *branch_name
, const char *base
,
1992 int *num_ours
, int *num_theirs
,
1993 enum ahead_behind_flags abf
)
1995 struct object_id oid
;
1996 struct commit
*ours
, *theirs
;
1997 struct rev_info revs
;
1998 struct strvec argv
= STRVEC_INIT
;
2000 /* Cannot stat if what we used to build on no longer exists */
2001 if (read_ref(base
, &oid
))
2003 theirs
= lookup_commit_reference(the_repository
, &oid
);
2007 if (read_ref(branch_name
, &oid
))
2009 ours
= lookup_commit_reference(the_repository
, &oid
);
2013 *num_theirs
= *num_ours
= 0;
2015 /* are we the same? */
2018 if (abf
== AHEAD_BEHIND_QUICK
)
2020 if (abf
!= AHEAD_BEHIND_FULL
)
2021 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2023 /* Run "rev-list --left-right ours...theirs" internally... */
2024 strvec_push(&argv
, ""); /* ignored */
2025 strvec_push(&argv
, "--left-right");
2026 strvec_pushf(&argv
, "%s...%s",
2027 oid_to_hex(&ours
->object
.oid
),
2028 oid_to_hex(&theirs
->object
.oid
));
2029 strvec_push(&argv
, "--");
2031 repo_init_revisions(the_repository
, &revs
, NULL
);
2032 setup_revisions(argv
.nr
, argv
.v
, &revs
, NULL
);
2033 if (prepare_revision_walk(&revs
))
2034 die(_("revision walk setup failed"));
2036 /* ... and count the commits on each side. */
2038 struct commit
*c
= get_revision(&revs
);
2041 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2047 /* clear object flags smudged by the above traversal */
2048 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2049 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2051 strvec_clear(&argv
);
2056 * Lookup the tracking branch for the given branch and if present, optionally
2057 * compute the commit ahead/behind values for the pair.
2059 * If for_push is true, the tracking branch refers to the push branch,
2060 * otherwise it refers to the upstream branch.
2062 * The name of the tracking branch (or NULL if it is not defined) is
2063 * returned via *tracking_name, if it is not itself NULL.
2065 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2066 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2067 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2070 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2071 * upstream defined, or ref does not exist). Returns 0 if the commits are
2072 * identical. Returns 1 if commits are different.
2074 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2075 const char **tracking_name
, int for_push
,
2076 enum ahead_behind_flags abf
)
2080 /* Cannot stat unless we are marked to build on top of somebody else. */
2081 base
= for_push
? branch_get_push(branch
, NULL
) :
2082 branch_get_upstream(branch
, NULL
);
2084 *tracking_name
= base
;
2088 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2092 * Return true when there is anything to report, otherwise false.
2094 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2095 enum ahead_behind_flags abf
)
2097 int ours
, theirs
, sti
;
2098 const char *full_base
;
2100 int upstream_is_gone
= 0;
2102 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2106 upstream_is_gone
= 1;
2109 base
= shorten_unambiguous_ref(full_base
, 0);
2110 if (upstream_is_gone
) {
2112 _("Your branch is based on '%s', but the upstream is gone.\n"),
2114 if (advice_status_hints
)
2116 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2119 _("Your branch is up to date with '%s'.\n"),
2121 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2123 _("Your branch and '%s' refer to different commits.\n"),
2125 if (advice_status_hints
)
2126 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2127 "git status --ahead-behind");
2128 } else if (!theirs
) {
2130 Q_("Your branch is ahead of '%s' by %d commit.\n",
2131 "Your branch is ahead of '%s' by %d commits.\n",
2134 if (advice_status_hints
)
2136 _(" (use \"git push\" to publish your local commits)\n"));
2139 Q_("Your branch is behind '%s' by %d commit, "
2140 "and can be fast-forwarded.\n",
2141 "Your branch is behind '%s' by %d commits, "
2142 "and can be fast-forwarded.\n",
2145 if (advice_status_hints
)
2147 _(" (use \"git pull\" to update your local branch)\n"));
2150 Q_("Your branch and '%s' have diverged,\n"
2151 "and have %d and %d different commit each, "
2153 "Your branch and '%s' have diverged,\n"
2154 "and have %d and %d different commits each, "
2157 base
, ours
, theirs
);
2158 if (advice_status_hints
)
2160 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2166 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2167 int flag
, void *cb_data
)
2169 struct ref
***local_tail
= cb_data
;
2172 /* we already know it starts with refs/ to get here */
2173 if (check_refname_format(refname
+ 5, 0))
2176 ref
= alloc_ref(refname
);
2177 oidcpy(&ref
->new_oid
, oid
);
2179 *local_tail
= &ref
->next
;
2183 struct ref
*get_local_heads(void)
2185 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2187 for_each_ref(one_local_ref
, &local_tail
);
2191 struct ref
*guess_remote_head(const struct ref
*head
,
2192 const struct ref
*refs
,
2195 const struct ref
*r
;
2196 struct ref
*list
= NULL
;
2197 struct ref
**tail
= &list
;
2203 * Some transports support directly peeking at
2204 * where HEAD points; if that is the case, then
2205 * we don't have to guess.
2208 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2210 /* If a remote branch exists with the default branch name, let's use it. */
2212 char *ref
= xstrfmt("refs/heads/%s", git_default_branch_name());
2214 r
= find_ref_by_name(refs
, ref
);
2216 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2219 /* Fall back to the hard-coded historical default */
2220 r
= find_ref_by_name(refs
, "refs/heads/master");
2221 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2225 /* Look for another ref that points there */
2226 for (r
= refs
; r
; r
= r
->next
) {
2228 starts_with(r
->name
, "refs/heads/") &&
2229 oideq(&r
->old_oid
, &head
->old_oid
)) {
2230 *tail
= copy_ref(r
);
2231 tail
= &((*tail
)->next
);
2240 struct stale_heads_info
{
2241 struct string_list
*ref_names
;
2242 struct ref
**stale_refs_tail
;
2246 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2247 int flags
, void *cb_data
)
2249 struct stale_heads_info
*info
= cb_data
;
2250 struct string_list matches
= STRING_LIST_INIT_DUP
;
2251 struct refspec_item query
;
2253 memset(&query
, 0, sizeof(struct refspec_item
));
2254 query
.dst
= (char *)refname
;
2256 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2257 if (matches
.nr
== 0)
2258 goto clean_exit
; /* No matches */
2261 * If we did find a suitable refspec and it's not a symref and
2262 * it's not in the list of refs that currently exist in that
2263 * remote, we consider it to be stale. In order to deal with
2264 * overlapping refspecs, we need to go over all of the
2267 if (flags
& REF_ISSYMREF
)
2270 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2271 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2275 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2276 oidcpy(&ref
->new_oid
, oid
);
2280 string_list_clear(&matches
, 0);
2284 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2286 struct ref
*ref
, *stale_refs
= NULL
;
2287 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2288 struct stale_heads_info info
;
2290 info
.ref_names
= &ref_names
;
2291 info
.stale_refs_tail
= &stale_refs
;
2293 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2294 string_list_append(&ref_names
, ref
->name
);
2295 string_list_sort(&ref_names
);
2296 for_each_ref(get_stale_heads_cb
, &info
);
2297 string_list_clear(&ref_names
, 0);
2304 static void clear_cas_option(struct push_cas_option
*cas
)
2308 for (i
= 0; i
< cas
->nr
; i
++)
2309 free(cas
->entry
[i
].refname
);
2311 memset(cas
, 0, sizeof(*cas
));
2314 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2315 const char *refname
,
2318 struct push_cas
*entry
;
2319 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2320 entry
= &cas
->entry
[cas
->nr
++];
2321 memset(entry
, 0, sizeof(*entry
));
2322 entry
->refname
= xmemdupz(refname
, refnamelen
);
2326 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2329 struct push_cas
*entry
;
2332 /* "--no-<option>" */
2333 clear_cas_option(cas
);
2338 /* just "--<option>" */
2339 cas
->use_tracking_for_rest
= 1;
2343 /* "--<option>=refname" or "--<option>=refname:value" */
2344 colon
= strchrnul(arg
, ':');
2345 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2347 entry
->use_tracking
= 1;
2349 oidclr(&entry
->expect
);
2350 else if (get_oid(colon
+ 1, &entry
->expect
))
2351 return error(_("cannot parse expected object name '%s'"),
2356 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2358 return parse_push_cas_option(opt
->value
, arg
, unset
);
2361 int is_empty_cas(const struct push_cas_option
*cas
)
2363 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2367 * Look at remote.fetch refspec and see if we have a remote
2368 * tracking branch for the refname there. Fill its current
2370 * If we cannot do so, return negative to signal an error.
2372 static int remote_tracking(struct remote
*remote
, const char *refname
,
2373 struct object_id
*oid
)
2377 dst
= apply_refspecs(&remote
->fetch
, refname
);
2379 return -1; /* no tracking ref for refname at remote */
2380 if (read_ref(dst
, oid
))
2381 return -1; /* we know what the tracking ref is but we cannot read it */
2385 static void apply_cas(struct push_cas_option
*cas
,
2386 struct remote
*remote
,
2391 /* Find an explicit --<option>=<name>[:<value>] entry */
2392 for (i
= 0; i
< cas
->nr
; i
++) {
2393 struct push_cas
*entry
= &cas
->entry
[i
];
2394 if (!refname_match(entry
->refname
, ref
->name
))
2396 ref
->expect_old_sha1
= 1;
2397 if (!entry
->use_tracking
)
2398 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2399 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2400 oidclr(&ref
->old_oid_expect
);
2404 /* Are we using "--<option>" to cover all? */
2405 if (!cas
->use_tracking_for_rest
)
2408 ref
->expect_old_sha1
= 1;
2409 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2410 oidclr(&ref
->old_oid_expect
);
2413 void apply_push_cas(struct push_cas_option
*cas
,
2414 struct remote
*remote
,
2415 struct ref
*remote_refs
)
2418 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2419 apply_cas(cas
, remote
, ref
);