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 for (i
= 0; i
< rs
->nr
; i
++) {
745 struct refspec_item
*refspec
= &rs
->items
[i
];
748 if (refspec
->negative
)
751 /* Note the reversal of src and dst */
752 if (refspec
->pattern
) {
753 const char *key
= refspec
->dst
? refspec
->dst
: refspec
->src
;
754 const char *value
= refspec
->src
;
756 if (match_name_with_pattern(key
, needle
, value
, &expn_name
))
757 string_list_append_nodup(&reversed
, expn_name
);
758 } else if (refspec
->matching
) {
759 /* For the special matching refspec, any query should match */
760 string_list_append(&reversed
, needle
);
761 } else if (!refspec
->src
) {
762 BUG("refspec->src should not be null here");
763 } else if (!strcmp(needle
, refspec
->src
)) {
764 string_list_append(&reversed
, refspec
->src
);
768 for (i
= 0; !matched_negative
&& i
< reversed
.nr
; i
++) {
769 if (omit_name_by_refspec(reversed
.items
[i
].string
, rs
))
770 matched_negative
= 1;
773 string_list_clear(&reversed
, 0);
775 return matched_negative
;
778 static void query_refspecs_multiple(struct refspec
*rs
,
779 struct refspec_item
*query
,
780 struct string_list
*results
)
783 int find_src
= !query
->src
;
785 if (find_src
&& !query
->dst
)
786 BUG("query_refspecs_multiple: need either src or dst");
788 if (query_matches_negative_refspec(rs
, query
))
791 for (i
= 0; i
< rs
->nr
; i
++) {
792 struct refspec_item
*refspec
= &rs
->items
[i
];
793 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
794 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
795 const char *needle
= find_src
? query
->dst
: query
->src
;
796 char **result
= find_src
? &query
->src
: &query
->dst
;
798 if (!refspec
->dst
|| refspec
->negative
)
800 if (refspec
->pattern
) {
801 if (match_name_with_pattern(key
, needle
, value
, result
))
802 string_list_append_nodup(results
, *result
);
803 } else if (!strcmp(needle
, key
)) {
804 string_list_append(results
, value
);
809 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
812 int find_src
= !query
->src
;
813 const char *needle
= find_src
? query
->dst
: query
->src
;
814 char **result
= find_src
? &query
->src
: &query
->dst
;
816 if (find_src
&& !query
->dst
)
817 BUG("query_refspecs: need either src or dst");
819 if (query_matches_negative_refspec(rs
, query
))
822 for (i
= 0; i
< rs
->nr
; i
++) {
823 struct refspec_item
*refspec
= &rs
->items
[i
];
824 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
825 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
827 if (!refspec
->dst
|| refspec
->negative
)
829 if (refspec
->pattern
) {
830 if (match_name_with_pattern(key
, needle
, value
, result
)) {
831 query
->force
= refspec
->force
;
834 } else if (!strcmp(needle
, key
)) {
835 *result
= xstrdup(value
);
836 query
->force
= refspec
->force
;
843 char *apply_refspecs(struct refspec
*rs
, const char *name
)
845 struct refspec_item query
;
847 memset(&query
, 0, sizeof(struct refspec_item
));
848 query
.src
= (char *)name
;
850 if (query_refspecs(rs
, &query
))
856 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
858 return query_refspecs(&remote
->fetch
, refspec
);
861 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
864 size_t len
= strlen(name
);
865 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
866 memcpy(ref
->name
, prefix
, prefixlen
);
867 memcpy(ref
->name
+ prefixlen
, name
, len
);
871 struct ref
*alloc_ref(const char *name
)
873 return alloc_ref_with_prefix("", 0, name
);
876 struct ref
*copy_ref(const struct ref
*ref
)
882 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
884 memcpy(cpy
, ref
, len
);
886 cpy
->symref
= xstrdup_or_null(ref
->symref
);
887 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
888 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
892 struct ref
*copy_ref_list(const struct ref
*ref
)
894 struct ref
*ret
= NULL
;
895 struct ref
**tail
= &ret
;
897 *tail
= copy_ref(ref
);
899 tail
= &((*tail
)->next
);
904 void free_one_ref(struct ref
*ref
)
908 free_one_ref(ref
->peer_ref
);
909 free(ref
->remote_status
);
914 void free_refs(struct ref
*ref
)
924 int ref_compare_name(const void *va
, const void *vb
)
926 const struct ref
*a
= va
, *b
= vb
;
927 return strcmp(a
->name
, b
->name
);
930 static void *ref_list_get_next(const void *a
)
932 return ((const struct ref
*)a
)->next
;
935 static void ref_list_set_next(void *a
, void *next
)
937 ((struct ref
*)a
)->next
= next
;
940 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
942 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
945 int count_refspec_match(const char *pattern
,
947 struct ref
**matched_ref
)
949 int patlen
= strlen(pattern
);
950 struct ref
*matched_weak
= NULL
;
951 struct ref
*matched
= NULL
;
955 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
956 char *name
= refs
->name
;
957 int namelen
= strlen(name
);
959 if (!refname_match(pattern
, name
))
962 /* A match is "weak" if it is with refs outside
963 * heads or tags, and did not specify the pattern
964 * in full (e.g. "refs/remotes/origin/master") or at
965 * least from the toplevel (e.g. "remotes/origin/master");
966 * otherwise "git push $URL master" would result in
967 * ambiguity between remotes/origin/master and heads/master
968 * at the remote site.
970 if (namelen
!= patlen
&&
971 patlen
!= namelen
- 5 &&
972 !starts_with(name
, "refs/heads/") &&
973 !starts_with(name
, "refs/tags/")) {
974 /* We want to catch the case where only weak
975 * matches are found and there are multiple
976 * matches, and where more than one strong
977 * matches are found, as ambiguous. One
978 * strong match with zero or more weak matches
979 * are acceptable as a unique match.
991 *matched_ref
= matched_weak
;
996 *matched_ref
= matched
;
1001 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1009 static struct ref
*alloc_delete_ref(void)
1011 struct ref
*ref
= alloc_ref("(delete)");
1012 oidclr(&ref
->new_oid
);
1016 static int try_explicit_object_name(const char *name
,
1019 struct object_id oid
;
1023 *match
= alloc_delete_ref();
1027 if (get_oid(name
, &oid
))
1031 *match
= alloc_ref(name
);
1032 oidcpy(&(*match
)->new_oid
, &oid
);
1037 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1039 struct ref
*ret
= alloc_ref(name
);
1040 tail_link_ref(ret
, tail
);
1044 static char *guess_ref(const char *name
, struct ref
*peer
)
1046 struct strbuf buf
= STRBUF_INIT
;
1048 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1053 if (starts_with(r
, "refs/heads/")) {
1054 strbuf_addstr(&buf
, "refs/heads/");
1055 } else if (starts_with(r
, "refs/tags/")) {
1056 strbuf_addstr(&buf
, "refs/tags/");
1061 strbuf_addstr(&buf
, name
);
1062 return strbuf_detach(&buf
, NULL
);
1065 static int match_explicit_lhs(struct ref
*src
,
1066 struct refspec_item
*rs
,
1068 int *allocated_match
)
1070 switch (count_refspec_match(rs
->src
, src
, match
)) {
1072 if (allocated_match
)
1073 *allocated_match
= 0;
1076 /* The source could be in the get_sha1() format
1077 * not a reference name. :refs/other is a
1078 * way to delete 'other' ref at the remote end.
1080 if (try_explicit_object_name(rs
->src
, match
) < 0)
1081 return error(_("src refspec %s does not match any"), rs
->src
);
1082 if (allocated_match
)
1083 *allocated_match
= 1;
1086 return error(_("src refspec %s matches more than one"), rs
->src
);
1090 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1091 const char *matched_src_name
)
1093 struct object_id oid
;
1094 enum object_type type
;
1097 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1098 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1101 error(_("The destination you provided is not a full refname (i.e.,\n"
1102 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1104 "- Looking for a ref that matches '%s' on the remote side.\n"
1105 "- Checking if the <src> being pushed ('%s')\n"
1106 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1107 " refs/{heads,tags}/ prefix on the remote side.\n"
1109 "Neither worked, so we gave up. You must fully qualify the ref."),
1110 dst_value
, matched_src_name
);
1112 if (!advice_push_unqualified_ref_name
)
1115 if (get_oid(matched_src_name
, &oid
))
1116 BUG("'%s' is not a valid object, "
1117 "match_explicit_lhs() should catch this!",
1119 type
= oid_object_info(the_repository
, &oid
, NULL
);
1120 if (type
== OBJ_COMMIT
) {
1121 advise(_("The <src> part of the refspec is a commit object.\n"
1122 "Did you mean to create a new branch by pushing to\n"
1123 "'%s:refs/heads/%s'?"),
1124 matched_src_name
, dst_value
);
1125 } else if (type
== OBJ_TAG
) {
1126 advise(_("The <src> part of the refspec is a tag object.\n"
1127 "Did you mean to create a new tag by pushing to\n"
1128 "'%s:refs/tags/%s'?"),
1129 matched_src_name
, dst_value
);
1130 } else if (type
== OBJ_TREE
) {
1131 advise(_("The <src> part of the refspec is a tree object.\n"
1132 "Did you mean to tag a new tree by pushing to\n"
1133 "'%s:refs/tags/%s'?"),
1134 matched_src_name
, dst_value
);
1135 } else if (type
== OBJ_BLOB
) {
1136 advise(_("The <src> part of the refspec is a blob object.\n"
1137 "Did you mean to tag a new blob by pushing to\n"
1138 "'%s:refs/tags/%s'?"),
1139 matched_src_name
, dst_value
);
1141 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1142 matched_src_name
, type
);
1146 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1147 struct ref
***dst_tail
,
1148 struct refspec_item
*rs
)
1150 struct ref
*matched_src
, *matched_dst
;
1153 const char *dst_value
= rs
->dst
;
1156 if (rs
->pattern
|| rs
->matching
|| rs
->negative
)
1159 matched_src
= matched_dst
= NULL
;
1160 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1166 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1167 RESOLVE_REF_READING
,
1170 ((flag
& REF_ISSYMREF
) &&
1171 !starts_with(dst_value
, "refs/heads/")))
1172 die(_("%s cannot be resolved to branch"),
1176 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1180 if (starts_with(dst_value
, "refs/")) {
1181 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1182 } else if (is_null_oid(&matched_src
->new_oid
)) {
1183 error(_("unable to delete '%s': remote ref does not exist"),
1185 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1186 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1189 show_push_unqualified_ref_name_error(dst_value
,
1195 error(_("dst refspec %s matches more than one"),
1201 if (matched_dst
->peer_ref
)
1202 return error(_("dst ref %s receives from more than one src"),
1205 matched_dst
->peer_ref
= allocated_src
?
1207 copy_ref(matched_src
);
1208 matched_dst
->force
= rs
->force
;
1213 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1214 struct ref
***dst_tail
, struct refspec
*rs
)
1217 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1218 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1222 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1223 int send_mirror
, int direction
,
1224 const struct refspec_item
**ret_pat
)
1226 const struct refspec_item
*pat
;
1229 int matching_refs
= -1;
1230 for (i
= 0; i
< rs
->nr
; i
++) {
1231 const struct refspec_item
*item
= &rs
->items
[i
];
1236 if (item
->matching
&&
1237 (matching_refs
== -1 || item
->force
)) {
1242 if (item
->pattern
) {
1243 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1245 if (direction
== FROM_SRC
)
1246 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1248 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1255 if (matching_refs
== -1)
1258 pat
= &rs
->items
[matching_refs
];
1259 if (pat
->matching
) {
1261 * "matching refs"; traditionally we pushed everything
1262 * including refs outside refs/heads/ hierarchy, but
1263 * that does not make much sense these days.
1265 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1267 name
= xstrdup(ref
->name
);
1274 static struct ref
**tail_ref(struct ref
**head
)
1276 struct ref
**tail
= head
;
1278 tail
= &((*tail
)->next
);
1283 struct commit
**tip
;
1287 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1289 struct commit
*commit
;
1291 if (is_null_oid(oid
))
1293 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1294 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1296 commit
->object
.flags
|= TMP_MARK
;
1297 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1298 tips
->tip
[tips
->nr
++] = commit
;
1301 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1303 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1304 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1305 struct string_list_item
*item
;
1307 struct tips sent_tips
;
1310 * Collect everything we know they would have at the end of
1311 * this push, and collect all tags they have.
1313 memset(&sent_tips
, 0, sizeof(sent_tips
));
1314 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1315 if (ref
->peer_ref
&&
1316 !is_null_oid(&ref
->peer_ref
->new_oid
))
1317 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1319 add_to_tips(&sent_tips
, &ref
->old_oid
);
1320 if (starts_with(ref
->name
, "refs/tags/"))
1321 string_list_append(&dst_tag
, ref
->name
);
1323 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1325 string_list_sort(&dst_tag
);
1327 /* Collect tags they do not have. */
1328 for (ref
= src
; ref
; ref
= ref
->next
) {
1329 if (!starts_with(ref
->name
, "refs/tags/"))
1330 continue; /* not a tag */
1331 if (string_list_has_string(&dst_tag
, ref
->name
))
1332 continue; /* they already have it */
1333 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1334 continue; /* be conservative */
1335 item
= string_list_append(&src_tag
, ref
->name
);
1338 string_list_clear(&dst_tag
, 0);
1341 * At this point, src_tag lists tags that are missing from
1342 * dst, and sent_tips lists the tips we are pushing or those
1343 * that we know they already have. An element in the src_tag
1344 * that is an ancestor of any of the sent_tips needs to be
1345 * sent to the other side.
1348 const int reachable_flag
= 1;
1349 struct commit_list
*found_commits
;
1350 struct commit
**src_commits
;
1351 int nr_src_commits
= 0, alloc_src_commits
= 16;
1352 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1354 for_each_string_list_item(item
, &src_tag
) {
1355 struct ref
*ref
= item
->util
;
1356 struct commit
*commit
;
1358 if (is_null_oid(&ref
->new_oid
))
1360 commit
= lookup_commit_reference_gently(the_repository
,
1364 /* not pushing a commit, which is not an error */
1367 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1368 src_commits
[nr_src_commits
++] = commit
;
1371 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1372 src_commits
, nr_src_commits
,
1375 for_each_string_list_item(item
, &src_tag
) {
1376 struct ref
*dst_ref
;
1377 struct ref
*ref
= item
->util
;
1378 struct commit
*commit
;
1380 if (is_null_oid(&ref
->new_oid
))
1382 commit
= lookup_commit_reference_gently(the_repository
,
1386 /* not pushing a commit, which is not an error */
1390 * Is this tag, which they do not have, reachable from
1391 * any of the commits we are sending?
1393 if (!(commit
->object
.flags
& reachable_flag
))
1397 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1398 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1399 dst_ref
->peer_ref
= copy_ref(ref
);
1402 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1404 free_commit_list(found_commits
);
1407 string_list_clear(&src_tag
, 0);
1408 free(sent_tips
.tip
);
1411 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1413 for ( ; list
; list
= list
->next
)
1414 if (!strcmp(list
->name
, name
))
1415 return (struct ref
*)list
;
1419 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1421 for ( ; ref
; ref
= ref
->next
)
1422 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1424 string_list_sort(ref_index
);
1428 * Given only the set of local refs, sanity-check the set of push
1429 * refspecs. We can't catch all errors that match_push_refs would,
1430 * but we can catch some errors early before even talking to the
1433 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1438 for (i
= 0; i
< rs
->nr
; i
++) {
1439 struct refspec_item
*item
= &rs
->items
[i
];
1441 if (item
->pattern
|| item
->matching
|| item
->negative
)
1444 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1451 * Given the set of refs the local repository has, the set of refs the
1452 * remote repository has, and the refspec used for push, determine
1453 * what remote refs we will update and with what value by setting
1454 * peer_ref (which object is being pushed) and force (if the push is
1455 * forced) in elements of "dst". The function may add new elements to
1456 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1458 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1459 struct refspec
*rs
, int flags
)
1461 int send_all
= flags
& MATCH_REFS_ALL
;
1462 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1463 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1465 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1466 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1468 /* If no refspec is provided, use the default ":" */
1470 refspec_append(rs
, ":");
1472 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1474 /* pick the remainder */
1475 for (ref
= src
; ref
; ref
= ref
->next
) {
1476 struct string_list_item
*dst_item
;
1477 struct ref
*dst_peer
;
1478 const struct refspec_item
*pat
= NULL
;
1481 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1485 if (!dst_ref_index
.nr
)
1486 prepare_ref_index(&dst_ref_index
, *dst
);
1488 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1489 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1491 if (dst_peer
->peer_ref
)
1492 /* We're already sending something to this ref. */
1495 if (pat
->matching
&& !(send_all
|| send_mirror
))
1497 * Remote doesn't have it, and we have no
1498 * explicit pattern, and we don't have
1499 * --all or --mirror.
1503 /* Create a new one and link it */
1504 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1505 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1506 string_list_insert(&dst_ref_index
,
1507 dst_peer
->name
)->util
= dst_peer
;
1509 dst_peer
->peer_ref
= copy_ref(ref
);
1510 dst_peer
->force
= pat
->force
;
1515 string_list_clear(&dst_ref_index
, 0);
1517 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1518 add_missing_tags(src
, dst
, &dst_tail
);
1521 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1522 /* check for missing refs on the remote */
1523 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1527 /* We're already sending something to this ref. */
1530 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1532 if (!src_ref_index
.nr
)
1533 prepare_ref_index(&src_ref_index
, src
);
1534 if (!string_list_has_string(&src_ref_index
,
1536 ref
->peer_ref
= alloc_delete_ref();
1540 string_list_clear(&src_ref_index
, 0);
1543 *dst
= apply_negative_refspecs(*dst
, rs
);
1550 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1555 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1556 int force_ref_update
= ref
->force
|| force_update
;
1557 int reject_reason
= 0;
1560 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1561 else if (!send_mirror
)
1564 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1565 if (!ref
->deletion
&&
1566 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1567 ref
->status
= REF_STATUS_UPTODATE
;
1572 * If the remote ref has moved and is now different
1573 * from what we expect, reject any push.
1575 * It also is an error if the user told us to check
1576 * with the remote-tracking branch to find the value
1577 * to expect, but we did not have such a tracking
1580 if (ref
->expect_old_sha1
) {
1581 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1582 reject_reason
= REF_STATUS_REJECT_STALE
;
1584 /* If the ref isn't stale then force the update. */
1585 force_ref_update
= 1;
1589 * If the update isn't already rejected then check
1590 * the usual "must fast-forward" rules.
1592 * Decide whether an individual refspec A:B can be
1593 * pushed. The push will succeed if any of the
1594 * following are true:
1596 * (1) the remote reference B does not exist
1598 * (2) the remote reference B is being removed (i.e.,
1599 * pushing :B where no source is specified)
1601 * (3) the destination is not under refs/tags/, and
1602 * if the old and new value is a commit, the new
1603 * is a descendant of the old.
1605 * (4) it is forced using the +A:B notation, or by
1606 * passing the --force argument
1609 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1610 if (starts_with(ref
->name
, "refs/tags/"))
1611 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1612 else if (!has_object_file(&ref
->old_oid
))
1613 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1614 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1615 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1616 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1617 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1618 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1622 * "--force" will defeat any rejection implemented
1623 * by the rules above.
1625 if (!force_ref_update
)
1626 ref
->status
= reject_reason
;
1627 else if (reject_reason
)
1628 ref
->forced_update
= 1;
1632 static void set_merge(struct branch
*ret
)
1634 struct remote
*remote
;
1636 struct object_id oid
;
1640 return; /* no branch */
1642 return; /* already run */
1643 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1645 * no merge config; let's make sure we don't confuse callers
1646 * with a non-zero merge_nr but a NULL merge
1652 remote
= remote_get(ret
->remote_name
);
1654 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1655 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1656 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1657 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1658 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1659 strcmp(ret
->remote_name
, "."))
1661 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1663 ret
->merge
[i
]->dst
= ref
;
1665 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1669 struct branch
*branch_get(const char *name
)
1674 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1675 ret
= current_branch
;
1677 ret
= make_branch(name
, strlen(name
));
1682 int branch_has_merge_config(struct branch
*branch
)
1684 return branch
&& !!branch
->merge
;
1687 int branch_merge_matches(struct branch
*branch
,
1689 const char *refname
)
1691 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1693 return refname_match(branch
->merge
[i
]->src
, refname
);
1696 __attribute__((format (printf
,2,3)))
1697 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1702 strbuf_vaddf(err
, fmt
, ap
);
1708 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1711 return error_buf(err
, _("HEAD does not point to a branch"));
1713 if (!branch
->merge
|| !branch
->merge
[0]) {
1715 * no merge config; is it because the user didn't define any,
1716 * or because it is not a real branch, and get_branch
1719 if (!ref_exists(branch
->refname
))
1720 return error_buf(err
, _("no such branch: '%s'"),
1722 return error_buf(err
,
1723 _("no upstream configured for branch '%s'"),
1727 if (!branch
->merge
[0]->dst
)
1728 return error_buf(err
,
1729 _("upstream branch '%s' not stored as a remote-tracking branch"),
1730 branch
->merge
[0]->src
);
1732 return branch
->merge
[0]->dst
;
1735 static const char *tracking_for_push_dest(struct remote
*remote
,
1736 const char *refname
,
1741 ret
= apply_refspecs(&remote
->fetch
, refname
);
1743 return error_buf(err
,
1744 _("push destination '%s' on remote '%s' has no local tracking branch"),
1745 refname
, remote
->name
);
1749 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1751 struct remote
*remote
;
1753 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1755 return error_buf(err
,
1756 _("branch '%s' has no remote for pushing"),
1759 if (remote
->push
.nr
) {
1763 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1765 return error_buf(err
,
1766 _("push refspecs for '%s' do not include '%s'"),
1767 remote
->name
, branch
->name
);
1769 ret
= tracking_for_push_dest(remote
, dst
, err
);
1775 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1777 switch (push_default
) {
1778 case PUSH_DEFAULT_NOTHING
:
1779 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1781 case PUSH_DEFAULT_MATCHING
:
1782 case PUSH_DEFAULT_CURRENT
:
1783 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1785 case PUSH_DEFAULT_UPSTREAM
:
1786 return branch_get_upstream(branch
, err
);
1788 case PUSH_DEFAULT_UNSPECIFIED
:
1789 case PUSH_DEFAULT_SIMPLE
:
1791 const char *up
, *cur
;
1793 up
= branch_get_upstream(branch
, err
);
1796 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1799 if (strcmp(cur
, up
))
1800 return error_buf(err
,
1801 _("cannot resolve 'simple' push to a single destination"));
1806 BUG("unhandled push situation");
1809 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1812 return error_buf(err
, _("HEAD does not point to a branch"));
1814 if (!branch
->push_tracking_ref
)
1815 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1816 return branch
->push_tracking_ref
;
1819 static int ignore_symref_update(const char *refname
)
1823 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1824 return 0; /* non-existing refs are OK */
1825 return (flag
& REF_ISSYMREF
);
1829 * Create and return a list of (struct ref) consisting of copies of
1830 * each remote_ref that matches refspec. refspec must be a pattern.
1831 * Fill in the copies' peer_ref to describe the local tracking refs to
1832 * which they map. Omit any references that would map to an existing
1833 * local symbolic ref.
1835 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1836 const struct refspec_item
*refspec
)
1838 const struct ref
*ref
;
1839 struct ref
*ret
= NULL
;
1840 struct ref
**tail
= &ret
;
1842 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1843 char *expn_name
= NULL
;
1845 if (strchr(ref
->name
, '^'))
1846 continue; /* a dereference item */
1847 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1848 refspec
->dst
, &expn_name
) &&
1849 !ignore_symref_update(expn_name
)) {
1850 struct ref
*cpy
= copy_ref(ref
);
1852 cpy
->peer_ref
= alloc_ref(expn_name
);
1854 cpy
->peer_ref
->force
= 1;
1864 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1866 const struct ref
*ref
;
1867 const struct ref
*best_match
= NULL
;
1870 for (ref
= refs
; ref
; ref
= ref
->next
) {
1871 int score
= refname_match(name
, ref
->name
);
1873 if (best_score
< score
) {
1881 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1883 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1888 return copy_ref(ref
);
1891 static struct ref
*get_local_ref(const char *name
)
1893 if (!name
|| name
[0] == '\0')
1896 if (starts_with(name
, "refs/"))
1897 return alloc_ref(name
);
1899 if (starts_with(name
, "heads/") ||
1900 starts_with(name
, "tags/") ||
1901 starts_with(name
, "remotes/"))
1902 return alloc_ref_with_prefix("refs/", 5, name
);
1904 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1907 int get_fetch_map(const struct ref
*remote_refs
,
1908 const struct refspec_item
*refspec
,
1912 struct ref
*ref_map
, **rmp
;
1914 if (refspec
->negative
)
1917 if (refspec
->pattern
) {
1918 ref_map
= get_expanded_map(remote_refs
, refspec
);
1920 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1922 if (refspec
->exact_sha1
) {
1923 ref_map
= alloc_ref(name
);
1924 get_oid_hex(name
, &ref_map
->old_oid
);
1925 ref_map
->exact_oid
= 1;
1927 ref_map
= get_remote_ref(remote_refs
, name
);
1929 if (!missing_ok
&& !ref_map
)
1930 die(_("couldn't find remote ref %s"), name
);
1932 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1933 if (ref_map
->peer_ref
&& refspec
->force
)
1934 ref_map
->peer_ref
->force
= 1;
1938 for (rmp
= &ref_map
; *rmp
; ) {
1939 if ((*rmp
)->peer_ref
) {
1940 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1941 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1942 struct ref
*ignore
= *rmp
;
1943 error(_("* Ignoring funny ref '%s' locally"),
1944 (*rmp
)->peer_ref
->name
);
1945 *rmp
= (*rmp
)->next
;
1946 free(ignore
->peer_ref
);
1951 rmp
= &((*rmp
)->next
);
1955 tail_link_ref(ref_map
, tail
);
1960 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1964 for (; list
; list
= list
->next
)
1965 if (!strcmp(ref
->symref
, list
->name
)) {
1966 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1973 * Compute the commit ahead/behind values for the pair branch_name, base.
1975 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1976 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1977 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1980 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1981 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1982 * commits are different.
1985 static int stat_branch_pair(const char *branch_name
, const char *base
,
1986 int *num_ours
, int *num_theirs
,
1987 enum ahead_behind_flags abf
)
1989 struct object_id oid
;
1990 struct commit
*ours
, *theirs
;
1991 struct rev_info revs
;
1992 struct strvec argv
= STRVEC_INIT
;
1994 /* Cannot stat if what we used to build on no longer exists */
1995 if (read_ref(base
, &oid
))
1997 theirs
= lookup_commit_reference(the_repository
, &oid
);
2001 if (read_ref(branch_name
, &oid
))
2003 ours
= lookup_commit_reference(the_repository
, &oid
);
2007 *num_theirs
= *num_ours
= 0;
2009 /* are we the same? */
2012 if (abf
== AHEAD_BEHIND_QUICK
)
2014 if (abf
!= AHEAD_BEHIND_FULL
)
2015 BUG("stat_branch_pair: invalid abf '%d'", abf
);
2017 /* Run "rev-list --left-right ours...theirs" internally... */
2018 strvec_push(&argv
, ""); /* ignored */
2019 strvec_push(&argv
, "--left-right");
2020 strvec_pushf(&argv
, "%s...%s",
2021 oid_to_hex(&ours
->object
.oid
),
2022 oid_to_hex(&theirs
->object
.oid
));
2023 strvec_push(&argv
, "--");
2025 repo_init_revisions(the_repository
, &revs
, NULL
);
2026 setup_revisions(argv
.nr
, argv
.v
, &revs
, NULL
);
2027 if (prepare_revision_walk(&revs
))
2028 die(_("revision walk setup failed"));
2030 /* ... and count the commits on each side. */
2032 struct commit
*c
= get_revision(&revs
);
2035 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2041 /* clear object flags smudged by the above traversal */
2042 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2043 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2045 strvec_clear(&argv
);
2050 * Lookup the tracking branch for the given branch and if present, optionally
2051 * compute the commit ahead/behind values for the pair.
2053 * If for_push is true, the tracking branch refers to the push branch,
2054 * otherwise it refers to the upstream branch.
2056 * The name of the tracking branch (or NULL if it is not defined) is
2057 * returned via *tracking_name, if it is not itself NULL.
2059 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2060 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
2061 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2064 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2065 * upstream defined, or ref does not exist). Returns 0 if the commits are
2066 * identical. Returns 1 if commits are different.
2068 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2069 const char **tracking_name
, int for_push
,
2070 enum ahead_behind_flags abf
)
2074 /* Cannot stat unless we are marked to build on top of somebody else. */
2075 base
= for_push
? branch_get_push(branch
, NULL
) :
2076 branch_get_upstream(branch
, NULL
);
2078 *tracking_name
= base
;
2082 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
2086 * Return true when there is anything to report, otherwise false.
2088 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2089 enum ahead_behind_flags abf
)
2091 int ours
, theirs
, sti
;
2092 const char *full_base
;
2094 int upstream_is_gone
= 0;
2096 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2100 upstream_is_gone
= 1;
2103 base
= shorten_unambiguous_ref(full_base
, 0);
2104 if (upstream_is_gone
) {
2106 _("Your branch is based on '%s', but the upstream is gone.\n"),
2108 if (advice_status_hints
)
2110 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2113 _("Your branch is up to date with '%s'.\n"),
2115 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2117 _("Your branch and '%s' refer to different commits.\n"),
2119 if (advice_status_hints
)
2120 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2121 "git status --ahead-behind");
2122 } else if (!theirs
) {
2124 Q_("Your branch is ahead of '%s' by %d commit.\n",
2125 "Your branch is ahead of '%s' by %d commits.\n",
2128 if (advice_status_hints
)
2130 _(" (use \"git push\" to publish your local commits)\n"));
2133 Q_("Your branch is behind '%s' by %d commit, "
2134 "and can be fast-forwarded.\n",
2135 "Your branch is behind '%s' by %d commits, "
2136 "and can be fast-forwarded.\n",
2139 if (advice_status_hints
)
2141 _(" (use \"git pull\" to update your local branch)\n"));
2144 Q_("Your branch and '%s' have diverged,\n"
2145 "and have %d and %d different commit each, "
2147 "Your branch and '%s' have diverged,\n"
2148 "and have %d and %d different commits each, "
2151 base
, ours
, theirs
);
2152 if (advice_status_hints
)
2154 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2160 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2161 int flag
, void *cb_data
)
2163 struct ref
***local_tail
= cb_data
;
2166 /* we already know it starts with refs/ to get here */
2167 if (check_refname_format(refname
+ 5, 0))
2170 ref
= alloc_ref(refname
);
2171 oidcpy(&ref
->new_oid
, oid
);
2173 *local_tail
= &ref
->next
;
2177 struct ref
*get_local_heads(void)
2179 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2181 for_each_ref(one_local_ref
, &local_tail
);
2185 struct ref
*guess_remote_head(const struct ref
*head
,
2186 const struct ref
*refs
,
2189 const struct ref
*r
;
2190 struct ref
*list
= NULL
;
2191 struct ref
**tail
= &list
;
2197 * Some transports support directly peeking at
2198 * where HEAD points; if that is the case, then
2199 * we don't have to guess.
2202 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2204 /* If a remote branch exists with the default branch name, let's use it. */
2206 char *ref
= xstrfmt("refs/heads/%s", git_default_branch_name());
2208 r
= find_ref_by_name(refs
, ref
);
2210 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2213 /* Fall back to the hard-coded historical default */
2214 r
= find_ref_by_name(refs
, "refs/heads/master");
2215 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2219 /* Look for another ref that points there */
2220 for (r
= refs
; r
; r
= r
->next
) {
2222 starts_with(r
->name
, "refs/heads/") &&
2223 oideq(&r
->old_oid
, &head
->old_oid
)) {
2224 *tail
= copy_ref(r
);
2225 tail
= &((*tail
)->next
);
2234 struct stale_heads_info
{
2235 struct string_list
*ref_names
;
2236 struct ref
**stale_refs_tail
;
2240 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2241 int flags
, void *cb_data
)
2243 struct stale_heads_info
*info
= cb_data
;
2244 struct string_list matches
= STRING_LIST_INIT_DUP
;
2245 struct refspec_item query
;
2247 memset(&query
, 0, sizeof(struct refspec_item
));
2248 query
.dst
= (char *)refname
;
2250 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2251 if (matches
.nr
== 0)
2252 goto clean_exit
; /* No matches */
2255 * If we did find a suitable refspec and it's not a symref and
2256 * it's not in the list of refs that currently exist in that
2257 * remote, we consider it to be stale. In order to deal with
2258 * overlapping refspecs, we need to go over all of the
2261 if (flags
& REF_ISSYMREF
)
2264 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2265 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2269 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2270 oidcpy(&ref
->new_oid
, oid
);
2274 string_list_clear(&matches
, 0);
2278 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2280 struct ref
*ref
, *stale_refs
= NULL
;
2281 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2282 struct stale_heads_info info
;
2284 info
.ref_names
= &ref_names
;
2285 info
.stale_refs_tail
= &stale_refs
;
2287 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2288 string_list_append(&ref_names
, ref
->name
);
2289 string_list_sort(&ref_names
);
2290 for_each_ref(get_stale_heads_cb
, &info
);
2291 string_list_clear(&ref_names
, 0);
2298 static void clear_cas_option(struct push_cas_option
*cas
)
2302 for (i
= 0; i
< cas
->nr
; i
++)
2303 free(cas
->entry
[i
].refname
);
2305 memset(cas
, 0, sizeof(*cas
));
2308 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2309 const char *refname
,
2312 struct push_cas
*entry
;
2313 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2314 entry
= &cas
->entry
[cas
->nr
++];
2315 memset(entry
, 0, sizeof(*entry
));
2316 entry
->refname
= xmemdupz(refname
, refnamelen
);
2320 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2323 struct push_cas
*entry
;
2326 /* "--no-<option>" */
2327 clear_cas_option(cas
);
2332 /* just "--<option>" */
2333 cas
->use_tracking_for_rest
= 1;
2337 /* "--<option>=refname" or "--<option>=refname:value" */
2338 colon
= strchrnul(arg
, ':');
2339 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2341 entry
->use_tracking
= 1;
2343 oidclr(&entry
->expect
);
2344 else if (get_oid(colon
+ 1, &entry
->expect
))
2345 return error(_("cannot parse expected object name '%s'"),
2350 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2352 return parse_push_cas_option(opt
->value
, arg
, unset
);
2355 int is_empty_cas(const struct push_cas_option
*cas
)
2357 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2361 * Look at remote.fetch refspec and see if we have a remote
2362 * tracking branch for the refname there. Fill its current
2364 * If we cannot do so, return negative to signal an error.
2366 static int remote_tracking(struct remote
*remote
, const char *refname
,
2367 struct object_id
*oid
)
2371 dst
= apply_refspecs(&remote
->fetch
, refname
);
2373 return -1; /* no tracking ref for refname at remote */
2374 if (read_ref(dst
, oid
))
2375 return -1; /* we know what the tracking ref is but we cannot read it */
2379 static void apply_cas(struct push_cas_option
*cas
,
2380 struct remote
*remote
,
2385 /* Find an explicit --<option>=<name>[:<value>] entry */
2386 for (i
= 0; i
< cas
->nr
; i
++) {
2387 struct push_cas
*entry
= &cas
->entry
[i
];
2388 if (!refname_match(entry
->refname
, ref
->name
))
2390 ref
->expect_old_sha1
= 1;
2391 if (!entry
->use_tracking
)
2392 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2393 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2394 oidclr(&ref
->old_oid_expect
);
2398 /* Are we using "--<option>" to cover all? */
2399 if (!cas
->use_tracking_for_rest
)
2402 ref
->expect_old_sha1
= 1;
2403 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2404 oidclr(&ref
->old_oid_expect
);
2407 void apply_push_cas(struct push_cas_option
*cas
,
2408 struct remote
*remote
,
2409 struct ref
*remote_refs
)
2412 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2413 apply_cas(cas
, remote
, ref
);