11 #include "string-list.h"
12 #include "mergesort.h"
13 #include "argv-array.h"
15 enum map_direction
{ FROM_SRC
, FROM_DST
};
17 struct counted_string
{
24 struct counted_string
*instead_of
;
29 struct rewrite
**rewrite
;
34 static struct remote
**remotes
;
35 static int remotes_alloc
;
36 static int remotes_nr
;
37 static struct hashmap remotes_hash
;
39 static struct branch
**branches
;
40 static int branches_alloc
;
41 static int branches_nr
;
43 static struct branch
*current_branch
;
44 static const char *pushremote_name
;
46 static struct rewrites rewrites
;
47 static struct rewrites rewrites_push
;
49 static int valid_remote(const struct remote
*remote
)
51 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
54 static const char *alias_url(const char *url
, struct rewrites
*r
)
57 struct counted_string
*longest
;
62 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
65 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
66 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
68 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
69 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
77 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
80 static void add_url(struct remote
*remote
, const char *url
)
82 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
83 remote
->url
[remote
->url_nr
++] = url
;
86 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
88 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
89 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
92 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
94 const char *pushurl
= alias_url(url
, &rewrites_push
);
96 add_pushurl(remote
, pushurl
);
99 static void add_url_alias(struct remote
*remote
, const char *url
)
101 add_url(remote
, alias_url(url
, &rewrites
));
102 add_pushurl_alias(remote
, url
);
105 struct remotes_hash_key
{
110 static int remotes_hash_cmp(const void *unused_cmp_data
,
112 const void *entry_or_key
,
115 const struct remote
*a
= entry
;
116 const struct remote
*b
= entry_or_key
;
117 const struct remotes_hash_key
*key
= keydata
;
120 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
122 return strcmp(a
->name
, b
->name
);
125 static inline void init_remotes_hash(void)
127 if (!remotes_hash
.cmpfn
)
128 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
131 static struct remote
*make_remote(const char *name
, int len
)
133 struct remote
*ret
, *replaced
;
134 struct remotes_hash_key lookup
;
135 struct hashmap_entry lookup_entry
;
143 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
145 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
148 ret
= xcalloc(1, sizeof(struct remote
));
149 ret
->prune
= -1; /* unspecified */
150 ret
->prune_tags
= -1; /* unspecified */
151 ret
->name
= xstrndup(name
, len
);
152 refspec_init(&ret
->push
, REFSPEC_PUSH
);
153 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
155 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
156 remotes
[remotes_nr
++] = ret
;
158 hashmap_entry_init(ret
, lookup_entry
.hash
);
159 replaced
= hashmap_put(&remotes_hash
, ret
);
160 assert(replaced
== NULL
); /* no previous entry overwritten */
164 static void add_merge(struct branch
*branch
, const char *name
)
166 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
167 branch
->merge_alloc
);
168 branch
->merge_name
[branch
->merge_nr
++] = name
;
171 static struct branch
*make_branch(const char *name
, int len
)
176 for (i
= 0; i
< branches_nr
; i
++) {
177 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
178 !branches
[i
]->name
[len
]) :
179 !strcmp(name
, branches
[i
]->name
))
183 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
184 ret
= xcalloc(1, sizeof(struct branch
));
185 branches
[branches_nr
++] = ret
;
187 ret
->name
= xstrndup(name
, len
);
189 ret
->name
= xstrdup(name
);
190 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
195 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
200 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
202 ? (len
== r
->rewrite
[i
]->baselen
&&
203 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
204 : !strcmp(base
, r
->rewrite
[i
]->base
))
205 return r
->rewrite
[i
];
208 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
209 ret
= xcalloc(1, sizeof(struct rewrite
));
210 r
->rewrite
[r
->rewrite_nr
++] = ret
;
212 ret
->base
= xstrndup(base
, len
);
216 ret
->base
= xstrdup(base
);
217 ret
->baselen
= strlen(base
);
222 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
224 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
225 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
226 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
227 rewrite
->instead_of_nr
++;
230 static const char *skip_spaces(const char *s
)
237 static void read_remotes_file(struct remote
*remote
)
239 struct strbuf buf
= STRBUF_INIT
;
240 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
244 remote
->configured_in_repo
= 1;
245 remote
->origin
= REMOTE_REMOTES
;
246 while (strbuf_getline(&buf
, f
) != EOF
) {
251 if (skip_prefix(buf
.buf
, "URL:", &v
))
252 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
253 else if (skip_prefix(buf
.buf
, "Push:", &v
))
254 refspec_append(&remote
->push
, skip_spaces(v
));
255 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
256 refspec_append(&remote
->fetch
, skip_spaces(v
));
258 strbuf_release(&buf
);
262 static void read_branches_file(struct remote
*remote
)
265 struct strbuf buf
= STRBUF_INIT
;
266 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
271 strbuf_getline_lf(&buf
, f
);
275 strbuf_release(&buf
);
279 remote
->configured_in_repo
= 1;
280 remote
->origin
= REMOTE_BRANCHES
;
283 * The branches file would have URL and optionally
284 * #branch specified. The "master" (or specified) branch is
285 * fetched and stored in the local branch matching the
288 frag
= strchr(buf
.buf
, '#');
294 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
295 strbuf_addf(&buf
, "refs/heads/%s:refs/heads/%s",
297 refspec_append(&remote
->fetch
, buf
.buf
);
300 * Cogito compatible push: push current HEAD to remote #branch
301 * (master if missing)
304 strbuf_addf(&buf
, "HEAD:refs/heads/%s", frag
);
305 refspec_append(&remote
->push
, buf
.buf
);
306 remote
->fetch_tags
= 1; /* always auto-follow */
307 strbuf_release(&buf
);
310 static int handle_config(const char *key
, const char *value
, void *cb
)
315 struct remote
*remote
;
316 struct branch
*branch
;
317 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
320 branch
= make_branch(name
, namelen
);
321 if (!strcmp(subkey
, "remote")) {
322 return git_config_string(&branch
->remote_name
, key
, value
);
323 } else if (!strcmp(subkey
, "pushremote")) {
324 return git_config_string(&branch
->pushremote_name
, key
, value
);
325 } else if (!strcmp(subkey
, "merge")) {
327 return config_error_nonbool(key
);
328 add_merge(branch
, xstrdup(value
));
332 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
333 struct rewrite
*rewrite
;
336 if (!strcmp(subkey
, "insteadof")) {
337 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
339 return config_error_nonbool(key
);
340 add_instead_of(rewrite
, xstrdup(value
));
341 } else if (!strcmp(subkey
, "pushinsteadof")) {
342 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
344 return config_error_nonbool(key
);
345 add_instead_of(rewrite
, xstrdup(value
));
349 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
352 /* Handle remote.* variables */
353 if (!name
&& !strcmp(subkey
, "pushdefault"))
354 return git_config_string(&pushremote_name
, key
, value
);
358 /* Handle remote.<name>.* variables */
360 warning("Config remote shorthand cannot begin with '/': %s",
364 remote
= make_remote(name
, namelen
);
365 remote
->origin
= REMOTE_CONFIG
;
366 if (current_config_scope() == CONFIG_SCOPE_REPO
)
367 remote
->configured_in_repo
= 1;
368 if (!strcmp(subkey
, "mirror"))
369 remote
->mirror
= git_config_bool(key
, value
);
370 else if (!strcmp(subkey
, "skipdefaultupdate"))
371 remote
->skip_default_update
= git_config_bool(key
, value
);
372 else if (!strcmp(subkey
, "skipfetchall"))
373 remote
->skip_default_update
= git_config_bool(key
, value
);
374 else if (!strcmp(subkey
, "prune"))
375 remote
->prune
= git_config_bool(key
, value
);
376 else if (!strcmp(subkey
, "prunetags"))
377 remote
->prune_tags
= git_config_bool(key
, value
);
378 else if (!strcmp(subkey
, "url")) {
380 if (git_config_string(&v
, key
, value
))
383 } else if (!strcmp(subkey
, "pushurl")) {
385 if (git_config_string(&v
, key
, value
))
387 add_pushurl(remote
, v
);
388 } else if (!strcmp(subkey
, "push")) {
390 if (git_config_string(&v
, key
, value
))
392 refspec_append(&remote
->push
, v
);
394 } else if (!strcmp(subkey
, "fetch")) {
396 if (git_config_string(&v
, key
, value
))
398 refspec_append(&remote
->fetch
, v
);
400 } else if (!strcmp(subkey
, "receivepack")) {
402 if (git_config_string(&v
, key
, value
))
404 if (!remote
->receivepack
)
405 remote
->receivepack
= v
;
407 error("more than one receivepack given, using the first");
408 } else if (!strcmp(subkey
, "uploadpack")) {
410 if (git_config_string(&v
, key
, value
))
412 if (!remote
->uploadpack
)
413 remote
->uploadpack
= v
;
415 error("more than one uploadpack given, using the first");
416 } else if (!strcmp(subkey
, "tagopt")) {
417 if (!strcmp(value
, "--no-tags"))
418 remote
->fetch_tags
= -1;
419 else if (!strcmp(value
, "--tags"))
420 remote
->fetch_tags
= 2;
421 } else if (!strcmp(subkey
, "proxy")) {
422 return git_config_string((const char **)&remote
->http_proxy
,
424 } else if (!strcmp(subkey
, "proxyauthmethod")) {
425 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
427 } else if (!strcmp(subkey
, "vcs")) {
428 return git_config_string(&remote
->foreign_vcs
, key
, value
);
433 static void alias_all_urls(void)
436 for (i
= 0; i
< remotes_nr
; i
++) {
437 int add_pushurl_aliases
;
440 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
441 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
443 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
444 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
445 if (add_pushurl_aliases
)
446 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
447 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
452 static void read_config(void)
461 current_branch
= NULL
;
462 if (startup_info
->have_repository
) {
463 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
464 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
465 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
466 current_branch
= make_branch(head_ref
, 0);
469 git_config(handle_config
, NULL
);
473 static int valid_remote_nick(const char *name
)
475 if (!name
[0] || is_dot_or_dotdot(name
))
478 /* remote nicknames cannot contain slashes */
480 if (is_dir_sep(*name
++))
485 const char *remote_for_branch(struct branch
*branch
, int *explicit)
487 if (branch
&& branch
->remote_name
) {
490 return branch
->remote_name
;
497 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
499 if (branch
&& branch
->pushremote_name
) {
502 return branch
->pushremote_name
;
504 if (pushremote_name
) {
507 return pushremote_name
;
509 return remote_for_branch(branch
, explicit);
512 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
,
517 if (branch
->merge_nr
) {
520 return branch
->merge_name
[0];
523 const char *dst
, *remote_name
=
524 pushremote_for_branch(branch
, NULL
);
525 struct remote
*remote
= remote_get(remote_name
);
527 if (remote
&& remote
->push
.nr
&&
528 (dst
= apply_refspecs(remote
->push
.items
,
542 static struct remote
*remote_get_1(const char *name
,
543 const char *(*get_default
)(struct branch
*, int *))
553 name
= get_default(current_branch
, &name_given
);
555 ret
= make_remote(name
, 0);
556 if (valid_remote_nick(name
) && have_git_dir()) {
557 if (!valid_remote(ret
))
558 read_remotes_file(ret
);
559 if (!valid_remote(ret
))
560 read_branches_file(ret
);
562 if (name_given
&& !valid_remote(ret
))
563 add_url_alias(ret
, name
);
564 if (!valid_remote(ret
))
569 struct remote
*remote_get(const char *name
)
571 return remote_get_1(name
, remote_for_branch
);
574 struct remote
*pushremote_get(const char *name
)
576 return remote_get_1(name
, pushremote_for_branch
);
579 int remote_is_configured(struct remote
*remote
, int in_repo
)
584 return remote
->configured_in_repo
;
585 return !!remote
->origin
;
588 int for_each_remote(each_remote_fn fn
, void *priv
)
592 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
593 struct remote
*r
= remotes
[i
];
596 result
= fn(r
, priv
);
601 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
603 if (strcmp(ref1
->name
, ref2
->name
)) {
604 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
605 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
606 die(_("Cannot fetch both %s and %s to %s"),
607 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
608 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
609 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
610 warning(_("%s usually tracks %s, not %s"),
611 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
612 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
613 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
614 die(_("%s tracks both %s and %s"),
615 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
618 * This last possibility doesn't occur because
619 * FETCH_HEAD_IGNORE entries always appear at
620 * the end of the list.
622 die(_("Internal error"));
625 free(ref2
->peer_ref
);
629 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
631 struct string_list refs
= STRING_LIST_INIT_NODUP
;
632 struct ref
*retval
= NULL
;
633 struct ref
**p
= &retval
;
636 struct ref
*ref
= ref_map
;
638 ref_map
= ref_map
->next
;
641 if (!ref
->peer_ref
) {
645 struct string_list_item
*item
=
646 string_list_insert(&refs
, ref
->peer_ref
->name
);
649 /* Entry already existed */
650 handle_duplicate((struct ref
*)item
->util
, ref
);
659 string_list_clear(&refs
, 0);
663 int remote_has_url(struct remote
*remote
, const char *url
)
666 for (i
= 0; i
< remote
->url_nr
; i
++) {
667 if (!strcmp(remote
->url
[i
], url
))
673 static int match_name_with_pattern(const char *key
, const char *name
,
674 const char *value
, char **result
)
676 const char *kstar
= strchr(key
, '*');
682 die("Key '%s' of pattern had no '*'", key
);
684 ksuffixlen
= strlen(kstar
+ 1);
685 namelen
= strlen(name
);
686 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
687 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
689 struct strbuf sb
= STRBUF_INIT
;
690 const char *vstar
= strchr(value
, '*');
692 die("Value '%s' of pattern has no '*'", value
);
693 strbuf_add(&sb
, value
, vstar
- value
);
694 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
695 strbuf_addstr(&sb
, vstar
+ 1);
696 *result
= strbuf_detach(&sb
, NULL
);
701 static void query_refspecs_multiple(struct refspec_item
*refs
, int ref_count
, struct refspec_item
*query
, struct string_list
*results
)
704 int find_src
= !query
->src
;
706 if (find_src
&& !query
->dst
)
707 error("query_refspecs_multiple: need either src or dst");
709 for (i
= 0; i
< ref_count
; i
++) {
710 struct refspec_item
*refspec
= &refs
[i
];
711 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
712 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
713 const char *needle
= find_src
? query
->dst
: query
->src
;
714 char **result
= find_src
? &query
->src
: &query
->dst
;
718 if (refspec
->pattern
) {
719 if (match_name_with_pattern(key
, needle
, value
, result
))
720 string_list_append_nodup(results
, *result
);
721 } else if (!strcmp(needle
, key
)) {
722 string_list_append(results
, value
);
727 int query_refspecs(struct refspec_item
*refs
, int ref_count
, struct refspec_item
*query
)
730 int find_src
= !query
->src
;
731 const char *needle
= find_src
? query
->dst
: query
->src
;
732 char **result
= find_src
? &query
->src
: &query
->dst
;
734 if (find_src
&& !query
->dst
)
735 return error("query_refspecs: need either src or dst");
737 for (i
= 0; i
< ref_count
; i
++) {
738 struct refspec_item
*refspec
= &refs
[i
];
739 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
740 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
744 if (refspec
->pattern
) {
745 if (match_name_with_pattern(key
, needle
, value
, result
)) {
746 query
->force
= refspec
->force
;
749 } else if (!strcmp(needle
, key
)) {
750 *result
= xstrdup(value
);
751 query
->force
= refspec
->force
;
758 char *apply_refspecs(struct refspec_item
*refspecs
, int nr_refspec
,
761 struct refspec_item query
;
763 memset(&query
, 0, sizeof(struct refspec_item
));
764 query
.src
= (char *)name
;
766 if (query_refspecs(refspecs
, nr_refspec
, &query
))
772 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
774 return query_refspecs(remote
->fetch
.items
, remote
->fetch
.nr
, refspec
);
777 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
780 size_t len
= strlen(name
);
781 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
782 memcpy(ref
->name
, prefix
, prefixlen
);
783 memcpy(ref
->name
+ prefixlen
, name
, len
);
787 struct ref
*alloc_ref(const char *name
)
789 return alloc_ref_with_prefix("", 0, name
);
792 struct ref
*copy_ref(const struct ref
*ref
)
798 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
800 memcpy(cpy
, ref
, len
);
802 cpy
->symref
= xstrdup_or_null(ref
->symref
);
803 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
804 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
808 struct ref
*copy_ref_list(const struct ref
*ref
)
810 struct ref
*ret
= NULL
;
811 struct ref
**tail
= &ret
;
813 *tail
= copy_ref(ref
);
815 tail
= &((*tail
)->next
);
820 static void free_ref(struct ref
*ref
)
824 free_ref(ref
->peer_ref
);
825 free(ref
->remote_status
);
830 void free_refs(struct ref
*ref
)
840 int ref_compare_name(const void *va
, const void *vb
)
842 const struct ref
*a
= va
, *b
= vb
;
843 return strcmp(a
->name
, b
->name
);
846 static void *ref_list_get_next(const void *a
)
848 return ((const struct ref
*)a
)->next
;
851 static void ref_list_set_next(void *a
, void *next
)
853 ((struct ref
*)a
)->next
= next
;
856 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
858 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
861 int count_refspec_match(const char *pattern
,
863 struct ref
**matched_ref
)
865 int patlen
= strlen(pattern
);
866 struct ref
*matched_weak
= NULL
;
867 struct ref
*matched
= NULL
;
871 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
872 char *name
= refs
->name
;
873 int namelen
= strlen(name
);
875 if (!refname_match(pattern
, name
))
878 /* A match is "weak" if it is with refs outside
879 * heads or tags, and did not specify the pattern
880 * in full (e.g. "refs/remotes/origin/master") or at
881 * least from the toplevel (e.g. "remotes/origin/master");
882 * otherwise "git push $URL master" would result in
883 * ambiguity between remotes/origin/master and heads/master
884 * at the remote site.
886 if (namelen
!= patlen
&&
887 patlen
!= namelen
- 5 &&
888 !starts_with(name
, "refs/heads/") &&
889 !starts_with(name
, "refs/tags/")) {
890 /* We want to catch the case where only weak
891 * matches are found and there are multiple
892 * matches, and where more than one strong
893 * matches are found, as ambiguous. One
894 * strong match with zero or more weak matches
895 * are acceptable as a unique match.
907 *matched_ref
= matched_weak
;
912 *matched_ref
= matched
;
917 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
925 static struct ref
*alloc_delete_ref(void)
927 struct ref
*ref
= alloc_ref("(delete)");
928 oidclr(&ref
->new_oid
);
932 static int try_explicit_object_name(const char *name
,
935 struct object_id oid
;
939 *match
= alloc_delete_ref();
943 if (get_oid(name
, &oid
))
947 *match
= alloc_ref(name
);
948 oidcpy(&(*match
)->new_oid
, &oid
);
953 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
955 struct ref
*ret
= alloc_ref(name
);
956 tail_link_ref(ret
, tail
);
960 static char *guess_ref(const char *name
, struct ref
*peer
)
962 struct strbuf buf
= STRBUF_INIT
;
964 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
969 if (starts_with(r
, "refs/heads/"))
970 strbuf_addstr(&buf
, "refs/heads/");
971 else if (starts_with(r
, "refs/tags/"))
972 strbuf_addstr(&buf
, "refs/tags/");
976 strbuf_addstr(&buf
, name
);
977 return strbuf_detach(&buf
, NULL
);
980 static int match_explicit_lhs(struct ref
*src
,
981 struct refspec_item
*rs
,
983 int *allocated_match
)
985 switch (count_refspec_match(rs
->src
, src
, match
)) {
988 *allocated_match
= 0;
991 /* The source could be in the get_sha1() format
992 * not a reference name. :refs/other is a
993 * way to delete 'other' ref at the remote end.
995 if (try_explicit_object_name(rs
->src
, match
) < 0)
996 return error("src refspec %s does not match any.", rs
->src
);
998 *allocated_match
= 1;
1001 return error("src refspec %s matches more than one.", rs
->src
);
1005 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1006 struct ref
***dst_tail
,
1007 struct refspec_item
*rs
)
1009 struct ref
*matched_src
, *matched_dst
;
1012 const char *dst_value
= rs
->dst
;
1015 if (rs
->pattern
|| rs
->matching
)
1018 matched_src
= matched_dst
= NULL
;
1019 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1025 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1026 RESOLVE_REF_READING
,
1029 ((flag
& REF_ISSYMREF
) &&
1030 !starts_with(dst_value
, "refs/heads/")))
1031 die("%s cannot be resolved to branch.",
1035 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1039 if (starts_with(dst_value
, "refs/"))
1040 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1041 else if (is_null_oid(&matched_src
->new_oid
))
1042 error("unable to delete '%s': remote ref does not exist",
1044 else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1045 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1048 error("unable to push to unqualified destination: %s\n"
1049 "The destination refspec neither matches an "
1050 "existing ref on the remote nor\n"
1051 "begins with refs/, and we are unable to "
1052 "guess a prefix based on the source ref.",
1057 error("dst refspec %s matches more than one.",
1063 if (matched_dst
->peer_ref
)
1064 return error("dst ref %s receives from more than one src.",
1067 matched_dst
->peer_ref
= allocated_src
?
1069 copy_ref(matched_src
);
1070 matched_dst
->force
= rs
->force
;
1075 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1076 struct ref
***dst_tail
, struct refspec_item
*rs
,
1080 for (i
= errs
= 0; i
< rs_nr
; i
++)
1081 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1085 static char *get_ref_match(const struct refspec_item
*rs
, int rs_nr
, const struct ref
*ref
,
1086 int send_mirror
, int direction
, const struct refspec_item
**ret_pat
)
1088 const struct refspec_item
*pat
;
1091 int matching_refs
= -1;
1092 for (i
= 0; i
< rs_nr
; i
++) {
1093 if (rs
[i
].matching
&&
1094 (matching_refs
== -1 || rs
[i
].force
)) {
1099 if (rs
[i
].pattern
) {
1100 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1102 if (direction
== FROM_SRC
)
1103 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1105 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1112 if (matching_refs
== -1)
1115 pat
= rs
+ matching_refs
;
1116 if (pat
->matching
) {
1118 * "matching refs"; traditionally we pushed everything
1119 * including refs outside refs/heads/ hierarchy, but
1120 * that does not make much sense these days.
1122 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1124 name
= xstrdup(ref
->name
);
1131 static struct ref
**tail_ref(struct ref
**head
)
1133 struct ref
**tail
= head
;
1135 tail
= &((*tail
)->next
);
1140 struct commit
**tip
;
1144 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1146 struct commit
*commit
;
1148 if (is_null_oid(oid
))
1150 commit
= lookup_commit_reference_gently(oid
, 1);
1151 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1153 commit
->object
.flags
|= TMP_MARK
;
1154 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1155 tips
->tip
[tips
->nr
++] = commit
;
1158 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1160 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1161 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1162 struct string_list_item
*item
;
1164 struct tips sent_tips
;
1167 * Collect everything we know they would have at the end of
1168 * this push, and collect all tags they have.
1170 memset(&sent_tips
, 0, sizeof(sent_tips
));
1171 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1172 if (ref
->peer_ref
&&
1173 !is_null_oid(&ref
->peer_ref
->new_oid
))
1174 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1176 add_to_tips(&sent_tips
, &ref
->old_oid
);
1177 if (starts_with(ref
->name
, "refs/tags/"))
1178 string_list_append(&dst_tag
, ref
->name
);
1180 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1182 string_list_sort(&dst_tag
);
1184 /* Collect tags they do not have. */
1185 for (ref
= src
; ref
; ref
= ref
->next
) {
1186 if (!starts_with(ref
->name
, "refs/tags/"))
1187 continue; /* not a tag */
1188 if (string_list_has_string(&dst_tag
, ref
->name
))
1189 continue; /* they already have it */
1190 if (oid_object_info(&ref
->new_oid
, NULL
) != OBJ_TAG
)
1191 continue; /* be conservative */
1192 item
= string_list_append(&src_tag
, ref
->name
);
1195 string_list_clear(&dst_tag
, 0);
1198 * At this point, src_tag lists tags that are missing from
1199 * dst, and sent_tips lists the tips we are pushing or those
1200 * that we know they already have. An element in the src_tag
1201 * that is an ancestor of any of the sent_tips needs to be
1202 * sent to the other side.
1205 for_each_string_list_item(item
, &src_tag
) {
1206 struct ref
*ref
= item
->util
;
1207 struct ref
*dst_ref
;
1208 struct commit
*commit
;
1210 if (is_null_oid(&ref
->new_oid
))
1212 commit
= lookup_commit_reference_gently(&ref
->new_oid
,
1215 /* not pushing a commit, which is not an error */
1219 * Is this tag, which they do not have, reachable from
1220 * any of the commits we are sending?
1222 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1226 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1227 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1228 dst_ref
->peer_ref
= copy_ref(ref
);
1231 string_list_clear(&src_tag
, 0);
1232 free(sent_tips
.tip
);
1235 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1237 for ( ; list
; list
= list
->next
)
1238 if (!strcmp(list
->name
, name
))
1239 return (struct ref
*)list
;
1243 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1245 for ( ; ref
; ref
= ref
->next
)
1246 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1248 string_list_sort(ref_index
);
1252 * Given only the set of local refs, sanity-check the set of push
1253 * refspecs. We can't catch all errors that match_push_refs would,
1254 * but we can catch some errors early before even talking to the
1257 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1259 struct refspec refspec
= REFSPEC_INIT_PUSH
;
1263 refspec_appendn(&refspec
, refspec_names
, nr_refspec
);
1265 for (i
= 0; i
< refspec
.nr
; i
++) {
1266 struct refspec_item
*rs
= &refspec
.items
[i
];
1268 if (rs
->pattern
|| rs
->matching
)
1271 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1274 refspec_clear(&refspec
);
1279 * Given the set of refs the local repository has, the set of refs the
1280 * remote repository has, and the refspec used for push, determine
1281 * what remote refs we will update and with what value by setting
1282 * peer_ref (which object is being pushed) and force (if the push is
1283 * forced) in elements of "dst". The function may add new elements to
1284 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1286 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1287 int nr_refspec
, const char **refspec
, int flags
)
1289 struct refspec rs
= REFSPEC_INIT_PUSH
;
1290 int send_all
= flags
& MATCH_REFS_ALL
;
1291 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1292 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1294 static const char *default_refspec
[] = { ":", NULL
};
1295 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1296 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1300 refspec
= default_refspec
;
1302 refspec_appendn(&rs
, refspec
, nr_refspec
);
1303 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
.items
, rs
.nr
);
1305 /* pick the remainder */
1306 for (ref
= src
; ref
; ref
= ref
->next
) {
1307 struct string_list_item
*dst_item
;
1308 struct ref
*dst_peer
;
1309 const struct refspec_item
*pat
= NULL
;
1312 dst_name
= get_ref_match(rs
.items
, rs
.nr
, ref
, send_mirror
, FROM_SRC
, &pat
);
1316 if (!dst_ref_index
.nr
)
1317 prepare_ref_index(&dst_ref_index
, *dst
);
1319 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1320 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1322 if (dst_peer
->peer_ref
)
1323 /* We're already sending something to this ref. */
1326 if (pat
->matching
&& !(send_all
|| send_mirror
))
1328 * Remote doesn't have it, and we have no
1329 * explicit pattern, and we don't have
1330 * --all or --mirror.
1334 /* Create a new one and link it */
1335 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1336 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1337 string_list_insert(&dst_ref_index
,
1338 dst_peer
->name
)->util
= dst_peer
;
1340 dst_peer
->peer_ref
= copy_ref(ref
);
1341 dst_peer
->force
= pat
->force
;
1346 string_list_clear(&dst_ref_index
, 0);
1348 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1349 add_missing_tags(src
, dst
, &dst_tail
);
1352 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1353 /* check for missing refs on the remote */
1354 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1358 /* We're already sending something to this ref. */
1361 src_name
= get_ref_match(rs
.items
, rs
.nr
, ref
, send_mirror
, FROM_DST
, NULL
);
1363 if (!src_ref_index
.nr
)
1364 prepare_ref_index(&src_ref_index
, src
);
1365 if (!string_list_has_string(&src_ref_index
,
1367 ref
->peer_ref
= alloc_delete_ref();
1371 string_list_clear(&src_ref_index
, 0);
1381 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1386 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1387 int force_ref_update
= ref
->force
|| force_update
;
1388 int reject_reason
= 0;
1391 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1392 else if (!send_mirror
)
1395 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1396 if (!ref
->deletion
&&
1397 !oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
1398 ref
->status
= REF_STATUS_UPTODATE
;
1403 * If the remote ref has moved and is now different
1404 * from what we expect, reject any push.
1406 * It also is an error if the user told us to check
1407 * with the remote-tracking branch to find the value
1408 * to expect, but we did not have such a tracking
1411 if (ref
->expect_old_sha1
) {
1412 if (oidcmp(&ref
->old_oid
, &ref
->old_oid_expect
))
1413 reject_reason
= REF_STATUS_REJECT_STALE
;
1415 /* If the ref isn't stale then force the update. */
1416 force_ref_update
= 1;
1420 * If the update isn't already rejected then check
1421 * the usual "must fast-forward" rules.
1423 * Decide whether an individual refspec A:B can be
1424 * pushed. The push will succeed if any of the
1425 * following are true:
1427 * (1) the remote reference B does not exist
1429 * (2) the remote reference B is being removed (i.e.,
1430 * pushing :B where no source is specified)
1432 * (3) the destination is not under refs/tags/, and
1433 * if the old and new value is a commit, the new
1434 * is a descendant of the old.
1436 * (4) it is forced using the +A:B notation, or by
1437 * passing the --force argument
1440 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1441 if (starts_with(ref
->name
, "refs/tags/"))
1442 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1443 else if (!has_object_file(&ref
->old_oid
))
1444 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1445 else if (!lookup_commit_reference_gently(&ref
->old_oid
, 1) ||
1446 !lookup_commit_reference_gently(&ref
->new_oid
, 1))
1447 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1448 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1449 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1453 * "--force" will defeat any rejection implemented
1454 * by the rules above.
1456 if (!force_ref_update
)
1457 ref
->status
= reject_reason
;
1458 else if (reject_reason
)
1459 ref
->forced_update
= 1;
1463 static void set_merge(struct branch
*ret
)
1465 struct remote
*remote
;
1467 struct object_id oid
;
1471 return; /* no branch */
1473 return; /* already run */
1474 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1476 * no merge config; let's make sure we don't confuse callers
1477 * with a non-zero merge_nr but a NULL merge
1483 remote
= remote_get(ret
->remote_name
);
1485 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1486 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1487 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1488 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1489 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1490 strcmp(ret
->remote_name
, "."))
1492 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1494 ret
->merge
[i
]->dst
= ref
;
1496 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1500 struct branch
*branch_get(const char *name
)
1505 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1506 ret
= current_branch
;
1508 ret
= make_branch(name
, 0);
1513 int branch_has_merge_config(struct branch
*branch
)
1515 return branch
&& !!branch
->merge
;
1518 int branch_merge_matches(struct branch
*branch
,
1520 const char *refname
)
1522 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1524 return refname_match(branch
->merge
[i
]->src
, refname
);
1527 __attribute__((format (printf
,2,3)))
1528 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1533 strbuf_vaddf(err
, fmt
, ap
);
1539 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1542 return error_buf(err
, _("HEAD does not point to a branch"));
1544 if (!branch
->merge
|| !branch
->merge
[0]) {
1546 * no merge config; is it because the user didn't define any,
1547 * or because it is not a real branch, and get_branch
1550 if (!ref_exists(branch
->refname
))
1551 return error_buf(err
, _("no such branch: '%s'"),
1553 return error_buf(err
,
1554 _("no upstream configured for branch '%s'"),
1558 if (!branch
->merge
[0]->dst
)
1559 return error_buf(err
,
1560 _("upstream branch '%s' not stored as a remote-tracking branch"),
1561 branch
->merge
[0]->src
);
1563 return branch
->merge
[0]->dst
;
1566 static const char *tracking_for_push_dest(struct remote
*remote
,
1567 const char *refname
,
1572 ret
= apply_refspecs(remote
->fetch
.items
, remote
->fetch
.nr
, refname
);
1574 return error_buf(err
,
1575 _("push destination '%s' on remote '%s' has no local tracking branch"),
1576 refname
, remote
->name
);
1580 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1582 struct remote
*remote
;
1584 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1586 return error_buf(err
,
1587 _("branch '%s' has no remote for pushing"),
1590 if (remote
->push
.nr
) {
1594 dst
= apply_refspecs(remote
->push
.items
, remote
->push
.nr
,
1597 return error_buf(err
,
1598 _("push refspecs for '%s' do not include '%s'"),
1599 remote
->name
, branch
->name
);
1601 ret
= tracking_for_push_dest(remote
, dst
, err
);
1607 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1609 switch (push_default
) {
1610 case PUSH_DEFAULT_NOTHING
:
1611 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1613 case PUSH_DEFAULT_MATCHING
:
1614 case PUSH_DEFAULT_CURRENT
:
1615 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1617 case PUSH_DEFAULT_UPSTREAM
:
1618 return branch_get_upstream(branch
, err
);
1620 case PUSH_DEFAULT_UNSPECIFIED
:
1621 case PUSH_DEFAULT_SIMPLE
:
1623 const char *up
, *cur
;
1625 up
= branch_get_upstream(branch
, err
);
1628 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1631 if (strcmp(cur
, up
))
1632 return error_buf(err
,
1633 _("cannot resolve 'simple' push to a single destination"));
1638 die("BUG: unhandled push situation");
1641 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1644 return error_buf(err
, _("HEAD does not point to a branch"));
1646 if (!branch
->push_tracking_ref
)
1647 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1648 return branch
->push_tracking_ref
;
1651 static int ignore_symref_update(const char *refname
)
1655 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1656 return 0; /* non-existing refs are OK */
1657 return (flag
& REF_ISSYMREF
);
1661 * Create and return a list of (struct ref) consisting of copies of
1662 * each remote_ref that matches refspec. refspec must be a pattern.
1663 * Fill in the copies' peer_ref to describe the local tracking refs to
1664 * which they map. Omit any references that would map to an existing
1665 * local symbolic ref.
1667 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1668 const struct refspec_item
*refspec
)
1670 const struct ref
*ref
;
1671 struct ref
*ret
= NULL
;
1672 struct ref
**tail
= &ret
;
1674 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1675 char *expn_name
= NULL
;
1677 if (strchr(ref
->name
, '^'))
1678 continue; /* a dereference item */
1679 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1680 refspec
->dst
, &expn_name
) &&
1681 !ignore_symref_update(expn_name
)) {
1682 struct ref
*cpy
= copy_ref(ref
);
1684 cpy
->peer_ref
= alloc_ref(expn_name
);
1686 cpy
->peer_ref
->force
= 1;
1696 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1698 const struct ref
*ref
;
1699 for (ref
= refs
; ref
; ref
= ref
->next
) {
1700 if (refname_match(name
, ref
->name
))
1706 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1708 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1713 return copy_ref(ref
);
1716 static struct ref
*get_local_ref(const char *name
)
1718 if (!name
|| name
[0] == '\0')
1721 if (starts_with(name
, "refs/"))
1722 return alloc_ref(name
);
1724 if (starts_with(name
, "heads/") ||
1725 starts_with(name
, "tags/") ||
1726 starts_with(name
, "remotes/"))
1727 return alloc_ref_with_prefix("refs/", 5, name
);
1729 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1732 int get_fetch_map(const struct ref
*remote_refs
,
1733 const struct refspec_item
*refspec
,
1737 struct ref
*ref_map
, **rmp
;
1739 if (refspec
->pattern
) {
1740 ref_map
= get_expanded_map(remote_refs
, refspec
);
1742 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1744 if (refspec
->exact_sha1
) {
1745 ref_map
= alloc_ref(name
);
1746 get_oid_hex(name
, &ref_map
->old_oid
);
1748 ref_map
= get_remote_ref(remote_refs
, name
);
1750 if (!missing_ok
&& !ref_map
)
1751 die("Couldn't find remote ref %s", name
);
1753 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1754 if (ref_map
->peer_ref
&& refspec
->force
)
1755 ref_map
->peer_ref
->force
= 1;
1759 for (rmp
= &ref_map
; *rmp
; ) {
1760 if ((*rmp
)->peer_ref
) {
1761 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1762 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1763 struct ref
*ignore
= *rmp
;
1764 error("* Ignoring funny ref '%s' locally",
1765 (*rmp
)->peer_ref
->name
);
1766 *rmp
= (*rmp
)->next
;
1767 free(ignore
->peer_ref
);
1772 rmp
= &((*rmp
)->next
);
1776 tail_link_ref(ref_map
, tail
);
1781 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1785 for (; list
; list
= list
->next
)
1786 if (!strcmp(ref
->symref
, list
->name
)) {
1787 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1793 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1796 struct commit
*commit
= pop_commit(&list
);
1797 commit
->object
.flags
&= ~mark
;
1801 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
1804 struct commit
*old_commit
, *new_commit
;
1805 struct commit_list
*list
, *used
;
1809 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1810 * old_commit. Otherwise we require --force.
1812 o
= deref_tag(parse_object(old_oid
), NULL
, 0);
1813 if (!o
|| o
->type
!= OBJ_COMMIT
)
1815 old_commit
= (struct commit
*) o
;
1817 o
= deref_tag(parse_object(new_oid
), NULL
, 0);
1818 if (!o
|| o
->type
!= OBJ_COMMIT
)
1820 new_commit
= (struct commit
*) o
;
1822 if (parse_commit(new_commit
) < 0)
1826 commit_list_insert(new_commit
, &list
);
1828 new_commit
= pop_most_recent_commit(&list
, TMP_MARK
);
1829 commit_list_insert(new_commit
, &used
);
1830 if (new_commit
== old_commit
) {
1835 unmark_and_free(list
, TMP_MARK
);
1836 unmark_and_free(used
, TMP_MARK
);
1841 * Lookup the upstream branch for the given branch and if present, optionally
1842 * compute the commit ahead/behind values for the pair.
1844 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1845 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1846 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1849 * The name of the upstream branch (or NULL if no upstream is defined) is
1850 * returned via *upstream_name, if it is not itself NULL.
1852 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1853 * upstream defined, or ref does not exist). Returns 0 if the commits are
1854 * identical. Returns 1 if commits are different.
1856 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1857 const char **upstream_name
, enum ahead_behind_flags abf
)
1859 struct object_id oid
;
1860 struct commit
*ours
, *theirs
;
1861 struct rev_info revs
;
1863 struct argv_array argv
= ARGV_ARRAY_INIT
;
1865 /* Cannot stat unless we are marked to build on top of somebody else. */
1866 base
= branch_get_upstream(branch
, NULL
);
1868 *upstream_name
= base
;
1872 /* Cannot stat if what we used to build on no longer exists */
1873 if (read_ref(base
, &oid
))
1875 theirs
= lookup_commit_reference(&oid
);
1879 if (read_ref(branch
->refname
, &oid
))
1881 ours
= lookup_commit_reference(&oid
);
1885 *num_theirs
= *num_ours
= 0;
1887 /* are we the same? */
1890 if (abf
== AHEAD_BEHIND_QUICK
)
1892 if (abf
!= AHEAD_BEHIND_FULL
)
1893 BUG("stat_tracking_info: invalid abf '%d'", abf
);
1895 /* Run "rev-list --left-right ours...theirs" internally... */
1896 argv_array_push(&argv
, ""); /* ignored */
1897 argv_array_push(&argv
, "--left-right");
1898 argv_array_pushf(&argv
, "%s...%s",
1899 oid_to_hex(&ours
->object
.oid
),
1900 oid_to_hex(&theirs
->object
.oid
));
1901 argv_array_push(&argv
, "--");
1903 init_revisions(&revs
, NULL
);
1904 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
1905 if (prepare_revision_walk(&revs
))
1906 die("revision walk setup failed");
1908 /* ... and count the commits on each side. */
1910 struct commit
*c
= get_revision(&revs
);
1913 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1919 /* clear object flags smudged by the above traversal */
1920 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1921 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1923 argv_array_clear(&argv
);
1928 * Return true when there is anything to report, otherwise false.
1930 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
1931 enum ahead_behind_flags abf
)
1933 int ours
, theirs
, sti
;
1934 const char *full_base
;
1936 int upstream_is_gone
= 0;
1938 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, abf
);
1942 upstream_is_gone
= 1;
1945 base
= shorten_unambiguous_ref(full_base
, 0);
1946 if (upstream_is_gone
) {
1948 _("Your branch is based on '%s', but the upstream is gone.\n"),
1950 if (advice_status_hints
)
1952 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1955 _("Your branch is up to date with '%s'.\n"),
1957 } else if (abf
== AHEAD_BEHIND_QUICK
) {
1959 _("Your branch and '%s' refer to different commits.\n"),
1961 if (advice_status_hints
)
1962 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
1963 "git status --ahead-behind");
1964 } else if (!theirs
) {
1966 Q_("Your branch is ahead of '%s' by %d commit.\n",
1967 "Your branch is ahead of '%s' by %d commits.\n",
1970 if (advice_status_hints
)
1972 _(" (use \"git push\" to publish your local commits)\n"));
1975 Q_("Your branch is behind '%s' by %d commit, "
1976 "and can be fast-forwarded.\n",
1977 "Your branch is behind '%s' by %d commits, "
1978 "and can be fast-forwarded.\n",
1981 if (advice_status_hints
)
1983 _(" (use \"git pull\" to update your local branch)\n"));
1986 Q_("Your branch and '%s' have diverged,\n"
1987 "and have %d and %d different commit each, "
1989 "Your branch and '%s' have diverged,\n"
1990 "and have %d and %d different commits each, "
1993 base
, ours
, theirs
);
1994 if (advice_status_hints
)
1996 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2002 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2003 int flag
, void *cb_data
)
2005 struct ref
***local_tail
= cb_data
;
2008 /* we already know it starts with refs/ to get here */
2009 if (check_refname_format(refname
+ 5, 0))
2012 ref
= alloc_ref(refname
);
2013 oidcpy(&ref
->new_oid
, oid
);
2015 *local_tail
= &ref
->next
;
2019 struct ref
*get_local_heads(void)
2021 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2023 for_each_ref(one_local_ref
, &local_tail
);
2027 struct ref
*guess_remote_head(const struct ref
*head
,
2028 const struct ref
*refs
,
2031 const struct ref
*r
;
2032 struct ref
*list
= NULL
;
2033 struct ref
**tail
= &list
;
2039 * Some transports support directly peeking at
2040 * where HEAD points; if that is the case, then
2041 * we don't have to guess.
2044 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2046 /* If refs/heads/master could be right, it is. */
2048 r
= find_ref_by_name(refs
, "refs/heads/master");
2049 if (r
&& !oidcmp(&r
->old_oid
, &head
->old_oid
))
2053 /* Look for another ref that points there */
2054 for (r
= refs
; r
; r
= r
->next
) {
2056 starts_with(r
->name
, "refs/heads/") &&
2057 !oidcmp(&r
->old_oid
, &head
->old_oid
)) {
2058 *tail
= copy_ref(r
);
2059 tail
= &((*tail
)->next
);
2068 struct stale_heads_info
{
2069 struct string_list
*ref_names
;
2070 struct ref
**stale_refs_tail
;
2071 struct refspec_item
*refs
;
2075 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2076 int flags
, void *cb_data
)
2078 struct stale_heads_info
*info
= cb_data
;
2079 struct string_list matches
= STRING_LIST_INIT_DUP
;
2080 struct refspec_item query
;
2082 memset(&query
, 0, sizeof(struct refspec_item
));
2083 query
.dst
= (char *)refname
;
2085 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2086 if (matches
.nr
== 0)
2087 goto clean_exit
; /* No matches */
2090 * If we did find a suitable refspec and it's not a symref and
2091 * it's not in the list of refs that currently exist in that
2092 * remote, we consider it to be stale. In order to deal with
2093 * overlapping refspecs, we need to go over all of the
2096 if (flags
& REF_ISSYMREF
)
2099 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2100 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2104 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2105 oidcpy(&ref
->new_oid
, oid
);
2109 string_list_clear(&matches
, 0);
2113 struct ref
*get_stale_heads(struct refspec_item
*refs
, int ref_count
, struct ref
*fetch_map
)
2115 struct ref
*ref
, *stale_refs
= NULL
;
2116 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2117 struct stale_heads_info info
;
2119 info
.ref_names
= &ref_names
;
2120 info
.stale_refs_tail
= &stale_refs
;
2122 info
.ref_count
= ref_count
;
2123 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2124 string_list_append(&ref_names
, ref
->name
);
2125 string_list_sort(&ref_names
);
2126 for_each_ref(get_stale_heads_cb
, &info
);
2127 string_list_clear(&ref_names
, 0);
2134 static void clear_cas_option(struct push_cas_option
*cas
)
2138 for (i
= 0; i
< cas
->nr
; i
++)
2139 free(cas
->entry
[i
].refname
);
2141 memset(cas
, 0, sizeof(*cas
));
2144 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2145 const char *refname
,
2148 struct push_cas
*entry
;
2149 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2150 entry
= &cas
->entry
[cas
->nr
++];
2151 memset(entry
, 0, sizeof(*entry
));
2152 entry
->refname
= xmemdupz(refname
, refnamelen
);
2156 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2159 struct push_cas
*entry
;
2162 /* "--no-<option>" */
2163 clear_cas_option(cas
);
2168 /* just "--<option>" */
2169 cas
->use_tracking_for_rest
= 1;
2173 /* "--<option>=refname" or "--<option>=refname:value" */
2174 colon
= strchrnul(arg
, ':');
2175 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2177 entry
->use_tracking
= 1;
2179 oidclr(&entry
->expect
);
2180 else if (get_oid(colon
+ 1, &entry
->expect
))
2181 return error("cannot parse expected object name '%s'", colon
+ 1);
2185 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2187 return parse_push_cas_option(opt
->value
, arg
, unset
);
2190 int is_empty_cas(const struct push_cas_option
*cas
)
2192 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2196 * Look at remote.fetch refspec and see if we have a remote
2197 * tracking branch for the refname there. Fill its current
2199 * If we cannot do so, return negative to signal an error.
2201 static int remote_tracking(struct remote
*remote
, const char *refname
,
2202 struct object_id
*oid
)
2206 dst
= apply_refspecs(remote
->fetch
.items
, remote
->fetch
.nr
, refname
);
2208 return -1; /* no tracking ref for refname at remote */
2209 if (read_ref(dst
, oid
))
2210 return -1; /* we know what the tracking ref is but we cannot read it */
2214 static void apply_cas(struct push_cas_option
*cas
,
2215 struct remote
*remote
,
2220 /* Find an explicit --<option>=<name>[:<value>] entry */
2221 for (i
= 0; i
< cas
->nr
; i
++) {
2222 struct push_cas
*entry
= &cas
->entry
[i
];
2223 if (!refname_match(entry
->refname
, ref
->name
))
2225 ref
->expect_old_sha1
= 1;
2226 if (!entry
->use_tracking
)
2227 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2228 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2229 oidclr(&ref
->old_oid_expect
);
2233 /* Are we using "--<option>" to cover all? */
2234 if (!cas
->use_tracking_for_rest
)
2237 ref
->expect_old_sha1
= 1;
2238 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2239 oidclr(&ref
->old_oid_expect
);
2242 void apply_push_cas(struct push_cas_option
*cas
,
2243 struct remote
*remote
,
2244 struct ref
*remote_refs
)
2247 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2248 apply_cas(cas
, remote
, ref
);