6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
14 #include "argv-array.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
,
115 const void *entry_or_key
,
118 const struct remote
*a
= entry
;
119 const struct remote
*b
= entry_or_key
;
120 const struct remotes_hash_key
*key
= keydata
;
123 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
125 return strcmp(a
->name
, b
->name
);
128 static inline void init_remotes_hash(void)
130 if (!remotes_hash
.cmpfn
)
131 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
134 static struct remote
*make_remote(const char *name
, int len
)
136 struct remote
*ret
, *replaced
;
137 struct remotes_hash_key lookup
;
138 struct hashmap_entry lookup_entry
, *e
;
146 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
148 e
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
);
150 return container_of(e
, struct remote
, ent
);
152 ret
= xcalloc(1, sizeof(struct remote
));
153 ret
->prune
= -1; /* unspecified */
154 ret
->prune_tags
= -1; /* unspecified */
155 ret
->name
= xstrndup(name
, len
);
156 refspec_init(&ret
->push
, REFSPEC_PUSH
);
157 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
159 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
160 remotes
[remotes_nr
++] = ret
;
162 hashmap_entry_init(&ret
->ent
, lookup_entry
.hash
);
163 replaced
= hashmap_put(&remotes_hash
, &ret
->ent
);
164 assert(replaced
== NULL
); /* no previous entry overwritten */
168 static void add_merge(struct branch
*branch
, const char *name
)
170 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
171 branch
->merge_alloc
);
172 branch
->merge_name
[branch
->merge_nr
++] = name
;
175 static struct branch
*make_branch(const char *name
, int len
)
180 for (i
= 0; i
< branches_nr
; i
++) {
181 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
182 !branches
[i
]->name
[len
]) :
183 !strcmp(name
, branches
[i
]->name
))
187 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
188 ret
= xcalloc(1, sizeof(struct branch
));
189 branches
[branches_nr
++] = ret
;
191 ret
->name
= xstrndup(name
, len
);
193 ret
->name
= xstrdup(name
);
194 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
199 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
204 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
206 ? (len
== r
->rewrite
[i
]->baselen
&&
207 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
208 : !strcmp(base
, r
->rewrite
[i
]->base
))
209 return r
->rewrite
[i
];
212 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
213 ret
= xcalloc(1, sizeof(struct rewrite
));
214 r
->rewrite
[r
->rewrite_nr
++] = ret
;
216 ret
->base
= xstrndup(base
, len
);
220 ret
->base
= xstrdup(base
);
221 ret
->baselen
= strlen(base
);
226 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
228 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
229 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
230 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
231 rewrite
->instead_of_nr
++;
234 static const char *skip_spaces(const char *s
)
241 static void read_remotes_file(struct remote
*remote
)
243 struct strbuf buf
= STRBUF_INIT
;
244 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
248 remote
->configured_in_repo
= 1;
249 remote
->origin
= REMOTE_REMOTES
;
250 while (strbuf_getline(&buf
, f
) != EOF
) {
255 if (skip_prefix(buf
.buf
, "URL:", &v
))
256 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
257 else if (skip_prefix(buf
.buf
, "Push:", &v
))
258 refspec_append(&remote
->push
, skip_spaces(v
));
259 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
260 refspec_append(&remote
->fetch
, skip_spaces(v
));
262 strbuf_release(&buf
);
266 static void read_branches_file(struct remote
*remote
)
269 struct strbuf buf
= STRBUF_INIT
;
270 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
275 strbuf_getline_lf(&buf
, f
);
279 strbuf_release(&buf
);
283 remote
->configured_in_repo
= 1;
284 remote
->origin
= REMOTE_BRANCHES
;
287 * The branches file would have URL and optionally
288 * #branch specified. The "master" (or specified) branch is
289 * fetched and stored in the local branch matching the
292 frag
= strchr(buf
.buf
, '#');
298 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
299 strbuf_addf(&buf
, "refs/heads/%s:refs/heads/%s",
301 refspec_append(&remote
->fetch
, buf
.buf
);
304 * Cogito compatible push: push current HEAD to remote #branch
305 * (master if missing)
308 strbuf_addf(&buf
, "HEAD:refs/heads/%s", frag
);
309 refspec_append(&remote
->push
, buf
.buf
);
310 remote
->fetch_tags
= 1; /* always auto-follow */
311 strbuf_release(&buf
);
314 static int handle_config(const char *key
, const char *value
, void *cb
)
319 struct remote
*remote
;
320 struct branch
*branch
;
321 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
324 branch
= make_branch(name
, namelen
);
325 if (!strcmp(subkey
, "remote")) {
326 return git_config_string(&branch
->remote_name
, key
, value
);
327 } else if (!strcmp(subkey
, "pushremote")) {
328 return git_config_string(&branch
->pushremote_name
, key
, value
);
329 } else if (!strcmp(subkey
, "merge")) {
331 return config_error_nonbool(key
);
332 add_merge(branch
, xstrdup(value
));
336 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
337 struct rewrite
*rewrite
;
340 if (!strcmp(subkey
, "insteadof")) {
342 return config_error_nonbool(key
);
343 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
344 add_instead_of(rewrite
, xstrdup(value
));
345 } else if (!strcmp(subkey
, "pushinsteadof")) {
347 return config_error_nonbool(key
);
348 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
349 add_instead_of(rewrite
, xstrdup(value
));
353 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
356 /* Handle remote.* variables */
357 if (!name
&& !strcmp(subkey
, "pushdefault"))
358 return git_config_string(&pushremote_name
, key
, value
);
362 /* Handle remote.<name>.* variables */
364 warning(_("config remote shorthand cannot begin with '/': %s"),
368 remote
= make_remote(name
, namelen
);
369 remote
->origin
= REMOTE_CONFIG
;
370 if (current_config_scope() == CONFIG_SCOPE_REPO
)
371 remote
->configured_in_repo
= 1;
372 if (!strcmp(subkey
, "mirror"))
373 remote
->mirror
= git_config_bool(key
, value
);
374 else if (!strcmp(subkey
, "skipdefaultupdate"))
375 remote
->skip_default_update
= git_config_bool(key
, value
);
376 else if (!strcmp(subkey
, "skipfetchall"))
377 remote
->skip_default_update
= git_config_bool(key
, value
);
378 else if (!strcmp(subkey
, "prune"))
379 remote
->prune
= git_config_bool(key
, value
);
380 else if (!strcmp(subkey
, "prunetags"))
381 remote
->prune_tags
= git_config_bool(key
, value
);
382 else if (!strcmp(subkey
, "url")) {
384 if (git_config_string(&v
, key
, value
))
387 } else if (!strcmp(subkey
, "pushurl")) {
389 if (git_config_string(&v
, key
, value
))
391 add_pushurl(remote
, v
);
392 } else if (!strcmp(subkey
, "push")) {
394 if (git_config_string(&v
, key
, value
))
396 refspec_append(&remote
->push
, v
);
398 } else if (!strcmp(subkey
, "fetch")) {
400 if (git_config_string(&v
, key
, value
))
402 refspec_append(&remote
->fetch
, v
);
404 } else if (!strcmp(subkey
, "receivepack")) {
406 if (git_config_string(&v
, key
, value
))
408 if (!remote
->receivepack
)
409 remote
->receivepack
= v
;
411 error(_("more than one receivepack given, using the first"));
412 } else if (!strcmp(subkey
, "uploadpack")) {
414 if (git_config_string(&v
, key
, value
))
416 if (!remote
->uploadpack
)
417 remote
->uploadpack
= v
;
419 error(_("more than one uploadpack given, using the first"));
420 } else if (!strcmp(subkey
, "tagopt")) {
421 if (!strcmp(value
, "--no-tags"))
422 remote
->fetch_tags
= -1;
423 else if (!strcmp(value
, "--tags"))
424 remote
->fetch_tags
= 2;
425 } else if (!strcmp(subkey
, "proxy")) {
426 return git_config_string((const char **)&remote
->http_proxy
,
428 } else if (!strcmp(subkey
, "proxyauthmethod")) {
429 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
431 } else if (!strcmp(subkey
, "vcs")) {
432 return git_config_string(&remote
->foreign_vcs
, key
, value
);
437 static void alias_all_urls(void)
440 for (i
= 0; i
< remotes_nr
; i
++) {
441 int add_pushurl_aliases
;
444 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
445 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
447 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
448 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
449 if (add_pushurl_aliases
)
450 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
451 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
456 static void read_config(void)
465 current_branch
= NULL
;
466 if (startup_info
->have_repository
) {
467 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
468 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
469 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
470 current_branch
= make_branch(head_ref
, 0);
473 git_config(handle_config
, NULL
);
477 static int valid_remote_nick(const char *name
)
479 if (!name
[0] || is_dot_or_dotdot(name
))
482 /* remote nicknames cannot contain slashes */
484 if (is_dir_sep(*name
++))
489 const char *remote_for_branch(struct branch
*branch
, int *explicit)
491 if (branch
&& branch
->remote_name
) {
494 return branch
->remote_name
;
501 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
503 if (branch
&& branch
->pushremote_name
) {
506 return branch
->pushremote_name
;
508 if (pushremote_name
) {
511 return pushremote_name
;
513 return remote_for_branch(branch
, explicit);
516 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
,
521 if (branch
->merge_nr
) {
524 return branch
->merge_name
[0];
527 const char *dst
, *remote_name
=
528 pushremote_for_branch(branch
, NULL
);
529 struct remote
*remote
= remote_get(remote_name
);
531 if (remote
&& remote
->push
.nr
&&
532 (dst
= apply_refspecs(&remote
->push
,
545 static struct remote
*remote_get_1(const char *name
,
546 const char *(*get_default
)(struct branch
*, int *))
556 name
= get_default(current_branch
, &name_given
);
558 ret
= make_remote(name
, 0);
559 if (valid_remote_nick(name
) && have_git_dir()) {
560 if (!valid_remote(ret
))
561 read_remotes_file(ret
);
562 if (!valid_remote(ret
))
563 read_branches_file(ret
);
565 if (name_given
&& !valid_remote(ret
))
566 add_url_alias(ret
, name
);
567 if (!valid_remote(ret
))
572 struct remote
*remote_get(const char *name
)
574 return remote_get_1(name
, remote_for_branch
);
577 struct remote
*pushremote_get(const char *name
)
579 return remote_get_1(name
, pushremote_for_branch
);
582 int remote_is_configured(struct remote
*remote
, int in_repo
)
587 return remote
->configured_in_repo
;
588 return !!remote
->origin
;
591 int for_each_remote(each_remote_fn fn
, void *priv
)
595 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
596 struct remote
*r
= remotes
[i
];
599 result
= fn(r
, priv
);
604 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
606 if (strcmp(ref1
->name
, ref2
->name
)) {
607 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
608 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
609 die(_("Cannot fetch both %s and %s to %s"),
610 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
611 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
612 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
613 warning(_("%s usually tracks %s, not %s"),
614 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
615 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
616 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
617 die(_("%s tracks both %s and %s"),
618 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
621 * This last possibility doesn't occur because
622 * FETCH_HEAD_IGNORE entries always appear at
623 * the end of the list.
625 BUG("Internal error");
628 free(ref2
->peer_ref
);
632 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
634 struct string_list refs
= STRING_LIST_INIT_NODUP
;
635 struct ref
*retval
= NULL
;
636 struct ref
**p
= &retval
;
639 struct ref
*ref
= ref_map
;
641 ref_map
= ref_map
->next
;
644 if (!ref
->peer_ref
) {
648 struct string_list_item
*item
=
649 string_list_insert(&refs
, ref
->peer_ref
->name
);
652 /* Entry already existed */
653 handle_duplicate((struct ref
*)item
->util
, ref
);
662 string_list_clear(&refs
, 0);
666 int remote_has_url(struct remote
*remote
, const char *url
)
669 for (i
= 0; i
< remote
->url_nr
; i
++) {
670 if (!strcmp(remote
->url
[i
], url
))
676 static int match_name_with_pattern(const char *key
, const char *name
,
677 const char *value
, char **result
)
679 const char *kstar
= strchr(key
, '*');
685 die(_("key '%s' of pattern had no '*'"), key
);
687 ksuffixlen
= strlen(kstar
+ 1);
688 namelen
= strlen(name
);
689 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
690 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
692 struct strbuf sb
= STRBUF_INIT
;
693 const char *vstar
= strchr(value
, '*');
695 die(_("value '%s' of pattern has no '*'"), value
);
696 strbuf_add(&sb
, value
, vstar
- value
);
697 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
698 strbuf_addstr(&sb
, vstar
+ 1);
699 *result
= strbuf_detach(&sb
, NULL
);
704 static void query_refspecs_multiple(struct refspec
*rs
,
705 struct refspec_item
*query
,
706 struct string_list
*results
)
709 int find_src
= !query
->src
;
711 if (find_src
&& !query
->dst
)
712 BUG("query_refspecs_multiple: need either src or dst");
714 for (i
= 0; i
< rs
->nr
; i
++) {
715 struct refspec_item
*refspec
= &rs
->items
[i
];
716 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
717 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
718 const char *needle
= find_src
? query
->dst
: query
->src
;
719 char **result
= find_src
? &query
->src
: &query
->dst
;
723 if (refspec
->pattern
) {
724 if (match_name_with_pattern(key
, needle
, value
, result
))
725 string_list_append_nodup(results
, *result
);
726 } else if (!strcmp(needle
, key
)) {
727 string_list_append(results
, value
);
732 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
735 int find_src
= !query
->src
;
736 const char *needle
= find_src
? query
->dst
: query
->src
;
737 char **result
= find_src
? &query
->src
: &query
->dst
;
739 if (find_src
&& !query
->dst
)
740 BUG("query_refspecs: need either src or dst");
742 for (i
= 0; i
< rs
->nr
; i
++) {
743 struct refspec_item
*refspec
= &rs
->items
[i
];
744 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
745 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
749 if (refspec
->pattern
) {
750 if (match_name_with_pattern(key
, needle
, value
, result
)) {
751 query
->force
= refspec
->force
;
754 } else if (!strcmp(needle
, key
)) {
755 *result
= xstrdup(value
);
756 query
->force
= refspec
->force
;
763 char *apply_refspecs(struct refspec
*rs
, const char *name
)
765 struct refspec_item query
;
767 memset(&query
, 0, sizeof(struct refspec_item
));
768 query
.src
= (char *)name
;
770 if (query_refspecs(rs
, &query
))
776 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
778 return query_refspecs(&remote
->fetch
, refspec
);
781 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
784 size_t len
= strlen(name
);
785 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
786 memcpy(ref
->name
, prefix
, prefixlen
);
787 memcpy(ref
->name
+ prefixlen
, name
, len
);
791 struct ref
*alloc_ref(const char *name
)
793 return alloc_ref_with_prefix("", 0, name
);
796 struct ref
*copy_ref(const struct ref
*ref
)
802 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
804 memcpy(cpy
, ref
, len
);
806 cpy
->symref
= xstrdup_or_null(ref
->symref
);
807 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
808 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
812 struct ref
*copy_ref_list(const struct ref
*ref
)
814 struct ref
*ret
= NULL
;
815 struct ref
**tail
= &ret
;
817 *tail
= copy_ref(ref
);
819 tail
= &((*tail
)->next
);
824 void free_one_ref(struct ref
*ref
)
828 free_one_ref(ref
->peer_ref
);
829 free(ref
->remote_status
);
834 void free_refs(struct ref
*ref
)
844 int ref_compare_name(const void *va
, const void *vb
)
846 const struct ref
*a
= va
, *b
= vb
;
847 return strcmp(a
->name
, b
->name
);
850 static void *ref_list_get_next(const void *a
)
852 return ((const struct ref
*)a
)->next
;
855 static void ref_list_set_next(void *a
, void *next
)
857 ((struct ref
*)a
)->next
= next
;
860 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
862 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
865 int count_refspec_match(const char *pattern
,
867 struct ref
**matched_ref
)
869 int patlen
= strlen(pattern
);
870 struct ref
*matched_weak
= NULL
;
871 struct ref
*matched
= NULL
;
875 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
876 char *name
= refs
->name
;
877 int namelen
= strlen(name
);
879 if (!refname_match(pattern
, name
))
882 /* A match is "weak" if it is with refs outside
883 * heads or tags, and did not specify the pattern
884 * in full (e.g. "refs/remotes/origin/master") or at
885 * least from the toplevel (e.g. "remotes/origin/master");
886 * otherwise "git push $URL master" would result in
887 * ambiguity between remotes/origin/master and heads/master
888 * at the remote site.
890 if (namelen
!= patlen
&&
891 patlen
!= namelen
- 5 &&
892 !starts_with(name
, "refs/heads/") &&
893 !starts_with(name
, "refs/tags/")) {
894 /* We want to catch the case where only weak
895 * matches are found and there are multiple
896 * matches, and where more than one strong
897 * matches are found, as ambiguous. One
898 * strong match with zero or more weak matches
899 * are acceptable as a unique match.
911 *matched_ref
= matched_weak
;
916 *matched_ref
= matched
;
921 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
929 static struct ref
*alloc_delete_ref(void)
931 struct ref
*ref
= alloc_ref("(delete)");
932 oidclr(&ref
->new_oid
);
936 static int try_explicit_object_name(const char *name
,
939 struct object_id oid
;
943 *match
= alloc_delete_ref();
947 if (get_oid(name
, &oid
))
951 *match
= alloc_ref(name
);
952 oidcpy(&(*match
)->new_oid
, &oid
);
957 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
959 struct ref
*ret
= alloc_ref(name
);
960 tail_link_ref(ret
, tail
);
964 static char *guess_ref(const char *name
, struct ref
*peer
)
966 struct strbuf buf
= STRBUF_INIT
;
968 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
973 if (starts_with(r
, "refs/heads/")) {
974 strbuf_addstr(&buf
, "refs/heads/");
975 } else if (starts_with(r
, "refs/tags/")) {
976 strbuf_addstr(&buf
, "refs/tags/");
981 strbuf_addstr(&buf
, name
);
982 return strbuf_detach(&buf
, NULL
);
985 static int match_explicit_lhs(struct ref
*src
,
986 struct refspec_item
*rs
,
988 int *allocated_match
)
990 switch (count_refspec_match(rs
->src
, src
, match
)) {
993 *allocated_match
= 0;
996 /* The source could be in the get_sha1() format
997 * not a reference name. :refs/other is a
998 * way to delete 'other' ref at the remote end.
1000 if (try_explicit_object_name(rs
->src
, match
) < 0)
1001 return error(_("src refspec %s does not match any"), rs
->src
);
1002 if (allocated_match
)
1003 *allocated_match
= 1;
1006 return error(_("src refspec %s matches more than one"), rs
->src
);
1010 static void show_push_unqualified_ref_name_error(const char *dst_value
,
1011 const char *matched_src_name
)
1013 struct object_id oid
;
1014 enum object_type type
;
1017 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1018 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1021 error(_("The destination you provided is not a full refname (i.e.,\n"
1022 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1024 "- Looking for a ref that matches '%s' on the remote side.\n"
1025 "- Checking if the <src> being pushed ('%s')\n"
1026 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1027 " refs/{heads,tags}/ prefix on the remote side.\n"
1029 "Neither worked, so we gave up. You must fully qualify the ref."),
1030 dst_value
, matched_src_name
);
1032 if (!advice_push_unqualified_ref_name
)
1035 if (get_oid(matched_src_name
, &oid
))
1036 BUG("'%s' is not a valid object, "
1037 "match_explicit_lhs() should catch this!",
1039 type
= oid_object_info(the_repository
, &oid
, NULL
);
1040 if (type
== OBJ_COMMIT
) {
1041 advise(_("The <src> part of the refspec is a commit object.\n"
1042 "Did you mean to create a new branch by pushing to\n"
1043 "'%s:refs/heads/%s'?"),
1044 matched_src_name
, dst_value
);
1045 } else if (type
== OBJ_TAG
) {
1046 advise(_("The <src> part of the refspec is a tag object.\n"
1047 "Did you mean to create a new tag by pushing to\n"
1048 "'%s:refs/tags/%s'?"),
1049 matched_src_name
, dst_value
);
1050 } else if (type
== OBJ_TREE
) {
1051 advise(_("The <src> part of the refspec is a tree object.\n"
1052 "Did you mean to tag a new tree by pushing to\n"
1053 "'%s:refs/tags/%s'?"),
1054 matched_src_name
, dst_value
);
1055 } else if (type
== OBJ_BLOB
) {
1056 advise(_("The <src> part of the refspec is a blob object.\n"
1057 "Did you mean to tag a new blob by pushing to\n"
1058 "'%s:refs/tags/%s'?"),
1059 matched_src_name
, dst_value
);
1061 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1062 matched_src_name
, type
);
1066 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1067 struct ref
***dst_tail
,
1068 struct refspec_item
*rs
)
1070 struct ref
*matched_src
, *matched_dst
;
1073 const char *dst_value
= rs
->dst
;
1076 if (rs
->pattern
|| rs
->matching
)
1079 matched_src
= matched_dst
= NULL
;
1080 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1086 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1087 RESOLVE_REF_READING
,
1090 ((flag
& REF_ISSYMREF
) &&
1091 !starts_with(dst_value
, "refs/heads/")))
1092 die(_("%s cannot be resolved to branch"),
1096 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1100 if (starts_with(dst_value
, "refs/")) {
1101 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1102 } else if (is_null_oid(&matched_src
->new_oid
)) {
1103 error(_("unable to delete '%s': remote ref does not exist"),
1105 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1106 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1109 show_push_unqualified_ref_name_error(dst_value
,
1115 error(_("dst refspec %s matches more than one"),
1121 if (matched_dst
->peer_ref
)
1122 return error(_("dst ref %s receives from more than one src"),
1125 matched_dst
->peer_ref
= allocated_src
?
1127 copy_ref(matched_src
);
1128 matched_dst
->force
= rs
->force
;
1133 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1134 struct ref
***dst_tail
, struct refspec
*rs
)
1137 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1138 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1142 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1143 int send_mirror
, int direction
,
1144 const struct refspec_item
**ret_pat
)
1146 const struct refspec_item
*pat
;
1149 int matching_refs
= -1;
1150 for (i
= 0; i
< rs
->nr
; i
++) {
1151 const struct refspec_item
*item
= &rs
->items
[i
];
1152 if (item
->matching
&&
1153 (matching_refs
== -1 || item
->force
)) {
1158 if (item
->pattern
) {
1159 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1161 if (direction
== FROM_SRC
)
1162 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1164 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1171 if (matching_refs
== -1)
1174 pat
= &rs
->items
[matching_refs
];
1175 if (pat
->matching
) {
1177 * "matching refs"; traditionally we pushed everything
1178 * including refs outside refs/heads/ hierarchy, but
1179 * that does not make much sense these days.
1181 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1183 name
= xstrdup(ref
->name
);
1190 static struct ref
**tail_ref(struct ref
**head
)
1192 struct ref
**tail
= head
;
1194 tail
= &((*tail
)->next
);
1199 struct commit
**tip
;
1203 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1205 struct commit
*commit
;
1207 if (is_null_oid(oid
))
1209 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1210 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1212 commit
->object
.flags
|= TMP_MARK
;
1213 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1214 tips
->tip
[tips
->nr
++] = commit
;
1217 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1219 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1220 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1221 struct string_list_item
*item
;
1223 struct tips sent_tips
;
1226 * Collect everything we know they would have at the end of
1227 * this push, and collect all tags they have.
1229 memset(&sent_tips
, 0, sizeof(sent_tips
));
1230 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1231 if (ref
->peer_ref
&&
1232 !is_null_oid(&ref
->peer_ref
->new_oid
))
1233 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1235 add_to_tips(&sent_tips
, &ref
->old_oid
);
1236 if (starts_with(ref
->name
, "refs/tags/"))
1237 string_list_append(&dst_tag
, ref
->name
);
1239 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1241 string_list_sort(&dst_tag
);
1243 /* Collect tags they do not have. */
1244 for (ref
= src
; ref
; ref
= ref
->next
) {
1245 if (!starts_with(ref
->name
, "refs/tags/"))
1246 continue; /* not a tag */
1247 if (string_list_has_string(&dst_tag
, ref
->name
))
1248 continue; /* they already have it */
1249 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1250 continue; /* be conservative */
1251 item
= string_list_append(&src_tag
, ref
->name
);
1254 string_list_clear(&dst_tag
, 0);
1257 * At this point, src_tag lists tags that are missing from
1258 * dst, and sent_tips lists the tips we are pushing or those
1259 * that we know they already have. An element in the src_tag
1260 * that is an ancestor of any of the sent_tips needs to be
1261 * sent to the other side.
1264 const int reachable_flag
= 1;
1265 struct commit_list
*found_commits
;
1266 struct commit
**src_commits
;
1267 int nr_src_commits
= 0, alloc_src_commits
= 16;
1268 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1270 for_each_string_list_item(item
, &src_tag
) {
1271 struct ref
*ref
= item
->util
;
1272 struct commit
*commit
;
1274 if (is_null_oid(&ref
->new_oid
))
1276 commit
= lookup_commit_reference_gently(the_repository
,
1280 /* not pushing a commit, which is not an error */
1283 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1284 src_commits
[nr_src_commits
++] = commit
;
1287 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1288 src_commits
, nr_src_commits
,
1291 for_each_string_list_item(item
, &src_tag
) {
1292 struct ref
*dst_ref
;
1293 struct ref
*ref
= item
->util
;
1294 struct commit
*commit
;
1296 if (is_null_oid(&ref
->new_oid
))
1298 commit
= lookup_commit_reference_gently(the_repository
,
1302 /* not pushing a commit, which is not an error */
1306 * Is this tag, which they do not have, reachable from
1307 * any of the commits we are sending?
1309 if (!(commit
->object
.flags
& reachable_flag
))
1313 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1314 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1315 dst_ref
->peer_ref
= copy_ref(ref
);
1318 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1320 free_commit_list(found_commits
);
1323 string_list_clear(&src_tag
, 0);
1324 free(sent_tips
.tip
);
1327 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1329 for ( ; list
; list
= list
->next
)
1330 if (!strcmp(list
->name
, name
))
1331 return (struct ref
*)list
;
1335 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1337 for ( ; ref
; ref
= ref
->next
)
1338 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1340 string_list_sort(ref_index
);
1344 * Given only the set of local refs, sanity-check the set of push
1345 * refspecs. We can't catch all errors that match_push_refs would,
1346 * but we can catch some errors early before even talking to the
1349 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1354 for (i
= 0; i
< rs
->nr
; i
++) {
1355 struct refspec_item
*item
= &rs
->items
[i
];
1357 if (item
->pattern
|| item
->matching
)
1360 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1367 * Given the set of refs the local repository has, the set of refs the
1368 * remote repository has, and the refspec used for push, determine
1369 * what remote refs we will update and with what value by setting
1370 * peer_ref (which object is being pushed) and force (if the push is
1371 * forced) in elements of "dst". The function may add new elements to
1372 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1374 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1375 struct refspec
*rs
, int flags
)
1377 int send_all
= flags
& MATCH_REFS_ALL
;
1378 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1379 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1381 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1382 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1384 /* If no refspec is provided, use the default ":" */
1386 refspec_append(rs
, ":");
1388 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1390 /* pick the remainder */
1391 for (ref
= src
; ref
; ref
= ref
->next
) {
1392 struct string_list_item
*dst_item
;
1393 struct ref
*dst_peer
;
1394 const struct refspec_item
*pat
= NULL
;
1397 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1401 if (!dst_ref_index
.nr
)
1402 prepare_ref_index(&dst_ref_index
, *dst
);
1404 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1405 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1407 if (dst_peer
->peer_ref
)
1408 /* We're already sending something to this ref. */
1411 if (pat
->matching
&& !(send_all
|| send_mirror
))
1413 * Remote doesn't have it, and we have no
1414 * explicit pattern, and we don't have
1415 * --all or --mirror.
1419 /* Create a new one and link it */
1420 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1421 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1422 string_list_insert(&dst_ref_index
,
1423 dst_peer
->name
)->util
= dst_peer
;
1425 dst_peer
->peer_ref
= copy_ref(ref
);
1426 dst_peer
->force
= pat
->force
;
1431 string_list_clear(&dst_ref_index
, 0);
1433 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1434 add_missing_tags(src
, dst
, &dst_tail
);
1437 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1438 /* check for missing refs on the remote */
1439 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1443 /* We're already sending something to this ref. */
1446 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1448 if (!src_ref_index
.nr
)
1449 prepare_ref_index(&src_ref_index
, src
);
1450 if (!string_list_has_string(&src_ref_index
,
1452 ref
->peer_ref
= alloc_delete_ref();
1456 string_list_clear(&src_ref_index
, 0);
1464 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1469 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1470 int force_ref_update
= ref
->force
|| force_update
;
1471 int reject_reason
= 0;
1474 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1475 else if (!send_mirror
)
1478 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1479 if (!ref
->deletion
&&
1480 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1481 ref
->status
= REF_STATUS_UPTODATE
;
1486 * If the remote ref has moved and is now different
1487 * from what we expect, reject any push.
1489 * It also is an error if the user told us to check
1490 * with the remote-tracking branch to find the value
1491 * to expect, but we did not have such a tracking
1494 if (ref
->expect_old_sha1
) {
1495 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1496 reject_reason
= REF_STATUS_REJECT_STALE
;
1498 /* If the ref isn't stale then force the update. */
1499 force_ref_update
= 1;
1503 * If the update isn't already rejected then check
1504 * the usual "must fast-forward" rules.
1506 * Decide whether an individual refspec A:B can be
1507 * pushed. The push will succeed if any of the
1508 * following are true:
1510 * (1) the remote reference B does not exist
1512 * (2) the remote reference B is being removed (i.e.,
1513 * pushing :B where no source is specified)
1515 * (3) the destination is not under refs/tags/, and
1516 * if the old and new value is a commit, the new
1517 * is a descendant of the old.
1519 * (4) it is forced using the +A:B notation, or by
1520 * passing the --force argument
1523 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1524 if (starts_with(ref
->name
, "refs/tags/"))
1525 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1526 else if (!has_object_file(&ref
->old_oid
))
1527 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1528 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1529 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1530 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1531 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1532 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1536 * "--force" will defeat any rejection implemented
1537 * by the rules above.
1539 if (!force_ref_update
)
1540 ref
->status
= reject_reason
;
1541 else if (reject_reason
)
1542 ref
->forced_update
= 1;
1546 static void set_merge(struct branch
*ret
)
1548 struct remote
*remote
;
1550 struct object_id oid
;
1554 return; /* no branch */
1556 return; /* already run */
1557 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1559 * no merge config; let's make sure we don't confuse callers
1560 * with a non-zero merge_nr but a NULL merge
1566 remote
= remote_get(ret
->remote_name
);
1568 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1569 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1570 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1571 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1572 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1573 strcmp(ret
->remote_name
, "."))
1575 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1577 ret
->merge
[i
]->dst
= ref
;
1579 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1583 struct branch
*branch_get(const char *name
)
1588 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1589 ret
= current_branch
;
1591 ret
= make_branch(name
, 0);
1596 int branch_has_merge_config(struct branch
*branch
)
1598 return branch
&& !!branch
->merge
;
1601 int branch_merge_matches(struct branch
*branch
,
1603 const char *refname
)
1605 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1607 return refname_match(branch
->merge
[i
]->src
, refname
);
1610 __attribute__((format (printf
,2,3)))
1611 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1616 strbuf_vaddf(err
, fmt
, ap
);
1622 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1625 return error_buf(err
, _("HEAD does not point to a branch"));
1627 if (!branch
->merge
|| !branch
->merge
[0]) {
1629 * no merge config; is it because the user didn't define any,
1630 * or because it is not a real branch, and get_branch
1633 if (!ref_exists(branch
->refname
))
1634 return error_buf(err
, _("no such branch: '%s'"),
1636 return error_buf(err
,
1637 _("no upstream configured for branch '%s'"),
1641 if (!branch
->merge
[0]->dst
)
1642 return error_buf(err
,
1643 _("upstream branch '%s' not stored as a remote-tracking branch"),
1644 branch
->merge
[0]->src
);
1646 return branch
->merge
[0]->dst
;
1649 static const char *tracking_for_push_dest(struct remote
*remote
,
1650 const char *refname
,
1655 ret
= apply_refspecs(&remote
->fetch
, refname
);
1657 return error_buf(err
,
1658 _("push destination '%s' on remote '%s' has no local tracking branch"),
1659 refname
, remote
->name
);
1663 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1665 struct remote
*remote
;
1667 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1669 return error_buf(err
,
1670 _("branch '%s' has no remote for pushing"),
1673 if (remote
->push
.nr
) {
1677 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1679 return error_buf(err
,
1680 _("push refspecs for '%s' do not include '%s'"),
1681 remote
->name
, branch
->name
);
1683 ret
= tracking_for_push_dest(remote
, dst
, err
);
1689 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1691 switch (push_default
) {
1692 case PUSH_DEFAULT_NOTHING
:
1693 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1695 case PUSH_DEFAULT_MATCHING
:
1696 case PUSH_DEFAULT_CURRENT
:
1697 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1699 case PUSH_DEFAULT_UPSTREAM
:
1700 return branch_get_upstream(branch
, err
);
1702 case PUSH_DEFAULT_UNSPECIFIED
:
1703 case PUSH_DEFAULT_SIMPLE
:
1705 const char *up
, *cur
;
1707 up
= branch_get_upstream(branch
, err
);
1710 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1713 if (strcmp(cur
, up
))
1714 return error_buf(err
,
1715 _("cannot resolve 'simple' push to a single destination"));
1720 BUG("unhandled push situation");
1723 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1726 return error_buf(err
, _("HEAD does not point to a branch"));
1728 if (!branch
->push_tracking_ref
)
1729 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1730 return branch
->push_tracking_ref
;
1733 static int ignore_symref_update(const char *refname
)
1737 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1738 return 0; /* non-existing refs are OK */
1739 return (flag
& REF_ISSYMREF
);
1743 * Create and return a list of (struct ref) consisting of copies of
1744 * each remote_ref that matches refspec. refspec must be a pattern.
1745 * Fill in the copies' peer_ref to describe the local tracking refs to
1746 * which they map. Omit any references that would map to an existing
1747 * local symbolic ref.
1749 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1750 const struct refspec_item
*refspec
)
1752 const struct ref
*ref
;
1753 struct ref
*ret
= NULL
;
1754 struct ref
**tail
= &ret
;
1756 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1757 char *expn_name
= NULL
;
1759 if (strchr(ref
->name
, '^'))
1760 continue; /* a dereference item */
1761 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1762 refspec
->dst
, &expn_name
) &&
1763 !ignore_symref_update(expn_name
)) {
1764 struct ref
*cpy
= copy_ref(ref
);
1766 cpy
->peer_ref
= alloc_ref(expn_name
);
1768 cpy
->peer_ref
->force
= 1;
1778 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1780 const struct ref
*ref
;
1781 const struct ref
*best_match
= NULL
;
1784 for (ref
= refs
; ref
; ref
= ref
->next
) {
1785 int score
= refname_match(name
, ref
->name
);
1787 if (best_score
< score
) {
1795 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1797 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1802 return copy_ref(ref
);
1805 static struct ref
*get_local_ref(const char *name
)
1807 if (!name
|| name
[0] == '\0')
1810 if (starts_with(name
, "refs/"))
1811 return alloc_ref(name
);
1813 if (starts_with(name
, "heads/") ||
1814 starts_with(name
, "tags/") ||
1815 starts_with(name
, "remotes/"))
1816 return alloc_ref_with_prefix("refs/", 5, name
);
1818 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1821 int get_fetch_map(const struct ref
*remote_refs
,
1822 const struct refspec_item
*refspec
,
1826 struct ref
*ref_map
, **rmp
;
1828 if (refspec
->pattern
) {
1829 ref_map
= get_expanded_map(remote_refs
, refspec
);
1831 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1833 if (refspec
->exact_sha1
) {
1834 ref_map
= alloc_ref(name
);
1835 get_oid_hex(name
, &ref_map
->old_oid
);
1836 ref_map
->exact_oid
= 1;
1838 ref_map
= get_remote_ref(remote_refs
, name
);
1840 if (!missing_ok
&& !ref_map
)
1841 die(_("couldn't find remote ref %s"), name
);
1843 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1844 if (ref_map
->peer_ref
&& refspec
->force
)
1845 ref_map
->peer_ref
->force
= 1;
1849 for (rmp
= &ref_map
; *rmp
; ) {
1850 if ((*rmp
)->peer_ref
) {
1851 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1852 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1853 struct ref
*ignore
= *rmp
;
1854 error(_("* Ignoring funny ref '%s' locally"),
1855 (*rmp
)->peer_ref
->name
);
1856 *rmp
= (*rmp
)->next
;
1857 free(ignore
->peer_ref
);
1862 rmp
= &((*rmp
)->next
);
1866 tail_link_ref(ref_map
, tail
);
1871 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1875 for (; list
; list
= list
->next
)
1876 if (!strcmp(ref
->symref
, list
->name
)) {
1877 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1884 * Compute the commit ahead/behind values for the pair branch_name, base.
1886 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1887 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1888 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1891 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1892 * does not exist). Returns 0 if the commits are identical. Returns 1 if
1893 * commits are different.
1896 static int stat_branch_pair(const char *branch_name
, const char *base
,
1897 int *num_ours
, int *num_theirs
,
1898 enum ahead_behind_flags abf
)
1900 struct object_id oid
;
1901 struct commit
*ours
, *theirs
;
1902 struct rev_info revs
;
1903 struct argv_array argv
= ARGV_ARRAY_INIT
;
1905 /* Cannot stat if what we used to build on no longer exists */
1906 if (read_ref(base
, &oid
))
1908 theirs
= lookup_commit_reference(the_repository
, &oid
);
1912 if (read_ref(branch_name
, &oid
))
1914 ours
= lookup_commit_reference(the_repository
, &oid
);
1918 *num_theirs
= *num_ours
= 0;
1920 /* are we the same? */
1923 if (abf
== AHEAD_BEHIND_QUICK
)
1925 if (abf
!= AHEAD_BEHIND_FULL
)
1926 BUG("stat_branch_pair: invalid abf '%d'", abf
);
1928 /* Run "rev-list --left-right ours...theirs" internally... */
1929 argv_array_push(&argv
, ""); /* ignored */
1930 argv_array_push(&argv
, "--left-right");
1931 argv_array_pushf(&argv
, "%s...%s",
1932 oid_to_hex(&ours
->object
.oid
),
1933 oid_to_hex(&theirs
->object
.oid
));
1934 argv_array_push(&argv
, "--");
1936 repo_init_revisions(the_repository
, &revs
, NULL
);
1937 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
1938 if (prepare_revision_walk(&revs
))
1939 die(_("revision walk setup failed"));
1941 /* ... and count the commits on each side. */
1943 struct commit
*c
= get_revision(&revs
);
1946 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1952 /* clear object flags smudged by the above traversal */
1953 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1954 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1956 argv_array_clear(&argv
);
1961 * Lookup the tracking branch for the given branch and if present, optionally
1962 * compute the commit ahead/behind values for the pair.
1964 * If for_push is true, the tracking branch refers to the push branch,
1965 * otherwise it refers to the upstream branch.
1967 * The name of the tracking branch (or NULL if it is not defined) is
1968 * returned via *tracking_name, if it is not itself NULL.
1970 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1971 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1972 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1975 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1976 * upstream defined, or ref does not exist). Returns 0 if the commits are
1977 * identical. Returns 1 if commits are different.
1979 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1980 const char **tracking_name
, int for_push
,
1981 enum ahead_behind_flags abf
)
1985 /* Cannot stat unless we are marked to build on top of somebody else. */
1986 base
= for_push
? branch_get_push(branch
, NULL
) :
1987 branch_get_upstream(branch
, NULL
);
1989 *tracking_name
= base
;
1993 return stat_branch_pair(branch
->refname
, base
, num_ours
, num_theirs
, abf
);
1997 * Return true when there is anything to report, otherwise false.
1999 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
2000 enum ahead_behind_flags abf
)
2002 int ours
, theirs
, sti
;
2003 const char *full_base
;
2005 int upstream_is_gone
= 0;
2007 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, 0, abf
);
2011 upstream_is_gone
= 1;
2014 base
= shorten_unambiguous_ref(full_base
, 0);
2015 if (upstream_is_gone
) {
2017 _("Your branch is based on '%s', but the upstream is gone.\n"),
2019 if (advice_status_hints
)
2021 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2024 _("Your branch is up to date with '%s'.\n"),
2026 } else if (abf
== AHEAD_BEHIND_QUICK
) {
2028 _("Your branch and '%s' refer to different commits.\n"),
2030 if (advice_status_hints
)
2031 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
2032 "git status --ahead-behind");
2033 } else if (!theirs
) {
2035 Q_("Your branch is ahead of '%s' by %d commit.\n",
2036 "Your branch is ahead of '%s' by %d commits.\n",
2039 if (advice_status_hints
)
2041 _(" (use \"git push\" to publish your local commits)\n"));
2044 Q_("Your branch is behind '%s' by %d commit, "
2045 "and can be fast-forwarded.\n",
2046 "Your branch is behind '%s' by %d commits, "
2047 "and can be fast-forwarded.\n",
2050 if (advice_status_hints
)
2052 _(" (use \"git pull\" to update your local branch)\n"));
2055 Q_("Your branch and '%s' have diverged,\n"
2056 "and have %d and %d different commit each, "
2058 "Your branch and '%s' have diverged,\n"
2059 "and have %d and %d different commits each, "
2062 base
, ours
, theirs
);
2063 if (advice_status_hints
)
2065 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2071 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2072 int flag
, void *cb_data
)
2074 struct ref
***local_tail
= cb_data
;
2077 /* we already know it starts with refs/ to get here */
2078 if (check_refname_format(refname
+ 5, 0))
2081 ref
= alloc_ref(refname
);
2082 oidcpy(&ref
->new_oid
, oid
);
2084 *local_tail
= &ref
->next
;
2088 struct ref
*get_local_heads(void)
2090 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2092 for_each_ref(one_local_ref
, &local_tail
);
2096 struct ref
*guess_remote_head(const struct ref
*head
,
2097 const struct ref
*refs
,
2100 const struct ref
*r
;
2101 struct ref
*list
= NULL
;
2102 struct ref
**tail
= &list
;
2108 * Some transports support directly peeking at
2109 * where HEAD points; if that is the case, then
2110 * we don't have to guess.
2113 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2115 /* If refs/heads/master could be right, it is. */
2117 r
= find_ref_by_name(refs
, "refs/heads/master");
2118 if (r
&& oideq(&r
->old_oid
, &head
->old_oid
))
2122 /* Look for another ref that points there */
2123 for (r
= refs
; r
; r
= r
->next
) {
2125 starts_with(r
->name
, "refs/heads/") &&
2126 oideq(&r
->old_oid
, &head
->old_oid
)) {
2127 *tail
= copy_ref(r
);
2128 tail
= &((*tail
)->next
);
2137 struct stale_heads_info
{
2138 struct string_list
*ref_names
;
2139 struct ref
**stale_refs_tail
;
2143 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2144 int flags
, void *cb_data
)
2146 struct stale_heads_info
*info
= cb_data
;
2147 struct string_list matches
= STRING_LIST_INIT_DUP
;
2148 struct refspec_item query
;
2150 memset(&query
, 0, sizeof(struct refspec_item
));
2151 query
.dst
= (char *)refname
;
2153 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2154 if (matches
.nr
== 0)
2155 goto clean_exit
; /* No matches */
2158 * If we did find a suitable refspec and it's not a symref and
2159 * it's not in the list of refs that currently exist in that
2160 * remote, we consider it to be stale. In order to deal with
2161 * overlapping refspecs, we need to go over all of the
2164 if (flags
& REF_ISSYMREF
)
2167 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2168 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2172 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2173 oidcpy(&ref
->new_oid
, oid
);
2177 string_list_clear(&matches
, 0);
2181 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2183 struct ref
*ref
, *stale_refs
= NULL
;
2184 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2185 struct stale_heads_info info
;
2187 info
.ref_names
= &ref_names
;
2188 info
.stale_refs_tail
= &stale_refs
;
2190 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2191 string_list_append(&ref_names
, ref
->name
);
2192 string_list_sort(&ref_names
);
2193 for_each_ref(get_stale_heads_cb
, &info
);
2194 string_list_clear(&ref_names
, 0);
2201 static void clear_cas_option(struct push_cas_option
*cas
)
2205 for (i
= 0; i
< cas
->nr
; i
++)
2206 free(cas
->entry
[i
].refname
);
2208 memset(cas
, 0, sizeof(*cas
));
2211 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2212 const char *refname
,
2215 struct push_cas
*entry
;
2216 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2217 entry
= &cas
->entry
[cas
->nr
++];
2218 memset(entry
, 0, sizeof(*entry
));
2219 entry
->refname
= xmemdupz(refname
, refnamelen
);
2223 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2226 struct push_cas
*entry
;
2229 /* "--no-<option>" */
2230 clear_cas_option(cas
);
2235 /* just "--<option>" */
2236 cas
->use_tracking_for_rest
= 1;
2240 /* "--<option>=refname" or "--<option>=refname:value" */
2241 colon
= strchrnul(arg
, ':');
2242 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2244 entry
->use_tracking
= 1;
2246 oidclr(&entry
->expect
);
2247 else if (get_oid(colon
+ 1, &entry
->expect
))
2248 return error(_("cannot parse expected object name '%s'"),
2253 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2255 return parse_push_cas_option(opt
->value
, arg
, unset
);
2258 int is_empty_cas(const struct push_cas_option
*cas
)
2260 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2264 * Look at remote.fetch refspec and see if we have a remote
2265 * tracking branch for the refname there. Fill its current
2267 * If we cannot do so, return negative to signal an error.
2269 static int remote_tracking(struct remote
*remote
, const char *refname
,
2270 struct object_id
*oid
)
2274 dst
= apply_refspecs(&remote
->fetch
, refname
);
2276 return -1; /* no tracking ref for refname at remote */
2277 if (read_ref(dst
, oid
))
2278 return -1; /* we know what the tracking ref is but we cannot read it */
2282 static void apply_cas(struct push_cas_option
*cas
,
2283 struct remote
*remote
,
2288 /* Find an explicit --<option>=<name>[:<value>] entry */
2289 for (i
= 0; i
< cas
->nr
; i
++) {
2290 struct push_cas
*entry
= &cas
->entry
[i
];
2291 if (!refname_match(entry
->refname
, ref
->name
))
2293 ref
->expect_old_sha1
= 1;
2294 if (!entry
->use_tracking
)
2295 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2296 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2297 oidclr(&ref
->old_oid_expect
);
2301 /* Are we using "--<option>" to cover all? */
2302 if (!cas
->use_tracking_for_rest
)
2305 ref
->expect_old_sha1
= 1;
2306 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2307 oidclr(&ref
->old_oid_expect
);
2310 void apply_push_cas(struct push_cas_option
*cas
,
2311 struct remote
*remote
,
2312 struct ref
*remote_refs
)
2315 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2316 apply_cas(cas
, remote
, ref
);